Index: dialin/common/msg_ids.py =================================================================== diff -u -r4eebf06e7b22d8bed803d79925fb5e5b32b4cac4 -r9aba683492b810bf6b6bef503573572ef9bcaca5 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 4eebf06e7b22d8bed803d79925fb5e5b32b4cac4) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 9aba683492b810bf6b6bef503573572ef9bcaca5) @@ -219,6 +219,7 @@ MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE = 0xC4 MSG_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC5 MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6 + MSG_ID_HD_AIR_PUMP_DATA = 0xC7 MSG_ID_CAN_ERROR_COUNT = 0x999 @@ -249,7 +250,7 @@ MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018 MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019 MSG_ID_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE = 0x801A - MSG_ID____AVAILABLE_11 = 0x801B + MSG_ID_HD_AIR_PUMP_SET_STATE = 0x801B MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C MSG_ID_SET_RTC_DATE_TIME = 0x801D MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -rcfba10908598bcb6b1f179ec5265226c9a3292ff -r9aba683492b810bf6b6bef503573572ef9bcaca5 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision cfba10908598bcb6b1f179ec5265226c9a3292ff) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 9aba683492b810bf6b6bef503573572ef9bcaca5) @@ -86,6 +86,8 @@ # HD login password DG_LOGIN_PASSWORD = '123' + SW_COMPATIBILITY_REV = 1 + # DG version message field positions START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX END_POS_MAJOR = START_POS_MAJOR + 1 @@ -348,7 +350,7 @@ minor = unsigned_byte_to_bytearray(0) micro = unsigned_byte_to_bytearray(0) build = short_to_bytearray(0) - compatibility = integer_to_bytearray(0) + compatibility = integer_to_bytearray(self.SW_COMPATIBILITY_REV) payload = major + minor + micro + build + compatibility Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rf41b8d86fed7fa08b1ecf42cb39f4406ce149cf5 -r9aba683492b810bf6b6bef503573572ef9bcaca5 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision f41b8d86fed7fa08b1ecf42cb39f4406ce149cf5) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 9aba683492b810bf6b6bef503573572ef9bcaca5) @@ -8,7 +8,7 @@ # @file ui_proxy.py # # @author (last) Dara Navaei -# @date (last) 03-Aug-2022 +# @date (last) 08-Dec-2022 # @author (original) Sean # @date (original) 15-Apr-2020 # @@ -1654,6 +1654,32 @@ self.logger.debug("Sending setting standby submode to wait for disinfect to HD.") self.can_interface.send(message, 0) + def cmd_ui_set_hd_service_time(self) -> None: + """ + Constructs and sends a ui message to set the HD service time + + @return: none + """ + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=MsgIds.MSG_ID_HD_SET_SERVICE_TIME.value) + + self.logger.debug("Setting HD service time.") + self.can_interface.send(message, 0) + + def cmd_ui_set_dg_service_time(self) -> None: + """ + Constructs and sends a ui message to set the DG service time + + @return: none + """ + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message_id=MsgIds.MSG_ID_DG_SET_SERVICE_TIME.value) + + self.logger.debug("Setting DG service time.") + self.can_interface.send(message, 0) + @publish(["disinfects_hd_submode", "disinfects_dg_mode"]) def _handler_disinfects_data_publish(self, message: dict) -> None: """