Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -r6caa49d072aceb2655d605de5d2eea52ab1a8911 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 6caa49d072aceb2655d605de5d2eea52ab1a8911) @@ -45,8 +45,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, @@ -63,6 +61,22 @@ self.handler_execution_times = [] + +# ============================================================ 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): """ @@ -72,26 +86,26 @@ @returns none """ start = time.perf_counter() - 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 self.handler_execution_times.append((timestamp, message, time.perf_counter() - start)) + +# ============================================================ Overrides and Requests ============================================================ def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval.