Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r006258aac11cf89bd1a37ffde078c953f5e307f1
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision d862dfcd402206e33b314c458e41c13b684a4565)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 006258aac11cf89bd1a37ffde078c953f5e307f1)
@@ -72,11 +72,12 @@
 
     // -----
     {Gui::GuiActionType::ID_TreatmentTime                           ,   3 * 4       }, // 3 parameters each 4bytes
-    {Gui::GuiActionType::ID_BloodFlow                               ,  10 * 4       }, //10 parameters each 4bytes
+    {Gui::GuiActionType::ID_BloodFlow                               ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_DialysateInletFlow                      ,  10 * 4       }, //10 parameters each 4bytes
     {Gui::GuiActionType::ID_DialysateOutletFlow                     ,  13 * 4       }, //13 parameters each 4bytes
     {Gui::GuiActionType::ID_PressureOcclusion                       ,  12 * 4       }, //12 parameters each 4bytes
-    {Gui::GuiActionType::ID_Saline                                  ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_Saline                                  ,   4 * 4       }, // 4 parameters each 4bytes
+    {Gui::GuiActionType::ID_Ultrafiltration                         ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_Rinseback                               ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Recirculate                             ,   2 * 4       }, // 2 parameters each 4bytes
@@ -102,19 +103,20 @@
     {Gui::GuiActionType::ID_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
     {Gui::GuiActionType::ID_DGTemperaturesData                      ,  23 * 4       }, // 23 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGConductivityData                      ,  13 * 4       }, // 13 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDConductivityData                      ,   8 * 4       }, //  8 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDGenDialysateData                      ,  10 * 4       }, // 10 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_HDUsageInfoReq                          ,   0 * 4       }, // 0 parameters each 4bytes
     {Gui::GuiActionType::ID_HDUsageInfoRsp                          ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2 bytes
     {Gui::GuiActionType::ID_TDVoltageData                           ,  11 * 4       }, //11 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDBloodPumpData                         ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_TDValvesData                            ,   3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
     {Gui::GuiActionType::ID_TDEjectorData                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TDSwitchesData                          ,   1 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
     {Gui::GuiActionType::ID_TDTemperatureData                       ,   1 * 4       }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
+    {Gui::GuiActionType::ID_TreatmentSetPointData                 ,   3 * 4       }, // 3 parameters each 4bytes
 
     // ---- 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 * 3 + 2   }, // 3 parameters each 4bytes + 1 parameter 2bytes