Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r79697500614904bafb56f3d33e368b954ba78f7d -raa534fb000c14ca2490eda9c4497f18402db3c2d --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 79697500614904bafb56f3d33e368b954ba78f7d) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision aa534fb000c14ca2490eda9c4497f18402db3c2d) @@ -7,20 +7,20 @@ # # @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 @@ -40,13 +40,13 @@ from .proxies.ro_proxy import ROProxy from .proxies.td_proxy import TDProxy -from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions +from ..common.constants import NO_RESET from ..common.dd_defs import DDOpModes +from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions +from ..common.override_templates import 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): @@ -163,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): """ @@ -172,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): """ @@ -190,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): """ @@ -228,6 +231,7 @@ 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 @@ -259,6 +263,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. @@ -275,26 +280,17 @@ 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 = 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. @@ -304,17 +300,17 @@ @return: None """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_SOFTWARE_RESET_REQUEST.value) + 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) - 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. @@ -331,21 +327,12 @@ 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)