Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rb7310738257f7a0efc48cdb955a5e11b79343677 -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision b7310738257f7a0efc48cdb955a5e11b79343677)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06)
@@ -7,7 +7,7 @@
  *
  * \file    MessageGlobals.h
  * \author  (last)      Dara Navaei
- * \date    (last)      05-Feb-2024
+ * \date    (last)      06-Nov-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -72,23 +72,23 @@
 
     // -----
     {Gui::GuiActionType::ID_TreatmentTime                           ,   3 * 4       }, // 3 parameters each 4bytes
-    {Gui::GuiActionType::ID_BloodFlow                               ,   8 * 4       }, // 8 parameters each 4bytes
-    {Gui::GuiActionType::ID_DialysateInletFlow                      ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::ID_BloodFlow                               ,  10 * 4       }, //10 parameters each 4bytes
+    {Gui::GuiActionType::ID_DialysateInletFlow                      ,  10 * 4       }, //10 parameters each 4bytes
     {Gui::GuiActionType::ID_DialysateOutletFlow                     ,  13 * 4       }, //13 parameters each 4bytes
-    {Gui::GuiActionType::ID_PressureOcclusion                       ,   8 * 4       }, // 8 parameters each 4bytes
-    {Gui::GuiActionType::ID_Saline                                  ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_PressureOcclusion                       ,  12 * 4       }, //12 parameters each 4bytes
+    {Gui::GuiActionType::ID_Saline                                  ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_Rinseback                               ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Recirculate                             ,   2 * 4       }, // 2 parameters each 4bytes
     {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_HDAirTrapData                           ,   4 * 4       }, // 4 parameters each 4bytes
-    {Gui::GuiActionType::ID_HDBloodLeakData                         ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_HDBloodLeakData                         ,  10 * 4       }, //10 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_HDOperationModeData                     ,   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_TreatmentStates                         ,  11 * 4       }, //11 parameters each 4bytes
     {Gui::GuiActionType::ID_PostTreatmentStates                     ,   2 * 4       }, // 2 parameter  each 4bytes
 
     // DG Data Messages
@@ -98,7 +98,7 @@
     {Gui::GuiActionType::ID_DGOperationModeData                     ,   2 * 4       }, //  2 parameter  each 4bytes
     {Gui::GuiActionType::ID_DGReservoirData                         ,  12 * 4       }, // 12 parameters each 4bytes
     {Gui::GuiActionType::ID_DGValvesStatesData                      ,   1 * 2 + 13  }, //  1 parameter      16bits & 13 parameters each 1 byte
-    {Gui::GuiActionType::ID_DGHeatersData                           ,  11 * 4       }, // 11 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGHeatersData                           ,  13 * 4       }, // 13 parameters each 4bytes
     {Gui::GuiActionType::ID_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
     {Gui::GuiActionType::ID_DGTemperaturesData                      ,  23 * 4       }, // 23 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
@@ -107,7 +107,7 @@
     {Gui::GuiActionType::ID_HDAccelerometerData                     ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_HDSyringePumpData                       ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_HDUsageInfoReq                          ,   0 * 4       }, // 0 parameters each 4bytes
-    {Gui::GuiActionType::ID_HDUsageInfoRsp                          ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2 bytes
+    {Gui::GuiActionType::ID_HDUsageInfoRsp                          ,   4 * 3       }, // 3 parameters each 4bytes
 
     // ---- 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
@@ -258,7 +258,7 @@
     // ---- RO Water
     {Gui::GuiActionType::ID_DuetRoWaterStatDGq                      ,   0 * 4       }, // 0 parameter  each 4bytes
     {Gui::GuiActionType::ID_DuetRoWaterModeUIi                      ,   1 * 4       }, // 1 parameter  each 4bytes
-    {Gui::GuiActionType::ID_DuetRoWaterModeDGr                      ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DuetRoWaterModeDGr                      ,   3 * 4       }, // 3 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_CANBusFaultCount                        ,   1           },
     {Gui::GuiActionType::ID_RawData                                 , 255           },
@@ -272,7 +272,10 @@
     {Gui::GuiActionType::ID_DGGeneralEvent                          ,   5 * 4       }, // 5 parameters each 4bytes
 
     {Gui::GuiActionType::ID_AdjustInstitutionalRecordReq            ,   0 * 4       }, // 0 parameter
-    {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp            ,  26 * 4       }, //26 parameters each 4 bytes
+    {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp            ,  27 * 4       }, //27 parameters each 4 bytes
+
+    // HD reset request in service mode
+    {Gui::GuiActionType::ID_ResetHDInServiceModeReq                 ,   0 * 4       }, // 0 parameters each 4bytes
 };
 
 /*!