Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 -reca9e15bc984af2b7f59eb38f3836ca354ee1251 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision eca9e15bc984af2b7f59eb38f3836ca354ee1251) @@ -21,7 +21,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common import dd_enum_repository 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.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -44,8 +44,6 @@ function = self._handler_temperature_sensors_sync) self.dd_temperatures_timestamp = 0.0 #: The timestamp of the latest message - - #: The Temperature Sensors data in dictionary format self.dd_temperatures = { dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name: 0.0, @@ -74,6 +72,22 @@ } + +# ============================================================ Properties ============================================================ + @property + def dd_temperatures(self) -> dict: + """ + The Temperature Sensors data + """ + return self._temperatures + + @dd_temperatures.setter + def dd_temperatures(self, value): + self._temperatures = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_dd_temperature_data", "dd_temperatures", "dd_temperatures_timestamp"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ @@ -82,38 +96,38 @@ @param message: published DD temperature sensors data message @returns none """ - sensor_list =[] - 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.D1_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)) + msg_list =[] + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D30_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D44_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D1_AVG_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name, DataTypes.F32)) + msg_list.append((self.dd_temperatures, dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.dd_temperatures, - decoder_list = sensor_list, - message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.dd_temperatures_timestamp = timestamp + +# ============================================================ Overrides and Requests ============================================================ def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval.