Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r5f69bb944ed9b2186528f726def2630544bd0de6 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 5f69bb944ed9b2186528f726def2630544bd0de6)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07)
@@ -51,7 +51,7 @@
     // ----
     {Gui::GuiActionType::ID_PowerOff                                ,   1           }, // 1 byte
     {Gui::GuiActionType::ID_ShuttingDown                            ,   0           },
-    {Gui::GuiActionType::ID_TDCheckIn                               , 255           }, // 0 => 255 to be able to run a multi-frame test.
+    {Gui::GuiActionType::ID_TDCheckIn                               ,   0           }, //// ----- @LEAHIZED
 
     // Generic Confirm
     {Gui::GuiActionType::ID_DuetConfirmHDi                          ,   3 * 4       }, // 3 parameters each 4bytes
@@ -86,7 +86,7 @@
     {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
+    {Gui::GuiActionType::ID_TDOpModeData                            ,   2 * 4       }, // 2 parameter  each 4bytes
     {Gui::GuiActionType::ID_PreTreatmentStates                      ,  11 * 4       }, //11 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStates                         ,  10 * 4       }, //10 parameters each 4bytes
     {Gui::GuiActionType::ID_PostTreatmentStates                     ,   2 * 4       }, // 2 parameter  each 4bytes
@@ -117,7 +117,7 @@
     {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
+    {Gui::GuiActionType::ID_AlarmStatus                             ,   4 * 3 + 2   }, // 3 parameters each 4bytes + 1 parameter 2bytes
     {Gui::GuiActionType::ID_AlarmTriggered                          ,   8 * 4       }, // 5 parameters each 4bytes
     {Gui::GuiActionType::ID_AlarmCleared                            ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AlarmSilenceReq                         ,   1 * 4       }, // 1 parameter  each 1bytes
@@ -233,10 +233,10 @@
 
     // ---- Versions
     {Gui::GuiActionType::ID_AdjustVersionsUIReq                     ,1+1+1+2+4      }, // variable length parameters
-    {Gui::GuiActionType::ID_AdjustVersionsTDRsp                     ,3*1+2+4*1+4    }, // variable length parameters
-    {Gui::GuiActionType::ID_AdjustVersionsDDRsp                     ,3*1+2+4*1+4    }, // variable length parameters
-    {Gui::GuiActionType::ID_AdjustSerialTDRsp                       ,   1 * 1       }, // minimum 1 parameter 1 byte
-    {Gui::GuiActionType::ID_AdjustSerialDDRsp                       ,   1 * 1       }, // minimum 1 parameter 1 byte
+    {Gui::GuiActionType::ID_AdjustVersionsHDRsp                     ,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_AdjustSerialHDRsp                       ,   1 * 1       }, // minimum 1 parameter 1 byte
+    {Gui::GuiActionType::ID_AdjustSerialDGRsp                       ,   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