Index: HDDefs.h
===================================================================
diff -u -rf43c46ba89b3427d971cbf031ca5312eba82fcc9 -rf25b0475a73dc85068e7c743d9aec75c14c2926e
--- HDDefs.h	(.../HDDefs.h)	(revision f43c46ba89b3427d971cbf031ca5312eba82fcc9)
+++ HDDefs.h	(.../HDDefs.h)	(revision f25b0475a73dc85068e7c743d9aec75c14c2926e)
@@ -8,7 +8,7 @@
 * @file    HDDefs.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      01-Dec-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -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
 {