Index: leahi_dialin/dd/modules/pre_gen_dialysate.py =================================================================== diff -u -rbcee4d024cee5855b3662785cad1c6834c5dc858 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision bcee4d024cee5855b3662785cad1c6834c5dc858) +++ leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -7,33 +7,35 @@ # # @file pre_gen_dialysate.py # -# @author (last) Micahel Garthwaite -# @date (last) 07-Mar-2023 +# @author (last) Zoltan Miskolci +# @date (last) 04-May-2026 # @author (original) Micahel Garthwaite # @date (original) 29-Oct-2020 # ############################################################################ -import struct -from enum import unique + +# Module imports from logging import Logger -from .constants import RESET, NO_RESET -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum -from leahi_dialin.utils.checks import check_broadcast_interval_override_ms -from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray +# Project imports +from leahi_dialin.common.constants import NO_RESET +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 CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish + class DDPreGenDialysate(AbstractSubSystem): """ Pre Gen Dialysate Dialysate Delivery (DD) Dialin API sub-class for pre gen dialysate related commands. """ - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Leahi Can Messenger object """ super().__init__() @@ -42,61 +44,65 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self._handler_pre_gen_state_sync) + 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) - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self._handler_pre_gen_request_sync) + 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) - self.execution_state = 0 - self.pre_gen_state_timestamp = 0 + self.pre_gen_state_timestamp = 0 #: The timestamp of the latest Pre-Gen State message + self.execution_state = 0 #: The execution state - self.pre_gen_request_timestamp = 0 - self.pre_gen_start = 0 - self.pre_gen_dial_rate = 0.0 - self.pre_gen_dial_temp = 0.0 - self.pre_gen_acid = 0 - self.pre_gen_bicarb = 0 + self.pre_gen_request_timestamp = 0 #: The timestamp of the latest Pre-Gen Request message + self.pre_gen_start = 0 #: The Pre-Gen start value + self.pre_gen_dial_rate = 0.0 #: The Pre-Gen dialysate rate + self.pre_gen_dial_temp = 0.0 #: The Pre-Gen dialysate temperature + self.pre_gen_acid = 0 #: The Pre-Gen acid concentrate option index + self.pre_gen_bicarb = 0 #: The Pre-Gen bicarb concentrate option index + + @publish(["msg_id_dd_pre_gen_dialysate_state_data", "execution_state", "pre_gen_state_timestamp"]) def _handler_pre_gen_state_sync(self, message, timestamp=0.0): """ Handles published pre gen dialysate data messages. @param message: published pre gen dialysate data message @return: None """ + msg_list =[] + msg_list.append(('self.execution_state', DataTypes.U32)) - self.execution_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.process_into_vars(decoder_list = msg_list, + message = message) self.pre_gen_state_timestamp = timestamp + @publish(["msg_id_dd_pre_gen_dialysate_request_data", + "pre_gen_start", "pre_gen_dial_rate", "pre_gen_dial_temp", + "pre_gen_acid", "pre_gen_bicarb", + "pre_gen_request_timestamp"]) def _handler_pre_gen_request_sync(self, message, timestamp=0.0): """ Handles published pre gen dialysate request messages. @param message: published pre gen dialysate request message @return: None """ + msg_list =[] + msg_list.append(('self.pre_gen_start', DataTypes.U32)) + msg_list.append(('self.pre_gen_dial_rate', DataTypes.F32)) + msg_list.append(('self.pre_gen_dial_temp', DataTypes.F32)) + msg_list.append(('self.pre_gen_acid', DataTypes.U32)) + msg_list.append(('self.pre_gen_bicarb', DataTypes.U32)) - self.pre_gen_start = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.pre_gen_dial_rate = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.pre_gen_dial_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.pre_gen_acid = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.pre_gen_bicarb = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - + self.process_into_vars(decoder_list = msg_list, + message = message) self.pre_gen_request_timestamp = timestamp + def cmd_pre_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the broadcast time interval override for pre gen dialysate data. @@ -108,25 +114,11 @@ @param reset: (int) 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ - if not check_broadcast_interval_override_ms(ms): - return False - - reset_value = integer_to_bytearray(reset) - interval_value = integer_to_bytearray(ms) - payload = reset_value + interval_value - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Sending {} ms publish interval to the Pre-Gen module".format(ms)) - # Send message - received_message = self.can_interface.send(message) - - # If there is content in message - if received_message is not None: - # Response payload is OK or not - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + 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, + can_interface = self.can_interface)