Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -r1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 28f3f8dd18981262995386d29d3c2ab31418bfc4)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3)
@@ -93,8 +93,10 @@
             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
@@ -169,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)
@@ -191,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();