Index: leahi_dialin/dd/modules/drybicart.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 --- leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) @@ -7,44 +7,48 @@ # # @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_ids 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_timestamp = 0 #: The timestamp of the last message self.dd_dry_bicart_fill_execution_state = 0 #: The Dry Bicart fill execution state @@ -74,31 +78,22 @@ @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) self.dd_dry_bicart_timestamp = timestamp @@ -116,7 +111,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_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name='DD Dry Bicart', logger=self.logger, @@ -140,7 +135,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_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST, entity_name='max fill cycle count', override_text=str(count), @@ -164,7 +159,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_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST, entity_name='Bicart Fill Request', override_text=str(start_stop), @@ -188,7 +183,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_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST, entity_name='Bicarb Fill Request', override_text=str(start_stop), @@ -212,7 +207,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_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST, entity_name='Bicart Drain Request', override_text=str(start_stop), @@ -236,7 +231,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_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST, entity_name='Bicart Cartridge Size', override_text=str(small_large),