Index: leahi_dialin/dd/modules/drybicart.py =================================================================== diff -u -rbe50641ca58589da9cfcd9e837578c6662311ee2 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision be50641ca58589da9cfcd9e837578c6662311ee2) +++ leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -7,101 +7,96 @@ # # @file drybicart.py # -# @author (last) Sameer Poyil -# @date (last) 19-Nov-2025 +# @author (last) Zoltan Miskolci +# @date (last) 04-May-2026 # @author (original) Sameer Poyil # @date (original) 19-Nov-2025 # ############################################################################ -import struct + +# Module imports from logging import Logger +# Project imports from leahi_dialin.common.constants import NO_RESET , 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.utils.conversions import integer_to_bytearray, float_to_bytearray +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 + class DDDryBicart(AbstractSubSystem): """ DryBicart Dialysate Delivery (DD) Dialin API sub-class for Dry Bicart 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_dry_bicart_data = MsgIds.MSG_ID_DD_DRY_BICART_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_dry_bicart_data, - self._handler_dry_bicart_sync) + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_DD_DRY_BICART_DATA.value, + function = self._handler_dry_bicart_sync) - self.dd_dry_bicart_fill_execution_state = 0 - self.dd_bicarb_chamber_fill_execution_state = 0 - self.dd_dry_bicart_drain_execution_state = 0 - self.dd_dry_bicart_fill_cycle_counter = 0 - self.dd_dry_bicart_max_fill_cycle_count = 0 - self.dd_dry_bicart_fill_request = 0 - self.dd_bicarb_chamber_fill_request = 0 - self.dd_dry_bicart_drain_request = 0 - self.dd_dry_bicart_last_fill_time = 0 - self.dd_dry_bicart_current_fill_time = 0 - self.dd_dry_bicart_timestamp = 0 - self.dd_dryBiCartType = 0 - self.dd_dryBiCartDrainTimePeriod = 0 + self.dd_dry_bicart_timestamp = 0.0 #: The timestamp of the last message + self.dd_dry_bicart_fill_execution_state = 0 #: The Dry Bicart fill execution state + self.dd_bicarb_chamber_fill_execution_state = 0 #: The Bicarb chamber fill execution state + self.dd_dry_bicart_drain_execution_state = 0.0 #: The Dry Bicart drain execution state + self.dd_dry_bicart_fill_cycle_counter = 0 #: The Dry Bicart fill cycle counter + self.dd_dry_bicart_max_fill_cycle_count = 0 #: The Dry Bicart max fill cycle state + self.dd_dry_bicart_fill_request = 0 #: Is fill requested for Dry Bicart or not + self.dd_bicarb_chamber_fill_request = 0 #: Is fill requested for Bicarb Chamber or not + self.dd_dry_bicart_drain_request = 0 #: Is drain requested for Dry Bicart or not + self.dd_dry_bicart_last_fill_time = 0 #: The Dry Bicart last fill time + self.dd_dry_bicart_current_fill_time = 0 #: The Dry Bicart current fill time + self.dd_dryBiCartType = 0 #: The Dry Bicart concentrate option index + self.dd_dryBiCartDrainTimePeriod = 0 #: The Dry Bicart drain time period in sec + @publish(["msg_id_dd_dry_bicart_data", "dd_dry_bicart_fill_execution_state", "dd_bicarb_chamber_fill_execution_state", "dd_dry_bicart_drain_execution_state", "dd_dry_bicart_fill_cycle_counter", "dd_dry_bicart_max_fill_cycle_count", "dd_dry_bicart_fill_request", "dry_bicarb_chamber_fill_request", "dd_dry_bicart_drain_request", "dd_dry_bicart_last_fill_time", "dd_dry_bicart_current_fill_time", "dd_dryBiCartType", "dd_dryBiCartDrainTimePeriod", "dd_dry_bicart_timestamp"]) - def _handler_dry_bicart_sync(self, message, timestamp=0.0): """ Handles published dry bicart data messages. @param message: published dry bicart data message @return: None """ - - self.dd_dry_bicart_fill_execution_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_bicarb_chamber_fill_execution_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_dry_bicart_drain_execution_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_dry_bicart_fill_cycle_counter = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_dry_bicart_max_fill_cycle_count = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.ddd_dry_bicart_fill_request = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.dd_bicarb_chamber_fill_request = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.ddd_dry_bicart_drain_request = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_dry_bicart_last_fill_time = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_dry_bicart_current_fill_time = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_dryBiCartType = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.dd_dryBiCartDrainTimePeriod = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - + msg_list = [] + msg_list.append(('self.dd_dry_bicart_fill_execution_state', DataTypes.U32)) + msg_list.append(('self.dd_bicarb_chamber_fill_execution_state', DataTypes.U32)) + msg_list.append(('self.dd_dry_bicart_drain_execution_state', DataTypes.F32)) + msg_list.append(('self.dd_dry_bicart_fill_cycle_counter', DataTypes.U32)) + msg_list.append(('self.dd_dry_bicart_max_fill_cycle_count', DataTypes.U32)) + msg_list.append(('self.dd_dry_bicart_fill_request', DataTypes.U32)) + msg_list.append(('self.dd_bicarb_chamber_fill_request', DataTypes.U32)) + msg_list.append(('self.dd_dry_bicart_drain_request', DataTypes.U32)) + msg_list.append(('self.dd_dry_bicart_last_fill_time', DataTypes.U32)) + msg_list.append(('self.dd_dry_bicart_current_fill_time', DataTypes.U32)) + msg_list.append(('self.dd_dryBiCartType', DataTypes.U32)) + msg_list.append(('self.dd_dryBiCartDrainTimePeriod', DataTypes.U32)) + + self.process_into_vars(decoder_list = msg_list, + message = message,debug=True) self.dd_dry_bicart_timestamp = timestamp + def cmd_dry_bicart_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart data broadcast interval override command @@ -113,16 +108,16 @@ @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, + channel_id=CanChannels.dialin_to_dd_ch_id, msg_id=MsgIds.MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name='DD Dry Bicart', logger=self.logger, can_interface=self.can_interface) + def cmd_bicart_max_fill_cycle_count_override(self, count: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart max cycle count override command @@ -132,7 +127,6 @@ @param count: int - count value to override max fill cycle count @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ cycle_count = integer_to_bytearray(count) reset_byte_array = integer_to_bytearray(reset) @@ -141,13 +135,14 @@ 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_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST, entity_name='max fill cycle count', override_text=str(count), logger=self.logger, can_interface=self.can_interface) + def cmd_dry_bicart_fill_request_override(self, start_stop: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart fill request override command @@ -156,23 +151,22 @@ @param start_stop: int - value to start or stop dry bicart fill ( start = 1, stop = 0 @return: 1 if successful, zero otherwise - """ - request = integer_to_bytearray(start_stop) reset_byte_array = integer_to_bytearray(reset) payload = reset_byte_array + request 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_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST, entity_name='Bicart Fill Request', override_text=str(start_stop), logger=self.logger, can_interface=self.can_interface) + def cmd_dry_bicart_bicarb_chamber_fill_request_override(self, start_stop: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart bicarbonate chamber F fill request override command @@ -181,23 +175,22 @@ @param start_stop: int - value to start or stop dry bicart fill ( start = 1, stop = 0 @return: 1 if successful, zero otherwise - """ - request = integer_to_bytearray(start_stop) reset_byte_array = integer_to_bytearray(reset) payload = reset_byte_array + request 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_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST, entity_name='Bicarb Fill Request', override_text=str(start_stop), logger=self.logger, can_interface=self.can_interface) + def cmd_dry_bicart_drain_request_override(self, start_stop: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart drain request override command @@ -206,23 +199,22 @@ @param start_stop: int - value to start or stop dry bicart drain ( start = 1, stop = 0 @return: 1 if successful, zero otherwise - """ - request = integer_to_bytearray(start_stop) reset_byte_array = integer_to_bytearray(reset) payload = reset_byte_array + request 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_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST, entity_name='Bicart Drain Request', override_text=str(start_stop), logger=self.logger, can_interface=self.can_interface) + def cmd_dry_bicart_cartridge_size_override(self, small_large: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart cartridge size override command @@ -231,17 +223,15 @@ @param small_large: int - value for small or large dry bicart ( small = 0, large = 1 @return: 1 if successful, zero otherwise - """ - cartridge_size = integer_to_bytearray(small_large) reset_byte_array = integer_to_bytearray(reset) payload = reset_byte_array + cartridge_size 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_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST, entity_name='Bicart Cartridge Size', override_text=str(small_large),