Index: .gitignore =================================================================== diff -u -rf8d379027a25b5497de67aabfb1e11b5e4fd6cbc -r92ab2f51edaf18c3a24e51e151bb6d390e7acf6e --- .gitignore (.../.gitignore) (revision f8d379027a25b5497de67aabfb1e11b5e4fd6cbc) +++ .gitignore (.../.gitignore) (revision 92ab2f51edaf18c3a24e51e151bb6d390e7acf6e) @@ -28,3 +28,4 @@ testsuites squishtesting *.pyc +/.metadata/ Index: dialin/common/msg_ids.py =================================================================== diff -u -rd2b3fbb3d2f087b815a6a74f85098e0ae57e6b85 -r92ab2f51edaf18c3a24e51e151bb6d390e7acf6e --- dialin/common/msg_ids.py (.../msg_ids.py) (revision d2b3fbb3d2f087b815a6a74f85098e0ae57e6b85) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 92ab2f51edaf18c3a24e51e151bb6d390e7acf6e) @@ -149,9 +149,9 @@ MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE = 0x7E MSG_ID_UI_DISINFECT_REQUEST = 0x7F MSG_ID_HD_DISINFECT_RESPONSE = 0x80 - MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0x81 - MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE = 0x82 - MSG_ID_DG_FLUSH_TIME_DATA = 0x83 + MSG_ID_DG_SEND_SERVICE_SCHEDULE_DATA_TO_HD = 0x81 + MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD = 0x82 + MSG_ID_DG_PARK_CONCENTRATE_PUMPS = 0x83 MSG_ID_DG_HEAT_DISINFECT_TIME_DATA = 0x84 MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0x85 MSG_ID_DG_VOLTAGES_DATA = 0x86 @@ -205,7 +205,7 @@ MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6 MSG_ID_DG_RTC_EPOCH = 0xB7 MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8 - MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9 + MSG_ID_MSG_AVAILABLE_9 = 0xB9 MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA MSG_ID_UI_CONFIRMATION_RESULT = 0xBB MSG_ID_UI_SET_DG_RO_MODE = 0xBC @@ -447,7 +447,7 @@ MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0xA03E MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0xA03F MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0xA040 - MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041 + MSG_ID_MSG_AVAILABLE_11 = 0xA041 MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042 MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043 MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044 @@ -470,7 +470,7 @@ MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055 MSG_ID_DG_SET_OP_MODE_REQUEST = 0xA056 MSG_ID_DG_RESERVOIR_TARE_REQUEST = 0xA057 - MSG_ID_DG_CPLD_PUBLISH_INTERVAL_OVERRIDE = 0xA058 + MSG_ID_MSG_AVAILABLE_10 = 0xA058 MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE = 0xA059 MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE = 0xA05A MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE = 0xA05B Index: dialin/ui/dg_simulator.py =================================================================== diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -r92ab2f51edaf18c3a24e51e151bb6d390e7acf6e --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 428c5c0a653129867b1cb32b5e64f89f68191c4b) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 92ab2f51edaf18c3a24e51e151bb6d390e7acf6e) @@ -536,22 +536,6 @@ self.can_interface.send(message, 0) - def cmd_send_dg_disinfect_progress_time_flush(self, total: int, countdown: int) -> None: - """ - the broadcast progress water flush time - @param total: the total time - @param countdown: the gradual countdown time - @return: None - """ - payload = integer_to_bytearray(total) - payload += integer_to_bytearray(countdown) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIds.MSG_ID_DG_FLUSH_TIME_DATA.value, - payload=payload) - - self.can_interface.send(message, 0) - def cmd_send_dg_disinfect_progress_time_heat(self, total: int, countdown: int) -> None: """ the broadcast progress heat disinfect time Index: dialin/ui/hd_simulator.py =================================================================== diff -u -rf931595765812123b9caea8803381d213a70e54d -r92ab2f51edaf18c3a24e51e151bb6d390e7acf6e --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision f931595765812123b9caea8803381d213a70e54d) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 92ab2f51edaf18c3a24e51e151bb6d390e7acf6e) @@ -1925,22 +1925,6 @@ self.can_interface.send(message, 0) - def cmd_send_hd_disinfect_chemical_confirm(self, accepted: bool, reason: int) -> None: - """ - the HD response to the UI sending the user chemical disinfection steps confirm. - @param accepted: boolean accepted or rejected - @param reason: the rejection reason - @return: None - """ - payload = integer_to_bytearray(accepted) - payload += integer_to_bytearray(reason) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, - payload=payload) - - self.can_interface.send(message, 0) - @publish(["ui_version"]) def _handler_ui_version(self, message, timestamp=0.0) -> None: """