Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -r6caa49d072aceb2655d605de5d2eea52ab1a8911 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6caa49d072aceb2655d605de5d2eea52ab1a8911) @@ -49,8 +49,6 @@ function = self._handler_pressures_sync) self.dd_pressures_timestamp = 0 #: The timestamp of the latest message - - #: The Pressure Sensors data in dictionary format self.dd_pressures = { dd_enum_repository.DDPressureSensorNames.D9_PRES.name: 0.0, dd_enum_repository.DDPressureSensorNames.D66_PRES.name: 0.0, @@ -62,6 +60,22 @@ self.handler_execution_times = [] + +# ============================================================ Properties ============================================================ + @property + def dd_pressures(self) -> dict: + """ + The Pressure Sensors data + """ + return self._pressures + + @dd_pressures.setter + def dd_pressures(self, value): + self._pressures = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_dd_pressures_data", "dd_pressures", "dd_pressures_timestamp"]) def _handler_pressures_sync(self, message,timestamp=0.0): """ @@ -73,19 +87,19 @@ """ start = time.perf_counter() sensor_list =[] - sensor_list.append((dd_enum_repository.DDPressureSensorNames.D9_PRES.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDPressureSensorNames.D66_PRES.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDPressureSensorNames.D51_PRES.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDPressureSensorNames.D18_PRES.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDPressureSensorNames.D41_PRES.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDPressureSensorNames.D87_PRES.name, DataTypes.F32)) + sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D9_PRES.name, DataTypes.F32)) + sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D66_PRES.name, DataTypes.F32)) + sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D51_PRES.name, DataTypes.F32)) + sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D18_PRES.name, DataTypes.F32)) + sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D41_PRES.name, DataTypes.F32)) + sensor_list.append((self.dd_pressures, dd_enum_repository.DDPressureSensorNames.D87_PRES.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.dd_pressures, - decoder_list = sensor_list, - message = message) + self.process_into_vars(decoder_list = sensor_list, message = message) self.dd_pressures_timestamp = timestamp self.handler_execution_times.append((timestamp, message, time.perf_counter() - start)) + +# ============================================================ Overrides and Requests ============================================================ def cmd_pressure_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure broadcast interval override command.