Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r8e3ce4e082f70e12b48d796c518994662f7668b3 -rf66c019100e98b49cd94fa0a69951a1a7c952da0 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 8e3ce4e082f70e12b48d796c518994662f7668b3) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision f66c019100e98b49cd94fa0a69951a1a7c952da0) @@ -7,21 +7,22 @@ # # @file dialysate_delivery.py # -# @author (last) Dara Navaei -# @date (last) 26-Feb-2024 +# @author (last) Zoltan Miskolci +# @date (last) 08-Jan-2026 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ + import struct from .modules.alarms import DDAlarms from .modules.balancing_chamber import DDBalancingChamber from .modules.blood_leak import DDBloodLeak from .modules.concentrate_pump import DDConcentratePumps from .modules.conductivity_sensors import DDConductivitySensors -from .modules.constants import NO_RESET, RESET from .modules.dialysate_pump import DDDialysatePumps +from .modules.events import DDEvents from .modules.gen_dialysate import DDGenDialysate from .modules.heaters import DDHeaters from .modules.levels import DDLevels @@ -30,6 +31,7 @@ from .modules.pre_gen_dialysate import DDPreGenDialysate from .modules.rinse_pump import DDRinsePump from .modules.spent_chamber_fill import DDSpentChamberFill +from .modules.drybicart import DDDryBicart from .modules.temperature_sensors import DDTemperatureSensors from .modules.dd_test_configs import DDTestConfig from .modules.ultrafiltration import DDUltrafiltration @@ -39,13 +41,13 @@ from .proxies.ro_proxy import ROProxy from .proxies.td_proxy import TDProxy +from ..common.constants import NO_RESET +from ..common.dd_defs import dd_enum_repository from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions -from ..common.dd_defs import DDOpModes +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 ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray, unsigned_short_to_bytearray, bytearray_to_integer, \ - bytearray_to_byte +from ..utils.conversions import integer_to_bytearray, bytearray_to_byte class DD(AbstractSubSystem): @@ -73,7 +75,6 @@ @param can_interface: (str) CANBus interface name, e.g. "can0" @param log_level: (str) Logging level, defaults to None """ - super().__init__() self._log_manager = LogManager(log_level=log_level, log_filepath=self.__class__.__name__ + ".log") self.logger = self._log_manager.logger @@ -104,7 +105,7 @@ self.dd_op_mode_timestamp = 0.0 self.dd_debug_events_timestamp = 0.0 self.dd_version_response_timestamp = 0.0 - self.dd_operation_mode = DDOpModes.MODE_INIT.value + self.dd_operation_mode = dd_enum_repository.DDOpModes.MODE_INIT.value self.dd_operation_sub_mode = 0 self.dd_logged_in = False self.dd_set_logged_in_status(False) @@ -121,6 +122,7 @@ self.concentrate_pumps = DDConcentratePumps(self.can_interface, self.logger) self.conductivity_sensors = DDConductivitySensors(self.can_interface, self.logger) self.dialysate_pumps = DDDialysatePumps(self.can_interface, self.logger) + self.events = DDEvents(self.can_interface, self.logger) self.gen_dialysate = DDGenDialysate(self.can_interface, self.logger) self.heaters = DDHeaters(self.can_interface, self.logger) self.levels = DDLevels(self.can_interface, self.logger) @@ -129,6 +131,7 @@ self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger) self.rinse_pump = DDRinsePump(self.can_interface, self.logger) self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger) + self.drybicart = DDDryBicart(self.can_interface, self.logger) self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger) self.test_configs = DDTestConfig(self.can_interface, self.logger) self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger) @@ -141,7 +144,6 @@ @publish(["msg_id_dd_debug_event", "dd_debug_events_timestamp","dd_debug_events"]) def _handler_dd_debug_event_sync(self, message, timestamp = 0.0): - payload = message['message'] message_length = payload[self._DD_DEBUG_EVENT_MSG_LEN_INDEX] temp_message = '' @@ -161,6 +163,7 @@ if self.dd_debug_event_index == self._DD_DEBUG_EVENT_LIST_COUNT: self.dd_debug_event_index = 0 + @publish(["dd_logged_in"]) def dd_set_logged_in_status(self, logged_in: bool = False): """ @@ -170,6 +173,7 @@ """ self.dd_logged_in = logged_in + @publish(["msg_id_dd_op_mode_data", "dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"]) def _handler_dd_op_mode_sync(self, message, timestamp = 0.0): """ @@ -188,6 +192,7 @@ self.dd_operation_sub_mode = smode[0] self.dd_op_mode_timestamp = timestamp + @publish(["msg_id_dd_version_response", "dd_version, dd_fpga_version"]) def _handler_dd_version_response_sync(self,message, timestamp = 0.0): """ @@ -226,6 +231,28 @@ self.dd_version_response_timestamp = timestamp + + # def cmd_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + # """ + # Constructs and sends the measured op mode broadcast interval override command + # Constraints: + # Must be logged into TD. + # Given interval must be non-zero and a multiple of the TD general task interval (50 ms). + + # @param ms: integer - interval (in ms) to override with + # @param reset: integer - 1 to reset a previous override, 0 to override + # @return: 1 if successful, zero otherwise + # """ + # return cmd_generic_broadcast_interval_override( + # ms = ms, + # reset = reset, + # channel_id = DenaliChannels.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, + # can_interface = self.can_interface) + + def cmd_log_in_to_dd(self, resend: bool = False) -> int: """ Constructs and sends a login command via CAN bus. Login required before \n @@ -234,7 +261,6 @@ @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_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD)))) @@ -257,6 +283,7 @@ self.logger.debug("Login Timeout!!!!") return False + def cmd_dd_set_operation_mode(self, new_mode: int = 0) -> int: """ Constructs and sends a set operation mode request command via CAN bus. @@ -268,31 +295,20 @@ @param new_mode: ID of operation mode to transition to @return: 1 if successful, zero otherwise - """ - payload = integer_to_bytearray(new_mode) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST.value, - payload=payload) + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.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, + logger = self.logger, + can_interface = self.can_interface) - self.logger.debug("Requesting DD mode change to " + str(new_mode)) - # Send message - received_message = self.can_interface.send(message) - - if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - self.logger.debug("Success: Mode change accepted") - else: - self.logger.debug("Failure: Mode change rejected.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("DD mode change request Timeout!!!!") - return False - - def cmd_dd_software_reset_request(self) -> None: """ Constructs and sends an DD software reset request via CAN bus. @@ -301,18 +317,17 @@ @return: None """ + return cmd_generic_override( + payload = None, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_SOFTWARE_RESET_REQUEST, + entity_name = 'DD Software Reset', + override_text = '', + logger = self.logger, + can_interface = self.can_interface) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_SOFTWARE_RESET_REQUEST.value) - self.logger.debug("requesting DD software reset") - - # Send message - self.can_interface.send(message, 0) - self.logger.debug("Sent request to DD to reset...") - self.dd_set_logged_in_status(False) - - def cmd_dd_safety_shutdown_override(self, active: int, reset: int = NO_RESET) -> int: """ Constructs and sends an DD safety shutdown override command via CAN bus. @@ -322,28 +337,17 @@ @param active: int - True to activate safety shutdown, False to deactivate @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ - rst = integer_to_bytearray(reset) saf = integer_to_bytearray(active) payload = rst + saf - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("overriding FP safety shutdown") - - # Send message - received_message = self.can_interface.send(message) - - if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - self.logger.debug("Safety shutdown signal overridden") - else: - self.logger.debug("Safety shutdown signal override failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.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), + logger = self.logger, + can_interface = self.can_interface)