Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -r8b649cbfaa83006af095fe7478cebd3027570cc5 -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 8b649cbfaa83006af095fe7478cebd3027570cc5) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -20,7 +20,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.common.td_defs import td_enum_repository +from leahi_dialin.common import td_enum_repository from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish @@ -45,10 +45,10 @@ self.msg_id_td_pressure_data = MsgIds.MSG_ID_TD_PRESSURE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_pressure_data, self._handler_pressure_sync) - #: The timestamp of the latest message - self.td_pressure_timestamp = 0.0 - #: A dictionary for for TD Pressure data + self.td_pressure_timestamp = 0.0 #: The timestamp of the latest message + + #: The Pressure data in dictionary format self.td_pressure_sensors = { td_enum_repository.TDPressureSensorNames.H2_PRES.name: { td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0, @@ -67,22 +67,13 @@ } } - #: Pressure limits state value - self.pressure_limits_state = 0 - - #: Tmp Pressure value - self.tmp_pressure = 0.0 + self.pressure_limits_state = 0 #: Pressure limits state value + self.tmp_pressure = 0.0 #: Transmembrane pressure value + self.tmp_long_filtered_pressure = 0.0 #: Transmembrane average (over 10 seconds) pressure value + self.tmp_min_limit = 0.0 #: Transmembrane pressure minimum limit value + self.tmp_max_limit = 0.0 #: Transmembrane pressure maximum limit value - #: Tmp Average Pressure value - self.tmp_long_filtered_pressure = 0.0 - - #: Tmp Pressure minimum limit value - self.tmp_min_limit = 0.0 - - #: Tmp Pressure maximum limit value - self.tmp_max_limit = 0.0 - @publish([ "msg_id_td_pressure_data", "td_pressure_sensors",