Index: DGDefs.h
===================================================================
diff -u -r0b4f8ddcc627cee68b65a8ff4dc49bdfe1bb66df -ra3423542cf15d36156ff66d5b18a3e36ae8088c4
--- DGDefs.h	(.../DGDefs.h)	(revision 0b4f8ddcc627cee68b65a8ff4dc49bdfe1bb66df)
+++ DGDefs.h	(.../DGDefs.h)	(revision a3423542cf15d36156ff66d5b18a3e36ae8088c4)
@@ -191,46 +191,47 @@
 /// Enumeration of flush mode states.
 enum DG_Flush_States
 {
-    DG_FLUSH_STATE_START = 0,                       ///< Flush, start mode state
-    DG_FLUSH_STATE_DRAIN_R1,                        ///< Flush, drain reservoir 1 state
-    DG_FLUSH_STATE_DRAIN_R2,                        ///< Flush, drain reservoir 2 state
-    DG_FLUSH_STATE_FLUSH_DRAIN,                     ///< Flush, flush drain state
-    DG_FLUSH_STATE_FLUSH_DIALYSATE,                 ///< Flush, flush dialysate state
-    DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS,        ///< Flush, flush concentrate straws state
-    DG_FLUSH_STATE_FLUSH_R1_TO_R2,                  ///< Flush, flush reservoir 1 to reservoir 2 state
-    DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1,           ///< Flush, flush reservoir 2 and drain reservoir 1 state
-    DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE,    ///< Flush, flush circulation drain line state
-    DG_FLUSH_STATE_FLUSH_CIRCULATION,               ///< Flush, flush circulation state
-    DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER,          ///< Flush, flush with fresh water
-    DG_FLUSH_STATE_CANCEL_BASIC_PATH,               ///< Flush, cancel basic path state
-    DG_FLUSH_STATE_CANCEL_WATER_PATH,               ///< Flush, cancel water path state
-    DG_FLUSH_STATE_COMPLETE,                        ///< Flush, complete mode state
-    NUM_OF_DG_FLUSH_STATES                          ///< Number of flush mode states
+    DG_FLUSH_STATE_START = 0,                          ///< Flush, start mode state
+    DG_FLUSH_STATE_DRAIN_R1,                           ///< Flush, drain reservoir 1 state
+    DG_FLUSH_STATE_DRAIN_R2,                           ///< Flush, drain reservoir 2 state
+    DG_FLUSH_STATE_FLUSH_DRAIN,                        ///< Flush, flush drain state
+    DG_FLUSH_STATE_FLUSH_DIALYSATE,                    ///< Flush, flush dialysate state
+    DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS,           ///< Flush, flush concentrate straws state
+    DG_FLUSH_STATE_FLUSH_R1_TO_R2,                     ///< Flush, flush reservoir 1 to reservoir 2 state
+    DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1,              ///< Flush, flush reservoir 2 and drain reservoir 1 state
+    DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE,       ///< Flush, flush circulation drain line state
+    DG_FLUSH_STATE_FLUSH_CIRCULATION,                  ///< Flush, flush circulation state
+    DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER,             ///< Flush, flush with fresh water
+    DG_FLUSH_STATE_CANCEL_BASIC_PATH,                  ///< Flush, cancel basic path state
+    DG_FLUSH_STATE_CANCEL_WATER_PATH,                  ///< Flush, cancel water path state
+    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
 
 /// Enumeration of flush mode UI states.
 enum DG_Flush_UI_States
 {
-    FLUSH_UI_STATE_NOT_RUNNING = 0,                 ///< Flush UI, not running state
-    FLUSH_UI_STATE_DRAIN_DEVICE,                    ///< Flush UI, drain device state
-    FLUSH_UI_STATE_FLUSH_RESERVOIRS,                ///< Flush UI, flush reservoirs
-    FLUSH_UI_STATE_DRAIN_RESERVOIRS,                ///< Flush UI, drain reservoirs
-    FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH,        ///< Flush UI, flush recirculation path
-    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
+    FLUSH_UI_STATE_NOT_RUNNING = 0,                    ///< Flush UI, not running state
+    FLUSH_UI_STATE_DRAIN_DEVICE,                       ///< Flush UI, drain device state
+    FLUSH_UI_STATE_FLUSH_RESERVOIRS,                   ///< Flush UI, flush reservoirs
+    FLUSH_UI_STATE_DRAIN_RESERVOIRS,                   ///< Flush UI, drain reservoirs
+    FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH,           ///< Flush UI, flush recirculation path
+    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_States DG_FLUSH_UI_STATE_T;    ///< Type for DG flush mode UI states enumeration
+typedef enum DG_Flush_UI_States DG_FLUSH_UI_STATE_T;   ///< Type for DG flush mode UI states enumeration
 
 #if defined(_HD_) || defined(_DG_)
 /// Flush mode data publish struct
 typedef struct
 {
-    U32 flushState;                                     ///< Flush state.
-    U32 overallElapsedTime;                             ///< Overall elapsed time in flush mode.
-    U32 stateElapsedTime;                               ///< Current flush elapsed time.
-    F32 drainLineVolume;                                ///< Drain line volume.
+    U32 flushState;                                    ///< Flush state.
+    U32 overallElapsedTime;                            ///< Overall elapsed time in flush mode.
+    U32 stateElapsedTime;                              ///< Current flush elapsed time.
+    F32 drainLineVolume;                               ///< Drain line volume.
+    U32 flushUIState;                                  ///< Flush UI state.
 } MODE_FLUSH_DATA_T;
 #endif