Index: dialin/common/hd_defs.py
===================================================================
diff -u -r48ccc5d7805463c2c10efb4c1b3ebc64f9347110 -ree6ba6e92e9ef365ecb063cea67f4c998bc24c44
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 48ccc5d7805463c2c10efb4c1b3ebc64f9347110)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision ee6ba6e92e9ef365ecb063cea67f4c998bc24c44)
@@ -7,8 +7,8 @@
 #
 # @file    hd_defs.py
 #
-# @author  (last)      Sean Nash
-# @date    (last)      25-May-2023
+# @author  (last)      Dara Navaei
+# @date    (last)      11-Jun-2023
 # @author  (original)  Peter Lucia
 # @date    (original)  04-Dec-2020
 #
@@ -33,19 +33,13 @@
 
 @unique
 class HDStandbyStates(DialinEnum):
-    STANDBY_START_STATE                                     =  0    # Start standby.
-    STANDBY_WAIT_FOR_TREATMENT_STATE                        =  1    # Wait for treatment.
-    STANDBY_WAIT_FOR_DISINFECT_STATE                        =  2    # Wait for UI to send disinfect option.
-    STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE            =  3    # Wait for DG flush command response.
-    STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE                =  4    # Wait for DG flush to start.
-    STANDBY_DG_FLUSH_IN_PROGRESS_STATE                      =  5    # DG flush operation is in progress
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE   =  6    # Wait for DG heat disinfect command response.
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE       =  7    # Wait for DG heat disinfect to start.
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE             =  8    # DG heat disinfect operation is in progress.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE   =  9    # Wait for DG chemical disinfect command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE       = 10    # Wait for DG chemical disinfect to start.
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE             = 11    # DG chemical disinfect operation is in progress
-    NUM_OF_STANDBY_STATES                                   = 12    # Number of standby states (sub-modes)
+    STANDBY_START_STATE                                     = 0    # Start standby (home actuators).
+    STANDBY_WAIT_FOR_TREATMENT_STATE                        = 1    # Wait for treatment.
+    STANDBY_WAIT_FOR_DISINFECT_STATE                        = 2    # Wait for UI to send disinfect option.
+    STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE    = 3    # Wait for DG cleaning mode command response state.
+    STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE        = 4    # Wait for DG cleaning mode to start state.
+    STANDBY_CLEANING_MODE_IN_PROGRESS_STATE                 = 5    # Cleaning mode in progress state.
+    NUM_OF_STANDBY_STATES                                   = 6    # Number of standby states (sub-modes).
 
 @unique
 class HDInitStates(DialinEnum):
Index: dialin/common/msg_ids.py
===================================================================
diff -u -r35ab0929ebeabda5c7a2c4eced8f6d0cf1a93435 -ree6ba6e92e9ef365ecb063cea67f4c998bc24c44
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 35ab0929ebeabda5c7a2c4eced8f6d0cf1a93435)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision ee6ba6e92e9ef365ecb063cea67f4c998bc24c44)
@@ -8,7 +8,7 @@
 # @file    msg_ids.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      15-May-2023
+# @date    (last)      11-Jun-2023
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Apr-2021
 #
@@ -221,6 +221,10 @@
     MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6
     MSG_ID_HD_AIR_PUMP_DATA = 0xC7
     MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG = 0xC8
+    MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST = 0xC9
+    MSG_ID_DG_RO_PERMEATE_SAMPLE_DATA = 0xCA
+    MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG = 0xCB
+    MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD = 0xCD
 
     MSG_ID_CAN_ERROR_COUNT = 0x999
 
@@ -375,6 +379,7 @@
     MSG_ID_HD_SEND_TEST_CONFIGURATION = 0x8095
     MSG_ID_HD_RESET_ALL_TEST_CONFIGURATIONS = 0x8096
     MSG_ID_HD_SET_TEST_CONFIGURATION = 0x8097
+    MSG_ID_HD_SIGNAL_RECOVER_FROM_FAULT_MODE = 0x8098
 
     MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001
@@ -485,6 +490,7 @@
     MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES = 0xA06C
     MSG_ID_DG_SEND_LOAD_CELLS_TARE_VALUES_TO_DIALIN = 0xA06D
     MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE = 0xA06E
+    MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE = 0xA06F
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2