Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -reca9e15bc984af2b7f59eb38f3836ca354ee1251 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision eca9e15bc984af2b7f59eb38f3836ca354ee1251) @@ -21,7 +21,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common import dd_enum_repository 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 @@ -48,8 +48,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, @@ -60,6 +58,22 @@ } + +# ============================================================ 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): """ @@ -70,19 +84,19 @@ @return: none """ 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 + +# ============================================================ 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.