Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -r6caa49d072aceb2655d605de5d2eea52ab1a8911 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6caa49d072aceb2655d605de5d2eea52ab1a8911) @@ -50,8 +50,6 @@ function = self._handler_pressure_sync) self.fp_pressure_timestamp = 0.0 #: The timestamp of the last message - - # The Pressure Sensors data in dictionary format self.fp_pressures = { fp_enum_repository.FPPressureSensorNames.M3_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P8_PRES.name: 0.0, @@ -62,6 +60,22 @@ self.handler_execution_times = [] + +# ============================================================ Properties ============================================================ + @property + def fp_pressures(self) -> dict: + """ + The Pressure Sensors data + """ + return self._pressures + + @fp_pressures.setter + def fp_pressures(self, value): + self._pressures = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_fp_pressures_data", "fp_pressures", "fp_pressure_timestamp"]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -72,20 +86,20 @@ @return: none """ start = time.perf_counter() - sensor_list =[] - sensor_list.append((fp_enum_repository.FPPressureSensorNames.M3_PRES.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPPressureSensorNames.P8_PRES.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPPressureSensorNames.P13_PRES.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPPressureSensorNames.P17_PRES.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPPressureSensorNames.P46_PRES.name, DataTypes.F32)) + msg_list =[] + msg_list.append((self.fp_pressures, fp_enum_repository.FPPressureSensorNames.M3_PRES.name, DataTypes.F32)) + msg_list.append((self.fp_pressures, fp_enum_repository.FPPressureSensorNames.P8_PRES.name, DataTypes.F32)) + msg_list.append((self.fp_pressures, fp_enum_repository.FPPressureSensorNames.P13_PRES.name, DataTypes.F32)) + msg_list.append((self.fp_pressures, fp_enum_repository.FPPressureSensorNames.P17_PRES.name, DataTypes.F32)) + msg_list.append((self.fp_pressures, fp_enum_repository.FPPressureSensorNames.P46_PRES.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.fp_pressures, - decoder_list = sensor_list, - message = message) + self.process_into_vars(decoder_list = msg_list, message = message) self.fp_pressure_timestamp = timestamp self.handler_execution_times.append((timestamp, message, time.perf_counter() - start)) + +# ============================================================ Overrides and Requests ============================================================ def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the FP pressure data broadcast interval override command.