Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) @@ -22,7 +22,7 @@ from leahi_dialin.common import fp_enum_repository from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET 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.fp_temperature_sensors_timestamp = 0 #: The timestamp of the last message - - # The Temperature data in dictionary format self.fp_temperatures = { fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name: 0.0, @@ -61,6 +59,22 @@ } + +# ============================================================ Properties ============================================================ + @property + def fp_temperatures(self) -> dict: + """ + The Temperature Sensors data + """ + return self._temperatures + + @fp_temperatures.setter + def fp_temperatures(self, value): + self._temperatures = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ @@ -69,25 +83,25 @@ @param message: published FP temperature sensors data message @returns none """ - sensor_list =[] - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P13_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P17_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P10_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP.name, DataTypes.F32)) + msg_list =[] + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P8_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P13_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P17_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P10_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP.name, DataTypes.F32)) + msg_list.append((self.fp_temperatures, fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.fp_temperatures, - decoder_list = sensor_list, - message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.fp_temperature_sensors_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.