Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -rdbe55daa5838b4b8ee07037e78b393c296423cb3
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision dbe55daa5838b4b8ee07037e78b393c296423cb3)
@@ -79,7 +79,7 @@
     {Gui::GuiActionType::ID_Vitals                                  ,   3 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_Ultrafiltration                         ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_IsolatedUF                              ,   6 * 4       }, // 6 parameters each 4bytes
-    {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_Heparin                                 ,   3 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_Rinseback                               ,   7 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Recirculate                             ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_BloodPrime                              ,   4 * 4       }, // 4 parameters each 4bytes
@@ -90,7 +90,7 @@
     {Gui::GuiActionType::ID_HDBloodLeakData                         ,   4 * 4       }, // 4 parameters 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_PreTreatmentStates                      ,   8 * 4       }, // 8 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStates                         ,  10 * 4       }, //10 parameters each 4bytes
     {Gui::GuiActionType::ID_PostTreatmentStates                     ,   2 * 4       }, // 2 parameter  each 4bytes
 
@@ -129,7 +129,7 @@
     {Gui::GuiActionType::ID_HDUsageInfoRsp                          ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2 bytes
     //TD Data Messages
     {Gui::GuiActionType::ID_TDVoltageData                           ,   8 * 4       }, // 8 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDValvesData                            ,   3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
+    {Gui::GuiActionType::ID_TDValvesData                            ,   3 * 4 + 5*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
     {Gui::GuiActionType::ID_TDEjectorData                           ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_TDSwitchesData                          ,   1 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes
@@ -248,7 +248,7 @@
     // Pre-Treatment Disposable Priming
     {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq               ,   0 * 4       }, // 0 parameter
     {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp               ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_DisposablesPrimeData                    ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisposablesPrimeData                    ,   4 * 4       }, // 2 parameters each 4bytes
     // Pre-Treatment Patient Connection Begin
     {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq         ,   0 * 4       }, // 0 parameter
     {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp         ,   2 * 4       }, // 2 parameters each 4bytes
@@ -348,9 +348,10 @@
     {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
-    {Gui::GuiActionType::ID_DuetRoWaterModeDGr                      ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_RoWaterModeReq                          ,   0 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_RoWaterModeRsp                          ,   3 * 4       }, // 3 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustRoWaterModeReq                    ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustRoWaterModeRsp                    ,   2 * 4       }, // 2 parameter  each 4bytes
     // ----
     {Gui::GuiActionType::ID_RawData                                 , 255           },
     {Gui::GuiActionType::ID_Acknow                                  ,   0           },