Index: leahi_dialin/fp/modules/permeate_tank.py =================================================================== diff -u -rf03c9a32180573f2430105ad69eb91d9f597a96b -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 --- leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision f03c9a32180573f2430105ad69eb91d9f597a96b) +++ leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) @@ -8,17 +8,19 @@ # @file permeate_tank.py # # @author (last) Zoltan Miskolci -# @date (last) 09-Jan-2026 +# @date (last) 05-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 from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -42,10 +44,9 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - self.msg_id_fp_permeate_tank_data = MsgIds.MSG_ID_FP_PERMEATE_TANK_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_permeate_tank_data, - self._handler_permeate_tank_sync) + self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id, # DenaliChannels.dd_sync_broadcast_ch_id ?? + message_id = MsgIds.MsgIds.value, + function = self._handler_permeate_tank_sync) self.permeate_tank_timestamp = 0.0 #: The timestamp of the last message self.permeate_tank_state = 0 #: The Permeate Tank's State value @@ -59,9 +60,11 @@ @param message: published permeate tank data message @return: None """ - self.permeate_tank_state = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + msg_list =[] + msg_list.append(('self.permeate_tank_state', DataTypes.U32)) + self.process_into_vars(decoder_list = msg_list, + message = message) self.permeate_tank_timestamp = timestamp