Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -re873a8e3cd071f814923bd7530ac87ccf27f9b4f -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e873a8e3cd071f814923bd7530ac87ccf27f9b4f) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) @@ -8,21 +8,25 @@ # @file pressure_sensors.py # # @author (last) Zoltan Miskolci -# @date (last) 09-Jan-2026 +# @date (last) 05-May-2026 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ -import struct +# Module imports from logging import Logger +# Project importsk from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_PRES_SENSOR_OFFSET -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common import fp_enum_repository +from leahi_dialin.common.fp_defs import BETA_IOFP_PRES_SENSOR_OFFSET +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.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 @@ -31,7 +35,7 @@ Dialin API sub-class for FP pressure sensor related commands. """ - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ FPPressureSensors constructor """ @@ -40,11 +44,13 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.fp_sync_broadcast_ch_id - self.msg_id_fp_pressures_data = MsgIds.MSG_ID_FP_PRESSURES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_pressures_data, - self._handler_pressure_sync) + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_FP_PRESSURES_DATA.value, + function = self._handler_pressure_sync) + self.fp_pressure_timestamp = 0.0 #: The timestamp of the last message + + # The Pressure Sensors data in dictionary format self.fp_pressures = { fp_enum_repository.FPPressureSensorNames.M3_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P8_PRES.name: 0.0, @@ -53,9 +59,7 @@ fp_enum_repository.FPPressureSensorNames.P46_PRES.name: 0.0 } - self.fp_pressure_timestamp = 0.0 - @publish(["msg_id_fp_pressures_data", "fp_pressures", "fp_pressure_timestamp"]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -65,17 +69,16 @@ @param message: published FP pressure sensor data message @return: none """ - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + sensor_list =[] + sensor_list.append((fp_enum_repository.FPPressureSensorNames.M3_PRES.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPPressureSensorNames.P8_PRES.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPPressureSensorNames.P13_PRES.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPPressureSensorNames.P17_PRES.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPPressureSensorNames.P46_PRES.name, DataTypes.F32)) + self.process_into_dict(dict_to_update = self.fp_pressures, + decoder_list = sensor_list, + message = message) self.fp_pressure_timestamp = timestamp @@ -93,7 +96,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'FP Pressure Sensors', logger = self.logger, @@ -121,7 +124,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Pressure Sensor pressure', override_text = f'{str(pressure)} psi', @@ -149,10 +152,9 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_fp_ch_id, + channel_id = CanChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Pressure Sensor filtered pressure', override_text = f'{str(pressure)} psi', logger = self.logger, can_interface = self.can_interface) -