Index: dialin/common/hd_defs.py
===================================================================
diff -u -r48ccc5d7805463c2c10efb4c1b3ebc64f9347110 -r1ac9f89ffb654b0186de4dfbad44cd2472916fc3
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 48ccc5d7805463c2c10efb4c1b3ebc64f9347110)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 1ac9f89ffb654b0186de4dfbad44cd2472916fc3)
@@ -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 -r26c7b6057f11680681e0a25399b5e5be9b92818d -r1ac9f89ffb654b0186de4dfbad44cd2472916fc3
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 26c7b6057f11680681e0a25399b5e5be9b92818d)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 1ac9f89ffb654b0186de4dfbad44cd2472916fc3)
@@ -21,7 +21,7 @@
 @unique
 class MsgIds(DialinEnum):
     MSG_ID_UNUSED = 0x0
-    MSG_ID_POWER_OFF = 0x1
+    MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x1
     MSG_ID_ALARM_STATUS = 0x2
     MSG_ID_ALARM_TRIGGERED = 0x3
     MSG_ID_ALARM_CLEARED = 0x4
Index: tools/Code_Report.csv
===================================================================
diff -u -rf289518395bb3a68a017ebd3ce77554a080ba810 -r1ac9f89ffb654b0186de4dfbad44cd2472916fc3
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision f289518395bb3a68a017ebd3ce77554a080ba810)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision 1ac9f89ffb654b0186de4dfbad44cd2472916fc3)
@@ -607,6 +607,7 @@
 ./hd/ui_proxy.py, Function, cmd_ui_set_dg_service_time(self) -> None:
 ./hd/ui_proxy.py, Function, cmd_set_ro_only_mode_status(self, status: int) -> int:
 ./hd/ui_proxy.py, Function, cmd_ui_send_alarm_list_request(self) -> None:
+./hd/ui_proxy.py, Function, cmd_ui_off_button_response(self, reponse: int) -> int:
 ./hd/ui_proxy.py, Function, get_hd_version(self):
 ./hd/ui_proxy.py, Function, get_fpga_version(self):
 ./hd/ui_proxy.py, Function, get_reject_reasons(self):
@@ -2103,6 +2104,7 @@
 common/hd_defs.py, Enum, TreatmentBloodPrimeStates, BLOOD_PRIME_RAMP_STATE
 common/hd_defs.py, Enum, TreatmentBloodPrimeStates, NUM_OF_BLOOD_PRIME_STATES
 common/hd_defs.py, Enum, TreatmentDialysisStates, TreatmentDialysisStates
+common/hd_defs.py, Enum, TreatmentDialysisStates, DIALYSIS_START_STATE
 common/hd_defs.py, Enum, TreatmentDialysisStates, DIALYSIS_UF_STATE
 common/hd_defs.py, Enum, TreatmentDialysisStates, DIALYSIS_SALINE_BOLUS_STATE
 common/hd_defs.py, Enum, TreatmentDialysisStates, NUM_OF_DIALYSIS_STATES
@@ -2282,7 +2284,7 @@
 common/msg_defs.py, Enum, RequestRejectReasons, NUM_OF_REQUEST_REJECT_REASONS
 common/msg_ids.py, Enum, MsgIds, MsgIds
 common/msg_ids.py, Enum, MsgIds, MSG_ID_UNUSED
-common/msg_ids.py, Enum, MsgIds, MSG_ID_POWER_OFF
+common/msg_ids.py, Enum, MsgIds, MSG_ID_OFF_BUTTON_PRESS_REQUEST
 common/msg_ids.py, Enum, MsgIds, MSG_ID_ALARM_STATUS
 common/msg_ids.py, Enum, MsgIds, MSG_ID_ALARM_TRIGGERED
 common/msg_ids.py, Enum, MsgIds, MSG_ID_ALARM_CLEARED