Index: leahi_dialin/td/modules/records.py =================================================================== diff -u -re3c60dd439b2f996b0392951fd4461e8e37b8692 -rf6b74a922cea4bd0cc195719e808028e50a5af8c --- leahi_dialin/td/modules/records.py (.../records.py) (revision e3c60dd439b2f996b0392951fd4461e8e37b8692) +++ leahi_dialin/td/modules/records.py (.../records.py) (revision f6b74a922cea4bd0cc195719e808028e50a5af8c) @@ -46,19 +46,19 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, - message_id = MsgIds.MSG_ID_TD_NVM_SYSTEM_RECORD_RESPONSE.value, + message_id = MsgIds.MSG_ID_UNUSED.value, function = self._handler_system_record_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, - message_id = MsgIds.MSG_ID_TD_NVM_SERVICE_RECORD_RESPONSE.value, + message_id = MsgIds.MSG_ID_UNUSED.value, function = self._handler_service_record_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, - message_id = MsgIds.MSG_ID_TD_NVM_CAL_RESPONSE.value, + message_id = MsgIds.MSG_ID_UNUSED.value, function = self._handler_calibration_record_pres_sensor_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, - message_id = MsgIds.MSG_ID_TD_NVM_INSTITUTIONAL_RECORD_RESPONSE.value, + message_id = MsgIds.MSG_ID_UNUSED.value, function = self._handler_institutional_record_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, - message_id = MsgIds.MSG_ID_TD_NVM_USAGE_INFO_RECORD_RESPONSE.value, + message_id = MsgIds.MSG_ID_UNUSED.value, function = self._handler_usage_info_record_sync) self.system_records_timestamp = 0 #: The timestamp of the latest System Records message @@ -246,7 +246,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'TD System Record request', override_text = '', logger = self.logger, @@ -268,7 +268,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'TD Service Record request', override_text = '', logger = self.logger, @@ -290,7 +290,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'TD Calibration Record request', override_text = '', logger = self.logger, @@ -312,7 +312,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'TD Institutional Record request', override_text = '', logger = self.logger, @@ -334,7 +334,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'TD Usage Information Record request', override_text = '', logger = self.logger, @@ -375,7 +375,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_TD_NVM_SET_SYSTEM_RECORD, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'New TD System Record', override_text = 'being set', logger = self.logger, @@ -409,7 +409,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_TD_NVM_SET_SERVICE_RECORD, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'New TD Service Record', override_text = 'being set', logger = self.logger, @@ -427,9 +427,9 @@ @return: 1 if successful, zero otherwise """ msg_id_pairing = { - 'PRES': MsgIds.MSG_ID_UI_TD_NVM_SET_CAL_PRESSURE_SENSOR, - 'TEMP': MsgIds.MSG_ID_UI_TD_NVM_SET_CAL_TEMP_SENSOR, - 'ACCEL': MsgIds.MSG_ID_UI_TD_NVM_SET_CAL_ACCEL_SENSOR, + 'PRES': MsgIds.MSG_ID_UNUSED, + 'TEMP': MsgIds.MSG_ID_UNUSED, + 'ACCEL': MsgIds.MSG_ID_UNUSED, } send_data = [] checked = [] @@ -580,7 +580,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_dd_ch_id, - msg_id = MsgIds.MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'TD Institutional Record', override_text = 'being set', logger = self.logger, @@ -630,7 +630,7 @@ payload = payload, reset = None, channel_id = CanChannels.dialin_to_td_ch_id, - msg_id = MsgIds.MSG_ID_TD_NVM_SET_USAGE_INFO_RECORD, + msg_id = MsgIds.MSG_ID_UNUSED, entity_name = f'New TD Usage Information Record', override_text = 'being set', logger = self.logger, @@ -651,7 +651,7 @@ calibration_time: int = 0) -> int: payload_sensor = integer_to_bytearray(sensor_enum.value) payload_content = b'' - if msg_id == MsgIds.MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP: + if msg_id == MsgIds.MSG_ID_UNUSED: payload_content += float_to_bytearray(dialysate_pump_target_speed) payload_content += float_to_bytearray(forth_order_coeff) payload_content += float_to_bytearray(third_order_coeff) @@ -663,13 +663,13 @@ payload = payload_sensor + payload_content sensor_type = '' - if msg_id == MsgIds.TBD: + if msg_id == MsgIds.MSG_ID_UNUSED: sensor_type = 'Pressure Sensor' - elif msg_id == MsgIds.TBD: + elif msg_id == MsgIds.MSG_ID_UNUSED: sensor_type = 'Temperature Sensor' - elif msg_id == MsgIds.TBD: + elif msg_id == MsgIds.MSG_ID_UNUSED: sensor_type = 'Concentrate Pump' - elif msg_id == MsgIds.TBD: + elif msg_id == MsgIds.MSG_ID_UNUSED: sensor_type = 'Dialysate Pump' return cmd_generic_override(payload = payload, @@ -696,9 +696,9 @@ payload += unsigned_short_to_bytearray(self.crc16(payload)) conc_type = '' - if msg_id == MsgIds.TBD: + if msg_id == MsgIds.MSG_ID_UNUSED: conc_type = 'Acid' - elif msg_id == MsgIds.TBD: + elif msg_id == MsgIds.MSG_ID_UNUSED: conc_type = 'Bicarb' return cmd_generic_override(payload = payload,