Index: CHANGELOG.md =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- CHANGELOG.md (.../CHANGELOG.md) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ CHANGELOG.md (.../CHANGELOG.md) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -340,7 +340,7 @@ - DIAL-31: DG Software reset will not require response - Fixed valves state override message - Fixed incorrect message name for DG pressure override -- DEN-5802: Continued migrating to denali can messenger. +- DEN-5802: Continued migrating to Can Messenger. - DEN-5833: Implementation- Added Alarms Priority enums in the common folder. - Updated the CANBus test function test_can0 to be able to be used out side of the SquishQt (ex. Simulator) and moved the common portion in the utils.py - DEN-5638: Continued squish migration, refactored hd_simulator.py - DEN-3421 updated the drivers.Merged develop into the branch @@ -524,7 +524,7 @@ - Migration of squishapi to dialin - `dialin.squish.crc` - - `dialin.squish.denaliMessages` + - `dialin.squish.CanMessages` - `dialin.squish.globals` - `dialin.squish.messageBuilder` - `dialin.squish.unittests` Index: README.md =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- README.md (.../README.md) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ README.md (.../README.md) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -20,7 +20,7 @@ # Dialin This repository contains the source code for the Dialin API. -The Dialin API supports cross-functional testing of the Denali system. +The Dialin API supports cross-functional testing of the Leahi system. It supports the Systems level testing, Software Verification & Validation, and pre-release SW and FW developmental testing by exposing and simulating interaction with the UI, HD, and DG sub-components. Index: leahi_dialin/common/msg_defs.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -17,7 +17,7 @@ from ..utils.enums import DialinEnum from .msg_ids import MsgIds -MSG_HEADER_SIZE = 6 # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.DenaliMessage class +MSG_HEADER_SIZE = 6 # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.CanMessage class ACK_NOT_REQUIRED = [ ] @@ -78,7 +78,7 @@ class MsgFieldPositions: # Generic response msg field byte positions (where 32-bit data fields are used) - START_POS_FIELD_1 = MSG_HEADER_SIZE # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.DenaliMessage class + START_POS_FIELD_1 = MSG_HEADER_SIZE # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.CanMessage class END_POS_FIELD_1 = START_POS_FIELD_1 + 4 START_POS_FIELD_2 = END_POS_FIELD_1 END_POS_FIELD_2 = START_POS_FIELD_2 + 4 @@ -140,7 +140,7 @@ class MsgFieldPositionsFWVersions: # UI version message field positions - START_POS_MAJOR = MSG_HEADER_SIZE # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.DenaliMessage class + START_POS_MAJOR = MSG_HEADER_SIZE # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.CanMessage class END_POS_MAJOR = START_POS_MAJOR + 1 START_POS_MINOR = END_POS_MAJOR END_POS_MINOR = START_POS_MINOR + 1 Index: leahi_dialin/common/override_templates.py =================================================================== diff -u -r47a803c6dd859a5bcc7a6c82e0cb160c350473ea -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/common/override_templates.py (.../override_templates.py) (revision 47a803c6dd859a5bcc7a6c82e0cb160c350473ea) +++ leahi_dialin/common/override_templates.py (.../override_templates.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -20,7 +20,7 @@ # Project imports from .constants import RESET from .msg_defs import MsgIds -from ..protocols.CAN import DenaliMessage, DenaliChannels +from ..protocols.CAN import CanMessage, CanChannels from ..utils.checks import check_broadcast_interval_override_ms from ..utils.conversions import integer_to_bytearray @@ -29,7 +29,7 @@ ms: int, reset: int, msg_id: MsgIds, - channel_id: DenaliChannels, + channel_id: CanChannels, module_name: str, logger: Logger, can_interface) -> int: @@ -42,7 +42,7 @@ @param ms: integer - interval (in ms) to override with @param reset: integer - 1 to reset a previous override, 0 to override @param msg_id: MsgIds - The override's msg id - @param channel_id: DenaliChannels - The override's channel id + @param channel_id: Channels - The override's channel id @param module_name: str - The module's name to put into the debug prints @param logger: str - The logger for printing debug and error messages @param can_interface: The can_interface @@ -71,7 +71,7 @@ payload: bytearray, reset: int, msg_id: MsgIds, - channel_id: DenaliChannels, + channel_id: CanChannels, entity_name: str, override_text: str, logger: Logger, @@ -84,14 +84,14 @@ @param payload: bytearray - the actual payload @param reset: integer - 1 to reset a previous override, 0 to override @param msg_id: MsgIds - The override's msg id - @param channel_id: DenaliChannels - The override's channel id + @param channel_id: Channels - The override's channel id @param entity_name: str - The entity's name that will be overriden to put into the debug prints @param override_text: str - The value to be overriden with to put into the debug prints @param logger: str - The logger for printing debug and error messages @param can_interface: The can_interface @return: 1 if successful, zero otherwise """ - message = DenaliMessage.build_message(channel_id=channel_id, + message = CanMessage.build_message(channel_id=channel_id, message_id=msg_id.value, payload=payload) @@ -107,13 +107,13 @@ if received_message is not None: if payload is None or reset is None: str_res = f'not called' if reset is not None and reset == RESET else 'Called' - logger.debug(f'{entity_name} is {str_res} {str(received_message["message"][DenaliMessage.PAYLOAD_START_INDEX])}') + logger.debug(f'{entity_name} is {str_res} {str(received_message["message"][CanMessage.PAYLOAD_START_INDEX])}') else: str_res = f'its default value' if reset == RESET else override_text - logger.debug(f'{entity_name} is overridden to {str_res} {str(received_message["message"][DenaliMessage.PAYLOAD_START_INDEX])}') + logger.debug(f'{entity_name} is overridden to {str_res} {str(received_message["message"][CanMessage.PAYLOAD_START_INDEX])}') # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + return received_message['message'][CanMessage.PAYLOAD_START_INDEX] else: logger.error("Timeout!!!!") return False Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -45,7 +45,7 @@ from ..common.generic_defs import DataTypes from ..common.msg_defs import MsgIds, MsgFieldPositions from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels +from ..protocols.CAN import CanMessage, CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish, LogManager from ..utils.conversions import integer_to_bytearray, bytearray_to_byte @@ -81,21 +81,21 @@ self.logger = self._log_manager.logger # Create listener - self.can_interface = DenaliCanMessenger(can_interface=can_interface, + self.can_interface = CanMessenger(can_interface=can_interface, logger=self.logger) self.can_interface.start() self.callback_id = None # register handler for DD operation mode broadcast messages if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_OP_MODE_DATA.value, function = self._handler_dd_op_mode_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, function = self._handler_dd_version_response_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_DEBUG_EVENT.value, function = self._handler_dd_debug_event_sync) @@ -270,7 +270,7 @@ # return cmd_generic_broadcast_interval_override( # ms = ms, # reset = reset, - # channel_id = DenaliChannels.dialin_to_dd_ch_id, + # channel_id = Channels.dialin_to_dd_ch_id, # msg_id = MsgIds.MSG_ID_DD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, # module_name = 'TD Operation Mode', # logger = self.logger, @@ -285,7 +285,7 @@ @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD)))) @@ -295,14 +295,14 @@ received_message = self.can_interface.send(message, resend=resend) if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: + if received_message['message'][CanMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") self.dd_set_logged_in_status(True) #self._send_dd_checkin_message() # Timer starts interval first #self.can_interface.transmit_interval_dictionary[self.callback_id].start() else: self.logger.debug("Failure: Log In Failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + return received_message['message'][CanMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Login Timeout!!!!") return False @@ -325,7 +325,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST, entity_name = 'DD Operation Mode', override_text = dd_enum_repository.DDOpModes(new_mode).name, @@ -344,7 +344,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SOFTWARE_RESET_REQUEST, entity_name = 'DD Software Reset', override_text = '', @@ -369,7 +369,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST, entity_name = 'DD Safety Shutdown', override_text = str(active), Index: leahi_dialin/dd/modules/alarms.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -35,19 +35,19 @@ DD interface containing alarm related commands. """ _ALARM_ID_MAX_ALARMS = 500 - START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX + START_POS_ALARM_ID = CanMessage.PAYLOAD_START_INDEX END_POS_ALARM_ID = START_POS_ALARM_ID + 2 - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_alarm_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_alarm_broadcast_ch_id, message_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value, function = self._handler_alarm_triggered) @@ -170,7 +170,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = '', module_name = 'DD Alarm state', logger = self.logger, @@ -194,7 +194,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = '', module_name = 'DD Alarm info', logger = self.logger, @@ -218,7 +218,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = '', module_name = 'DD Alarm cleared', logger = self.logger, @@ -242,7 +242,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = '', module_name = 'DD Alarm condition cleared', logger = self.logger, @@ -272,7 +272,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST, entity_name = f'DD {alarm_name} Alarm state', override_text = f'{state_name}', Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,17 +35,17 @@ Dialysate Delivery (DD) Dialin API sub-class for Balancing Chamber related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value, function = self._handler_balancing_chamber_sync) @@ -105,7 +105,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Balancing Chamber', logger = self.logger, @@ -129,7 +129,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST, entity_name = 'Switch Frequency', override_text = str(frequency), @@ -154,7 +154,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BC_SWITCH_ONLY_START_STOP_OVERRIDE_REQUEST, entity_name = 'Switch Only Start' if start_stop == 1 else 'Switch Only Stop', override_text = str(flow), @@ -179,7 +179,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_ACID_DOSING_VOLUME_OVERRIDE_REQUEST, entity_name = 'Acid dose volume', override_text = str(volume), @@ -204,7 +204,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BICARB_DOSING_VOLUME_OVERRIDE_REQUEST, entity_name = 'Bicarb dose volume', override_text = str(volume), Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.enums import DialinEnum @@ -58,7 +58,7 @@ BLOOD_LEAK_DETECTED = 0 # Blood detected NO_BLOOD_LEAK_DETECTED = 1 # No blood detected - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -67,11 +67,11 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value, function = self._handler_blood_leak_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_to_dialin_ch_id, message_id = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value, function = self._handler_blood_leak_emb_mode_cmd_resp) @@ -199,7 +199,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Blood Leak', logger = self.logger, @@ -223,7 +223,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST, entity_name = 'DD Blood Leak Detector state', override_text = str(detected), @@ -242,7 +242,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST, entity_name = 'DD Blood Leak Zeroing', override_text = 'Active', @@ -261,7 +261,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST, entity_name = 'DD Blood Leak Embedded mode', override_text = 'Active', @@ -294,7 +294,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST, entity_name = f'DD {str(EmbModeCommands(command).name)} to the blood leak sensor', override_text = 'Active', @@ -322,7 +322,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST, entity_name = f'DD Blood Leak {EmbModeCommands(cmd).name}', override_text = str(value_to_override), @@ -347,7 +347,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST, entity_name = 'DD Blood Leak Intensity Moving Average', override_text = str(value), @@ -375,7 +375,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST, entity_name = f'DD Blood Leak Zeroing {text} interval', override_text = f'{str(value_mins)} minutes', Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,17 +34,17 @@ Dialin API sub-class for concentrate pumps related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value, function = self._handler_concentrate_pumps_sync) @@ -144,7 +144,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Concentrate Pump', logger = self.logger, @@ -167,7 +167,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump target speed', override_text = str(speed), @@ -192,7 +192,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump measured speed', override_text = str(speed), @@ -217,7 +217,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump parked status', override_text = str(status), @@ -242,7 +242,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump parked fault state', override_text = str(status), @@ -262,7 +262,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump to zeroing', override_text = 'Active', @@ -289,7 +289,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump speed', override_text = str(spd), Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -36,17 +36,17 @@ Dialysate Delivery (DD) API sub-class for conductivity sensors related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value, function = self._handler_conductivity_sensors_sync) @@ -98,7 +98,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Conductivity Sensors', logger = self.logger, @@ -126,7 +126,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Conductivity Sensor reading', override_text = f'{str(conductivity)} microsiemens/cm', @@ -155,7 +155,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Conductivity Sensor read counter', override_text = str(counter), @@ -180,7 +180,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Conductivity Sensor error counter', override_text = str(counter), @@ -206,7 +206,7 @@ return cmd_generic_override( payload = payload, reset = 0, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST, entity_name = f'DD set Conductivity Model ID', override_text = str(model_id), @@ -236,7 +236,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Conductivity Sensor resistance', override_text = f'{str(conductivity)} ohms', @@ -264,7 +264,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Conductivity Sensor reading', override_text = f'{str(conductivity)} microsiemens/cm', Index: leahi_dialin/dd/modules/dd_test_configs.py =================================================================== diff -u -ra5e55ec350051bc5b18989286b1c19f186328c07 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision a5e55ec350051bc5b18989286b1c19f186328c07) +++ leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_override from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer @@ -33,17 +33,17 @@ Dialysate Delivery (DD) Dialin API sub-class for setting and getting the test configurations. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_to_dialin_ch_id, message_id = MsgIds.MSG_ID_DD_SEND_TEST_CONFIGURATION.value, function = self._handler_dd_test_config_sync) @@ -104,7 +104,7 @@ response = cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SET_TEST_CONFIGURATION, entity_name = f'DD {DDFPTestConfigOptions(config).name} Test Config', override_text = 'Active', @@ -127,7 +127,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_GET_TEST_CONFIGURATION, entity_name = f'Get DD Test Configuration Record', override_text = 'Active', @@ -146,7 +146,7 @@ response = cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS, entity_name = f'Reset all DD & FP Test Configurations', override_text = 'Active', Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -36,17 +36,17 @@ Dialysate Delivery (DD) Dialin API sub-class for dialysate pumps related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value, function = self._handler_dialysate_pumps_sync) @@ -132,7 +132,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Dialysate Pump', logger = self.logger, @@ -156,7 +156,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump target speed', override_text = str(speed), @@ -181,7 +181,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump measured speed', override_text = str(speed), @@ -206,7 +206,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_TARGET_PRESSURE_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump target pressure', override_text = str(pressure), @@ -231,7 +231,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_CURRENT_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump measured current', override_text = str(current), @@ -256,7 +256,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_DIRECTION_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump measured direction', override_text = str(direction), @@ -282,7 +282,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST, entity_name = f'DD {dd_enum_repository.DDDialysatePumpNames(pump_id).name} Dialysate Pump start & stop', override_text = str(cmd), Index: leahi_dialin/dd/modules/drybicart.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -35,18 +35,18 @@ Dialysate Delivery (DD) Dialin API sub-class for Dry Bicart related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_DRY_BICART_DATA.value, function = self._handler_dry_bicart_sync) @@ -111,7 +111,7 @@ return cmd_generic_broadcast_interval_override( ms=ms, reset=reset, - channel_id=DenaliChannels.dialin_to_dd_ch_id, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name='DD Dry Bicart', logger=self.logger, @@ -135,7 +135,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_dd_ch_id, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST, entity_name='max fill cycle count', override_text=str(count), @@ -159,7 +159,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_dd_ch_id, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST, entity_name='Bicart Fill Request', override_text=str(start_stop), @@ -183,7 +183,7 @@ return cmd_generic_override( payload=payload, reset=NO_RESET, - channel_id=DenaliChannels.dialin_to_dd_ch_id, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST, entity_name='Bicarb Fill Request', override_text=str(start_stop), @@ -207,7 +207,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_dd_ch_id, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST, entity_name='Bicart Drain Request', override_text=str(start_stop), @@ -231,7 +231,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_dd_ch_id, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST, entity_name='Bicart Cartridge Size', override_text=str(small_large), Index: leahi_dialin/dd/modules/events.py =================================================================== diff -u -r22338b079fc9509217fc90488a5a5a4b7b096dd1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/events.py (.../events.py) (revision 22338b079fc9509217fc90488a5a5a4b7b096dd1) +++ leahi_dialin/dd/modules/events.py (.../events.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common import dd_enum_repository from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -36,21 +36,21 @@ """ UNKNOWN_STATE = "UNKNOWN_PREVIOUS_STATE" - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_EVENT.value, function = self._handler_events_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_OP_MODE_DATA.value, function = self._handler_dd_op_mode_sync) Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,17 +35,17 @@ Dialysate Delivery (DD) Dialin API sub-class for gen dialysate related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value, function = self._handler_gen_dialysate_sync) @@ -93,7 +93,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Gen Dialysate', logger = self.logger, @@ -115,7 +115,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST, entity_name = f'DD Dialysate Delivery in progress', override_text = str(in_progress), @@ -138,7 +138,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST, entity_name = f'DD Dialysate Delivery is good to deliver', override_text = str(delivery), @@ -161,7 +161,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_HYD_CHAMBER_TARGET_TEMP_OVERRIDE_REQUEST, entity_name = f'DD Hydraulics Chamber target Temperature', override_text = str(temperature), @@ -183,7 +183,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_GEND_EXEC_STATE_OVERRIDE_REQUEST, entity_name = f'DD Dialysate Delivery set state', override_text = str(state), @@ -206,7 +206,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST, entity_name = f'DD Dialysate Delivery pre gen mode', override_text = str(state), Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,17 +34,17 @@ Dialysate Delivery (DD) Dialin API sub-class for heaters related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_HEATERS_DATA.value, function = self._handler_heaters_sync) @@ -139,7 +139,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_HEATERS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Heaters', logger = self.logger, @@ -165,7 +165,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST, entity_name = f'DD {heater_name} Heaters Duty Cycle', override_text = str(duty_cycle), @@ -192,7 +192,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST, entity_name = f'DD {heater_name} Heaters {start_or_stop} temperature', override_text = str(temperature), @@ -218,7 +218,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_HEATERS_TARGET_TEMPERATURE_OVERRIDE_REQUEST, entity_name = f'DD {heater_name} Heaters target temperature', override_text = str(temperature), @@ -244,7 +244,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_HEATERS_PWM_PERIOD_OVERRIDE_REQUEST, entity_name = f'DD {heater_name} Heaters PWM period', override_text = str(period), Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -34,17 +34,17 @@ Dialysate Delivery (DD) Dialin API sub-class for levels related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_LEVEL_DATA.value, function = self._handler_levels_sync) @@ -99,7 +99,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Levels', logger = self.logger, @@ -125,7 +125,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Level Status', override_text = str(status), @@ -151,7 +151,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST, entity_name = f'DD Floater Levels status', override_text = f'{str(status)}', Index: leahi_dialin/dd/modules/post_gen_dialysate.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -34,7 +34,7 @@ Dialysate Delivery (DD) Dialin API sub-class for post gen dialysate related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA.value, function = self._handler_post_gen_dialysate_sync) @@ -82,7 +82,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Post-Gen Dialysate', logger = self.logger, Index: leahi_dialin/dd/modules/pre_gen_dialysate.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -34,7 +34,7 @@ Dialysate Delivery (DD) Dialin API sub-class for pre gen dialysate related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -44,11 +44,11 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA.value, function = self._handler_pre_gen_state_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA.value, function = self._handler_pre_gen_request_sync) @@ -117,7 +117,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Pre-Gen Dialysate', logger = self.logger, Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,16 +34,16 @@ DD interface containing pressure related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: The DenaliCANMessenger object + @param can_interface: The CanMessenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_PRESSURES_DATA.value, function = self._handler_pressures_sync) @@ -97,7 +97,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Pressure Sensors', logger = self.logger, @@ -124,7 +124,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Pressure Sensors pressure', override_text = f'{str(pressure)} psi', @@ -152,7 +152,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Pressure Sensors read counter', override_text = str(counter), @@ -180,7 +180,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Pressure Sensors error counter', override_text = str(counter), @@ -208,7 +208,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Pressure Sensors filtered pressure', override_text = f'{str(pressure)} psi', Index: leahi_dialin/dd/modules/rinse_pump.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,17 +35,17 @@ Dialysate Delivery (DD) Dialin API sub-class for Rinse Pump related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_RINSE_PUMP_DATA.value, function = self._handler_rinse_pump_sync) @@ -89,7 +89,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Rinse Pump', logger = self.logger, @@ -114,7 +114,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST, entity_name = f'DD Rinse Pump PWM', override_text = str(pwm_pct), @@ -138,7 +138,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST, entity_name = f'DD Rinse Pump state', override_text = 'On' if on_off == 1 else 'Off', Index: leahi_dialin/dd/modules/spent_chamber_fill.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/spent_chamber_fill.py (.../spent_chamber_fill.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/spent_chamber_fill.py (.../spent_chamber_fill.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -33,18 +33,18 @@ Dialysate Delivery (DD) Dialin API sub-class for Spent Chamber Fill related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_SPENT_CHAMBER_FILL_DATA.value, function = self._handler_spent_chamber_fill_sync) @@ -89,7 +89,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Spent Chamber Fill', logger = self.logger, Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,23 +23,23 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray class DDTemperatureSensors(AbstractSubSystem): - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): super().__init__() self.can_interface = can_interface self.logger: Logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value, function = self._handler_temperature_sensors_sync) @@ -126,7 +126,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Temperature Sensors', logger = self.logger, @@ -176,7 +176,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = message_id, entity_name = f'DD {sensor_name} Temperature Sensor temperature', override_text = f'{str(sensor_value)} Celsius', @@ -202,7 +202,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Temperature Sensor read counter', override_text = str(counter), @@ -225,7 +225,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD Barometer Sensor read counter', override_text = str(counter), @@ -248,7 +248,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST, entity_name = f'DD Barometer Sensor CRC', override_text = str(crc), @@ -298,7 +298,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = message_id, entity_name = f'DD {sensor_name} Temperature Sensor filtered temperature', override_text = f'{str(temperature)} Celsius', Index: leahi_dialin/dd/modules/ultrafiltration.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/ultrafiltration.py (.../ultrafiltration.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/ultrafiltration.py (.../ultrafiltration.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -34,7 +34,7 @@ Dialysate Delivery (DD) Dialin API sub-class for post gen dialysate related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_UF_DATA.value, function = self._handler_ultrafiltration_sync) @@ -90,7 +90,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Ultrafiltration', logger = self.logger, Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -25,7 +25,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -44,24 +44,24 @@ """ # Valves states publish message field positions - START_POS_VALVES_STATES = DenaliMessage.PAYLOAD_START_INDEX + START_POS_VALVES_STATES = CanMessage.PAYLOAD_START_INDEX END_POS_VALVES_STATES = START_POS_VALVES_STATES + 2 # Valves States come in as a U16 value (2 bytes) START_POS_BCV_VALVES_STATES = END_POS_VALVES_STATES END_POS_BCV_VALVES_STATES = START_POS_BCV_VALVES_STATES + 1 START_POS_SPARE_VALVES_STATES = END_POS_BCV_VALVES_STATES END_POS_SPARE_VALVES_STATES = START_POS_SPARE_VALVES_STATES + 1 END_POS_ALL_VALVES = START_POS_VALVES_STATES + 4 - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value, function = self._handler_valves_sync) @@ -301,7 +301,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Valves', logger = self.logger, @@ -329,7 +329,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST, entity_name = f'DD {valve_name} Valve sensed state', override_text = str(state), @@ -358,7 +358,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST, entity_name = f'DD {valve_name} Valve state', override_text = str(state), @@ -409,7 +409,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST, entity_name = f'DD Balancing Chamber Valves state', override_text = '', @@ -435,7 +435,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST, entity_name = f'DD {valve_name} Valve state', override_text = str(state), Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Dialysate Delivery (dD) Dialin API sub-class for voltage monitor related commands and data. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ DDVoltages constructor """ @@ -43,7 +43,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_VOLTAGES_DATA.value, function = self._handler_monitored_voltages_sync) @@ -92,7 +92,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Voltages', logger = self.logger, @@ -120,7 +120,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} voltage', override_text = f'{str(volts)} V', Index: leahi_dialin/dd/proxies/ro_proxy.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -20,7 +20,7 @@ # Project imports from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -30,11 +30,11 @@ Dialysate Delivery (DD) Dialin API sub-class for RO proxy ( injection ) related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ ROProxy constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self.can_interface = can_interface @@ -59,7 +59,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.dd_to_ro_ch_id, + channel_id = CanChannels.dd_to_ro_ch_id, msg_id = MsgIds.MSG_ID_DD_FP_START_STOP_CMD_REQUEST, entity_name = 'DD Start Stop Request to RO', override_text = 'N/A', Index: leahi_dialin/dd/proxies/td_proxy.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -21,7 +21,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -32,18 +32,18 @@ Dialysate Delivery (DD) Dialin API sub-class for TD proxy ( injection ) related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDProxy constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_dd_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_dd_ch_id, message_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value, function = self._handler_dialysate_delivery_request_response) @@ -104,7 +104,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, entity_name = 'TD Gen Dialysate Request', override_text = 'N/A', @@ -134,7 +134,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA, entity_name = 'TD Pre-Gen Dialysate Request', override_text = 'N/A', Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -36,7 +36,7 @@ from ..common.generic_defs import DataTypes from ..common.msg_defs import MsgIds, MsgFieldPositions from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels +from ..protocols.CAN import CanMessage, CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish, LogManager from ..utils.conversions import integer_to_bytearray, bytearray_to_byte @@ -72,30 +72,30 @@ self.logger = self._log_manager.logger # Create listener - self.can_interface = DenaliCanMessenger(can_interface=can_interface, + self.can_interface = CanMessenger(can_interface=can_interface, logger=self.logger) self.can_interface.start() self.callback_id = None # register handler for FP operation mode broadcast messages if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value, function = self._handler_fp_op_mode_sync) # FP's version is DD's version since they are the same FW. - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, function = self._handler_fp_version_response_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_DEBUG_EVENT.value, function = self._handler_fp_debug_event_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_to_dialin_ch_id, message_id = MsgIds.MSG_ID_FP_DEF_STATUS_RESPONSE.value, function = self._handler_fp_defeatured_response) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_to_dialin_ch_id, message_id = MsgIds.MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE.value, function = self._handler_fp_boost_pump_installed_response) # Dialin will send a login message during construction. This is for the leahi subsystems to start @@ -258,7 +258,7 @@ @return: 1 if successful, zero otherwise """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_DEF_STATUS_REQUEST.value) self.logger.debug('Getting FP defeatured status') @@ -268,7 +268,7 @@ if received_message is not None: self.logger.debug("Received FW ACK after requesting FP defeatured configuration record.") # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + return received_message['message'][CanMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") return False @@ -283,7 +283,7 @@ @return: 1 if successful, zero otherwise """ # ToDo: Update the msg id when FW part of LDT-3779 is implemented - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST.value) self.logger.debug('Getting FP P40 Boost Pump installed status') @@ -293,7 +293,7 @@ if received_message is not None: self.logger.debug("Received FW ACK after requesting FP P40 Boost Pump installed configuration record.") # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + return received_message['message'][CanMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") return False @@ -314,7 +314,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Operation Mode', logger = self.logger, @@ -329,7 +329,7 @@ @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.FP_LOGIN_PASSWORD)))) @@ -339,15 +339,15 @@ received_message = self.can_interface.send(message, resend=resend) if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: + if received_message['message'][CanMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") self.fp_logged_in = True self.cmd_request_defeatured_status() #self._send_ro_checkin_message() # Timer starts interval first #self.can_interface.transmit_interval_dictionary[self.callback_id].start() else: self.logger.debug("Failure: Log In Failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + return received_message['message'][CanMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Login Timeout!!!!") return False @@ -369,7 +369,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SET_OP_MODE_REQUEST, entity_name = 'FP Operation Mode', override_text = fp_enum_repository.FPOpModes(new_mode).name, @@ -412,7 +412,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SET_OP_SUB_MODE_REQUEST, entity_name = 'FP Operation Sub Mode', override_text = new_sub_mode_enum.name, @@ -431,7 +431,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SOFTWARE_RESET_REQUEST, entity_name = 'FP Software Reset', override_text = '', @@ -456,7 +456,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST, entity_name = 'FP Safety Shutdown', override_text = str(active), Index: leahi_dialin/fp/modules/alarms.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/alarms.py (.../alarms.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/fp/modules/alarms.py (.../alarms.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -35,19 +35,19 @@ FP interface containing alarm related commands. """ _ALARM_ID_MAX_ALARMS = 500 - START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX + START_POS_ALARM_ID = CanMessage.PAYLOAD_START_INDEX END_POS_ALARM_ID = START_POS_ALARM_ID + 2 - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_alarm_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_alarm_broadcast_ch_id, message_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value, function = self._handler_alarm_triggered) @@ -131,7 +131,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = '', module_name = 'FP Alarm state', logger = self.logger, @@ -156,7 +156,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = '', module_name = 'FP Alarm info', logger = self.logger, @@ -187,7 +187,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST, entity_name = f'FP {alarm_name} Alarm state', override_text = f'{state_name}', @@ -210,7 +210,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST, entity_name = f'FP Alarms', override_text = f'Cleared', Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Dialin API sub-class for FP Boost pump controller related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ FPBoostPump constructor """ @@ -43,7 +43,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_BOOST_PUMP_DATA.value, function = self._handler_pump_sync) @@ -105,7 +105,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Boost Pump', logger = self.logger, @@ -130,7 +130,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST, entity_name = f'FP P40 Boost Pump target pressure', override_text = f'{str(pressure)} psi', @@ -156,7 +156,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST, entity_name = f'FP P40 Boost Pump target flow', override_text = f'{str(flow)}', @@ -182,7 +182,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST, entity_name = f'FP P40 Boost Pump target PWM', override_text = f'{str(duty_cycle)}', @@ -202,7 +202,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_STOP_REQUEST, entity_name = f'FP P40 Boost Pump hard stop', override_text = f'Active', Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,21 +35,21 @@ Dialin API sub-class for conductivity sensors related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value, function = self._handler_conductivity_sensors_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_DATA.value, function = self._handler_ro_rejection_ratio_sync) @@ -127,7 +127,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Conductivity Sensor', logger = self.logger, @@ -148,7 +148,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP RO Rejection Ratio', logger = self.logger, @@ -175,7 +175,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Conductivity Sensor reading', override_text = f'{str(conductivity)} microsiemens/cm', @@ -201,7 +201,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Conductivity Sensor read counter', override_text = str(counter), @@ -227,7 +227,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Conductivity Sensor error counter', override_text = str(counter), @@ -250,7 +250,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST, entity_name = f'FP RO Rejection Ratio', override_text = str(value), @@ -280,7 +280,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Conductivity Sensor resistance', override_text = f'{str(conductivity)} ohms', @@ -309,7 +309,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Conductivity Sensor reading', override_text = f'{str(conductivity)} microsiemens/cm', Index: leahi_dialin/fp/modules/events.py =================================================================== diff -u -r22338b079fc9509217fc90488a5a5a4b7b096dd1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/events.py (.../events.py) (revision 22338b079fc9509217fc90488a5a5a4b7b096dd1) +++ leahi_dialin/fp/modules/events.py (.../events.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common import dd_enum_repository, fp_enum_repository from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels, DenaliCanMessenger +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels, CanMessenger from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -33,21 +33,21 @@ """ UNKNOWN_STATE = "UNKNOWN_PREVIOUS_STATE" - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() - self.can_interface: DenaliCanMessenger = can_interface + self.can_interface: CanMessenger = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_EVENT.value, function = self._handler_events_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value, function = self._handler_fp_op_mode_sync) Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,17 +34,17 @@ API sub-class for FP flow sensor related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_FLOW_DATA.value, function = self._handler_flow_sensor_sync) @@ -89,7 +89,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Flow Sensor', logger = self.logger, @@ -115,7 +115,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Flow Sensor flow rate', override_text = f'{str(rate)}', @@ -142,7 +142,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Flow Sensor temperature', override_text = f'{str(temp)} C', @@ -169,7 +169,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FILTERED_FLOW_RATE_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Flow Sensor filtered flow rate', override_text = f'{str(rate)}', @@ -196,7 +196,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST, entity_name = f'FP {sensor_name} Flow Sensor filtered temperature', override_text = f'{str(temp)} C', Index: leahi_dialin/fp/modules/fp_test_configs.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/fp_test_configs.py (.../fp_test_configs.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/fp_test_configs.py (.../fp_test_configs.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_override from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer @@ -33,17 +33,17 @@ FP Dialin API sub-class for setting and getting the test configurations. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_to_dialin_ch_id, message_id = MsgIds.MSG_ID_FP_SEND_TEST_CONFIGURATION.value, function = self._handler_fp_test_config_sync) @@ -97,7 +97,7 @@ response = cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SET_TEST_CONFIGURATION, entity_name = f'FP {DDFPTestConfigOptions(config).name} Test Config', override_text = 'Active', @@ -120,7 +120,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_GET_TEST_CONFIGURATION, entity_name = f'Get FP Test Configuration Record', override_text = 'Active', @@ -139,7 +139,7 @@ response = cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS, entity_name = f'Reset all DD & FP Test Configurations', override_text = 'Active', Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -35,17 +35,17 @@ Dialin API sub-class for levels related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_LEVEL_DATA.value, function = self._handler_levels_sync) @@ -90,7 +90,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Levels', logger = self.logger, @@ -116,7 +116,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST, entity_name = f'FP Levels status', override_text = f'{str(status)}', Index: leahi_dialin/fp/modules/permeate_tank.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -34,7 +34,7 @@ Filtration Purification (FP) Dialin API sub-class for permeate tank related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, # DenaliChannels.dd_sync_broadcast_ch_id ?? + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, # Channels.dd_sync_broadcast_ch_id ?? message_id = MsgIds.MSG_ID_FP_PERMEATE_TANK_DATA.value, function = self._handler_permeate_tank_sync) @@ -82,7 +82,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Permeate Tank', logger = self.logger, Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,7 +35,7 @@ Dialin API sub-class for FP pressure sensor related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ FPPressureSensors constructor """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_PRESSURES_DATA.value, function = self._handler_pressure_sync) @@ -96,7 +96,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Pressure Sensors', logger = self.logger, @@ -124,7 +124,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Pressure Sensor pressure', override_text = f'{str(pressure)} psi', @@ -152,7 +152,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Pressure Sensor filtered pressure', override_text = f'{str(pressure)} psi', Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Dialin API sub-class for FP RO pump controller related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ FPROPump constructor """ @@ -43,7 +43,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_RO_PUMP_DATA.value, function = self._handler_pump_sync) @@ -106,7 +106,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP RO Pump', logger = self.logger, @@ -131,7 +131,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST, entity_name = f'FP P12 RO Pump target pressure', override_text = f'{str(pressure)} psi', @@ -157,7 +157,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST, entity_name = f'FP P12 RO Pump target flow', override_text = f'{str(flow)}', @@ -183,7 +183,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST, entity_name = f'FP P12 RO Pump target PWM', override_text = f'{str(duty_cycle)}', @@ -203,7 +203,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_RO_PUMP_STOP_REQUEST, entity_name = f'FP P12 RO Pump hard stop', override_text = f'Active', Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,22 +24,22 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray class FPTemperatureSensors(AbstractSubSystem): - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value, function = self._handler_temperature_sensors_sync) @@ -102,7 +102,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Temperature Sensors', logger = self.logger, @@ -145,7 +145,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = msg_id, entity_name = f'FP {sensor_name} Temperature Sensor temperature', override_text = str(sensor_value), @@ -190,7 +190,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_fp_ch_id, + channel_id=CanChannels.dialin_to_fp_ch_id, msg_id=msg_id, entity_name=f'FP {sensor_name} Temperature Sensor filtered temperature', override_text=str(sensor_value), Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -26,7 +26,7 @@ from leahi_dialin.common.fp_defs import BETA_IOFP_VALVE_OFFSET from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -43,21 +43,21 @@ """ # Valves states publish message field positions - START_IO_VALVES_STATES = DenaliMessage.PAYLOAD_START_INDEX + START_IO_VALVES_STATES = CanMessage.PAYLOAD_START_INDEX END_IO_VALVES_STATES = START_IO_VALVES_STATES + 1 # IO Valves States come in as a U08 value (1 byte) START_FP_VALVES_STATES = END_IO_VALVES_STATES END_FP_VALVES_STATES = START_FP_VALVES_STATES + 1 # FP Valves States come in as a U08 value (1 byte) - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value, function = self._handler_valves_sync) @@ -177,7 +177,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Valves', logger = self.logger, @@ -205,7 +205,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST, entity_name = f'FP {valve_name} Valve sensed state', override_text = str(state), @@ -234,7 +234,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST, entity_name = f'FP {valve_name} Valve state', override_text = str(state), Index: leahi_dialin/fp/modules/water_pumps.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/modules/water_pumps.py (.../water_pumps.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/modules/water_pumps.py (.../water_pumps.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common import fp_enum_repository from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -32,7 +32,7 @@ Dialin API sub-class for FP water pump driver related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ FPPumps constructor """ @@ -61,7 +61,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST, entity_name = f'FP {pump_name} Water Pump speed', override_text = str(rpm), @@ -88,7 +88,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST, entity_name = f'FP {pump_name} Water Pump PWM', override_text = str(pwm), @@ -116,7 +116,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST, entity_name = f'FP {pump_name} Water Pump read PWM', override_text = str(pwm), Index: leahi_dialin/fp/proxies/dd_proxy.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/fp/proxies/dd_proxy.py (.../dd_proxy.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/fp/proxies/dd_proxy.py (.../dd_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -20,7 +20,7 @@ # Project imports from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -30,11 +30,11 @@ Filtration Purification (FP) Dialin API sub-class for DD proxy ( injection ) related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger, fp): + def __init__(self, can_interface: CanMessenger, logger: Logger, fp): """ ROProxy constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self._fp = fp @@ -58,7 +58,7 @@ rtt = float_to_bytearray(ro_rate) payload = cmd + stt + rtt - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_DD_FP_START_STOP_CMD_REQUEST.value, payload=payload) Index: leahi_dialin/protocols/CAN.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -32,7 +32,7 @@ from concurrent.futures import ThreadPoolExecutor -class DenaliMessage: +class CanMessage: BYTE_ORDER = 'little' START_BYTE = 0xA5 START_INDEX = 0 @@ -83,7 +83,7 @@ @classmethod def build_message(cls, channel_id=0, message_id=0, payload=None, seq=None): """ - Builds a Denali message + Builds a CAN message @param channel_id: (int) indicates the channel @param message_id: (int) indicating the request type @@ -94,9 +94,9 @@ if payload is None: payload = [] - message_list = [DenaliCanMessenger.START_BYTE] + message_list = [CanMessenger.START_BYTE] - if 0 <= message_id <= DenaliMessage.MAX_MSG_ID_NUMBER: + if 0 <= message_id <= CanMessage.MAX_MSG_ID_NUMBER: if seq is None: # Wrap sequence number if it hits a max int16 if cls._seq_num >= 32767: @@ -107,13 +107,13 @@ if message_id not in ACK_NOT_REQUIRED: seq *= -1 - message_seq_in_bytes = seq.to_bytes(2, byteorder=DenaliMessage.BYTE_ORDER, signed=True) + message_seq_in_bytes = seq.to_bytes(2, byteorder=CanMessage.BYTE_ORDER, signed=True) message_list += [message_seq_in_bytes[0]] message_list += [message_seq_in_bytes[1]] # Add message ID as unsigned 16-bit # - message_id_in_bytes = message_id.to_bytes(2, byteorder=DenaliMessage.BYTE_ORDER) + message_id_in_bytes = message_id.to_bytes(2, byteorder=CanMessage.BYTE_ORDER) message_list += [message_id_in_bytes[0]] message_list += [message_id_in_bytes[1]] @@ -128,7 +128,7 @@ payload_length = len(payload) # if payload is larger than 255 return nothing - if payload_length <= DenaliMessage.MAX_NUMBER_OF_PAYLOAD_BYTES: + if payload_length <= CanMessage.MAX_NUMBER_OF_PAYLOAD_BYTES: # payload has to be a list message_list += [payload_length] else: @@ -137,11 +137,11 @@ message_list += payload # Because CRC does not include first byte, then we pass a list with out it - message_list += [DenaliMessage.crc8(message_list[1:])] + message_list += [CanMessage.crc8(message_list[1:])] - message_list = DenaliMessage.pad_message_with_zeros(message_list) + message_list = CanMessage.pad_message_with_zeros(message_list) - return DenaliMessage.build_basic_message(channel_id=channel_id, message=message_list) + return CanMessage.build_basic_message(channel_id=channel_id, message=message_list) @staticmethod def crc8(message_list): @@ -154,7 +154,7 @@ crc = 0 for byte in message_list: unsigned_byte = byte ^ crc - crc = DenaliMessage.CRC_LIST[unsigned_byte] + crc = CanMessage.CRC_LIST[unsigned_byte] return crc @@ -169,10 +169,10 @@ message_length = len(message) # message must be multiple of 8 - if message_length % DenaliMessage.PACKET_LENGTH != 0: + if message_length % CanMessage.PACKET_LENGTH != 0: # We need to pad the message with trailing zeros - add_these_many_zeros = math.ceil(message_length / DenaliMessage.PACKET_LENGTH) * \ - DenaliMessage.PACKET_LENGTH - message_length + add_these_many_zeros = math.ceil(message_length / CanMessage.PACKET_LENGTH) * \ + CanMessage.PACKET_LENGTH - message_length message += [0] * add_these_many_zeros @@ -187,7 +187,7 @@ @return:: CRC in message """ - crc_index = DenaliMessage.PAYLOAD_START_INDEX + DenaliMessage.get_payload_length(message) + crc_index = CanMessage.PAYLOAD_START_INDEX + CanMessage.get_payload_length(message) return message['message'][crc_index] @@ -203,9 +203,9 @@ else: message_list = message['message'] - message_length = DenaliMessage.PAYLOAD_START_INDEX + DenaliMessage.get_payload_length(message) - calculated_crc = DenaliMessage.crc8(message_list[1:message_length]) - actual_crc = DenaliMessage.get_crc(message) + message_length = CanMessage.PAYLOAD_START_INDEX + CanMessage.get_payload_length(message) + calculated_crc = CanMessage.crc8(message_list[1:message_length]) + actual_crc = CanMessage.get_crc(message) return calculated_crc == actual_crc @@ -227,8 +227,8 @@ @param message: dictionary containing the message @return:: (int) the sequence number """ - seq = message['message'][DenaliMessage.MSG_SEQ_INDEX:DenaliMessage.MSG_ID_INDEX] - return int.from_bytes(seq, byteorder=DenaliMessage.BYTE_ORDER, signed=True) + seq = message['message'][CanMessage.MSG_SEQ_INDEX:CanMessage.MSG_ID_INDEX] + return int.from_bytes(seq, byteorder=CanMessage.BYTE_ORDER, signed=True) @staticmethod def create_ack_message(message: dict, passive_mode: bool = True): @@ -242,57 +242,57 @@ message = message.copy() seq = struct.unpack('h', bytearray( - message['message'][DenaliMessage.MSG_SEQ_INDEX:DenaliMessage.MSG_ID_INDEX]))[0] + message['message'][CanMessage.MSG_SEQ_INDEX:CanMessage.MSG_ID_INDEX]))[0] # send back empty payload since this is an ACK payload = bytearray() - channel_id_rx = DenaliMessage.get_channel_id(message) + channel_id_rx = CanMessage.get_channel_id(message) if passive_mode: channel_rx_tx_pairs = { - DenaliChannels.td_alarm_broadcast_ch_id: None, - DenaliChannels.dd_alarm_broadcast_ch_id: None, - DenaliChannels.fp_alarm_broadcast_ch_id: None, - DenaliChannels.ui_alarm_broadcast_ch_id: None, - DenaliChannels.td_to_dd_ch_id: None, - DenaliChannels.dd_to_td_ch_id: None, - DenaliChannels.td_to_ui_ch_id: None, - DenaliChannels.td_sync_broadcast_ch_id: None, - DenaliChannels.dd_sync_broadcast_ch_id: None, - DenaliChannels.fp_sync_broadcast_ch_id: None, - DenaliChannels.ui_to_td_ch_id: None, - DenaliChannels.ui_sync_broadcast_ch_id: None, - DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.dd_to_dialin_ch_id: DenaliChannels.dialin_to_dd_ch_id, - DenaliChannels.fp_to_dialin_ch_id: DenaliChannels.dialin_to_fp_ch_id, - DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id + CanChannels.td_alarm_broadcast_ch_id: None, + CanChannels.dd_alarm_broadcast_ch_id: None, + CanChannels.fp_alarm_broadcast_ch_id: None, + CanChannels.ui_alarm_broadcast_ch_id: None, + CanChannels.td_to_dd_ch_id: None, + CanChannels.dd_to_td_ch_id: None, + CanChannels.td_to_ui_ch_id: None, + CanChannels.td_sync_broadcast_ch_id: None, + CanChannels.dd_sync_broadcast_ch_id: None, + CanChannels.fp_sync_broadcast_ch_id: None, + CanChannels.ui_to_td_ch_id: None, + CanChannels.ui_sync_broadcast_ch_id: None, + CanChannels.td_to_dialin_ch_id: CanChannels.dialin_to_td_ch_id, + CanChannels.dd_to_dialin_ch_id: CanChannels.dialin_to_dd_ch_id, + CanChannels.fp_to_dialin_ch_id: CanChannels.dialin_to_fp_ch_id, + CanChannels.ui_to_dialin_ch_id: CanChannels.dialin_to_ui_ch_id } else: channel_rx_tx_pairs = { - DenaliChannels.td_alarm_broadcast_ch_id: None, - DenaliChannels.dd_alarm_broadcast_ch_id: None, - DenaliChannels.fp_alarm_broadcast_ch_id: None, - DenaliChannels.ui_alarm_broadcast_ch_id: None, - DenaliChannels.td_to_dd_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.dd_to_td_ch_id: DenaliChannels.dialin_to_dd_ch_id, - DenaliChannels.td_to_ui_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.td_sync_broadcast_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.dd_sync_broadcast_ch_id: DenaliChannels.dialin_to_dd_ch_id, - DenaliChannels.fp_sync_broadcast_ch_id: DenaliChannels.dialin_to_fp_ch_id, - DenaliChannels.ui_to_td_ch_id: DenaliChannels.td_to_ui_ch_id, - DenaliChannels.ui_sync_broadcast_ch_id: DenaliChannels.dialin_to_ui_ch_id, - DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.dd_to_dialin_ch_id: DenaliChannels.dialin_to_dd_ch_id, - DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id + CanChannels.td_alarm_broadcast_ch_id: None, + CanChannels.dd_alarm_broadcast_ch_id: None, + CanChannels.fp_alarm_broadcast_ch_id: None, + CanChannels.ui_alarm_broadcast_ch_id: None, + CanChannels.td_to_dd_ch_id: CanChannels.dialin_to_td_ch_id, + CanChannels.dd_to_td_ch_id: CanChannels.dialin_to_dd_ch_id, + CanChannels.td_to_ui_ch_id: CanChannels.dialin_to_td_ch_id, + CanChannels.td_sync_broadcast_ch_id: CanChannels.dialin_to_td_ch_id, + CanChannels.dd_sync_broadcast_ch_id: CanChannels.dialin_to_dd_ch_id, + CanChannels.fp_sync_broadcast_ch_id: CanChannels.dialin_to_fp_ch_id, + CanChannels.ui_to_td_ch_id: CanChannels.td_to_ui_ch_id, + CanChannels.ui_sync_broadcast_ch_id: CanChannels.dialin_to_ui_ch_id, + CanChannels.td_to_dialin_ch_id: CanChannels.dialin_to_td_ch_id, + CanChannels.dd_to_dialin_ch_id: CanChannels.dialin_to_dd_ch_id, + CanChannels.ui_to_dialin_ch_id: CanChannels.dialin_to_ui_ch_id } channel_id_tx = channel_rx_tx_pairs.get(channel_id_rx, None) if channel_id_tx is None: return None - message = DenaliMessage.build_message( + message = CanMessage.build_message( channel_id=channel_id_tx, message_id=MsgIds.MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK.value, payload=payload, @@ -307,9 +307,9 @@ @param message: complete Diality Packet @return:: integer with request ID """ - msg_id_array = message['message'][DenaliMessage.MSG_ID_INDEX: - DenaliMessage.PAYLOAD_LENGTH_INDEX] - return int.from_bytes(msg_id_array, DenaliMessage.BYTE_ORDER) + msg_id_array = message['message'][CanMessage.MSG_ID_INDEX: + CanMessage.PAYLOAD_LENGTH_INDEX] + return int.from_bytes(msg_id_array, CanMessage.BYTE_ORDER) @staticmethod def get_message_id_xstr(message): @@ -319,7 +319,7 @@ @return:: integer with request ID """ msg_id = "" - for index in range(DenaliMessage.MSG_ID_INDEX, DenaliMessage.PAYLOAD_LENGTH_INDEX): + for index in range(CanMessage.MSG_ID_INDEX, CanMessage.PAYLOAD_LENGTH_INDEX): msg_id += "{0:02X}" .format(message['message'][index]) return msg_id @@ -331,7 +331,7 @@ @param message: dictionary with channel_id and message keys @return:: a unsigned payload length """ - return message['message'][DenaliMessage.PAYLOAD_LENGTH_INDEX] + return message['message'][CanMessage.PAYLOAD_LENGTH_INDEX] @staticmethod def get_payload(message): @@ -341,32 +341,32 @@ @param message: dictionary with channel_id and message keys @return:: a payload array if exist """ - payload_length = DenaliMessage.get_payload_length(message) + payload_length = CanMessage.get_payload_length(message) if payload_length == 0: return None else: - return message['message'][DenaliMessage.PAYLOAD_START_INDEX:] + return message['message'][CanMessage.PAYLOAD_START_INDEX:] @staticmethod def get_total_packets(message, is_array=True): """ - Returns the number of packets needed to transmit Denali Message + Returns the number of packets needed to transmit CAN Message @param message: dictionary with channel_id and message keys or raw message @param is_array: True if message is an array and not a dictionary @return:: number of packets """ the_message = message if is_array else message['message'] - return math.ceil((the_message[DenaliMessage.PAYLOAD_LENGTH_INDEX] + - DenaliMessage.HEADER_LENGTH + DenaliMessage.CRC_LENGTH) / - DenaliMessage.PACKET_LENGTH) + return math.ceil((the_message[CanMessage.PAYLOAD_LENGTH_INDEX] + + CanMessage.HEADER_LENGTH + CanMessage.CRC_LENGTH) / + CanMessage.PACKET_LENGTH) -class DenaliChannels: +class CanChannels: """ - Convenience class listing all the possible CAN channels used in the Denali system. + Convenience class listing all the possible CAN channels used in the Diality systems. Updates made to the "Message List.xlsx" document found in the Diality Software Team SharePoint, specifically in the CAN Channels sheet, should also be applied here. """ @@ -394,17 +394,17 @@ ui_to_dialin_ch_id = 0x407 -class LongDenaliMessageBuilder: +class LongMessageBuilder: def __init__(self, message: can.Message): """ - LongDialityMessageBuilder is a utility object that helps construct a Denali message + LongMessageBuilder is a utility object that helps construct a message that is longer than 8 bytes. It is only called when we don't yet have a long message builder for the current channel. Basic principle is to construct an object with the first 8 byte message which contains the length of the message, and the later push the remaining messages. e.g., let's imagine a 3 message packet. - obj = LongDialityMessageBuilder(msg1) + obj = LongMessageBuilder(msg1) message = obj.push(msg2), returns None, message is not complete @@ -413,7 +413,7 @@ @param message: a CAN message """ self.message_data = [b for b in message.data] - self.number_of_can_packets_needed = DenaliMessage.get_total_packets(self.message_data) + self.number_of_can_packets_needed = CanMessage.get_total_packets(self.message_data) self.number_of_can_packets_up_to_now = 1 def push(self, message: can.Message, first_packet=False): @@ -429,7 +429,7 @@ message_data = [b for b in message.data] if first_packet: self.message_data = message_data - self.number_of_can_packets_needed = DenaliMessage.get_total_packets(message_data) + self.number_of_can_packets_needed = CanMessage.get_total_packets(message_data) self.number_of_can_packets_up_to_now = 1 else: @@ -445,16 +445,16 @@ return None -class DenaliCanMessenger(metaclass=SingletonMeta): - START_BYTE = DenaliMessage.START_BYTE +class CanMessenger(metaclass=SingletonMeta): + START_BYTE = CanMessage.START_BYTE DIALIN_MSG_RESP_TO = 0.5 # number of seconds to wait for a response to a send command def __init__(self, can_interface: str, logger: Logger, passive_mode=True, console_out=False): """ - DenaliCanMessenger constructor + CanMessenger constructor @param can_interface - string containing the can interface, e.g., 'can0" @return: DialityCanMessenger object @@ -572,72 +572,72 @@ self.message_queue_mutex.acquire() message: can.Message = self.message_queue.popleft() - if message.dlc == DenaliMessage.PACKET_LENGTH: + if message.dlc == CanMessage.PACKET_LENGTH: # We have received a legit CAN message of 8 bytes can_data = [b for b in message.data] channel_id = message.arbitration_id - if not DenaliMessage.PAYLOAD_LENGTH_INDEX < len(can_data): - self.logger.error("Invalid Denali message received: {0}".format(message)) + if not CanMessage.PAYLOAD_LENGTH_INDEX < len(can_data): + self.logger.error("Invalid CAN message received: {0}".format(message)) self.messages = None # Can't process this message, get the next one self.message_queue_mutex.release() continue else: - message_length = can_data[DenaliMessage.PAYLOAD_LENGTH_INDEX] + message_length = can_data[CanMessage.PAYLOAD_LENGTH_INDEX] # if we are building a long message, then proceed to push it to the channel dictionary if channel_id in self.long_msg_channel_id_set: self.messages = self.long_message_builders[channel_id].push(message) - elif can_data[0] == DenaliMessage.START_BYTE and \ - message_length <= DenaliMessage.PAYLOAD_LENGTH_FIRST_PACKET: # This is a short packet + elif can_data[0] == CanMessage.START_BYTE and \ + message_length <= CanMessage.PAYLOAD_LENGTH_FIRST_PACKET: # This is a short packet # This is the first time that we are building a message self.messages = can_data # deliver the packet elif can_data[0] == self.START_BYTE and \ - message_length > DenaliMessage.PAYLOAD_LENGTH_FIRST_PACKET: # Long packet start + message_length > CanMessage.PAYLOAD_LENGTH_FIRST_PACKET: # Long packet start # We are starting to build a long message, include it in the lonMsgChannelIDSet self.long_msg_channel_id_set.add(channel_id) - # if we don't have a long Denali message builder yet, create it + # if we don't have a long CAN message builder yet, create it if channel_id not in self.long_message_builders.keys(): - self.long_message_builders[channel_id] = LongDenaliMessageBuilder(message) + self.long_message_builders[channel_id] = LongMessageBuilder(message) self.messages = None else: # if we do have a builder. This is the first time self.long_message_builders[channel_id].push(message, first_packet=True) self.messages = None - # Do we have a complete (long or short) Denali Message? + # Do we have a complete (long or short) CAN Message? if self.messages is not None: message_valid = True # assume true for now, set to false if CRC check fails below - complete_dialin_message = DenaliMessage.build_basic_message(channel_id=channel_id, + complete_dialin_message = CanMessage.build_basic_message(channel_id=channel_id, message=self.messages) - dialin_msg_id = DenaliMessage.get_message_id(complete_dialin_message) - dialin_ch_id = DenaliMessage.get_channel_id(complete_dialin_message) + dialin_msg_id = CanMessage.get_message_id(complete_dialin_message) + dialin_ch_id = CanMessage.get_channel_id(complete_dialin_message) # TODO for debugging purposes. Change to configurable setting. #self.temp_dialin_processed_logger.write(str(complete_dialin_message)) if dialin_ch_id in self.long_msg_channel_id_set: # We need to remove channel ID from the long message set self.long_msg_channel_id_set.remove(dialin_ch_id) # Need to verify CRC at this point - if not DenaliMessage.verify_crc(complete_dialin_message): + if not CanMessage.verify_crc(complete_dialin_message): # if verify is False, let's drop (ignore) this message message_valid = False dialin_ch_id = None dialin_msg_id = None self.logger.critical( "Incorrect CRC, received message: {}, crc: {}, calculated crc: {}\n".format( - self.messages, DenaliMessage.get_crc(complete_dialin_message), - DenaliMessage.crc8(self.messages))) + self.messages, CanMessage.get_crc(complete_dialin_message), + CanMessage.crc8(self.messages))) if message_valid: if self.console_out: self.do_console_out(complete_dialin_message) # Send an ack if required - if DenaliMessage.get_sequence_number(complete_dialin_message) < 0: + if CanMessage.get_sequence_number(complete_dialin_message) < 0: # ACK required. Send back the received message with the sequence sign bit flipped - msg = DenaliMessage.create_ack_message(message=complete_dialin_message, + msg = CanMessage.create_ack_message(message=complete_dialin_message, passive_mode=False) if msg is not None: self.send(msg, 0, is_ack=True) @@ -652,7 +652,7 @@ else: self.response_dictionary_mutex.acquire() - if DenaliCanMessenger.is_ui_received_channel(dialin_ch_id): # check if the channel is in ui channels + if CanMessenger.is_ui_received_channel(dialin_ch_id): # check if the channel is in ui channels if self.ui_received_function_ptr is not None: self.thread_pool_executor.submit( self.ui_received_function_ptr, @@ -682,11 +682,11 @@ @return: true, if the channel is the ui channel. """ if channel_id in { - DenaliChannels.ui_to_td_ch_id, - # DenaliChannels.ui_to_dd_ch_id, - DenaliChannels.ui_to_dialin_ch_id, - DenaliChannels.ui_sync_broadcast_ch_id, - DenaliChannels.ui_alarm_broadcast_ch_id + CanChannels.ui_to_td_ch_id, + # Channels.ui_to_dd_ch_id, + CanChannels.ui_to_dialin_ch_id, + CanChannels.ui_sync_broadcast_ch_id, + CanChannels.ui_alarm_broadcast_ch_id }: # check if the channel is in ui channels return True else: @@ -731,13 +731,13 @@ resend: bool = False, is_ack: bool = False): """ - Sends a Denali message + Sends a CAN message @param built_message: (dict) message built using DialinMessage class @param time_out: (float) time it will wait for a response in seconds @param resend: (bool) Allow resending the message when no response is received. Disabled by default @param is_ack: (bool) If we're sending an ACK, False by default - @return: (dict) The Denali packet. If a timeout occurs returns None + @return: (dict) The CAN packet. If a timeout occurs returns None """ data = str(time.time()) + ',' + str(built_message) + '\r' # TODO for debugging purposes. Change to configurable setting. @@ -748,25 +748,25 @@ # keep trying to send message until we get a response while not msg_sent: - channel_id = DenaliMessage.get_channel_id(built_message) + channel_id = CanMessage.get_channel_id(built_message) padded_can_message_array = built_message['message'] - msg_id = DenaliMessage.get_message_id(built_message) + msg_id = CanMessage.get_message_id(built_message) if not is_ack and msg_id not in self.pending_requests: self.pending_requests[msg_id] = None # A message can be longer than 8 bytes, so we need to split it # into 8 bytes packets. - number_of_packets = DenaliMessage.get_total_packets(padded_can_message_array) + number_of_packets = CanMessage.get_total_packets(padded_can_message_array) # We are sending one message at a time on CAN self.transmitting_mutex.acquire() for n in range(number_of_packets): - packet = padded_can_message_array[n * DenaliMessage.PACKET_LENGTH: - (n + 1) * DenaliMessage.PACKET_LENGTH] + packet = padded_can_message_array[n * CanMessage.PACKET_LENGTH: + (n + 1) * CanMessage.PACKET_LENGTH] # Sending one packet at a time packet = can.Message(arbitration_id=channel_id, @@ -841,23 +841,23 @@ @staticmethod def convert_message_to_string(complete_dialin_message: dict) -> str: """ - Converts the DenaliMessage to hex string (data len is not hex) + Converts the CanMessage to hex string (data len is not hex) @param complete_dialin_message: the complete can message in dictionary @return: """ - channel = "{0:03X}" .format(DenaliMessage.get_channel_id(complete_dialin_message)) - msg_id = DenaliMessage.get_message_id_xstr(complete_dialin_message) - data_len = DenaliMessage.get_payload_length(complete_dialin_message) + channel = "{0:03X}" .format(CanMessage.get_channel_id(complete_dialin_message)) + msg_id = CanMessage.get_message_id_xstr(complete_dialin_message) + data_len = CanMessage.get_payload_length(complete_dialin_message) length = "{0:02X}" .format(data_len) data = "" pram_len = 0 if data_len != 0: pram_len = int(data_len / 4) for i in range(pram_len): - data += "{0:02X}".format(complete_dialin_message['message'][DenaliMessage.PAYLOAD_START_INDEX + i ]) - data += "{0:02X}".format(complete_dialin_message['message'][DenaliMessage.PAYLOAD_START_INDEX + i + 1]) - data += "{0:02X}".format(complete_dialin_message['message'][DenaliMessage.PAYLOAD_START_INDEX + i + 2]) - data += "{0:02X}".format(complete_dialin_message['message'][DenaliMessage.PAYLOAD_START_INDEX + i + 3]) + data += "{0:02X}".format(complete_dialin_message['message'][CanMessage.PAYLOAD_START_INDEX + i ]) + data += "{0:02X}".format(complete_dialin_message['message'][CanMessage.PAYLOAD_START_INDEX + i + 1]) + data += "{0:02X}".format(complete_dialin_message['message'][CanMessage.PAYLOAD_START_INDEX + i + 2]) + data += "{0:02X}".format(complete_dialin_message['message'][CanMessage.PAYLOAD_START_INDEX + i + 3]) data += " " message = "{} {} {} {}".format(channel, msg_id, data_len, data) return message @@ -872,11 +872,11 @@ MsgIds.MSG_ID_UI_CHECK_IN.value, MsgIds.MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK } - msg_id = DenaliMessage.get_message_id(complete_dialin_message) + msg_id = CanMessage.get_message_id(complete_dialin_message) if msg_id in exception_msg_id: return - message = "# " + DenaliCanMessenger.convert_message_to_string(complete_dialin_message) + message = "# " + CanMessenger.convert_message_to_string(complete_dialin_message) print(message) def register_transmitting_interval_message(self, interval: float, function) ->None: Index: leahi_dialin/protocols/__init__.py =================================================================== diff -u -r8ad78a5baa403afceccf9627478285a2ec742c4a -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/protocols/__init__.py (.../__init__.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) +++ leahi_dialin/protocols/__init__.py (.../__init__.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -16,7 +16,7 @@ if ok: print(f"{sw_key} is set to bypass the auto imports in '{module_name}' module.") else: - from .CAN import DenaliCanMessenger - from .CAN import DenaliChannels - from .CAN import LongDenaliMessageBuilder - from .CAN import DenaliMessage + from .CAN import CanMessenger + from .CAN import CanChannels + from .CAN import LongMessageBuilder + from .CAN import CanMessage Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -37,16 +37,16 @@ Treatment Delivery (TD) Dialin API sub-class for air pump related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value, function = self._handler_air_pump_sync) @@ -103,7 +103,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Air Pump', logger = self.logger, @@ -133,7 +133,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST, entity_name = f'TD Air Pump to {state_name}', override_text = f'{power_value}', Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -40,16 +40,16 @@ AIR_DETECTED_AT_LEVEL = 0 FLUID_DETECTED_AT_LEVEL = 1 - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value, function = self._handler_air_trap_sync) @@ -134,7 +134,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_TRAP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Air Trap', logger = self.logger, @@ -161,7 +161,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_TRAP_LEVEL_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Air Trap level sensor', override_text = f'{str(detected)}', @@ -189,7 +189,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_TRAP_LEVEL_RAW_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Air Trap level sensor raw', override_text = f'{str(detected)}', @@ -214,7 +214,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_2_WAY_VALVE_SET_STATE_REQUEST, entity_name = f'TD Air Trap {valve_name} Valve state', override_text = f'{str(valve_state)}', @@ -235,7 +235,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SET_AIR_TRAP_CONTROL, entity_name = f'TD Air Trap control', override_text = f'{str(control)}', @@ -261,7 +261,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST, entity_name = f'TD Air Pump Raise power', override_text = f'{str(power)}', @@ -287,7 +287,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST, entity_name = f'TD Air Pump Lower power', override_text = f'{str(power)}', Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -25,7 +25,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -62,7 +62,7 @@ AlarmResponseButtons._str_list = {} # Alarm status message field positions - START_POS_ALARM_STATE = DenaliMessage.PAYLOAD_START_INDEX + START_POS_ALARM_STATE = CanMessage.PAYLOAD_START_INDEX END_POS_ALARM_STATE = START_POS_ALARM_STATE + 4 START_POS_ALARM_TOP = END_POS_ALARM_STATE END_POS_ALARM_TOP = START_POS_ALARM_TOP + 4 @@ -73,36 +73,36 @@ START_POS_ALARMS_FLAGS = END_POS_ALARM_SILENCE_EXPIRES_IN END_POS_ALARMS_FLAGS = START_POS_ALARMS_FLAGS + 2 - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_alarm_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_alarm_broadcast_ch_id, message_id = MsgIds.MSG_ID_ALARM_STATUS_DATA.value, function = self._handler_alarms_status_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_alarm_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_alarm_broadcast_ch_id, message_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value, function = self._handler_alarm_trigger) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_alarm_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_alarm_broadcast_ch_id, message_id = MsgIds.MSG_ID_ALARM_CLEARED.value, function = self._handler_alarm_clear) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_alarm_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_alarm_broadcast_ch_id, message_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value, function = self._handler_alarm_condition_clear) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_ALARM_INFORMATION_DATA.value, function = self._handler_alarm_information_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE.value, function = self._handler_alarm_list_response) @@ -373,7 +373,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_STATUS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Alarm Status', logger = self.logger, @@ -394,7 +394,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_INFO_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Alarm Info', logger = self.logger, @@ -424,7 +424,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_STATE_OVERRIDE_REQUEST, entity_name = f'TD {alarm_name} Alarm state', override_text = f'{state_name}', @@ -447,7 +447,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_CLEAR_ALL_ALARMS_REQUEST, entity_name = f'TD Alarms', override_text = f'Cleared', @@ -476,7 +476,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_START_TIME_OVERRIDE_REQUEST, entity_name = f'TD {alarm_name} Alarms time', override_text = f'{time_ms} ms', @@ -526,7 +526,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_AUDIO_LEVEL_OVERRIDE_REQUEST, entity_name = f'TD Alarms lamp pattern', override_text = f'{str_pat}', @@ -552,7 +552,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_AUDIO_LEVEL_OVERRIDE_REQUEST, entity_name = f'TD Alarms audio volume', override_text = f'{str(volume)}', @@ -577,7 +577,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_AUDIO_CURRENT_HG_OVERRIDE_REQUEST, entity_name = f'TD Alarms audio high gain current', override_text = f'{str(current)} mA', @@ -602,7 +602,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ALARM_AUDIO_CURRENT_LG_OVERRIDE_REQUEST, entity_name = f'TD Alarms audio low gain current', override_text = f'{str(current)} mA', @@ -627,7 +627,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BACKUP_ALARM_AUDIO_CURRENT_OVERRIDE_REQUEST, entity_name = f'TD Alarms backup audio current', override_text = f'{str(current)} mA', Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Treatment Device (TD) Dialin API sub-class for blood-flow related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDBloodFlow constructor """ @@ -43,7 +43,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_DATA.value, function = self._handler_blood_flow_sync) @@ -104,7 +104,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Blood Flow', logger = self.logger, @@ -128,7 +128,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_SET_FLOW_RATE_REQUEST, entity_name = f'TD Blood Flow flow rate', override_text = f'{str(flow)} mL/min', @@ -151,7 +151,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_SET_SPEED_REQUEST, entity_name = f'TD Blood Flow RPM', override_text = f'{str(rpm)}', @@ -176,7 +176,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_MEASURED_FLOW_RATE_OVERRIDE_REQUEST, entity_name = f'TD Blood Flow measured flow rate', override_text = f'{str(flow)} mL/min', @@ -202,7 +202,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST, entity_name = f'TD Blood Flow measured motor RPM', override_text = f'{str(spd)}', @@ -228,7 +228,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST, entity_name = f'TD Blood Flow measured rotor RPM', override_text = f'{str(spd)}', @@ -255,7 +255,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST, entity_name = f'TD Blood Flow rotor count', override_text = f'{str(rot_count)}', @@ -274,7 +274,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_HOME_BLOOD_PUMP_REQUEST, entity_name = f'TD Blood Flow homing', override_text = f'Active', @@ -293,7 +293,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_HARD_STOP_BLOOD_PUMP, entity_name = f'TD Blood Flow Pump hard stop', override_text = f'Active', @@ -317,7 +317,7 @@ return cmd_generic_override( payload=payload, reset=reset, - channel_id=DenaliChannels.dialin_to_td_ch_id, + channel_id=CanChannels.dialin_to_td_ch_id, msg_id=MsgIds.MSG_ID_TD_BLOOD_FLOW_STROKE_VOLUME_OVERRIDE_REQUEST, entity_name='TD Blood Flow stroke volume', override_text=f'{volume}', @@ -343,7 +343,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST, entity_name = f'TD Blood Flow wear A term', override_text = f'{str(a_term)}', @@ -368,7 +368,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST, entity_name = f'TD Blood Flow wear B term', override_text = f'{str(b_term)}', Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -46,16 +46,16 @@ AIR_BUBBLE_NORMAL_STATE = 0 # Normal state AIR_BUBBLE_SELF_TEST_STATE = 1 # Self-test state - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_BUBBLES_DATA.value, function = self._handler_air_bubbles_data_sync) @@ -104,7 +104,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Air Bubble Detector', logger = self.logger, @@ -132,7 +132,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Bubble Detector status', override_text = f'{str(status)}', @@ -154,7 +154,7 @@ return cmd_generic_override( payload=payload, reset=NO_RESET, - channel_id=DenaliChannels.dialin_to_td_ch_id, + channel_id=CanChannels.dialin_to_td_ch_id, msg_id=MsgIds.MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM, entity_name='TD Enable Venous Bubble Alarm', override_text=f'{ena}', Index: leahi_dialin/td/modules/buttons.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/buttons.py (.../buttons.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/buttons.py (.../buttons.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -34,18 +34,18 @@ Treatment Delivery (TD) Dialin API sub-class for button related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TD_Buttons constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value, function = self._handler_poweroff_timeout_occurred) @@ -102,7 +102,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_OFF_BUTTON_OVERRIDE_REQUEST, entity_name = f'TD Off Button', override_text = f'{state_name}', @@ -130,7 +130,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_STOP_BUTTON_OVERRIDE_REQUEST, entity_name = f'TD Stop Button', override_text = f'{state_name}', Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -36,16 +36,16 @@ Treatment Delivery (TD) Dialin API sub-class for ejector motor related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_EJECTOR_DATA.value, function = self._handler_ejector_sync) @@ -96,7 +96,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Ejector', logger = self.logger, @@ -121,7 +121,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_EJECTOR_COMMAND, entity_name = f'TD Ejector state', override_text = f'{str(cmd)}', @@ -145,7 +145,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST, entity_name = f'TD Ejector speed', override_text = f'{str(speed)}', @@ -179,7 +179,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_EJECTOR_OPT_SENSOR_OVERRIDE_REQUEST, entity_name = f'TD Ejector {sensor_name} Optical Sensor', override_text = f'{str(sensor_active)}', Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -r22338b079fc9509217fc90488a5a5a4b7b096dd1 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/events.py (.../events.py) (revision 22338b079fc9509217fc90488a5a5a4b7b096dd1) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -25,7 +25,7 @@ from leahi_dialin.common import td_enum_repository from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -36,20 +36,20 @@ """ UNKNOWN_STATE = "UNKNOWN_PREVIOUS_STATE" - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_EVENT.value, function = self._handler_events_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value, function = self._handler_td_op_mode_sync) Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,7 +35,7 @@ Treatment Delivery (TD) Dialin API sub-class for pressure related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDPressureSensors constructor """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_PRESSURE_DATA.value, function = self._handler_pressure_sync) @@ -146,7 +146,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Pressure Sensors', logger = self.logger, @@ -174,7 +174,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Pressure Sensor pressure', override_text = str(prs) + " mmHg. ", @@ -200,7 +200,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST, entity_name = 'TD TMP Pressure Sensor pressure', override_text = str(prs) + " mmHg. ", @@ -226,7 +226,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_BARO_PRESSURE_OVERRIDE, entity_name = 'TD Barometric Pressure Sensor pressure', override_text = str(prs) + " PSI. ", Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -34,7 +34,7 @@ @brief Treatment Device (TD) Dialin API sub-class for TD switches related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDSwitches constructor """ @@ -44,7 +44,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_SWITCHES_DATA.value, function = self._handler_switches_sync) @@ -85,7 +85,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Switches', logger = self.logger, @@ -112,7 +112,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SWITCH_STATE_OVERRIDE_REQUEST, entity_name = f'TD {switch_name} Switch status', override_text = f'{str(status)}', Index: leahi_dialin/td/modules/td_test_configs.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -22,7 +22,7 @@ from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_override from leahi_dialin.common.test_config_defs import TDTestConfigOptions -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer @@ -33,17 +33,17 @@ TD Dialin API sub-class for setting and getting the test configurations. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_dialin_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_dialin_ch_id, message_id = MsgIds.MSG_ID_TD_SEND_TEST_CONFIGURATION.value, function = self._handler_td_test_config_sync) @@ -97,7 +97,7 @@ response = cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SET_TEST_CONFIGURATION, entity_name = f'TD {TDTestConfigOptions(config).name} Test Config', override_text = 'Active', @@ -120,7 +120,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_GET_TEST_CONFIGURATION, entity_name = f'Get TD Test Configuration Record', override_text = 'Active', @@ -139,7 +139,7 @@ response = cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS, entity_name = f'Reset all TD Test Configurations', override_text = 'Active', Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Treatment Delivery (TD) Dialin API sub-class for temperature related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDTemperatureSensors constructor """ @@ -43,7 +43,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_TEMPERATURE_DATA.value, function = self._handler_temperature_sync) @@ -89,7 +89,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Temperature Sensors', logger = self.logger, @@ -117,7 +117,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_TEMPERATURE_OVERRIDE, entity_name = f'TD {sensor_name} Temperature Sensor temperature', override_text = f'{str(temperature)} C', Index: leahi_dialin/td/modules/treatment.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Treatment Delivery (TD) Dialin API sub-class for treatment related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDTreatment constructor """ @@ -43,27 +43,27 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value, function = self._handler_treatment_param_ranges_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value, function = self._handler_saline_bolus_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value, function = self._handler_uf_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value, function = self._handler_treatment_time_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value, function = self._handler_treatment_state_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS.value, function = self._handler_resp_treatment_parameters_sync) @@ -302,7 +302,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SET_TREATMENT_PARAMETER, entity_name = f'TD {param_name}', override_text = str(tx_param_value), Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -34,19 +34,19 @@ Treatment Delivery (TD) Dialin API sub-class for valves related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDValves constructor - @param can_interface: (DenaliCanMessenger) - Denali CAN messenger object. + @param can_interface: (CanMessenger) - Can Messenger object. @param logger: (Logger) - Dialin logger """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_VALVES_DATA.value, function = self._handler_valves_sync) @@ -106,7 +106,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_VALVES_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Valves', logger = self.logger, @@ -130,7 +130,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST, entity_name = f'TD {valve_name} Valve position', override_text = str(position), @@ -156,7 +156,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PINCH_VALVE_HOME_REQUEST, entity_name = f'TD {valve_name} Valve homing', override_text = 'Forcefully' if force_home == 1 else 'Normally', @@ -182,7 +182,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST, entity_name = f'TD {valve_name} Valve position', override_text = f'move by {str(position_count)}', @@ -208,7 +208,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST, entity_name = f'TD {valve_name} Valve status', override_text = str(status), @@ -233,7 +233,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST, entity_name = f'TD {valve_name} Valve encoder position offset', override_text = str(counts), Index: leahi_dialin/td/modules/voltages.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -23,7 +23,7 @@ from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common import td_enum_repository -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -34,7 +34,7 @@ Treatment Delivery (TD) Dialin API sub-class for voltage monitor related commands and data. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDVoltages constructor """ @@ -43,7 +43,7 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_VOLTAGES_DATA.value, function = self._handler_monitored_voltages_sync) @@ -95,7 +95,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Voltages', logger = self.logger, @@ -123,7 +123,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} voltage', override_text = f'{str(volts)} V', Index: leahi_dialin/td/proxies/dd_proxy.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/proxies/dd_proxy.py (.../dd_proxy.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/proxies/dd_proxy.py (.../dd_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from logging import Logger # Project imports -from leahi_dialin.protocols.CAN import DenaliCanMessenger +from leahi_dialin.protocols.CAN import CanMessenger from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -27,11 +27,11 @@ Treatment Delivery (DD) Dialin API sub-class for DD proxy ( injection ) related commands. """ - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ DDProxy constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self.can_interface = can_interface Index: leahi_dialin/td/proxies/ui_proxy.py =================================================================== diff -u -r636775bd0ba262967bcf06e194658b97720e2517 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 636775bd0ba262967bcf06e194658b97720e2517) +++ leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ from leahi_dialin.common.generic_defs import DataTypes from leahi_dialin.common.msg_defs import MsgIds, RequestRejectReasons from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.conversions import integer_to_bytearray, unsigned_byte_to_bytearray, float_to_bytearray, \ short_to_bytearray @@ -37,30 +37,30 @@ SW_COMPATIBILITY_REV = 0 - def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ DDProxy constructor - @param can_interface: the Denali CAN interface object + @param can_interface: the CAN interface object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE.value, function = self._handler_tx_parameters_val_resp_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.value, function = self._handler_uf_val_resp_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW.value, function = self._handler_initiate_treatment_resp_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE.value, function = self._handler_uf_pause_resp_sync) @@ -283,7 +283,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE, entity_name = 'Sneding UI Treatment Parameter to TD', override_text = 'N/A', @@ -307,7 +307,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_sync_broadcast_ch_id, + channel_id = CanChannels.ui_sync_broadcast_ch_id, msg_id = MsgIds.MSG_ID_FW_VERSIONS_REQUEST, entity_name = 'UI Version Request', override_text = 'N/A', @@ -327,7 +327,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW, entity_name = 'UI Initiate Treatment Workflow', override_text = 'N/A', @@ -347,7 +347,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED, entity_name = 'UI Confirm Treatment Parameters', override_text = 'N/A', @@ -369,7 +369,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_UI_UF_PAUSE_RESUME_REQUEST, entity_name = 'UI Pause or Resume UF Request', override_text = 'N/A', @@ -389,7 +389,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE, entity_name = 'Validate UI Ultrafiltration Volume', override_text = 'N/A', @@ -405,7 +405,7 @@ """ cmd_generic_override(payload = None, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST, entity_name = 'UI Active Alarm List Request', override_text = 'N/A', @@ -425,7 +425,7 @@ cmd_generic_override(payload = payload, reset = None, - channel_id = DenaliChannels.ui_to_td_ch_id, + channel_id = CanChannels.ui_to_td_ch_id, msg_id = MsgIds.MSG_ID_USER_ALARM_SILENCE_REQUEST, entity_name = 'UI Alarm Silence Request', override_text = 'N/A', Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -43,7 +43,7 @@ from ..common import td_enum_repository from ..common.generic_defs import DataTypes from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels +from ..protocols.CAN import CanMessage, CanMessenger, CanChannels from ..utils.abstract_classes import AbstractSubSystem from ..utils.base import publish, LogManager from ..utils.conversions import integer_to_bytearray, bytearray_to_byte @@ -80,25 +80,25 @@ self.logger = self._log_manager.logger # Create listener - self.can_interface = DenaliCanMessenger(can_interface=can_interface, + self.can_interface = CanMessenger(can_interface=can_interface, logger=self.logger) self.can_interface.start() self.callback_id = None # register handler for TD operation mode broadcast messages if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value, function = self._handler_td_op_mode_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_DEBUG_EVENT.value, function = self._handler_td_debug_event_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_TD_VERSION_RESPONSE.value, function = self._handler_td_version_response_sync) - self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, message_id = MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value, function = self._handler_ui_version_response_sync) @@ -275,7 +275,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Operation Mode', logger = self.logger, @@ -290,7 +290,7 @@ @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.TD_LOGIN_PASSWORD)))) @@ -300,14 +300,14 @@ received_message = self.can_interface.send(message, resend=resend) if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: + if received_message['message'][CanMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") self.td_set_logged_in_status(True) #self._send_td_checkin_message() # Timer starts interval first #self.can_interface.transmit_interval_dictionary[self.callback_id].start() else: self.logger.debug("Failure: Log In Failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + return received_message['message'][CanMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Login Timeout!!!!") return False @@ -338,7 +338,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST, entity_name = 'TD Operation Mode', override_text = td_enum_repository.TDOpModes(new_mode).name, @@ -357,7 +357,7 @@ resp = cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SOFTWARE_RESET_REQUEST, entity_name = 'TD Software Reset', override_text = '', @@ -386,7 +386,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST, entity_name = 'TD Safety Shutdown', override_text = str(active), @@ -400,7 +400,7 @@ @return: none """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_UI_VERSION_INFO_REQUEST.value) self.logger.debug("Sending an UI version request to the TD.") @@ -422,7 +422,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST, entity_name = 'TD Training Test Override', override_text = str(value), Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ def info(a1, a2): pass - self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) + self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) self.can_interface.start() if self.can_interface is not None: @@ -52,8 +52,8 @@ payload += conversions.float_to_bytearray(D43 ) payload += conversions.float_to_bytearray(D74 ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value, payload=payload) @@ -93,8 +93,8 @@ payload += conversions.float_to_bytearray (D51_spend_pressure ) payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value, payload=payload) @@ -129,8 +129,8 @@ payload += conversions.unsigned_byte_to_bytearray (fpga_lab ) payload += conversions.unsigned_integer_to_bytearray(compatibility_rev) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, payload=payload) @@ -146,8 +146,8 @@ # TODO: replace with proper payload and message ID once message is defined payload = bytes(serial, 'ascii') + b'\x00' - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_SERIAL_RESPONSE.value, payload=payload) @@ -167,8 +167,8 @@ payload += conversions.unsigned_integer_to_bytearray(d63Level ) payload += conversions.unsigned_integer_to_bytearray(d46Level ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_LEVEL_DATA.value, payload=payload) @@ -221,8 +221,8 @@ payload += conversions.float_to_bytearray(d18PresTemp ) payload += conversions.float_to_bytearray(d41PresTemp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_PRESSURES_DATA.value, payload=payload) @@ -278,8 +278,8 @@ payload += conversions.float_to_bytearray(d28AvgTemp ) payload += conversions.float_to_bytearray(d30AvgTemp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value, payload=payload) @@ -341,8 +341,8 @@ payload += conversions.float_to_bytearray (dbg8 ) payload += conversions.float_to_bytearray (dbg9 ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_HEATERS_DATA.value, payload=payload) @@ -428,8 +428,8 @@ payload += conversions.unsigned_integer_to_bytearray(d76PumpState ) payload += conversions.float_to_bytearray (d76PumpPulseUS ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value, payload=payload) @@ -501,8 +501,8 @@ payload += conversions.unsigned_integer_to_bytearray(d12PumpMeasuredDir ) payload += conversions.unsigned_integer_to_bytearray(d48PumpMeasuredDir ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value, payload=payload) @@ -516,8 +516,8 @@ """ payload = conversions.unsigned_integer_to_bytearray(blood_leak ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value, payload=payload) @@ -533,8 +533,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_DATE_AND_TIME_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -677,8 +677,8 @@ for i in range(len(valvesensedState)): payload += conversions.unsigned_byte_to_bytearray(valvesensedState[i]) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value, payload=payload) Index: leahi_dialin/ui/fp_messaging.py =================================================================== diff -u -r372d9868eab437585688e307e166881c42d2fc9b -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 372d9868eab437585688e307e166881c42d2fc9b) +++ leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ def info(a1, a2): pass - self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) + self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) self.can_interface.start() if self.can_interface is not None: @@ -60,8 +60,8 @@ payload += conversions.unsigned_byte_to_bytearray (fpga_lab ) payload += conversions.unsigned_integer_to_bytearray(compatibility_rev) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_VERSION_RESPONSE.value, payload=payload) @@ -100,8 +100,8 @@ payload += conversions.float_to_bytearray(x3Pressure ) payload += conversions.float_to_bytearray(x4Pressure ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_PRESSURES_DATA.value, payload=payload) @@ -140,8 +140,8 @@ payload += conversions.float_to_bytearray (p12PumpDutyCyclePct ) payload += conversions.float_to_bytearray (p12PumpFBDutyCyclePct ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_RO_PUMP_DATA.value, payload=payload) @@ -156,8 +156,8 @@ """ payload = conversions.unsigned_integer_to_bytearray(p25Level ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_LEVEL_DATA.value, payload=payload) @@ -181,8 +181,8 @@ payload += conversions.float_to_bytearray(p7Temp ) payload += conversions.float_to_bytearray(p16Temp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_FLOW_DATA.value, payload=payload) @@ -200,8 +200,8 @@ payload = conversions.float_to_bytearray(p9Conductivity ) payload += conversions.float_to_bytearray(p18Conductivity ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value, payload=payload) @@ -252,8 +252,8 @@ payload += conversions.float_to_bytearray(p7Temp ) payload += conversions.float_to_bytearray(p16Temp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value, payload=payload) @@ -292,8 +292,8 @@ payload += conversions.float_to_bytearray (p40PumpDutyCyclePct ) payload += conversions.float_to_bytearray (p40PumpFBDutyCyclePct ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_BOOST_PUMP_DATA.value, payload=payload) Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rbc48fc613a98360e723ed057a23f2635326b5fe2 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision bc48fc613a98360e723ed057a23f2635326b5fe2) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -25,7 +25,7 @@ def info(a1, a2): pass - self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) + self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) self.can_interface.start() if self.can_interface is not None: @@ -45,8 +45,8 @@ payload = conversions.integer_to_bytearray(op_mode ) payload += conversions.integer_to_bytearray(sub_mode) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_OP_MODE_DATA.value, payload=payload) @@ -65,8 +65,8 @@ payload = conversions.float_to_bytearray(board_temp) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TEMPERATURE_DATA.value, payload=payload) @@ -110,8 +110,8 @@ payload += conversions.unsigned_integer_to_bytearray(H4_pres_flow ) payload += conversions.unsigned_integer_to_bytearray(H6_rot_hall_state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PUMP_DATA.value, payload=payload) @@ -149,8 +149,8 @@ payload += conversions.unsigned_integer_to_bytearray(H20_State ) payload += conversions.unsigned_integer_to_bytearray(controlling ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value, payload=payload) @@ -172,8 +172,8 @@ payload = conversions.unsigned_integer_to_bytearray(H18_status ) payload += conversions.unsigned_integer_to_bytearray(H18_state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BUBBLES_DATA.value, payload=payload) @@ -195,8 +195,8 @@ payload = conversions.unsigned_integer_to_bytearray(H12_state) payload += conversions.unsigned_integer_to_bytearray(H12_power) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value, payload=payload) @@ -217,8 +217,8 @@ payload = conversions.unsigned_integer_to_bytearray(H5_state ) payload += conversions.float_to_bytearray (H5_set_speed) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_EJECTOR_DATA.value, payload=payload) @@ -237,8 +237,8 @@ payload = conversions.unsigned_integer_to_bytearray(H9_door ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_SWITCHES_DATA.value, payload=payload) @@ -260,8 +260,8 @@ payload = conversions.unsigned_integer_to_bytearray(capacity) payload += conversions.unsigned_integer_to_bytearray(ac_power) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BATTERY_DATA.value, payload=payload) @@ -289,8 +289,8 @@ payload += conversions.short_to_bytearray (pos_count ) payload += conversions.short_to_bytearray (next_pos ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VALVES_DATA.value, payload=payload) @@ -331,8 +331,8 @@ payload += conversions.float_to_bytearray(fpga_vaux ) payload += conversions.float_to_bytearray(fpga_vpvn ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VOLTAGES_DATA.value, payload=payload) @@ -385,8 +385,8 @@ payload += conversions.float_to_bytearray (tmp_min ) payload += conversions.float_to_bytearray (tmp_max ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_DATA.value, payload=payload) @@ -412,8 +412,8 @@ payload += conversions.float_to_bytearray (cumulative ) payload += conversions.unsigned_integer_to_bytearray(time_remaining ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_HEPARIN_DATA.value, payload=payload) @@ -436,8 +436,8 @@ payload = conversions.unsigned_integer_to_bytearray (total ) payload += conversions.unsigned_integer_to_bytearray (countdown ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA.value, payload=payload) @@ -463,8 +463,8 @@ payload += conversions.unsigned_integer_to_bytearray (diastolic ) payload += conversions.unsigned_integer_to_bytearray (heartRate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRESSURE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -492,8 +492,8 @@ payload += conversions.float_to_bytearray (bolus_volume ) payload += conversions.unsigned_integer_to_bytearray(state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value, payload=payload) @@ -522,8 +522,8 @@ payload += conversions.float_to_bytearray (volume_delivered ) payload += conversions.unsigned_integer_to_bytearray(state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value, payload=payload) @@ -550,8 +550,8 @@ payload += conversions.unsigned_integer_to_bytearray(tx_elapsed_s ) payload += conversions.unsigned_integer_to_bytearray(tx_remaining_s ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value, payload=payload) @@ -586,8 +586,8 @@ payload += conversions.unsigned_integer_to_bytearray (min_dial_rate_mLH ) payload += conversions.unsigned_integer_to_bytearray (max_dial_rate_mLH ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value, payload=payload) @@ -613,8 +613,8 @@ payload += conversions.unsigned_integer_to_bytearray(dialysate_flow ) payload += conversions.float_to_bytearray (dialysate_temp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS.value, payload=payload) @@ -644,8 +644,8 @@ payload += conversions.unsigned_integer_to_bytearray ( timeout ) payload += conversions.unsigned_integer_to_bytearray ( countdown ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA.value, payload=payload) @@ -662,8 +662,8 @@ payload = conversions.integer_to_bytearray(vAccepted) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE.value, payload=payload) @@ -682,8 +682,8 @@ payload = conversions.unsigned_integer_to_bytearray (vTimeout ) payload += conversions.unsigned_integer_to_bytearray (vCountdown ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RECIRCULATE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -699,8 +699,8 @@ payload = conversions.integer_to_bytearray(vAccepted) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RECIRCULATE_RESPONSE.value, payload=payload) @@ -729,8 +729,8 @@ payload += conversions.unsigned_integer_to_bytearray(volume_delivered ) payload += conversions.unsigned_integer_to_bytearray(rate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_DATA.value, payload=payload) @@ -767,8 +767,8 @@ payload += conversions.unsigned_byte_to_bytearray (fpga_lab ) payload += conversions.unsigned_integer_to_bytearray(compatibility_rev) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VERSION_RESPONSE.value, payload=payload) @@ -784,8 +784,8 @@ """ payload = bytes(serial, 'ascii') + b'\x00' - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_SERIAL_RESPONSE.value, payload=payload) @@ -798,8 +798,8 @@ None @return: None """ - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_UI_VERSION_INFO_REQUEST.value) self.can_interface.send(message, 0) @@ -815,8 +815,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRESSURE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -832,8 +832,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_LIMIT_WIDEN_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -849,8 +849,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_DATE_AND_TIME_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -865,8 +865,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_HEPARIN_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -881,8 +881,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_END_TREATMENT_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1013,8 +1013,8 @@ payload += conversions.float_to_bytearray(vSubstitutionVolumeMax) payload += conversions.float_to_bytearray(vSubstitutionVolumeDef) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1200,8 +1200,8 @@ payload += conversions.integer_to_bytearray(vSubVolumeMinReason ) payload += conversions.integer_to_bytearray(vSubVolumeMaxReason ) payload += conversions.integer_to_bytearray(vSubVolumeDefReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1261,8 +1261,8 @@ payload += conversions.integer_to_bytearray(vWaterSampleTestResultRequiredDef ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADVANCED_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1340,8 +1340,8 @@ payload += conversions.integer_to_bytearray(vChlorineWaterSampleCheckDefRejectionReason ) payload += conversions.integer_to_bytearray(vWaterSampleTestResultRequiredDefRejectionReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADVANCED_ADJUST_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1364,8 +1364,8 @@ payload += conversions.float_to_bytearray(vUFVolume ) payload += conversions.float_to_bytearray(vUFRate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_DURATION_VALIDATE_RESPONSE .value, payload=payload) self.can_interface.send(message, 0) @@ -1391,8 +1391,8 @@ payload += conversions.unsigned_integer_to_bytearray (vCountdown ) payload += conversions.integer_to_bytearray (vIsCompleted ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RINSEBACK_PROGRESS.value, payload=payload) self.can_interface.send(message, 0) @@ -1408,8 +1408,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RINSEBACK_CMD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1429,8 +1429,8 @@ payload += conversions.integer_to_bytearray(vRejectionReason ) payload += conversions.integer_to_bytearray(vVolumeMax ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_DURATION_CHANGE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1454,8 +1454,8 @@ payload += conversions.integer_to_bytearray(vDuration ) payload += conversions.integer_to_bytearray(vRate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_VOLUME_GOAL_CHANGE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1473,8 +1473,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0 ) payload += conversions.integer_to_bytearray(vRejectionReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1490,8 +1490,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1506,8 +1506,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1525,8 +1525,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW.value, payload=payload) self.can_interface.send(message, 0) @@ -1616,8 +1616,8 @@ payload += conversions.integer_to_bytearray(vUFEstimatedTargetWeightRejectReason ) payload += conversions.integer_to_bytearray(vUFVolumeRejectReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE.value, payload=payload) self.can_interface.send(message, 0) @@ -1660,8 +1660,8 @@ payload += conversions.unsigned_integer_to_bytearray(tx_saline_state ) payload += conversions.unsigned_integer_to_bytearray(tx_heparin_state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value, payload=payload) @@ -1680,8 +1680,8 @@ payload += conversions.float_to_bytearray(parameter1) payload += conversions.float_to_bytearray(parameter2) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT.value, payload=payload) @@ -1700,8 +1700,8 @@ payload += conversions.float_to_bytearray(old_value) payload += conversions.float_to_bytearray(new_value) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_LOG_EVENT.value, payload=payload) @@ -1712,7 +1712,7 @@ is_pure_data: bool = False, has_parameters: bool = False, parameters_payload: any = 0x00, - channel_id=CAN.DenaliChannels.td_to_ui_ch_id) -> None: + channel_id=CAN.CanChannels.td_to_ui_ch_id) -> None: """A general method to send any standard response message, by it's id and list of parameters. Args: message_id (int ): the id of the message @@ -1721,7 +1721,7 @@ is_pure_data (bool, optional ): The message only has data. Defaults to False. has_parameters (bool, optional ): if the message has parameter this needs to be true. Defaults to False. parameters_payload (any, optional ): the list of parameters pre-converted and ready to be concatenated to the payload. Defaults to 0x00. - channel_id (_type_, optional ): indicates the channel. Defaults to CAN.DenaliChannels.td_to_ui_ch_id. + channel_id (_type_, optional ): indicates the channel. Defaults to CAN.Channels.td_to_ui_ch_id. """ payload = "" if not is_pure_data: @@ -1731,7 +1731,7 @@ if has_parameters: payload = parameters_payload - message = CAN.DenaliMessage.build_message( + message = CAN.CanMessage.build_message( channel_id, message_id, payload Index: leahi_dialin/ui/td_messaging_alarms.py =================================================================== diff -u -r49a5752911c816d6f33e9800cda8c1221f0dca9e -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/ui/td_messaging_alarms.py (.../td_messaging_alarms.py) (revision 49a5752911c816d6f33e9800cda8c1221f0dca9e) +++ leahi_dialin/ui/td_messaging_alarms.py (.../td_messaging_alarms.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -24,7 +24,7 @@ def info(a1, a2): pass - self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) + self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) self.can_interface.start() if self.can_interface is not None: @@ -50,8 +50,8 @@ payload += conversions.integer_to_bytearray (silence_expires) payload += conversions.short_to_bytearray (flags ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id, message_id=CAN.MsgIds.MSG_ID_ALARM_STATUS_DATA.value, payload=payload) @@ -90,8 +90,8 @@ payload += conversions.integer_to_bytearray(a8) payload += conversions.integer_to_bytearray(a9) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=CAN.MsgIds.MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE.value, payload=payload) @@ -153,8 +153,8 @@ payload += conversions.unsigned_integer_to_bytearray(clear_top) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id, message_id=CAN.MsgIds.MSG_ID_ALARM_TRIGGERED.value, payload=payload) @@ -175,8 +175,8 @@ payload = conversions.integer_to_bytearray(alarm_id) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id, message_id=CAN.MsgIds.MSG_ID_ALARM_CLEARED.value, payload=payload) @@ -197,8 +197,8 @@ payload = conversions.integer_to_bytearray(alarm_id) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id, message_id=CAN.MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value, payload=payload) Index: tests/DebugMsgCatcher.py =================================================================== diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/DebugMsgCatcher.py (.../DebugMsgCatcher.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) +++ tests/DebugMsgCatcher.py (.../DebugMsgCatcher.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -25,7 +25,7 @@ from dialin.hd.hemodialysis_device import HD from dialin.dg.dialysate_generator import DG from dialin.common.msg_defs import MsgIds, MsgFieldPositions -from dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessenger, CanMessage, Channels from dialin.utils.base import AbstractSubSystem, publish, LogManager from dialin.utils.checks import check_broadcast_interval_override_ms from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray Index: tests/peter/test_blood_flow.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/peter/test_blood_flow.py (.../test_blood_flow.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/peter/test_blood_flow.py (.../test_blood_flow.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from time import sleep sys.path.append("../../") from dialin import HDSimulator -from dialin.protocols.CAN import DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessage, Channels from dialin.common import MsgIds from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray def run(): @@ -43,7 +43,7 @@ payload += float_to_bytearray(pwm_duty_cycle_pct) payload += float_to_bytearray(flow_signal_strength) - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_BLOOD_FLOW_DATA.value, payload=payload) Index: tests/peter/test_dg_thermistors.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/peter/test_dg_thermistors.py (.../test_dg_thermistors.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/peter/test_dg_thermistors.py (.../test_dg_thermistors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from time import sleep sys.path.append("../../") from dialin import DGSimulator -from dialin.protocols.CAN import DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessage, Channels from dialin.common import MsgIds from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -35,7 +35,7 @@ payload += float_to_bytearray(power_supply_1) payload += float_to_bytearray(power_supply_2) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.dg_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_THERMISTORS_DATA.value, payload=payload) Index: tests/peter/test_dg_valves.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/peter/test_dg_valves.py (.../test_dg_valves.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/peter/test_dg_valves.py (.../test_dg_valves.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from time import sleep sys.path.append("../../") from dialin import DGSimulator -from dialin.protocols.CAN import DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessage, Channels from dialin.common import MsgIds from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -31,7 +31,7 @@ payload = integer_to_bytearray(vlv_states) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.dg_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_VALVES_STATES.value, payload=payload) Index: tests/peter/test_hd_fluid_leak.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/peter/test_hd_fluid_leak.py (.../test_hd_fluid_leak.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/peter/test_hd_fluid_leak.py (.../test_hd_fluid_leak.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from time import sleep sys.path.append("../../") from dialin import HDSimulator -from dialin.protocols.CAN import DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessage, Channels from dialin.common import MsgIds from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray def run(): @@ -29,13 +29,13 @@ state = np.random.randint(0, 2) payload = integer_to_bytearray(state) - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, payload=payload) hd_sim.can_interface.send(message, 0) - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_STATE.value, payload=payload) Index: tests/peter/test_hd_valves.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/peter/test_hd_valves.py (.../test_hd_valves.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/peter/test_hd_valves.py (.../test_hd_valves.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from time import sleep sys.path.append("../../") from dialin import HDSimulator -from dialin.protocols.CAN import DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessage, Channels from dialin.common import MsgIds from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -51,7 +51,7 @@ payload += integer_to_bytearray(pwm) payload += integer_to_bytearray(air_trap) - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_HD_VALVES_DATA.value, payload=payload) Index: tests/peter/test_temperature_sensors.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/peter/test_temperature_sensors.py (.../test_temperature_sensors.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/peter/test_temperature_sensors.py (.../test_temperature_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -18,7 +18,7 @@ from time import sleep sys.path.append("../../") from dialin import HDSimulator -from dialin.protocols.CAN import DenaliMessage, DenaliChannels +from dialin.protocols.CAN import CanMessage, Channels from dialin.common import MsgIds from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray def run(): @@ -30,7 +30,7 @@ for val in vals: payload += float_to_bytearray(val) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, + message = CanMessage.build_message(channel_id=Channels.dg_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, payload=payload) Index: tests/unit_tests/depreciated_tests/test_ui_proxy.py =================================================================== diff -u -r72c423da1d07c40699f40b5da5bee6d992d3082c -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/unit_tests/depreciated_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 72c423da1d07c40699f40b5da5bee6d992d3082c) +++ tests/unit_tests/depreciated_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -21,8 +21,8 @@ from leahi_dialin.utils import setup_virtual_can_interface from collections import OrderedDict from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -from leahi_dialin.protocols.CAN import (DenaliMessage, - DenaliChannels) +from leahi_dialin.protocols.CAN import (CanMessage, + CanChannels) from leahi_dialin.common import MsgIds, TreatmentParameters from leahi_dialin.utils import is_interface_up, is_interface_present @@ -101,7 +101,7 @@ payload += integer_to_bytearray(self.params.get("bp_intvl", None)) payload += integer_to_bytearray(self.params.get("rb_flow", None)) - message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_to_hd_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.ui_to_hd_ch_id, message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, payload=payload) @@ -111,7 +111,7 @@ test_timestamp = 0.0 payload = bytearray() - message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_to_hd_ch_id, + message = CanMessage.build_message(channel_id=CanChannels.ui_to_hd_ch_id, message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, payload=payload) Index: tests/unit_tests/test_imports.py =================================================================== diff -u -r8e3ce4e082f70e12b48d796c518994662f7668b3 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- tests/unit_tests/test_imports.py (.../test_imports.py) (revision 8e3ce4e082f70e12b48d796c518994662f7668b3) +++ tests/unit_tests/test_imports.py (.../test_imports.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -67,10 +67,10 @@ def test_protocols_imports(self): - from leahi_dialin.protocols.CAN import (DenaliCanMessenger, - DenaliMessage, - DenaliChannels, - LongDenaliMessageBuilder) + from leahi_dialin.protocols.CAN import (CanMessenger, + CanMessage, + CanChannels, + LongMessageBuilder) def test_utils_imports(self):