Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -rc93ef62631552b2ba3ffb77006d29f902e7a1128 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) @@ -8,38 +8,40 @@ # @file temperature_sensors.py # # @author (last) Zoltan Miskolci -# @date (last) 07-Jan-2026 +# @date (last) 04-May-2026 # @author (original) Dara Navaei # @date (original) 01-Dec-2021 # ############################################################################ -import struct +# Module imports from logging import Logger +# Project imports from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common import dd_enum_repository -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.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 class DDTemperatureSensors(AbstractSubSystem): - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): super().__init__() self.can_interface = can_interface self.logger: Logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - self.msg_id_dd_temperature_data = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_temperature_data, - self._handler_temperature_sensors_sync) + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value, + function = self._handler_temperature_sensors_sync) self.dd_temperatures_timestamp = 0.0 #: The timestamp of the latest message @@ -80,37 +82,33 @@ @returns none """ sensor_list =[] - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D1_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D44_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D75_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP, 'f')) - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D44_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name, DataTypes.F32)) - i = 1 - for sensor in sensor_list: - start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}') - end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}') - self.dd_temperatures[sensor[0].name] = struct.unpack(sensor[1], bytearray(message['message'][start_pos:end_pos]))[0] - i += 1 - + self.process_into_dict(dict_to_update = self.dd_temperatures, + decoder_list = sensor_list, + message = message) self.dd_temperatures_timestamp = timestamp @@ -128,7 +126,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_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Temperature Sensors', logger = self.logger, @@ -178,7 +176,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 = message_id, entity_name = f'DD {sensor_name} Temperature Sensor temperature', override_text = f'{str(sensor_value)} Celsius', @@ -204,7 +202,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_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD {sensor_name} Temperature Sensor read counter', override_text = str(counter), @@ -227,7 +225,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_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST, entity_name = f'DD Barometer Sensor read counter', override_text = str(counter), @@ -250,7 +248,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_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST, entity_name = f'DD Barometer Sensor CRC', override_text = str(crc), @@ -300,7 +298,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 = message_id, entity_name = f'DD {sensor_name} Temperature Sensor filtered temperature', override_text = f'{str(temperature)} Celsius',