Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
@@ -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
 
@@ -124,7 +124,7 @@
     {Gui::GuiActionType::ID_FPRORejectionPercentageData             ,   5 * 4       }, //  5 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
+    {Gui::GuiActionType::ID_TDSyringePumpData                       ,  10 * 4       }, //10 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
     //TD Data Messages
@@ -274,6 +274,11 @@
     {Gui::GuiActionType::ID_AdjustHeparinReq                        ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustHeparinRsp                        ,   2 * 4       }, // 3 parameters each 4bytes
 
+    // ---- Dry Bicarb Disconnect
+    {Gui::GuiActionType::ID_DryBicartDisconnectData                 ,   5 * 4       }, // 5 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq            ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp            ,   2 * 4       }, // 2 parameter  each 4bytes
+
     // ---- Rinseback
     {Gui::GuiActionType::ID_AdjustRinsebackReq                      ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustRinsebackRsp                      ,   2 * 4       }, // 2 parameters each 4bytes
@@ -282,6 +287,15 @@
     {Gui::GuiActionType::ID_AdjustRecirculateReq                    ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustRecirculateRsp                    ,   2 * 4       }, // 2 parameters each 4bytes
 
+    // ---- HDF
+    {Gui::GuiActionType::ID_HDF                                     ,   9 * 4       }, // 9 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustHDFStateReq                       ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjsutHDFStateRsp                       ,   2 * 4       }, // 2 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustAutoSubReq                        ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustAutoSubRsp                        ,   2 * 4       }, // 2 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustHDFReq                            ,   2 * 4       }, // 2 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustHDFRsp                            ,   3 * 4       }, // 3 parameter  each 4bytes
+
     // ---- Treatment End
     {Gui::GuiActionType::ID_AdjustTreatmentEndReq                   ,   0 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustTreatmentEndRsp                   ,   2 * 4       }, // 2 parameters each 4bytes
@@ -334,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           },