Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -rf66c019100e98b49cd94fa0a69951a1a7c952da0 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision f66c019100e98b49cd94fa0a69951a1a7c952da0) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -8,20 +8,23 @@ # @file balancing_chamber.py # # @author (last) Zoltan Miskolci -# @date (last) 07-Jan-2026 +# @date (last) 04-May-2026 # @author (original) Micahel Garthwaite # @date (original) 29-Oct-2020 # ############################################################################ -import struct +# Module imports from logging import Logger +# Project imports from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +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, cmd_generic_override -from leahi_dialin.protocols.CAN import DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -32,29 +35,30 @@ Dialysate Delivery (DD) Dialin API sub-class for Balancing Chamber related commands. """ - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - self.msg_id_dd_bal_chamber_data = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_bal_chamber_data, - self._handler_balancing_chamber_sync) - self.execution_state = 0 - self.switching_state = 0 - self.switching_frequency = 0.0 - self.switching_period = 0 - self.bal_chamber_fill_in_progress = 0 - self.current_bal_chamber_switching_counter = 0 - self.is_pressure_stabilized_during_fill = 0 - self.bal_chamber_switch_only_state = 0 - self.dd_bal_chamber_timestamp = 0 + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value, + function = self._handler_balancing_chamber_sync) + + self.execution_state = 0 #: The Execution state + self.switching_state = 0 #: The Switching state + self.switching_frequency = 0.0 #: The Switching frequency of the balancing chamber + self.switching_period = 0 #: The Switching period in ms + self.bal_chamber_fill_in_progress = 0 #: The Balancing chamber's fill in progress + self.current_bal_chamber_switching_counter = 0 #: The Balancing Chamber's switching counter + self.is_pressure_stabilized_during_fill = 0 #: Is pressure stabilized during fill or not + self.bal_chamber_switch_only_state = 0 #: The Balancing Chamber's switch only state + self.is_bal_chamber_switching_active = 0 #: Is Balancing Chamber Switching Active + self.dd_bal_chamber_timestamp = 0 #: The timestamp of the last message @publish(["msg_id_dd_bal_chamber_data", @@ -63,31 +67,28 @@ "switching_period", "bal_chamber_fill_in_progress", "current_bal_chamber_switching_counter", "is_pressure_stabilized_during_fill", "bal_chamber_switch_only_state", - "dd_bal_chamber_timestamp"]) + "is_bal_chamber_switching_active", "dd_bal_chamber_timestamp"]) def _handler_balancing_chamber_sync(self, message, timestamp=0.0): """ Handles published balancing chamber data messages. @param message: published balancing chamber data message @return: None """ - self.execution_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.switching_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.switching_frequency = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.switching_period = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.bal_chamber_fill_in_progress = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.current_bal_chamber_switching_counter = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.is_pressure_stabilized_during_fill = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.bal_chamber_switch_only_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + msg_list = [] + msg_list.append(('self.execution_state', DataTypes.U32)) + msg_list.append(('self.switching_state', DataTypes.U32)) + msg_list.append(('self.switching_frequency', DataTypes.F32)) + msg_list.append(('self.switching_period', DataTypes.U32)) + msg_list.append(('self.bal_chamber_fill_in_progress', DataTypes.U32)) + msg_list.append(('self.current_bal_chamber_switching_counter', DataTypes.U32)) + msg_list.append(('self.is_pressure_stabilized_during_fill', DataTypes.U32)) + msg_list.append(('self.bal_chamber_switch_only_state', DataTypes.U32)) + msg_list.append(('self.is_bal_chamber_switching_active', DataTypes.U32)) + self.process_into_vars(decoder_list = msg_list, + message = message) + self.dd_bal_chamber_timestamp = timestamp @@ -105,7 +106,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST, module_name = 'DD Balancing Chamber', logger = self.logger, @@ -129,7 +130,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST, entity_name = 'Switch Frequency', override_text = str(frequency), @@ -154,7 +155,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_BC_SWITCH_ONLY_START_STOP_OVERRIDE_REQUEST, entity_name = 'Switch Only Start' if start_stop == 1 else 'Switch Only Stop', override_text = str(flow), @@ -179,7 +180,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_ACID_DOSING_VOLUME_OVERRIDE_REQUEST, entity_name = 'Acid dose volume', override_text = str(volume), @@ -204,7 +205,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BICARB_DOSING_VOLUME_OVERRIDE_REQUEST, entity_name = 'Bicarb dose volume', override_text = str(volume),