Index: HDDefs.h
===================================================================
diff -u -rb94e0f1626c7b36d685cfd3f0cf7581d58bb0e84 -r2561b56cad0a0810495bdff6add35ff4291e2519
--- HDDefs.h	(.../HDDefs.h)	(revision b94e0f1626c7b36d685cfd3f0cf7581d58bb0e84)
+++ HDDefs.h	(.../HDDefs.h)	(revision 2561b56cad0a0810495bdff6add35ff4291e2519)
@@ -106,24 +106,28 @@
 /// Sub-mode states while in standby mode
 enum HD_Standby_States
 {
-    STANDBY_START_STATE = 0,                                 ///< Start standby (home actuators).
-    STANDBY_WAIT_FOR_TREATMENT_STATE,                        ///< Wait for treatment.
-    STANDBY_WAIT_FOR_DISINFECT_STATE,                        ///< Wait for UI to send disinfect option.
+    STANDBY_START_STATE = 0,                                     ///< Start standby (home actuators).
+    STANDBY_WAIT_FOR_TREATMENT_STATE,                            ///< Wait for treatment.
+    STANDBY_WAIT_FOR_DISINFECT_STATE,                            ///< Wait for UI to send disinfect option.
 
-    STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE,            ///< Wait for DG flush command response.
-    STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE,                ///< Wait for DG flush to start.
-    STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                      ///< DG flush operation is in progress
+    STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE,                ///< Wait for DG flush command response.
+    STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE,                    ///< Wait for DG flush to start.
+    STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                          ///< DG flush operation is in progress
 
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE,   ///< Wait for DG heat disinfect command response.
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE,       ///< Wait for DG heat disinfect to start.
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,             ///< DG heat disinfect operation is in progress.
+    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE,       ///< Wait for DG heat disinfect command response.
+    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE,           ///< Wait for DG heat disinfect to start.
+    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,                 ///< DG heat disinfect operation is in progress.
 
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE,   ///< Wait for DG chemical disinfect command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE,       ///< Wait for DG chemical disinfect to start.
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,             ///< DG chemical disinfect operation is in progress
-    NUM_OF_STANDBY_STATES                                    ///< Number of standby states (sub-modes)
+    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE,       ///< Wait for DG chemical disinfect command response.
+    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE,           ///< Wait for DG chemical disinfect to start.
+    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,                 ///< DG chemical disinfect operation is in progress
+
+    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect flush command response.
+    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_TO_START_STATE,     ///< Wait for DG chemical disinfect flush to start.
+    STANDBY_DG_CHEM_DISINFECT_FLUSH_IN_PROGRESS_STATE,           ///< DG chemical disinfect flush operation is in progress
+    NUM_OF_STANDBY_STATES                                        ///< Number of standby states (sub-modes)
 };
-typedef enum HD_Standby_States HD_STANDBY_STATE_T;           ///< Type for HD standby states enumeration
+typedef enum HD_Standby_States HD_STANDBY_STATE_T;               ///< Type for HD standby states enumeration
 
 /**@}*/
 
@@ -780,8 +784,6 @@
 };
 typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T;                   ///< Type for generic confirm enumeration
 
-/**@}*/
-
 /// List of confirmation request status
 typedef enum Confirmation_Status
 {
Index: MsgDefs.h
===================================================================
diff -u -rd1ab59461b5f0d9dc6d509d004ad12c3f76765f5 -r2561b56cad0a0810495bdff6add35ff4291e2519
--- MsgDefs.h	(.../MsgDefs.h)	(revision d1ab59461b5f0d9dc6d509d004ad12c3f76765f5)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 2561b56cad0a0810495bdff6add35ff4291e2519)
@@ -221,6 +221,11 @@
     MSG_ID_DG_CPLD_STATUS = 0xBD,                                       ///< DG CPLD Status
     MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE,                           ///< HD battery management logging data
     MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF,                               ///< HD battery status logging data
+    MSG_ID_DG_CHEM_DISINFECT_FLUSH_DATA = 0xC0,                         ///< DG chemical disinfect flush logging data
+    MSG_ID_DG_CHEM_DISINFECT_FLUSH_TIME_DATA = 0xC1,                    ///< DG broadcast of chemical disinfect flush mode time data
+    MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH = 0xC2,                   ///< DG start/stop chemical disinfect flush
+    MSG_ID_UI_CHEM_DISINFECT_FLUSH_CONFIRM = 0xC3,                      ///< UI confirmation of chemical disinfect flush start
+    MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE = 0xC4,             ///< HD response to confirmation of chemical disinfect flush start
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing