Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 13d6a4fae2f910ab6e289ac9280258a94f734405)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -1,15 +1,15 @@
 /*!
- * 
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ *
+ * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file GuiGlobals.h
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 26-Aug-2020
+ * \file    GuiGlobals.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      07-Oct-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #pragma once
@@ -60,7 +60,7 @@
          * *** then it can be compared exactly the way it is with no conversion.***\n
          */
 
-        enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ {
+        enum GuiActionsType_Enum /* : quint16 QML does not support enum types */ {
             ID_Unknown                                  = 0x0000,
             ID_CANBusFaultCount                         = 0x9909,
 
@@ -72,23 +72,35 @@
             ID_HDDebugText                              = 0xF1FF,
             ID_DGDebugText                              = 0xF2FF,
 
+            ID_HDGeneralEvent                           = 0xA400,
+            ID_DGGeneralEvent                           = 0xA500,
+
             ID_DGCheckIn                                = 0x0600,
             ID_KeepAlive                                = 0x0700,
 
+            // POST
+            ID_HDPostSingleResultData                   = 0x8E00, // 142
+            ID_HDPostFinalResultData                    = 0x8F00, // 143
+            ID_DGPostSingleResultData                   = 0x9000, // 144
+            ID_DGPostFinalResultData                    = 0x9100, // 145
+            ID_UIPostFinalResultData                    = 0x9200, // 146
+
             // ----- Settings
             // Version
-            ID_AdjustVersionsReq                        = 0x1C00, // 28
+            ID_AdjustVersionsUIReq                      = 0x1C00, // 28
+            ID_AdjustVersionsUIRsp                      = 0x9F00, // 159 // ID_UIVersionsTxr - UI Version response transmit
+            ID_AdjustVersionsHDReq                      = 0x9E00, // 158 // ID_HDVersionsRxq - HD Version request  received
             ID_AdjustVersionsHDRsp                      = 0x1D00, // 29
             ID_AdjustVersionsDGRsp                      = 0x1E00, // 30
             ID_AdjustSerialHDRsp                        = 0x9900, // 153
             ID_AdjustSerialDGRsp                        = 0x8800, // 136
 
+
             // Service Information
             ID_AdjustServiceReq                         = 0x8900, // 137
             ID_AdjustServiceHDRsp                       = 0x8A00, // 138
             ID_AdjustServiceDGRsp                       = 0x8C00, // 140
 
-
             // RTC
             ID_AdjustHDDateTimeReq                      = 0x6D00, // 109
             ID_AdjustHDDateTimeRsp                      = 0x6E00, // 110
@@ -116,7 +128,7 @@
             ID_Rinseback                                = 0x5600, // 86
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
-            ID_HDAccelerometerData                      = 0x3300, // 51
+            ID_TreatmentStop                            = 0x4900, // 73
 
             // Alarm Messages
             ID_AlarmStatus                              = 0x0200,
@@ -180,7 +192,15 @@
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
             ID_DGTemperaturesData                       = 0x2D00, // 45
             ID_DGAccelerometerData                      = 0x3400, // 52
+            ID_DGConductivityData                       = 0x3100, // 49
 
+            // HD Data Messages
+            ID_HDAccelerometerData                      = 0x3300, // 51
+            ID_HDSyringePumpData                        = 0x6900, // 105
+            ID_HDBloodLeakData                          = 0x6C00, // 108
+            ID_HDAirBubbleData                          = 0x9300, // 147
+            ID_HDAirTrapData                            = 0x3E00, // 62
+
             // In-Treatment Adjustables
             ID_AdjustDurationReq                        = 0x1600, // 22
             ID_AdjustDurationRsp                        = 0x1B00, // 27
@@ -246,7 +266,7 @@
             ID_DisinfectDGChemicalTimeData              = 0x8500, // 133
         };
 
-        enum class GuiActionsData_Enum /*: quint8  QML doesn't support*/ {
+        enum class GuiActionsData_Enum /*: quint8  QML does not support*/ {
             NoData      = 0x00,
 
             Command     = 0x00, // HD=>UI : should be handled in receive
@@ -274,6 +294,7 @@
         Q_ENUM(Request_Reject_Reasons)
 
         #include "HDDefs.h"
+        Q_ENUM(HD_POST_States)
         Q_ENUM(HD_Op_Modes)
         Q_ENUM(HD_Standby_States)
         // Treatment
@@ -314,21 +335,15 @@
         Q_ENUM(HD_Pre_Treatment_Prime_States)
         // Pre-Treatment Recirculate
         Q_ENUM(HD_Pre_Treatment_Recirc_States)
+        // Disinfection
 
         #include "DGDefs.h"
+        Q_ENUM(DG_POST_States)
         Q_ENUM(DG_Op_Modes)
+        Q_ENUM(DG_Disinfect_States)
         Q_ENUM(DG_Flush_UI_States)
         Q_ENUM(DG_Heat_UI_States)
         Q_ENUM(DG_Chem_UI_States)
-
-        // TODO : temporary enum until DG defines one
-        enum DG_Disinfect_States {
-            DG_DISINFECT_STATE_UNKNOWN  = -1,
-            DG_DISINFECT_STATE_FLUSH    =  0,
-            DG_DISINFECT_STATE_HEAT     =  1,
-            DG_DISINFECT_STATE_CHEM     =  2,
-        };
-        Q_ENUM(DG_Disinfect_States)
     };
 
     // to be able to use the enum as signal/slot parameter
@@ -342,6 +357,9 @@
     typedef GuiActions::Alarm_Data_Types                                GuiAlarmDataTypes;
 
     typedef GuiActions::Request_Reject_Reasons                          GuiRequestReasons;
+    // POST
+    typedef GuiActions::HD_POST_States                                  GuiHDPOSTStates;
+    typedef GuiActions::DG_POST_States                                  GuiDGPOSTStates;
     // operation mode
     typedef GuiActions::HD_Op_Modes                                     GuiHDOpModes;
     typedef GuiActions::DG_Op_Modes                                     GuiDGOpModes;