Index: sources/gui/guiglobals.h
===================================================================
diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5
--- sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
+++ sources/gui/guiglobals.h	(.../guiglobals.h)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -39,55 +39,64 @@
          * *** Exactly as it is going to be shown/used in denali messages       ***\n
          * *** then it can be compared exactly the way it is with no conversion.***\n
          */
-        enum GuiActionsType_Enum /*: quint16 QML doesn't support enum types */ {
-            Unknown                 = 0x0000,
+        enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ {
+            ID_Unknown                 = 0x0000,
 
-            PowerOff                = 0x0100,
-            KeepAlive               = 0x0700,
-            BloodFlow               = 0x0500,
-            DialysateInletFlow      = 0x0800,
-            DialysateOutletFlow     = 0x0B00,
-            TreatmentTime           = 0x0D00,
-            PowerOffBroadcast       = 0x0E00,
+            ID_CANBusFaultCount        = 0x9909,
 
-            AlarmStatus             = 0x0200,
-            AlarmTriggered          = 0x0300,
-            AlarmCleared            = 0x0400,
-            AlarmSilenceReq         = 0x2F00, // 47 - Not implemented yet on FW side
-            AlarmSilenceRsp         = 0x3000, // 48 - Not implemented yet on FW side
+            ID_RawData                 = 0xFFFE,
 
-            LoadCellReadings        = 0x0C00,
+            ID_Acknow                  = 0xFFFF,
+            ID_AcknowGeneric           = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
 
-            PressureOcclusion       = 0x0900,
+            ID_HDDebugText             = 0xF1FF,
+            ID_DGDebugText             = 0xF2FF,
 
-            TemperatureSensors      = 0x2D00, // 45
+            ID_DGCheckIn               = 0x0600,
+            ID_KeepAlive               = 0x0700,
 
-            AdjustBloodDialysateReq = 0x1700, // 23
-            AdjustBloodDialysateRsp = 0x1800, // 24
+            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
 
-            AdjustUltrafiltrationStateReq   = 0x1000, // 16
-            // AcknowGeneric : the response is the AcknowGeneric with the same msgID
+            ID_AlarmStatus             = 0x0200,
+            ID_AlarmTriggered          = 0x0300,
+            ID_AlarmCleared            = 0x0400,
+            ID_AlarmSilenceReq         = 0x2F00, // 47 - Not implemented yet on FW side
+            ID_AlarmSilenceRsp         = 0x3000, // 48 - Not implemented yet on FW side
 
-            AdjustUltrafiltrationEditReq    = 0x1100, // 17
-            AdjustUltrafiltrationEditRsp    = 0x1300, // 19
+            ID_HDOperationModeData     = 0x2500, // 37
 
-            AdjustUltrafiltrationConfirmReq = 0x1500, // 21
-            AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46
+            ID_DGROPumpData            = 0x1F00, // 31
+            ID_DGPressuresData         = 0x2000, // 32
+            ID_DGDrainPumpData         = 0x2400, // 36
+            ID_DGOperationModeData     = 0x2700, // 39
+            ID_DGReservoirData         = 0x2800, // 40
+            ID_DGValvesStatesData      = 0x2A00, // 42
+            ID_DGHeatersData           = 0x2C00, // 44
+            ID_DGLoadCellReadingsData  = 0x0C00, // 12
+            ID_DGTemperaturesData      = 0x2D00, // 45
 
-            AdjustDurationReq       = 0x1600, // 22
-            AdjustDurationRsp       = 0x1B00, // 27
+            ID_AdjustBloodDialysateReq = 0x1700, // 23
+            ID_AdjustBloodDialysateRsp = 0x1800, // 24
 
-            TreatmentRanges         = 0x1A00, // 26
+            ID_AdjustUltrafiltrationStateReq   = 0x1000, // 16
+            // idAcknowGeneric : the response is the AcknowGeneric with the same msgID
 
-            TreatmentState          = 0x0F00, // 15
+            ID_AdjustUltrafiltrationEditReq    = 0x1100, // 17
+            ID_AdjustUltrafiltrationEditRsp    = 0x1300, // 19
 
-            CanBUSFaultCount        = 0x9909,
+            ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21
+            ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46
 
-            String                  = 0xFFFE,
-
-            Acknow                  = 0xFFFF,
-            AcknowGeneric           = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
-
+            ID_AdjustDurationReq       = 0x1600, // 22
+            ID_AdjustDurationRsp       = 0x1B00, // 27
         };
 
         enum class GuiActionsData_Enum /*: quint8  QML doesn't support*/ {
@@ -113,6 +122,13 @@
 
         #include "MsgDefs.h"
         Q_ENUM(Request_Reject_Reasons)
+
+        #include "HDDefs.h"
+        Q_ENUM(HD_Op_Modes)
+        Q_ENUM(UF_Adjustments)
+
+        #include "DGDefs.h"
+        Q_ENUM(DG_Op_Modes)
     };
 
     // to be able to use the enum as signal/slot parameter
@@ -124,6 +140,12 @@
 
     typedef GuiActions::Request_Reject_Reasons  GuiRequestReasons;
 
+    typedef GuiActions::HD_Op_Modes             GuiHDOpModes;
+    typedef GuiActions::DG_Op_Modes             GuiDGOpModes;
+
+    typedef GuiActions::UF_Adjustments          GuiUFAdjustment;
+
+
     void registerTypes();
     void registerQmlTypes();