Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r30b5a848a9dac0d1f3696ad7edbd6b607a117c09 -rc8f8cbb3230e40988847f33e9701714939462c93 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 30b5a848a9dac0d1f3696ad7edbd6b607a117c09) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision c8f8cbb3230e40988847f33e9701714939462c93) @@ -190,6 +190,10 @@ MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST = 0x803D MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST = 0x803E MSG_ID_TD_HARD_STOP_BLOOD_PUMP = 0x803F + MSG_ID_TD_BARO_MFG_CRC_OVERRIDE = 0x8040 + MSG_ID_TD_BARO_PRESSURE_OVERRIDE = 0x8041 + MSG_ID_TD_TEMPERATURE_OVERRIDE = 0x8042 + MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8043 MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r7c8e829c563547ee50c517f1d6b84cb800b72027 -rc8f8cbb3230e40988847f33e9701714939462c93 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 7c8e829c563547ee50c517f1d6b84cb800b72027) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision c8f8cbb3230e40988847f33e9701714939462c93) @@ -264,6 +264,11 @@ NUM_OF_PRESSURE_ATTRIBUTES = 4 # Number of Pressure Sensor Attributes @unique +class TDTemperatureSensorNames(DialinEnum): + H23_TEMP = 0 # Barometric temperature Sensor + NUM_OF_TEMPERATURE_SENSORS = 1 # Number of temperature Sensors + +@unique class TDSwitchStatus(DialinEnum): CLOSED = 0 # Closed State of the TD Switch OPEN = 1 # Open State of the TD Switch Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -r7c8e829c563547ee50c517f1d6b84cb800b72027 -rc8f8cbb3230e40988847f33e9701714939462c93 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 7c8e829c563547ee50c517f1d6b84cb800b72027) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision c8f8cbb3230e40988847f33e9701714939462c93) @@ -191,7 +191,7 @@ message_id=MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("override blood flow broadcast interval") + self.logger.debug("override pressure sensors broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -203,7 +203,7 @@ str_res = "reset back to normal: " else: str_res = str(ms) + " ms: " - self.logger.debug("Blood flow broadcast interval overridden to " + str_res + + self.logger.debug("Pressure sensors 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] Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u --- leahi_dialin/td/modules/temperature_sensors.py (revision 0) +++ leahi_dialin/td/modules/temperature_sensors.py (revision c8f8cbb3230e40988847f33e9701714939462c93) @@ -0,0 +1,136 @@ + +import struct +from logging import Logger + +from .constants import RESET, NO_RESET +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.td_defs import TDTemperatureSensorNames +from leahi_dialin.protocols.CAN import DenaliMessage, 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 + + +class TDTemperatureSensors(AbstractSubSystem): + """ + Treatment Delivery (TD) Dialin API sub-class for temperature related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + TDTemperatureSensors 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 + self.msg_id_td_temperature_data = MsgIds.MSG_ID_TD_TEMPERATURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_temperature_data, + self._handler_temperature_sync) + self.td_temperatures_status = {TDTemperatureSensorNames.H23_TEMP.name: 0.0} + self.td_temperature_timestamp = 0.0 + + @publish([ + "td_temperatures_status", + "td_temperature_timestamp" + ]) + def _handler_temperature_sync(self, message, timestamp=0.0): + """ + Handles published temperature data messages. Temperature data are captured + for reference. + + @param message: published temperature data message + @return: none + """ + baro = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + + self.td_temperatures_status[TDTemperatureSensorNames.H23_TEMP.name] = baro + self.td_temperature_timestamp = timestamp + + def cmd_temperature_sensor_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the measured temperature sensor override command + . + Constraints: + Must be logged into TD. + + @param sensor: int - sensor ID + @param temperature: float - measured temperature in C + @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(temperature) + payload = rst + prs + sen + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, + message_id=MsgIds.MSG_ID_TD_TEMPERATURE_OVERRIDE.value, + payload=payload) + + self.logger.debug("override temperature 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) + " C. " + self.logger.debug("temperature (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_temperature_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the measured temperature 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 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 + """ + + if not check_broadcast_interval_override_ms(ms): + return False + + rst = integer_to_bytearray(reset) + mis = integer_to_bytearray(ms) + payload = rst + mis + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, + message_id=MsgIds.MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override temperature sensors 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("Temperature sensors 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