Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287)
@@ -75,8 +75,7 @@
             ID_HDGeneralEvent                           = 0xA400,
             ID_DGGeneralEvent                           = 0xA500,
 
-            ID_DGCheckIn                                = 0x0600,
-            ID_TDCheckIn                                = 0x0700,
+            ID_TDCheckIn                                = 0x1000, //  16    //// ----- @LEAHIZED
 
             // Generic Confirmation
             ID_DuetConfirmHDi                           = 0xBA00, // 186
@@ -104,7 +103,6 @@
             ID_AdjustSerialHDRsp                        = 0x9900, // 153
             ID_AdjustSerialDGRsp                        = 0x8800, // 136
 
-
             // Service Information
             ID_AdjustServiceDatesReq                    = 0x8900, // 137
             ID_AdjustServiceDatesHDRsp                  = 0x8A00, // 138
@@ -122,7 +120,7 @@
             ID_HDRTCEpochData                           = 0x0A00, // 10
 
             // State Messages
-            ID_HDOperationModeData                      = 0x2500, // 37
+            ID_HDOperationModeData                      = 0x1200, // 18     //// ----- @LEAHIZED
             ID_PreTreatmentStates                       = 0x5C00, // 92
             ID_TreatmentStates                          = 0x0F00, // 15
             ID_PostTreatmentStates                      = 0x7700, // 119
@@ -147,8 +145,6 @@
             ID_AlarmStatus                              = 0x0200,
             ID_AlarmTriggered                           = 0x0300,
             ID_AlarmCleared                             = 0x0400,
-            ID_AlarmClearedConditionReq                 = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus
-            ID_AlarmClearedConditionRsp                 = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus
             ID_AlarmSilenceReq                          = 0x3200, // 50
             ID_AlarmUserActionReq                       = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD
             ID_AlarmActiveListReq                       = 0x9700, // 151
@@ -232,7 +228,7 @@
             ID_AdjustHeparinRsp                         = 0x4C00, // 76
 
             // Ultrafiltration
-            ID_AdjustUltrafiltrationStateReq            = 0x1000, // 16
+            ID_AdjustUltrafiltrationStateReq            = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationStateRsp            = 0x4100, // 65
 
             ID_AdjustUltrafiltrationEditReq             = 0x1100, // 17
@@ -336,7 +332,6 @@
         // Ultrafiltration
         Q_ENUM(UF_Adjustments)
         Q_ENUM(UF_Commands)
-        Q_ENUM(UF_States)
         // Saline
         Q_ENUM(Saline_Bolus_States)
         Q_ENUM(Saline_Commands)
@@ -355,7 +350,7 @@
         Q_ENUM(Treatment_End_States)
         Q_ENUM(Requested_Treatment_End_User_Actions)
         // Treatment Stop
-        Q_ENUM(Treatment_Stop_States)
+        Q_ENUM(Treatment_Paused_States)
         // Pre-Treatment SubMode
         Q_ENUM(TD_Pre_Treatment_Mode_States)
         // Pre-Treatment Water Sample
@@ -408,7 +403,6 @@
     // Dialysis
     typedef GuiActions::Dialysis_States                                 GuiDialysisState;
     // Ultrafiltration
-    typedef GuiActions::UF_States                                       GuiUFStates;
     typedef GuiActions::UF_Commands                                     GuiUFCommands;
     typedef GuiActions::UF_Adjustments                                  GuiUFAdjustment;
     // Saline
@@ -429,7 +423,7 @@
     typedef GuiActions::Treatment_End_States                            GuiTreatmentEndStates;
     typedef GuiActions::Requested_Treatment_End_User_Actions            GuiTreatmentEndCommands;
     // Treatment Stop
-    typedef GuiActions::Treatment_Stop_States                           GuiTreatmentStopStates;
+    typedef GuiActions::Treatment_Paused_States                         GuiTreatmentPausedStates;
     // Pre-Treatment SubMode
     typedef GuiActions::TD_Pre_Treatment_Mode_States                    GuiPreTreatmentStates;
     // Pre-Treatment Water Sample