Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r30d7e9993624feb138e7532ad2feaefc592f6a63 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 30d7e9993624feb138e7532ad2feaefc592f6a63)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    MessageGlobals.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      04-Oct-2022
+ * \date    (last)      10-Feb-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -73,8 +73,8 @@
     {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_DialysateOutletFlow                     ,   7 * 4       }, // 7 parameters each 4bytes
-    {Gui::GuiActionType::ID_PressureOcclusion                       ,   5 * 4       }, // 5 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_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
@@ -83,25 +83,25 @@
     {Gui::GuiActionType::ID_TreatmentStop                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_HDAirBubbleData                         ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_HDAirTrapData                           ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_HDBloodLeakData                         ,  10 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_HDBloodLeakData                         ,   2 * 4       }, // 2 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_HDOperationModeData                     ,   2 * 4       }, // 2 parameter  each 4bytes
-    {Gui::GuiActionType::ID_PreTreatmentStates                      ,   9 * 4       }, // 9 parameters each 4bytes
-    {Gui::GuiActionType::ID_TreatmentStates                         ,  10 * 4       }, // 9 parameters each 4bytes
-    {Gui::GuiActionType::ID_PostTreatmentStates                     ,   1 * 4       }, // 1 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
 
     // DG Data Messages
-    {Gui::GuiActionType::ID_DGROPumpData                            ,   4 * 4       }, //  4 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGPressuresData                         ,   4 * 4       }, //  4 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGDrainPumpData                         ,   4 * 4       }, //  4 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGROPumpData                            ,   6 * 4       }, //  6 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGPressuresData                         ,   5 * 4       }, //  5 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGDrainPumpData                         ,   7 * 4       }, //  7 parameters each 4bytes
     {Gui::GuiActionType::ID_DGOperationModeData                     ,   2 * 4       }, //  2 parameter  each 4bytes
-    {Gui::GuiActionType::ID_DGReservoirData                         ,   3 * 4       }, //  3 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGValvesStatesData                      ,   1 * 2       }, //  1 parameters each 2bytes
-    {Gui::GuiActionType::ID_DGHeatersData                           ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGReservoirData                         ,  15 * 4       }, // 15 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_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGTemperaturesData                      ,  13 * 4       }, // 13 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGTemperaturesData                      ,  21 * 4       }, // 21 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGConductivityData                      ,   5 * 4       }, //  9 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGConductivityData                      ,  13 * 4       }, // 13 parameters each 4bytes
     // HD Data Messages
     {Gui::GuiActionType::ID_HDAccelerometerData                     ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_HDSyringePumpData                       ,   9 * 4       }, // 9 parameters each 4bytes