Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -rcf5e82faaf502b2828ffb6e43c2a64b71f6e31f2 -r4c6191b3a68f1167a0e443c975c51f3cb00b8000 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision cf5e82faaf502b2828ffb6e43c2a64b71f6e31f2) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 4c6191b3a68f1167a0e443c975c51f3cb00b8000) @@ -33,7 +33,7 @@ from .proxies.ro_proxy import ROProxy from .proxies.td_proxy import TDProxy -from ..common.msg_defs import MsgIds, MsgFieldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions from ..common.dd_defs import DDOpModes from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils.base import AbstractSubSystem, publish, LogManager @@ -54,18 +54,6 @@ # DD login password DD_LOGIN_PASSWORD = '123' - # UI version message field positions - START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX - END_POS_MAJOR = START_POS_MAJOR + 1 - START_POS_MINOR = END_POS_MAJOR - END_POS_MINOR = START_POS_MINOR + 1 - START_POS_MICRO = END_POS_MINOR - END_POS_MICRO = START_POS_MICRO + 1 - START_POS_BUILD = END_POS_MICRO - END_POS_BUILD = START_POS_BUILD + 2 - START_POS_COMPATIBILITY_REV = END_POS_BUILD - END_POS_COMPATIBILITY_REV = START_POS_COMPATIBILITY_REV + 4 - def __init__(self, can_interface="can0", log_level=None): """ DD object provides test/service commands for the DD sub-system. @@ -97,18 +85,21 @@ self._handler_dd_op_mode_sync) self.can_interface.register_receiving_publication_function(channel_id, + MsgIds.MSG_ID_DD_VERSION_REPONSE.value, + self._handler_dd_version_response_sync) + + self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_DD_DEBUG_EVENT.value, self._handler_dd_debug_event_sync) # create properties self.dd_op_mode_timestamp = 0.0 self.dd_debug_events_timestamp = 0.0 - self.ui_version_info_response_timestamp = 0.0 + self.dd_version_response_timestamp = 0.0 self.dd_operation_mode = DDOpModes.MODE_INIT.value self.dd_operation_sub_mode = 0 self.dd_logged_in = False self.dd_set_logged_in_status(False) - self.ui_version = None self.dd_debug_events = [''] * self._DD_DEBUG_EVENT_LIST_COUNT self.dd_debug_event_index = 0 self.dd_last_debug_event = '' @@ -182,6 +173,44 @@ self.dd_operation_sub_mode = smode[0] self.dd_op_mode_timestamp = timestamp + @publish(["dd_version, dd_fpga_version"]) + def _handler_dd_version_response_sync(self,message, timestamp = 0.0): + """ + Handler for response from DD regarding its version. + + @param message: version response message from DD.\n + + @return: None if not successful, the version string if unpacked successfully + """ + major = struct.unpack(' 0 for each in [major, minor, micro, build, compatibility]]): + self.dd_version = f"v{major[0]}.{minor[0]}.{micro[0]}-{build[0]}.{compatibility[0]}" + self.logger.debug(f"DD VERSION: {self.dd_version}") + + if all([len(each) > 0 for each in [fpga_id, fpga_major, fpga_minor, fpga_lab]]): + self.dd_fpga_version = f"v{fpga_id[0]}.{fpga_major[0]}.{fpga_minor[0]}-{fpga_lab[0]}" + self.logger.debug(f"DD FPGA VERSION: {self.dd_fpga_version}") + + self.dd_version_response_timestamp = timestamp + def cmd_log_in_to_dd(self, resend: bool = False) -> int: """ Constructs and sends a login command via CAN bus. Login required before \n