Index: sources/gui/guiglobals.h
===================================================================
diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5
--- sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616)
+++ sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
@@ -39,55 +39,56 @@
          * *** 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,
+            idUnknown                 = 0x0000,
 
-            PowerOff                = 0x0100,
+            idCANBusFaultCount        = 0x9909,
 
-            DGCheckIn               = 0x0600,
-            KeepAlive               = 0x0700,
+            idRawData                 = 0xFFFE,
 
-            BloodFlow               = 0x0500,
-            DialysateInletFlow      = 0x0800,
-            DialysateOutletFlow     = 0x0B00,
-            TreatmentTime           = 0x0D00,
-            PowerOffBroadcast       = 0x0E00,
+            idAcknow                  = 0xFFFF,
+            idAcknowGeneric           = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
 
-            AlarmStatus             = 0x0200,
-            AlarmTriggered          = 0x0300,
-            AlarmCleared            = 0x0400,
+            idDGCheckIn               = 0x0600,
+            idKeepAlive               = 0x0700,
 
-            LoadCellReadings        = 0x0C00,
+            idPowerOff                = 0x0100,
+            idPowerOffBroadcast       = 0x0E00,
+            idTreatmentTime           = 0x0D00,
+            idBloodFlow               = 0x0500,
+            idDialysateInletFlow      = 0x0800,
+            idDialysateOutletFlow     = 0x0B00,
+            idTreatmentRanges         = 0x1A00, // 26
+            idPressureOcclusion       = 0x0900,
+            idTreatmentState          = 0x0F00, // 15
 
-            PressureOcclusion       = 0x0900,
+            idAlarmStatus             = 0x0200,
+            idAlarmTriggered          = 0x0300,
+            idAlarmCleared            = 0x0400,
 
-            TemperatureSensors      = 0x2D00, // 45
+            idDGROPumpData            = 0x1F00, // 31
+            idDGPressuresData         = 0x2000, // 32
+            idDGDrainPumpData         = 0x2400, // 36
+            idDGOperationModeData     = 0x2700, // 39
+            idDGReservoirData         = 0x2800, // 40
+            idDGValvesStatesData      = 0x2A00, // 42
+            idDGHeatersData           = 0x2C00, // 44
+            idDGLoadCellReadingsData  = 0x0C00, // 12
+            idDGTemperaturesData      = 0x2D00, // 45
 
-            AdjustBloodDialysateReq = 0x1700, // 23
-            AdjustBloodDialysateRsp = 0x1800, // 24
+            idAdjustBloodDialysateReq = 0x1700, // 23
+            idAdjustBloodDialysateRsp = 0x1800, // 24
 
-            AdjustUltrafiltrationStateReq   = 0x1000, // 16
-            // AcknowGeneric : the response is the AcknowGeneric with the same msgID
+            idAdjustUltrafiltrationStateReq   = 0x1000, // 16
+            // idAcknowGeneric : the response is the AcknowGeneric with the same msgID
 
-            AdjustUltrafiltrationEditReq    = 0x1100, // 17
-            AdjustUltrafiltrationEditRsp    = 0x1300, // 19
+            idAdjustUltrafiltrationEditReq    = 0x1100, // 17
+            idAdjustUltrafiltrationEditRsp    = 0x1300, // 19
 
-            AdjustUltrafiltrationConfirmReq = 0x1500, // 21
-            AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46
+            idAdjustUltrafiltrationConfirmReq = 0x1500, // 21
+            idAdjustUltrafiltrationConfirmRsp = 0x2E00, // 46
 
-            AdjustDurationReq       = 0x1600, // 22
-            AdjustDurationRsp       = 0x1B00, // 27
-
-            TreatmentRanges         = 0x1A00, // 26
-
-            TreatmentState          = 0x0F00, // 15
-
-            CanBUSFaultCount        = 0x9909,
-
-            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
-
+            idAdjustDurationReq       = 0x1600, // 22
+            idAdjustDurationRsp       = 0x1B00, // 27
         };
 
         enum class GuiActionsData_Enum /*: quint8  QML doesn't support*/ {
@@ -113,6 +114,9 @@
 
         #include "MsgDefs.h"
         Q_ENUM(Request_Reject_Reasons)
+
+        #include "DGDefs.h"
+        Q_ENUM(DG_Op_Modes)
     };
 
     // to be able to use the enum as signal/slot parameter
@@ -124,6 +128,8 @@
 
     typedef GuiActions::Request_Reject_Reasons  GuiRequestReasons;
 
+    typedef GuiActions::DG_Op_Modes             GuiDGOpModes;
+
     void registerTypes();
     void registerQmlTypes();