Index: HDDefs.h
===================================================================
diff -u -rb8a1fdc8e2c8a64c23b06f867d17edfaeba0f478 -rd24e82ef091e726832af388982dc2509b253c552
--- HDDefs.h	(.../HDDefs.h)	(revision b8a1fdc8e2c8a64c23b06f867d17edfaeba0f478)
+++ HDDefs.h	(.../HDDefs.h)	(revision d24e82ef091e726832af388982dc2509b253c552)
@@ -105,15 +105,24 @@
 /// Sub-mode states while in standby mode
 enum HD_Standby_States
 {
-    STANDBY_START_STATE = 0,                            ///< Start standby
-    STANDBY_WAIT_FOR_TREATMENT_STATE,                   ///< Wait for treatment
-    STANDBY_WAIT_FOR_DISINFECT_STATE,                   ///< Wait for UI to send disinfect option
-    STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                 ///< DG flush operation is in progress
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,        ///< DG heat disinfect operation is in progress
-    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_START_STATE = 0,                                 ///< Start standby.
+    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_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)
 };
-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
 
 /**@}*/