Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -rd864e0c1d88eb80c093137100b667d41f2de2443 -r60a4cdf7272161c64bb60aac93b26acf50465494 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision d864e0c1d88eb80c093137100b667d41f2de2443) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 60a4cdf7272161c64bb60aac93b26acf50465494) @@ -8,22 +8,25 @@ # @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.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 +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -32,7 +35,7 @@ Treatment Delivery (TD) Dialin API sub-class for pressure related commands. """ - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ TDPressureSensors constructor """ @@ -41,11 +44,13 @@ 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.td_pressure_timestamp = 0.0 + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.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 + + #: 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, @@ -61,13 +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 - self.tmp_pressure = 0.0 - self.tmp_long_filtered_pressure = 0.0 - self.tmp_min_limit = 0.0 - self.tmp_max_limit = 0.0 + + self.pressure_limits_state = 0 #: Pressure limits state value @publish([ @@ -88,29 +96,38 @@ @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, 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name], 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name], 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name], 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name], 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name], 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name], 'f')) - sensor_list.append((self.tmp_pressure, 'f')) - sensor_list.append((self.tmp_long_filtered_pressure, 'f')) - sensor_list.append((self.tmp_min_limit, 'f')) - sensor_list.append((self.tmp_max_limit, 'f')) - sensor_list.append((self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H23_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name], 'f')) - i = 1 - for sensor in sensor_list: - start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}') - end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}') - sensor[0] = struct.unpack(sensor[1],bytearray(message['message'][start_pos:end_pos]))[0] - i += 1 + sensor_list_1 = [] + sensor_list_1.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name, DataTypes.F32)) + sensor_list_1.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name, DataTypes.F32)) + msg_list_1 = [] + msg_list_1.append(['self.pressure_limits_state', DataTypes.U32]) + sensor_list_2 = [] + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name, DataTypes.S32)) + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name, DataTypes.S32)) + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name, DataTypes.S32)) + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name, DataTypes.S32)) + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H2_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name, DataTypes.F32)) + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H14_PRES.name, td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name, DataTypes.F32)) + sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES.name, DataTypes.F32)) + sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name, DataTypes.F32)) + sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name, DataTypes.F32)) + sensor_list_2.append(('TMP_PRES', td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name, DataTypes.F32)) + sensor_list_2.append((td_enum_repository.TDPressureSensorNames.H23_PRES.name, td_enum_repository.TDPressureSensorAttributes.PRES.name, DataTypes.F32)) + self.process_into_dict(dict_to_update = self.td_pressure_sensors, + decoder_list = sensor_list_1, + message = message) + + self.process_into_vars(decoder_list = msg_list_1, + message = message, + start_from_byte = len(sensor_list_1) * DataTypes.F32.size()) + + self.process_into_dict(dict_to_update = self.td_pressure_sensors, + decoder_list = sensor_list_2, + message = message, + start_from_byte = (len(sensor_list_1) + len(msg_list_1)) * DataTypes.F32.size()) + self.td_pressure_timestamp = timestamp @@ -128,7 +145,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'TD Pressure Sensors', logger = self.logger, @@ -156,7 +173,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST, entity_name = f'TD {sensor_name} Pressure Sensor pressure', override_text = str(prs) + " mmHg. ", @@ -182,9 +199,35 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST, entity_name = 'TD TMP Pressure Sensor pressure', override_text = str(prs) + " mmHg. ", logger = self.logger, can_interface = self.can_interface) + + + def cmd_baro_sensor_override(self, pressure: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the barometric sensor override command + . + Constraints: + Must be logged into TD. + + @param pressure: float - measured pressure (in PSI) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + rst = integer_to_bytearray(reset) + prs = float_to_bytearray(pressure) + payload = rst + prs + + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = CanChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_BARO_PRESSURE_OVERRIDE, + entity_name = 'TD Barometric Pressure Sensor pressure', + override_text = str(prs) + " PSI. ", + logger = self.logger, + can_interface = self.can_interface)