Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r3f4937e339925dde0b95f08e49969f8983c5cba4 --- leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 3f4937e339925dde0b95f08e49969f8983c5cba4) @@ -20,7 +20,7 @@ # Project imports from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.generic_defs import DataTypes -from leahi_dialin.common.msg_defs import MsgIds +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.common import td_enum_repository from leahi_dialin.protocols.CAN import CanMessenger, CanChannels @@ -51,9 +51,24 @@ # The Temperature data in dictionary format self.td_temperatures_status = { td_enum_repository.TDTemperatureSensorNames.H23_TEMP.name: 0.0 } - + +# ============================================================ Properties ============================================================ + @property + def td_temperatures_status(self) -> dict: + """ + The current Temperatures data + """ + return self._temperatures + + @td_temperatures_status.setter + def td_temperatures_status(self, value): + self._temperatures = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_td_temperature_data", "td_temperatures_status", "td_temperature_timestamp" @@ -66,15 +81,15 @@ @param message: published temperature data message @return: none """ - sensor_list =[] - sensor_list.append((td_enum_repository.TDTemperatureSensorNames.H23_TEMP.name, DataTypes.F32)) + msg_list =[] + msg_list.append((self.td_temperatures_status, td_enum_repository.TDTemperatureSensorNames.H23_TEMP.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.td_temperatures_status, - decoder_list = sensor_list, - message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.td_temperature_timestamp = timestamp + +# ============================================================ Overrides and Requests ============================================================ def cmd_temperature_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the measured temperature sensors broadcast interval override command