Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -rafe332fec54d9d0432dfc0d54aef1debaa92b066 -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision afe332fec54d9d0432dfc0d54aef1debaa92b066) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) @@ -7,20 +7,22 @@ # # @file pressure_occlusion.py # -# @author (last) Vinayakam Mani -# @date (last) 02-May-2024 +# @author (last) Zoltan Miskolci +# @date (last) 08-Jan-2026 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ + import struct from logging import Logger -from .constants import RESET, NO_RESET +from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +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.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish -from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -31,41 +33,49 @@ def __init__(self, can_interface, logger: Logger): """ - TDPressureOcclusion constructor - + TDPressureSensors constructor """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_PRESSURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_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.arterial_pressure = 0.0 - self.venous_pressure = 0.0 - self.arterial_long_filtered_pressure = 0.0 - self.venous_long_filtered_pressure = 0.0 + self.td_pressure_sensors = { + td_enum_repository.TDPressureSensorNames.H2_PRES.name: { + 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 + }, + td_enum_repository.TDPressureSensorNames.H14_PRES.name: { + 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 + }, + td_enum_repository.TDPressureSensorNames.H23_PRES.name: { + td_enum_repository.TDPressureSensorAttributes.PRES.name : 0.0 + } + } self.pressure_limits_state = 0 - self.arterial_pressure_limit_min = 0 - self.arterial_pressure_limit_max = 0 - self.venous_pressure_limit_min = 0 - self.venous_pressure_limit_max = 0 + self.tmp_pressure = 0.0 + self.tmp_min_limit = 0.0 + self.tmp_max_limit = 0.0 + @publish([ - "td_pressure_timestamp", - "arterial_pressure", - "venous_pressure", + "msg_id_td_pressure_data", + "td_pressure_sensors", "pressure_limits_state", - "arterial_pressure_limit_min", - "arterial_pressure_limit_max", - "venous_pressure_limit_min", - "venous_pressure_limit_max", - "arterial_long_filtered_pressure", - "venous_long_filtered_pressure", + "tmp_pressure", + "tmp_min_limit", + "tmp_max_limit", + "td_pressure_timestamp" ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -75,7 +85,6 @@ @param message: published pressure & occlusion data message @return: none """ - art = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) ven = struct.unpack('f', bytearray( @@ -94,99 +103,102 @@ message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) lfv = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + tps = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) + tmin = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) + tmax = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) + baro = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])) - self.arterial_pressure = art[0] - self.venous_pressure = ven[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = art[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = ven[0] self.pressure_limits_state = pls[0] - self.arterial_pressure_limit_min = apl[0] - self.arterial_pressure_limit_max = apu[0] - self.venous_pressure_limit_min = vpl[0] - self.venous_pressure_limit_max = vpu[0] - self.arterial_long_filtered_pressure = lfa[0] - self.venous_long_filtered_pressure = lfv[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = apl[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = apu[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = vpl[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = vpu[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfa[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfv[0] + self.tmp_pressure = tps[0] + self.tmp_min_limit = tmin[0] + self.tmp_max_limit = tmax[0] + self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H23_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = baro[0] self.td_pressure_timestamp = timestamp - def cmd_pressure_sensor_override(self, pressure: float, sensor: int, reset: int = NO_RESET) -> int: + + def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the measured arterial pressure override command - PRESSURE_SENSOR_ARTERIAL = 0 ///< Arterial blood line pressure sensor - PRESSURE_SENSOR_VENOUS = 1 ///< Vensous blood line pressure sensor + Constructs and sends the measured pressure sensors broadcast interval override command Constraints: Must be logged into TD. + Given interval must be non-zero and a multiple of the TD general task interval (50 ms). - @param pressure: float - measured arterial pressure (in mmHg) to override with - @param sensor: bool - switch between filtered override and raw override + @param ms: integer - interval (in ms) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'TD Pressure Sensors', + logger = self.logger, + can_interface = self.can_interface) + + def cmd_pressure_sensor_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the measured pressure sensor override command + . + Constraints: + Must be logged into TD. + + @param sensor: int - sensor ID + @param pressure: float - measured arterial or venous pressure (in mmHg) 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) sen = integer_to_bytearray(sensor) prs = float_to_bytearray(pressure) payload = rst + prs + sen - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_TD_ch_id, - message_id=MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST.value, - payload=payload) + sensor_name = td_enum_repository.TDPressureSensorNames(sensor).name.split('_')[0] + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = DenaliChannels.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. ", + logger = self.logger, + can_interface = self.can_interface) - self.logger.debug("override pressure sensor") - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal. " - else: - str_res = str(prs) + " mmHg. " - self.logger.debug("pressure (measured)) overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - - def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + def cmd_tmp_sensor_override(self, pressure: float, reset: int = NO_RESET) -> int: """ - Constructs and sends the measured pressure sensors broadcast interval override command + Constructs and sends the tmp sensor override command + . Constraints: Must be logged into TD. - Given interval must be non-zero and a multiple of the TD general task interval (50 ms). - @param ms: integer - interval (in ms) to override with + @param pressure: float - measured pressure (in mmHg) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - - if not check_broadcast_interval_override_ms(ms): - return False - rst = integer_to_bytearray(reset) - mis = integer_to_bytearray(ms) - payload = rst + mis + prs = float_to_bytearray(pressure) + payload = rst + prs - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override blood flow broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # self.logger.debug(received_message) - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ms) + " ms: " - self.logger.debug("Blood flow broadcast interval overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False \ No newline at end of file + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = DenaliChannels.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)