Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r3da801fd23f007886f7fda5e9b45d17d565150d2 -r024129d0aa4be9de46b0b223d2980a7be4747f15
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 3da801fd23f007886f7fda5e9b45d17d565150d2)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 024129d0aa4be9de46b0b223d2980a7be4747f15)
@@ -160,14 +160,15 @@
             ID_AdjustInitTreatmentRsp                   = 0x4600, // 70     //// ----- @LEAHIZED
             ID_AdjustParametersValidationReq            = 0x3F00, // 63     //// ----- @LEAHIZED
             ID_AdjustParametersValidationRsp            = 0x4000, // 64     //// ----- @LEAHIZED
-            ID_AdjustParametersConfirmReq               = 0x4400, // 68     //// ----- @LEAHIZED
+            ID_AdjustParametersConfirmReq               = 0x440F, // 68     //// ----- @LEAHIZED -> CRAPIZED OBSOLETE
             ID_TreatmentRanges                          = 0x4300, // 67     //// ----- @LEAHIZED
 
             // Pre-Treatment Water Sample
             ID_DGFilterFlushData                        = 0x600F, // ??     //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustWaterSampleReq                     = 0x5D00, // 93
-            ID_AdjustWaterSampleRsp                     = 0x5E00, // 94
             ID_AdjustWaterSampleResultReq               = 0XA300, // 163
+            ID_AdjustWaterSampleResultRsp               = 0xAB00, //
+            ID_AdjustWaterSampleData                    = 0xAC00, //
+
             // Pre-Treatment Consumables Installation Confirm
             ID_AdjustConsumablesConfirmReq              = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest NoCartridge Progress Data
@@ -197,7 +198,7 @@
             // DG Data Messages
             ID_DGROPumpData                             = 0x1F0F, // 31   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGDrainPumpData                          = 0x240F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_DGOperationModeData                      = 0x270F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_DDOperationModeData                      = 0x1300,
             ID_DGReservoirData                          = 0x280F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
             ID_DGAccelerometerData                      = 0x3400, // 52
@@ -221,6 +222,7 @@
             ID_FPConductivityData                       = 0x3700, // 55     //// ----- @LEAHIZED
             ID_FPTemperaturesData                       = 0x3900, // 57     //// ----- @LEAHIZED
             ID_FPROBoosterPumpData                      = 0x5000, // 80     //// ----- @LEAHIZED
+            ID_FPRORejectionPercentageData              = 0x7100, // 113    //// ----- @LEAHIZED
 
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
@@ -234,7 +236,7 @@
             ID_TDBatteryData                            = 0x5400, // 84   //// ----- TODO: Payload subject to change given FW implementation
             ID_TDSwitchesData                           = 0x2100, // 33   //// ----- @LEAHIZED
             ID_TDEjectorData                            = 0x4E00, // 78   //// ----- @LEAHIZED
-            ID_TDTemperatureData                        = 0x5300, // 83   //// ----- TODO: Payload subject to change given FW implementation
+            ID_TDTemperatureData                        = 0x5300, // 83   //// ----- @LEAHIZED
             ID_TreatmentParametersSetPointData          = 0x4F00, // 79   //// ----- @LEAHIZED
 
             // Blood Prime
@@ -315,18 +317,19 @@
             // Post-Treatment
             // Patient Disconnect
             ID_AdjustPatientDisconnectNotifyReq         = 0x4A00, //  74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
-            ID_AdjustPatientDisconnectConfirmReq        = 0x060F, //  060f   //// ----- @CRAPIZED
-            ID_AdjustPatientDisconnectConfirmRsp        = 0x7E0F, // 126    //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustPatientDisconnectConfirmReq        = 0x5500, // 85
+            ID_AdjustPatientDisconnectConfirmRsp        = 0x5600, // 86
 
             // Disposables Removal
             ID_AdjustDisposablesRemovalConfirmReq       = 0x9400, // 148
             ID_AdjustDisposablesRemovalConfirmRsp       = 0x9500, // 149
 
             // Treatment Log Adjs
-            ID_AdjustTreatmentLogReq                    = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustTreatmentLogRsp                    = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustTreatmentLogReq                    = 0xA900, // 166
+            ID_AdjustTreatmentLogRsp                    = 0xAA00, // 167
+
             // Treatment Log Data
-            ID_TreatmentLogAvrgeData                    = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentLogAvrgeData                    = 0xAD00, //
             ID_TreatmentLogAlarmData                    = 0x6A00, // 106  //// ----- @LEAHIZED
             ID_TreatmentLogEventData                    = 0x6B00, // 107  //// ----- @LEAHIZED
 
@@ -403,8 +406,8 @@
         Q_ENUM(UF_Adjustments)
         Q_ENUM(UF_Commands)
         // Saline
-        Q_ENUM(Saline_Bolus_States)
-        Q_ENUM(Saline_Commands)
+        Q_ENUM(Fluid_Bolus_States)
+        Q_ENUM(Fluid_Bolus_Commands)
         // Heparin
         Q_ENUM(Heparin_States)
         Q_ENUM(Heparin_Commands)
@@ -479,8 +482,8 @@
     typedef GuiActions::UF_Commands                                     GuiUFCommands;
     typedef GuiActions::UF_Adjustments                                  GuiUFAdjustment;
     // Saline
-    typedef GuiActions::Saline_Bolus_States                             GuiSalineStates;
-    typedef GuiActions::Saline_Commands                                 GuiSalineCommands;
+    typedef GuiActions::Fluid_Bolus_States                              GuiSalineStates;
+    typedef GuiActions::Fluid_Bolus_Commands                            GuiSalineCommands;
     // Heparin
     typedef GuiActions::Heparin_States                                  GuiHeparinStates;
     typedef GuiActions::Heparin_Commands                                GuiHeparinCommands;