Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r786c598a074df1620995ce09a1166a4f7173add6 -r54dac829fccaf4646e2e21c18226893afd3d8e73
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 786c598a074df1620995ce09a1166a4f7173add6)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 54dac829fccaf4646e2e21c18226893afd3d8e73)
@@ -98,7 +98,6 @@
     // DG Data Messages
     {Gui::GuiActionType::ID_DGROPumpData                            ,   6 * 4       }, //  6 parameters each 4bytes
     {Gui::GuiActionType::ID_DGDrainPumpData                         ,   8 * 4       }, //  8 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGOperationModeData                     ,   2 * 4       }, //  2 parameter  each 4bytes
     {Gui::GuiActionType::ID_DGReservoirData                         ,  12 * 4       }, // 12 parameters each 4bytes
     {Gui::GuiActionType::ID_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
@@ -111,8 +110,10 @@
     {Gui::GuiActionType::ID_DDDialysatePumpData                     ,  20 * 4       }, // 20 parameters each 4bytes
     {Gui::GuiActionType::ID_DDHeatersData                           ,   8 * 4       }, //  8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes
     {Gui::GuiActionType::ID_DDLevelData                             ,   3 * 4       }, //  3 parameters each 4bytes
-    {Gui::GuiActionType::ID_DDGenDialysateData                      ,   9 * 4       }, //  9 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDGenDialysateData                      ,   4 * 4       }, //  4 parameters each 4bytes
     {Gui::GuiActionType::ID_DDBloodLeakData                         ,   1 * 4       }, //  1 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDOperationModeData                     ,   2 * 4       }, //  2 parameter  each 4bytes
+
     //FP Data Messages
     {Gui::GuiActionType::ID_FPROPumpData                            ,   9 * 4       }, //  9 parameters each 4bytes
     {Gui::GuiActionType::ID_FPPressuresData                         ,   9 * 4       }, //  9 parameters each 4bytes
@@ -121,6 +122,7 @@
     {Gui::GuiActionType::ID_FPConductivityData                      ,   2 * 4       }, //  2 parameters each 4bytes
     {Gui::GuiActionType::ID_FPTemperaturesData                      ,  13 * 4       }, // 13 parameters each 4bytes
     {Gui::GuiActionType::ID_FPROBoosterPumpData                     ,   9 * 4       }, //  9 parameters each 4bytes
+    {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
@@ -221,14 +223,13 @@
     {Gui::GuiActionType::ID_AdjustInitTreatmentReq                  ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustInitTreatmentRsp                  ,   2 * 4       }, // 2 parameters each 4bytes
     // Pre-Treatment Treatment Parameters Validation/Confirm
-    {Gui::GuiActionType::ID_AdjustParametersValidationReq           ,  24 * 4       }, //24 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustParametersValidationReq           ,  25 * 4       }, //25 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustParametersValidationRsp           ,  25 * 4       }, //25 parameters each 4bytes
-    {Gui::GuiActionType::ID_AdjustParametersConfirmReq              ,   1 * 4       }, // 1 parameters each 4bytes
     // Pre-Treatment Water Sample
     {Gui::GuiActionType::ID_DGFilterFlushData                       ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_AdjustWaterSampleReq                    ,   1 * 4       }, // 1 parameters each 4bytes
-    {Gui::GuiActionType::ID_AdjustWaterSampleRsp                    ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustWaterSampleResultReq              ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustWaterSampleResultRsp              ,   3 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustWaterSampleData                   ,   2 * 4       }, // 2 parameters each 4bytes
     // Pre-Treatment Consumables Installation Confirm
     {Gui::GuiActionType::ID_AdjustConsumablesConfirmReq             ,   0 * 4       }, // 0 parameter
     // Pre-Treatment SelfTest NoCartridge Progress Data
@@ -291,7 +292,7 @@
 
     // ---- Treatment Log
     {Gui::GuiActionType::ID_AdjustTreatmentLogReq                   ,   0 * 4       }, // 0 parameter
-    {Gui::GuiActionType::ID_AdjustTreatmentLogRsp                   ,  36 * 4       }, //36 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustTreatmentLogRsp                   ,  62 * 4       }, // 62 parameter  each 4bytes
     {Gui::GuiActionType::ID_TreatmentLogAvrgeData                   ,   5 * 4       }, // 5 parameter  each 4bytes
     {Gui::GuiActionType::ID_TreatmentLogAlarmData                   ,   3 * 4       }, // 3 parameter  each 4bytes
     {Gui::GuiActionType::ID_TreatmentLogEventData                   ,   3 * 4       }, // 3 parameter  each 4bytes