Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) @@ -22,7 +22,7 @@ from leahi_dialin.common import fp_enum_repository from leahi_dialin.common.fp_defs import 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 @@ -49,8 +49,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, @@ -60,6 +58,22 @@ } + +# ============================================================ 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): """ @@ -69,19 +83,19 @@ @param message: published FP pressure sensor data message @return: none """ - 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 + +# ============================================================ 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.