Index: dialin/common/msg_defs.py =================================================================== diff -u -ra505f80795643e531cb0b0120a38a7765cbf7b9c -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/common/msg_defs.py (.../msg_defs.py) (revision a505f80795643e531cb0b0120a38a7765cbf7b9c) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -19,14 +19,8 @@ # Define msg ids that are not yet added to common but are needed in dialin -@unique -class MsgIdsDialin(DialinEnum): - MSG_DIALIN_ID_UI_SYSTEM_USAGE_REQUEST = 0x89 - MSG_DIALIN_ID_HD_SYSTEM_USAGE_RESPONSE = 0x8A - MSG_DIALIN_ID_DG_SYSTEM_USAGE_RESPONSE = 0x8C - MSG_DIALIN_ID_HD_DISINFECT_STATE = 0x7E - MSG_DIALIN_ID_HD_VERSION_REQUEST = 0x9E - MSG_DIALIN_ID_UI_POST_REPORT_VERSION = 0x9F +# @unique +# class MsgIdsDialin(DialinEnum): ACK_NOT_REQUIRED = [ Index: dialin/common/msg_ids.py =================================================================== diff -u -ra1ee274cb5cab5f83deae1c39efef89ee81289df -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/common/msg_ids.py (.../msg_ids.py) (revision a1ee274cb5cab5f83deae1c39efef89ee81289df) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 15-Jun-2021 +# @date (last) 05-Aug-2021 # @author (original) Peter Lucia -# @date (original) 15-Jun-2021 +# @date (original) 05-Aug-2021 # ############################################################################ from enum import unique @@ -146,7 +146,7 @@ MSG_ID_HD_VOLTAGES_DATA = 0X7B MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0X7C MSG_ID_HD_ALARM_INFORMATION = 0X7D - MSG_ID_HD_STANDBY_STATE = 0X7E + MSG_ID_HD_DISINFECT_STANDBY_DATA = 0X7E MSG_ID_UI_DISINFECT_REQUEST = 0X7F MSG_ID_HD_DISINFECT_RESPONSE = 0X80 MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0X81 @@ -157,7 +157,7 @@ MSG_ID_DG_VOLTAGES_DATA = 0X86 MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 MSG_ID_DG_SERIAL_NUMBER = 0X88 - MSG_ID_UI_REQUEST_SYSTEM_USAGE_INFO = 0X89 + MSG_ID_UI_REQUEST_SERVICE_INFO = 0X89 MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0X8A MSG_ID_HD_USAGE_DATA = 0X8B MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0X8C @@ -176,13 +176,14 @@ MSG_ID_HD_SERIAL_NUMBER = 0X99 MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0X9A MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0X9B - MSG_ID_HD_DISINFECTS_UI_STATE_READINGS = 0X9C - MSG_ID___AVAILABLE_1 = 0x9D - MSG_ID_HD_UI_VERSION_INFO_REQUEST = 0x9E - MSG_ID_HD_UI_VERSION_INFO_RESPONSE = 0x9F + MSG_ID_HD_DG_POST_RESULT_REQUEST = 0X9C + MSG_ID_HD_TEMPERATURES_DATA = 0X9D + MSG_ID_HD_UI_VERSION_INFO_REQUEST = 0X9E + MSG_ID_HD_UI_VERSION_INFO_RESPONSE = 0X9F MSG_ID_REQUEST_HD_USAGE_INFO = 0XA0 - MSG_ID_DG_SWITCHES_DATA = 0xA1 - MSG_ID_HD_SWITCHES_DATA = 0xA2 + MSG_ID_DG_SWITCHES_DATA = 0XA1 + MSG_ID_HD_SWITCHES_DATA = 0XA2 + MSG_ID_HD_FANS_DATA = 0XA3 MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 @@ -271,17 +272,22 @@ MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE = 0X8055 MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE = 0X8056 MSG_ID_HD_VALVES_CURRENT_OVERRIDE = 0X8057 - MSG_ID_HD_VALVES_POSITION_COUNT_OVERRIDE = 0x8058 + MSG_ID_HD_VALVES_POSITION_COUNT_OVERRIDE = 0X8058 MSG_ID_HD_SYRINGE_PUMP_STATUS_OVERRIDE = 0X8059 MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE = 0X805A MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE = 0X805B MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE = 0X805C MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE = 0X805D MSG_ID_HD_BUBBLE_STATUS_OVERRIDE = 0X805E + MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE = 0X805F MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST = 0X8060 MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE = 0X8061 MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0X8062 MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0X8063 + MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0X8064 + MSG_ID_HD_TEMPERATURES_VALUE_OVERRIDE = 0X8065 + MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE = 0X8066 + MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE = 0X8067 MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0XA001 MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0XA002 Index: dialin/hd/system_record.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/hd/system_record.py (.../system_record.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/system_record.py (.../system_record.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -194,7 +194,7 @@ result = OrderedDict() groups_byte_size = 0 # create a list of the functions of the sub dictionaries - functions = [self._prepare_hd_system_record()] + functions = [self._prepare_hd_system_group()] for function in functions: # Update the groups bytes size so far to be use to padding later @@ -220,7 +220,7 @@ return result - def _prepare_hd_system_record(self): + def _prepare_hd_system_group(self): """ Handles creating the system record dictionary. Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -192,7 +192,7 @@ self._handler_treatment_end_cmd_response) self.can_interface.\ register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id, - MsgIds.MSG_ID_HD_STANDBY_STATE.value, + MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, self._handler_disinfects_data_publish) # initialize variables that will be populated by HD version response Index: dialin/hd/valves.py =================================================================== diff -u -r78f3b6100f792682a26f87f6333a1d7243767fb6 -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/hd/valves.py (.../valves.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) +++ dialin/hd/valves.py (.../valves.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -20,7 +20,7 @@ from logging import Logger from .constants import NO_RESET -from ..common import MsgIds, MsgIdsDialin +from ..common import MsgIds from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish, DialinEnum from ..utils.checks import check_broadcast_interval_override_ms @@ -259,7 +259,7 @@ payload = reset_value + pos + vlv message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIdsDialin.MSG_ID_HD_VALVES_POSITION_COUNT_OVERRIDE.value, + message_id=MsgIds.MSG_ID_HD_VALVES_POSITION_COUNT_OVERRIDE.value, payload=payload) # Send message received_message = self.can_interface.send(message) Index: dialin/ui/dg_simulator.py =================================================================== diff -u -rf990c9bb863683c74bbe78c71932a14d7cf35422 -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision f990c9bb863683c74bbe78c71932a14d7cf35422) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -50,7 +50,7 @@ MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, self._handler_request_dg_version) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id, - MsgIdsDialin.MSG_DIALIN_ID_UI_SYSTEM_USAGE_REQUEST.value, + MsgIds.MSG_ID_UI_REQUEST_SERVICE_INFO.value, self._handler_system_usage_response) def cmd_send_dg_post_single_result(self, result: int, test_num: int) -> None: @@ -95,7 +95,7 @@ payload += integer_to_bytearray(1619887863) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIdsDialin.MSG_DIALIN_ID_DG_SYSTEM_USAGE_RESPONSE.value, + message_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -545,7 +545,7 @@ payload += integer_to_bytearray(chemical_mode) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIdsDialin.MSG_DIALIN_ID_HD_DISINFECT_STATE.value, + message_id=MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, payload=payload) self.can_interface.send(message, 0) Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r035e26e44bdb1ba5afa5c9a147941b9f91731ce7 -r717213478a1176cd315e5f4006ce8aeacbc4c0dc --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 035e26e44bdb1ba5afa5c9a147941b9f91731ce7) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 717213478a1176cd315e5f4006ce8aeacbc4c0dc) @@ -90,10 +90,10 @@ MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, self._handler_request_hd_version) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id, - MsgIdsDialin.MSG_DIALIN_ID_UI_SYSTEM_USAGE_REQUEST.value, + MsgIds.MSG_ID_UI_REQUEST_SERVICE_INFO.value, self._handler_system_usage_response) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, - MsgIdsDialin.MSG_DIALIN_ID_UI_POST_REPORT_VERSION.value, + MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, self._handler_ui_post_ui_version_compatibility) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, @@ -155,7 +155,7 @@ payload += integer_to_bytearray(1619887863) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIdsDialin.MSG_DIALIN_ID_HD_SYSTEM_USAGE_RESPONSE.value, + message_id=MsgIds.MSG_ID_HD_SERVICE_SCHEDULE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1986,7 +1986,7 @@ payload = bytearray() message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIdsDialin.MSG_DIALIN_ID_HD_VERSION_REQUEST.value, + message_id=MsgIds.MSG_ID_HD_UI_VERSION_INFO_REQUEST.value, payload=payload) self.can_interface.send(message, 0)