Index: DGDefs.h
===================================================================
diff -u -r3903a046a87ab4c9cdb7cf48ba9287e92a616eb0 -rdd5f52c4564ac5ce68a35069450e5250eba46db8
--- DGDefs.h	(.../DGDefs.h)	(revision 3903a046a87ab4c9cdb7cf48ba9287e92a616eb0)
+++ DGDefs.h	(.../DGDefs.h)	(revision dd5f52c4564ac5ce68a35069450e5250eba46db8)
@@ -207,7 +207,7 @@
     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
@@ -221,7 +221,18 @@
     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.
+} MODE_FLUSH_DATA_T;
+#endif
 
 /**@}*/
 
@@ -343,8 +354,22 @@
     CHEM_DISINFECT_UI_STATE_COMPLETE,                           ///< Chemical disinfect UI, complete state
     NUM_OF_CHEM_DISINFECT_UI_STATES                             ///< Number of chemical disinfect UI states
 };
-typedef enum DG_Chem_UI_States DG_CHEM_DISINFECT_UI_STATE_T;    ///< Type for DG chemical disinfect UI states enumeration
+typedef enum DG_Chem_UI_States DG_CHEM_DISINFECT_UI_STATE_T;    ///< Type for DG chemical disinfect UI states enumeration
 
+/// Chemical disinfect data
+typedef struct
+{
+    U32 chemDisinfectState;                                     ///< Chemical disinfect state.
+    U32 overallElapsedTime;                                     ///< Overall elapsed time in chemical disinfect mode.
+    U32 stateElapsedTime;                                       ///< Current chemical disinfect elapsed time.
+    U32 cancellationMode;                                       ///< Chemical disinfect cancellation mode.
+    F32 R1FillLevel;                                            ///< Reservoir 1 level upon starting the chemical disinfect.
+    F32 R2FillLevel;                                            ///< Reservoir 2 level upon starting the chemical disinfect.
+    U32 postDisinfectTargetRinseCount;                          ///< Target post disinfect rinse count.
+    U32 postDisinfectCurrentRinseCount;                         ///< Current post disinfect rinse count.
+    U32 chemDisinfectUIState;                                   ///< Chemical disinfect UI state.
+} MODE_CHEMICAL_DISINFECT_DATA_T;
+
 /**@}*/
 
 /**