Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r4bbec52d2257cfdef37604e3453846e501a2af91 -r7710fea4486a639caaa3c510add0eac0bcd4ddcc
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 4bbec52d2257cfdef37604e3453846e501a2af91)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc)
@@ -75,36 +75,41 @@
             ID_DGCheckIn                        = 0x0600,
             ID_KeepAlive                        = 0x0700,
 
+            // HD Data Messages
             ID_PowerOff                         = 0x0100,
             ID_ShuttingDown                     = 0x0E00,
             ID_TreatmentTime                    = 0x0D00,
             ID_BloodFlow                        = 0x0500,
             ID_DialysateInletFlow               = 0x0800,
             ID_DialysateOutletFlow              = 0x0B00,
             ID_TreatmentRanges                  = 0x1A00, // 26
-            ID_PressureOcclusion                = 0x0900,
             ID_TreatmentStates                  = 0x0F00, // 15
+            ID_HDOperationModeData              = 0x2500, // 37
+            ID_PressureOcclusion                = 0x0900,
             ID_Saline                           = 0x2F00, // 47
             ID_Heparin                          = 0x4D00, // 77
 
+            // Alarm Messages
             ID_AlarmStatus                      = 0x0200,
             ID_AlarmTriggered                   = 0x0300,
             ID_AlarmCleared                     = 0x0400,
-            ID_AlarmUserAckReq                  = 0x3F00, // 63
+            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
 
+            // Pre-Treatment Parameters
             ID_CreateTreatmentReq               = 0x3500, // 53
             ID_CreateTreatmentRsp               = 0x3600, // 54
             ID_StartTreatmentReq                = 0x3800, // 56
             ID_StartTreatmentRsp                = 0x3900, // 57
-            ID_ConfirmTreatmentReq              = 0x3A00, // 58
+            ID_ConfirmTreatmentReq              = 0x3B00, // 59
             ID_EndTreatmentReq                  = 0x3C00, // 60
             ID_EndTreatmentRsp                  = 0x3D00, // 61
-
             ID_PrimingData                      = 0x4300, // 67
 
-            ID_HDOperationModeData              = 0x2500, // 37
 
+            // DG Data Messages
             ID_DGROPumpData                     = 0x1F00, // 31
             ID_DGPressuresData                  = 0x2000, // 32
             ID_DGDrainPumpData                  = 0x2400, // 36
@@ -115,9 +120,27 @@
             ID_DGLoadCellReadingsData           = 0x0C00, // 12
             ID_DGTemperaturesData               = 0x2D00, // 45
 
+            // In-Treatment Adjustables
+            ID_AdjustDurationReq                = 0x1600, // 22
+            ID_AdjustDurationRsp                = 0x1B00, // 27
+
             ID_AdjustBloodDialysateReq          = 0x1700, // 23
             ID_AdjustBloodDialysateRsp          = 0x1800, // 24
 
+            ID_AdjustPressuresLimitsReq         = 0x4600, // 70
+            ID_AdjustPressuresLimitsRsp         = 0x4700, // 71
+
+            ID_AdjustSalineReq                  = 0x1200, // 18
+            ID_AdjustSalineRsp                  = 0x1400, // 20
+
+            ID_AdjustHeparinReq                 = 0x4B00, // 75
+            ID_AdjustHeparinRsp                 = 0x4C00, // 76
+
+
+            // Ultrafiltration: has also In-Treatment Adjustables but kept together
+            ID_AdjustUltrafiltrationInitReq     = 0x4F00, // 79
+            ID_AdjustUltrafiltrationInitRsp     = 0x5000, // 80
+
             ID_AdjustUltrafiltrationStateReq    = 0x1000, // 16
             ID_AdjustUltrafiltrationStateRsp    = 0x4100, // 65
 
@@ -126,18 +149,6 @@
 
             ID_AdjustUltrafiltrationConfirmReq  = 0x1500, // 21
             ID_AdjustUltrafiltrationConfirmRsp  = 0x2E00, // 46
-
-            ID_AdjustDurationReq                = 0x1600, // 22
-            ID_AdjustDurationRsp                = 0x1B00, // 27
-
-            ID_AdjustSalineReq                  = 0x1200, // 18
-            ID_AdjustSalineRsp                  = 0x1400, // 20
-
-            ID_AdjustPressuresLimitsReq         = 0x4600, // 70
-            ID_AdjustPressuresLimitsRsp         = 0x4700, // 71
-
-            ID_AdjustHeparinReq                 = 0x4B00, // 75
-            ID_AdjustHeparinRsp                 = 0x4C00, // 76
         };
 
         enum class GuiActionsData_Enum /*: quint8  QML doesn't support*/ {
@@ -160,6 +171,8 @@
         #include "AlarmDefs.h"
         Q_ENUM(Alarm_Priorities)
         Q_ENUM(Alarm_List      )
+        Q_ENUM(Alarm_State_Flag_Bit_Positions)
+        Q_ENUM(Alarm_User_Actions)
 
         #include "MsgDefs.h"
         Q_ENUM(Request_Reject_Reasons)
@@ -182,25 +195,27 @@
     };
 
     // to be able to use the enum as signal/slot parameter
-    typedef GuiActions::GuiActionsType_Enum     GuiActionType;
-    typedef GuiActions::GuiActionsData_Enum     GuiActionData;
+    typedef GuiActions::GuiActionsType_Enum             GuiActionType;
+    typedef GuiActions::GuiActionsData_Enum             GuiActionData;
 
-    typedef GuiActions::Alarm_Priorities        GuiAlarmPriority;
-    typedef GuiActions::Alarm_List              GuiAlarmID;
+    typedef GuiActions::Alarm_Priorities                GuiAlarmPriority;
+    typedef GuiActions::Alarm_List                      GuiAlarmID;
+    typedef GuiActions::Alarm_State_Flag_Bit_Positions  GuiAlarmFlags;
+    typedef GuiActions::Alarm_User_Actions              GuiAlarmUserActions;
 
-    typedef GuiActions::Request_Reject_Reasons  GuiRequestReasons;
+    typedef GuiActions::Request_Reject_Reasons          GuiRequestReasons;
 
-    typedef GuiActions::HD_Op_Modes             GuiHDOpModes;
-    typedef GuiActions::DG_Op_Modes             GuiDGOpModes;
+    typedef GuiActions::HD_Op_Modes                     GuiHDOpModes;
+    typedef GuiActions::DG_Op_Modes                     GuiDGOpModes;
 
-    typedef GuiActions::UF_Adjustments          GuiUFAdjustment;
-    typedef GuiActions::Treatment_States        GuiTreatmentStates;
-    typedef GuiActions::UF_Commands             GuiUFCommands;
-    typedef GuiActions::UF_States               GuiUFStates;
-    typedef GuiActions::Saline_Commands         GuiSalineCommands;
-    typedef GuiActions::Saline_Bolus_States     GuiSalineStates;
-    typedef GuiActions::Heparin_Commands        GuiHeparinCommands;
-    typedef GuiActions::Heparin_States          GuiHeparinStates;
+    typedef GuiActions::UF_Adjustments                  GuiUFAdjustment;
+    typedef GuiActions::Treatment_States                GuiTreatmentStates;
+    typedef GuiActions::UF_Commands                     GuiUFCommands;
+    typedef GuiActions::UF_States                       GuiUFStates;
+    typedef GuiActions::Saline_Commands                 GuiSalineCommands;
+    typedef GuiActions::Saline_Bolus_States             GuiSalineStates;
+    typedef GuiActions::Heparin_Commands                GuiHeparinCommands;
+    typedef GuiActions::Heparin_States                  GuiHeparinStates;
 
     void registerTypes();
     void registerQmlTypes();