Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r0a4abcc41defc031ae20dd79f9550619bc6c9806
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
@@ -76,15 +76,17 @@
             ID_KeepAlive                        = 0x0700,
 
             // HD Data Messages
+            ID_HDOperationModeData              = 0x2500, // 37
+            ID_PreTreatmentStates               = 0x5C00, // 92
+            ID_TreatmentStates                  = 0x0F00, // 15
+
             ID_PowerOff                         = 0x0100,
             ID_ShuttingDown                     = 0x0E00,
             ID_TreatmentTime                    = 0x0D00,
             ID_BloodFlow                        = 0x0500,
             ID_DialysateInletFlow               = 0x0800,
             ID_DialysateOutletFlow              = 0x0B00,
             ID_TreatmentRanges                  = 0x1A00, // 26
-            ID_TreatmentStates                  = 0x0F00, // 15
-            ID_HDOperationModeData              = 0x2500, // 37
             ID_PressureOcclusion                = 0x0900,
             ID_Saline                           = 0x2F00, // 47
             ID_Heparin                          = 0x4D00, // 77
@@ -221,9 +223,20 @@
         // Treatment End
         Q_ENUM(Treatment_End_States)
         Q_ENUM(Requested_Treatment_End_User_Actions)
+        // Pre-Treatment SubMode
+        Q_ENUM(HD_Pre_Treatment_Mode_States)
+        // Pre-Treatment Water Sample
+        Q_ENUM(HD_Pre_Treatment_Sample_Water_States)
+        Q_ENUM(Requested_Sample_Water_User_Actions)
+        // Pre-Treatment Self Test No Cartridge
+        Q_ENUM(HD_Pre_Treatment_No_Cart_Self_Tests_States)
+        // Pre-Treatment Self Test Dry
+        Q_ENUM(HD_Pre_Treatment_Dry_Self_Tests_States)
+        // Pre-Treatment Prime
+        Q_ENUM(HD_Pre_Treatment_Prime_States)
+        // Pre-Treatment Recirculate
+        Q_ENUM(HD_Pre_Treatment_Recirc_States)
 
-        // Treatment Stop
-
         #include "DGDefs.h"
         Q_ENUM(DG_Op_Modes)
     };
@@ -269,7 +282,22 @@
     typedef GuiActions::Treatment_Stop_States                   GuiTreatmentStopStates;
 //  typedef GuiActions::Requested_Treatment_Stop_User_Actions   GuiTreatmentStopCommands; // No user Action defined
 
+    // Pre-Treatment SubMode
+    typedef GuiActions::HD_Pre_Treatment_Mode_States            GuiPreTreatmentStates;
+    // Pre-Treatment Water Sample
+    typedef GuiActions::HD_Pre_Treatment_Sample_Water_States    GuiPreTreatmentWaterSampleStates;
+    typedef GuiActions::Requested_Sample_Water_User_Actions     GuiPreTreatmentWaterSampleCommands;
+    // Pre-Treatment Self Test No Cartridge
+    typedef GuiActions::HD_Pre_Treatment_No_Cart_Self_Tests_States  GuiPreTreatmentSelfTestNoCartridgeStates;
+    // Pre-Treatment Self Test Dry
+    typedef GuiActions::HD_Pre_Treatment_Dry_Self_Tests_States  GuiPreTreatmentSelfTestDryStates;
+    // Pre-Treatment Prime
+    typedef GuiActions::HD_Pre_Treatment_Prime_States           GuiPreTreatmentPrimeStates;
+    // Pre-Treatment Recirculate
+    typedef GuiActions::HD_Pre_Treatment_Recirc_States          GuiPreTreatmentRecirculateStates;
 
+
+
     void registerTypes();
     void registerQmlTypes();