Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -rf03c9a32180573f2430105ad69eb91d9f597a96b -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision f03c9a32180573f2430105ad69eb91d9f597a96b) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) @@ -8,16 +8,18 @@ # @file pressure_occlusion.py # # @author (last) Zoltan Miskolci -# @date (last) 08-Jan-2026 +# @date (last) 05-May-2026 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ -import struct +# Module imports from logging import Logger +# Project imports from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common.generic_defs import DataTypes 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 import td_enum_repository @@ -42,10 +44,9 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.td_sync_broadcast_ch_id - 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) + self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_TD_PRESSURE_DATA.value, + function = self._handler_pressure_sync) self.td_pressure_timestamp = 0.0 #: The timestamp of the latest message @@ -65,14 +66,16 @@ }, td_enum_repository.TDPressureSensorNames.H23_PRES.name: { td_enum_repository.TDPressureSensorAttributes.PRES.name : 0.0 + }, + 'TMP_PRES': { + td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0, + td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0, + td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0, + td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 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 @publish([ @@ -93,33 +96,39 @@ @param message: published pressure & occlusion data message @return: none """ - sensor_list =[] - sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name]', 'f']) - sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name]', 'f']) - sensor_list.append(['self.pressure_limits_state', 'i']) - # Every singed integer should be little endian - # TODO: update to 'i' after LDT-473 is merged - sensor_list.append(['self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name]', '