Index: DGDefs.h
===================================================================
diff -u -r0ba9faa505a5051d05941d709465d1624f48c775 -r7d02c87c1efdee842922413cc0fd96bb9b21abb9
--- DGDefs.h	(.../DGDefs.h)	(revision 0ba9faa505a5051d05941d709465d1624f48c775)
+++ DGDefs.h	(.../DGDefs.h)	(revision 7d02c87c1efdee842922413cc0fd96bb9b21abb9)
@@ -208,7 +208,17 @@
     DG_FLUSH_STATE_COMPLETE,                        ///< Flush, complete mode state
     NUM_OF_DG_FLUSH_STATES                          ///< Number of flush mode states
 };
-typedef enum DG_Flush_States DG_FLUSH_STATE_T;  ///< Type for DG flush mode states enumeration
+typedef enum DG_Flush_States DG_FLUSH_STATE_T;  ///< Type for DG flush mode states enumeration
+
+enum DG_Flush_UI_State
+{
+    FLUSH_UI_STATE_NOT_RUNNING = 0,                 ///< Flush UI, not running state
+    FLUSH_UI_STATE_FLUSH_DEVICE,                    ///< Flush UI, flush device state
+    FLUSH_UI_STATE_CANCEL_FLUSH,                    ///< Flush UI, cancel flush state
+    FLUSH_UI_STATE_COMPLETE,                        ///< Flush UI, complete state
+    NUM_OF_FLUSH_UI_STATES                          ///< Number of flush UI states
+};
+typedef enum DG_Flush_UI_State DG_FLUSH_UI_STATE_T;
 
 /**@}*/
 
@@ -250,7 +260,7 @@
 /// Enumeration of heat disinfect mode states.
 enum DG_Heat_UI_States
 {
-    HEAT_DISINFECT_UI_STATE_START = 0,                          ///< Heat disinfect UI, start state
+    HEAT_DISINFECT_UI_STATE_NOT_RUNNING = 0,                    ///< Heat disinfect UI, not running state
     HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT,             ///< Heat disinfect UI, flush before disinfect state
     HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER,                      ///< Heat disinfect UI, heat up water state
     HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE,                   ///< Heat disinfect UI, disinfect device state
@@ -304,7 +314,7 @@
 /// Enumeration of chemical disinfect mode UI states
 enum DG_Chem_UI_States
 {
-    CHEM_DISINFECT_UI_STATE_START = 0,                          ///< Chemical disinfect UI, start state
+    CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0,                    ///< Chemical disinfect UI, not running state
     CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT,             ///< Chemical disinfect UI, flush before disinfect state
     CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID,                 ///< Chemical disinfect UI, mix water and acid state
     CHEM_DISINFECT_UI_STATE_REMOVE_ACID,                        ///< Chemical disinfect UI, remove acid state