Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r70986eda0c1b55e62935f500014d0aa72f7262fe -r6be40239ce52d641692de158a044af0a54cde1e8
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 70986eda0c1b55e62935f500014d0aa72f7262fe)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 6be40239ce52d641692de158a044af0a54cde1e8)
@@ -7,7 +7,7 @@
  *
  * \file    MessageGlobals.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      30-Mar-2023
+ * \date    (last)      11-Aug-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -64,6 +64,7 @@
     {Gui::GuiActionType::ID_DGPostFinalResultData                   ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_UIPostFinalResultData                   ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_UIPostFinalResultHDReq                  ,   0 * 4       }, // 0 parameters
+    {Gui::GuiActionType::ID_HDRTCEpochData                          ,   1 * 4       }, // 1 parameters each 4bytes
 
     // Service Mode
     {Gui::GuiActionType::ID_AdjustServiceModeReq                    ,   0 * 4       }, // 0 parameters each 4bytes
@@ -74,7 +75,7 @@
     {Gui::GuiActionType::ID_BloodFlow                               ,   8 * 4       }, // 8 parameters each 4bytes
     {Gui::GuiActionType::ID_DialysateInletFlow                      ,   7 * 4       }, // 7 parameters each 4bytes
     {Gui::GuiActionType::ID_DialysateOutletFlow                     ,  10 * 4       }, //10 parameters each 4bytes
-    {Gui::GuiActionType::ID_PressureOcclusion                       ,   3 * 4       }, // 3 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_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_Rinseback                               ,   6 * 4       }, // 6 parameters each 4bytes
@@ -105,6 +106,8 @@
     // HD Data Messages
     {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
 
     // ---- 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
@@ -143,17 +146,17 @@
     {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp         ,   5 * 4       }, // 5 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::ID_AdjustPressuresLimitsReq                ,   4 * 4       }, // 4 parameter  each 4bytes
-    {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp                ,   6 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustPressuresLimitsReq                ,   3 * 4       }, // 3 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp                ,   5 * 4       }, // 5 parameters each 4bytes
 
     // Pre-Treatment
     // Create Parameters
     // Pre-Treatment Initiate Treatment
     {Gui::GuiActionType::ID_AdjustInitTreatmentReq                  ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustInitTreatmentRsp                  ,   2 * 4       }, // 2 parameters each 4bytes
     // Pre-Treatment Treatment Parameters Validation/Confirm
-    {Gui::GuiActionType::ID_AdjustParametersValidationReq           ,  18 * 4       }, //18 parameters each 4bytes
-    {Gui::GuiActionType::ID_AdjustParametersValidationRsp           ,  19 * 4       }, //19 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersValidationReq           ,  17 * 4       }, //17 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersValidationRsp           ,  18 * 4       }, //18 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustParametersConfirmReq              ,   1 * 4       }, // 1 parameters each 4bytes
     // Pre-Treatment Water Sample
     {Gui::GuiActionType::ID_DGFilterFlushData                       ,   2 * 4       }, // 2 parameters each 4bytes
@@ -208,11 +211,13 @@
 
     // ---- Post-Treatment
     // ---- Patient Disconnect
-    {Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq    ,   0 * 4       }, // 0 parameter
+    {Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq        ,   0 * 4       }, // 0 parameter
+    {Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq       ,   0 * 4       }, // 0 parameter
+    {Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp       ,   2 * 4       }, // 2 parameter  each 4bytes
 
     // ---- Disposables Removal
     {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq      ,   0 * 4       }, // 0 parameter
-    {Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp       ,   2 * 4       }, // 2 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp      ,   2 * 4       }, // 2 parameter  each 4bytes
 
     // ---- Treatment Log
     {Gui::GuiActionType::ID_AdjustTreatmentLogReq                   ,   0 * 4       }, // 0 parameter
@@ -247,6 +252,9 @@
     {Gui::GuiActionType::ID_AdjustDisinfectModeRsp                  ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustDisinfectStartReq                 ,   1 * 4       }, // 1 parameter       4bytes
     {Gui::GuiActionType::ID_AdjustDisinfectStartRsp                 ,   2 * 4       }, // 2 parameters each 4bytes
+    // ---- DG Cleaning Usage
+    {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq                ,   0 * 4       }, // 0 parameter
+    {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp                ,  10 * 4       }, //10 parameters each 4bytes
     // ---- RO Water
     {Gui::GuiActionType::ID_DuetRoWaterStatDGq                      ,   0 * 4       }, // 0 parameter  each 4bytes
     {Gui::GuiActionType::ID_DuetRoWaterModeUIi                      ,   1 * 4       }, // 1 parameter  each 4bytes