Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r1a78d846d8271f39cb472f88e52f825dbd805a9c -r442616b40449e509dbfc0d1eb8cbfec18ff4ed07
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 1a78d846d8271f39cb472f88e52f825dbd805a9c)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 442616b40449e509dbfc0d1eb8cbfec18ff4ed07)
@@ -71,10 +71,10 @@
 
     // -----
     {Gui::GuiActionType::ID_TreatmentTime                           ,   3 * 4       }, // 3 parameters each 4bytes
-    {Gui::GuiActionType::ID_BloodFlow                               ,   9 * 4       }, // 9 parameters each 4bytes
-    {Gui::GuiActionType::ID_DialysateInletFlow                      ,   9 * 4       }, // 9 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_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_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                      ,  11 * 4       }, //11 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_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_DGROPumpData                            ,   6 * 4       }, //  6 parameters each 4bytes
     {Gui::GuiActionType::ID_DGPressuresData                         ,   5 * 4       }, //  5 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGDrainPumpData                         ,   4 * 4       }, //  4 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_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                      ,  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