Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rc6d2dfdb988298f0264fcb163d8232929bdbe515 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision c6d2dfdb988298f0264fcb163d8232929bdbe515) @@ -8,14 +8,13 @@ # @file dialysate_delivery.py # # @author (last) Zoltan Miskolci -# @date (last) 08-Jan-2026 +# @date (last) 04-May-2026 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ -import struct - +# Project imports from .modules.alarms import DDAlarms from .modules.balancing_chamber import DDBalancingChamber from .modules.blood_leak import DDBloodLeak @@ -31,6 +30,7 @@ from .modules.pre_gen_dialysate import DDPreGenDialysate from .modules.rinse_pump import DDRinsePump from .modules.spent_chamber_fill import DDSpentChamberFill +from .modules.substitution_pump import DDSubstitutionPump from .modules.drybicart import DDDryBicart from .modules.temperature_sensors import DDTemperatureSensors from .modules.dd_test_configs import DDTestConfig @@ -43,10 +43,12 @@ from ..common.constants import NO_RESET from ..common import dd_enum_repository -from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions +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 ..utils.base import AbstractSubSystem, publish, LogManager +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 @@ -80,26 +82,24 @@ 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: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - self.msg_id_dd_op_mode_data = MsgIds.MSG_ID_DD_OP_MODE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_op_mode_data, - self._handler_dd_op_mode_sync) + 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.msg_id_dd_version_response = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value - self.can_interface.register_receiving_publication_function(channel_id, - self.msg_id_dd_version_response, - self._handler_dd_version_response_sync) + 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.msg_id_dd_debug_event = MsgIds.MSG_ID_DD_DEBUG_EVENT.value - self.can_interface.register_receiving_publication_function(channel_id, - self.msg_id_dd_debug_event, - self._handler_dd_debug_event_sync) + 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) + # Dialin will send a login message during construction. This is for the leahi subsystems to start # publishing CAN data when there is no UI connected as the UI typically does this job. self.cmd_log_in_to_dd() @@ -125,6 +125,7 @@ self.concentrate_pumps = DDConcentratePumps(self.can_interface, self.logger) #: The Concentrat Pumps module self.conductivity_sensors = DDConductivitySensors(self.can_interface, self.logger) #: The Conductivity Sensors module self.dialysate_pumps = DDDialysatePumps(self.can_interface, self.logger) #: The Dialysate Pumps module + self.drybicart = DDDryBicart(self.can_interface, self.logger) #: The Dry Bicarb module self.events = DDEvents(self.can_interface, self.logger) #: The Events module self.gen_dialysate = DDGenDialysate(self.can_interface, self.logger) #: The Generate Dialysate module self.heaters = DDHeaters(self.can_interface, self.logger) #: The Heaters module @@ -134,7 +135,7 @@ self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger) #: The Pre Generate Dialysate module self.rinse_pump = DDRinsePump(self.can_interface, self.logger) #: The Rinse Pump module self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger) #: The Spent Chamber module - self.drybicart = DDDryBicart(self.can_interface, self.logger) #: The Dry Bicarb module + self.substitution_pump = DDSubstitutionPump(self.can_interface, self.logger) #: The Substitution Pump module self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger) #: The Temperature Sensors module self.test_configs = DDTestConfig(self.can_interface, self.logger) #: The Test Configs module self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger) #: The Ultrafiltration module @@ -186,13 +187,12 @@ @param message: published DD operation mode broadcast message @return: None """ - mode = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) - smode = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + msg_list = [] + msg_list.append(('self.dd_operation_mode', DataTypes.U32)) + msg_list.append(('self.dd_operation_sub_mode', DataTypes.U32)) - self.dd_operation_mode = mode[0] - self.dd_operation_sub_mode = smode[0] + self.process_into_vars(decoder_list = msg_list, + message = message) self.dd_op_mode_timestamp = timestamp @@ -205,33 +205,56 @@ @return: None if not successful, the version string if unpacked successfully """ - major = struct.unpack(' 0 for each in [result['major'], result['minor'], result['micro'], result['build'], result['compatibility']]]): + self.dd_version = f"v{result['major']}.{result['minor']}.{result['micro']}-{result['build']}.{result['compatibility']}" + self.logger.debug(f'DD VERSION: {self.dd_version}') + + if all([len(each) > 0 for each in [result['fpga_id'], result['fpga_major'], result['fpga_minor'], result['fpga_lab']]]): + self.dd_fpga_version = f"v{result['fpga_id']}.{result['fpga_major']}.{result['fpga_minor']}-{result['fpga_lab']}" + self.logger.debug(f'DD FPGA VERSION: {self.dd_fpga_version}') + + """ + major = struct.unpack(DataTypes.U08.unpack_attrib(), bytearray( message['message'][MsgFieldPositionsFWVersions.START_POS_MAJOR:MsgFieldPositionsFWVersions.END_POS_MAJOR])) - minor = 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 @@ -249,7 +272,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, @@ -264,7 +287,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)))) @@ -274,14 +297,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 @@ -304,7 +327,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, @@ -323,7 +346,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 = '', @@ -348,7 +371,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),