Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision af9b5ee3e759ca45c4e55488f46601f30143edae)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2)
@@ -83,7 +83,7 @@
     {Gui::GuiActionType::ID_BloodPrime                              ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStop                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_HDAirBubbleData                         ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDAirTrapData                           ,   5 * 4 + 1   }, // 5 parameters each 4bytes & 1 parameter 1 bytes
+    {Gui::GuiActionType::ID_TDAirTrapData                           ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_HDBloodLeakData                         ,   4 * 4       }, // 4 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_HDOperationModeData                     ,   2 * 4       }, // 2 parameter  each 4bytes
@@ -113,8 +113,8 @@
     {Gui::GuiActionType::ID_TDValvesData                            ,   3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
     {Gui::GuiActionType::ID_TDEjectorData                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TDSwitchesData                          ,   1 * 4       }, // 3 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes //// LEAHIZED
-    {Gui::GuiActionType::ID_TDTemperatureData                       ,   1 * 4       }, // 1 parameters each 4bytes //// LEAHIZED
+    {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
+    {Gui::GuiActionType::ID_TDTemperatureData                       ,   1 * 4       }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
 
     // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE.
     {Gui::GuiActionType::ID_AlarmStatus                             ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2bytes
@@ -233,10 +233,10 @@
 
     // ---- Versions
     {Gui::GuiActionType::ID_AdjustVersionsUIReq                     ,1+1+1+2+4      }, // variable length parameters
-    {Gui::GuiActionType::ID_AdjustVersionsTDRsp                     ,1+1+1+2+1+1+1+1}, // variable length parameters
-    {Gui::GuiActionType::ID_AdjustVersionsDDRsp                     ,1+1+1+2+1+1+1+1}, // variable length parameters
+    {Gui::GuiActionType::ID_AdjustVersionsTDRsp                     ,3*1+2+4*1+4    }, // variable length parameters
+    {Gui::GuiActionType::ID_AdjustVersionsDGRsp                     ,3*1+2+4*1+4    }, // variable length parameters
     {Gui::GuiActionType::ID_AdjustSerialTDRsp                       ,   1 * 1       }, // minimum 1 parameter 1 byte
-    {Gui::GuiActionType::ID_AdjustSerialDGRsp                       ,   1 * 1       }, // minimum 1 parameter 1 byte
+    {Gui::GuiActionType::ID_AdjustSerialDDRsp                       ,   1 * 1       }, // minimum 1 parameter 1 byte
     // ----
     {Gui::GuiActionType::ID_AdjustVersionsTDReq                     ,   0 * 4       }, // 0 parameter
     {Gui::GuiActionType::ID_AdjustVersionsUIRsp                     ,1+1+1+2+4      }, // variable length parameters