Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rfd7a047d5520d16d4621aaddcb008467ad6ee5b5 -r472f06f3448ba0708f4b2592e202b45ce76f6836
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision fd7a047d5520d16d4621aaddcb008467ad6ee5b5)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 472f06f3448ba0708f4b2592e202b45ce76f6836)
@@ -91,8 +91,8 @@
 
             // ----- Settings
             // Service Mode
-            ID_AdjustServiceModeReq                    = 0xB000, // 176
-            ID_AdjustServiceModeRsp                    = 0xB100, // 177
+            ID_AdjustServiceModeReq                     = 0xB000, // 176
+            ID_AdjustServiceModeRsp                     = 0xB100, // 177
 
             // Version
             ID_AdjustVersionsUIReq                      = 0x0D00, // 13     //// ----- @LEAHIZED
@@ -127,13 +127,14 @@
 
             // -----
             ID_PowerOff                                 = 0x010F, // 010F   //// ----- @CRAPIZED
-            ID_ShuttingDown                             = 0x0E0F, // 35  //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_TreatmentTime                            = 0x0D0F, //     //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_BloodFlow                                = 0x0500,
+            ID_ShuttingDown                             = 0x0E0F, // 35     //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentTime                            = 0x3B00, // 59     //// ----- @LEAHIZED
+            ID_BloodFlow                                = 0x1100, // 11     //// ----- @LEAHIZED
             ID_DialysateInletFlow                       = 0x0800,
             ID_DialysateOutletFlow                      = 0x0B00,
-            ID_PressureOcclusion                        = 0x0900,
-            ID_Saline                                   = 0x2F00, // 47
+            ID_PressureOcclusion                        = 0x2400, // 36     //// ----- @LEAHIZED
+            ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
+            ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
             ID_Heparin                                  = 0x4D00, // 77
             ID_Rinseback                                = 0x5600, // 86
             ID_Recirculate                              = 0x5A00, // 90
@@ -175,13 +176,13 @@
             ID_SelfTestDryData                          = 0x6300, // 99
             // Pre-Treatment Disposable Priming
             ID_AdjustDisposablesPrimeReq                = 0x3C00, // 60
-            ID_AdjustDisposablesPrimeRsp                = 0x3D00, // 61
+            ID_AdjustDisposablesPrimeRsp                = 0x3D0F, // 61  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DisposablesPrimeData                     = 0x43FF, // ??     //// ----- @CRAPIZED - FFed
             // Pre-Treatment Patient Connection Begin
             ID_AdjustPatientConnectionBeginReq          = 0x6400, // 100
             ID_AdjustPatientConnectionBeginRsp          = 0x6500, // 101
             // Pre-Treatment Ultrafiltration initial volume
-            ID_AdjustUltrafiltrationInitReq             = 0x4F00, // 79
+            ID_AdjustUltrafiltrationInitReq             = 0x4F0F, // 79  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationInitRsp             = 0x5000, // 80
             // Pre-Treatment Patient Connection Confirm
             ID_AdjustPatientConnectionConfirmReq        = 0x6600, // 102
@@ -191,7 +192,7 @@
             ID_AdjustStartTreatmentRsp                  = 0x7200, // 114
 
             // DG Data Messages
-            ID_DGROPumpData                             = 0x1F00, // 31
+            ID_DGROPumpData                             = 0x1F0F, // 31  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGPressuresData                          = 0x2000, // 32
             ID_DGDrainPumpData                          = 0x2400, // 36
             ID_DGOperationModeData                      = 0x2700, // 39
@@ -201,7 +202,8 @@
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
             ID_DGTemperaturesData                       = 0x2D00, // 45
             ID_DGAccelerometerData                      = 0x3400, // 52
-            ID_DGConductivityData                       = 0x3100, // 49
+            ID_DDConductivityData                       = 0x1F00, // 31     //// ----- @LEAHIZED
+            ID_DDGenDialysateData                       = 0x2F00, // 47     //// ----- @LEAHIZED
 
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
@@ -210,12 +212,12 @@
             ID_HDAirBubbleData                          = 0x9300, // 147
             ID_TDAirTrapData                            = 0x2A00, // 42   //// ----- @LEAHIZED
             ID_TDVoltageData                            = 0x1D00, // 29   //// ----- @LEAHIZED
-            ID_TDBloodPumpData                          = 0x1100, // 17   //// ----- @LEAHIZED
             ID_TDValvesData                             = 0x2B00, // 43   //// ----- @LEAHIZED
             ID_TDBatteryData                            = 0x9400, //149   //// ----- TODO: MsgID subject to change given FW implementation
             ID_TDSwitchesData                           = 0x2100, // 33   //// ----- @LEAHIZED
             ID_TDEjectorData                            = 0x4E00, // 78   //// ----- @LEAHIZED
             ID_TDTemperatureData                        = 0x9100, //146   //// ----- TODO: MsgID subject to change given FW implementation
+            ID_TreatmentSetPointData                    = 0x4F00, // 79     //// ----- @LEAHIZED
 
             // In-Treatment Adjustables
             ID_AdjustDurationReq                        = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication
@@ -237,7 +239,7 @@
             ID_AdjustUltrafiltrationStateReq            = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationStateRsp            = 0x4100, // 65
 
-            ID_AdjustUltrafiltrationEditReq             = 0x1100, // 17
+            ID_AdjustUltrafiltrationEditReq             = 0x110F, // 17 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationEditRsp             = 0x1300, // 19
 
             ID_AdjustUltrafiltrationConfirmReq          = 0x150F, // 21 //// ----- @CRAPIZED: had to change to avoid duplication