Index: leahi_dialin/ro/modules/pressure_sensors.py =================================================================== diff -u -r3c967e5acc6286c6334d2708600e3317988f87f1 -r7ae7087e830140ab07b841b2c0ff437269a5fc2f --- leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 3c967e5acc6286c6334d2708600e3317988f87f1) +++ leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 7ae7087e830140ab07b841b2c0ff437269a5fc2f) @@ -27,22 +27,22 @@ @unique class ROPressureSensorNames(DialinEnum): - PRESSURE_SENSOR_WATER_INLET_PRE_REG = 0 - PRESSURE_SENSOR_WATER_INLET_POST_REG = 1 - PRESSURE_SENSOR_WATER_INLET_PRE_COND = 2 - PRESSURE_SENSOR_PRE_RO_FILTER = 3 - PRESSURE_SENSOR_POST_RO_FILTER = 4 - PRESSURE_SENSOR_PRE_RO_PUMP = 5 + M1_PRESSURE_SENSOR_WATER_INLET_PRE_REG = 0 + M3_PRESSURE_SENSOR_WATER_INLET_POST_REG = 1 + P8_PRESSURE_SENSOR_WATER_INLET_PRE_COND = 2 + P13_PRESSURE_SENSOR_PRE_RO_FILTER = 3 + P17_PRESSURE_SENSOR_POST_RO_FILTER = 4 + X1_PRESSURE_SENSOR_PRE_RO_PUMP = 5 class ROPressureSensors(AbstractSubSystem): """ - Reverse Osmosis (RO) Dialin API sub-class for pressure related commands. + Dialin API sub-class for RO pressure sensor related commands. """ def __init__(self, can_interface, logger: Logger): """ - ROPressureOcclusion constructor + ROPressureSensors constructor """ super().__init__() @@ -56,27 +56,41 @@ self._handler_pressure_sync) self.ro_pressure_timestamp = 0.0 - self.pressure_sensor_water_inlet_pre_reg = 0.0 - self.pressure_sensor_water_inlet_post_reg = 0.0 - self.pressure_sensor_water_inlet_pre_cond = 0.0 - self.pressure_sensor_pre_ro_filter = 0.0 - self.pressure_sensor_post_ro_filter = 0.0 + self.m1_water_inlet_pre_reg_pressure = 0.0 + self.m3_water_inlet_post_reg_pressure = 0.0 + self.p8_water_inlet_pre_cond_pressure = 0.0 + self.p13_pre_ro_filter_pressure = 0.0 + self.p17_post_ro_filter_pressure = 0.0 + self.x1_pre_ro_pump_pressure = 0.0 + self.m1_water_inlet_pre_reg_temp = 0.0 + self.m3_water_inlet_post_reg_temp = 0.0 + self.p8_water_inlet_pre_cond_temp = 0.0 + self.p13_pre_ro_filter_temp = 0.0 + self.p17_post_ro_filter_temp = 0.0 + self.x1_pre_ro_pump_temp = 0.0 @publish([ "ro_pressure_timestamp", - "pressure_sensor_water_inlet_pre_reg", - "pressure_sensor_water_inlet_post_reg", - "pressure_sensor_water_inlet_pre_cond", - "pressure_sensor_pre_ro_filter", - "pressure_sensor_post_ro_filter", + "m1_water_inlet_pre_reg_pressure", + "m3_water_inlet_post_reg_pressure", + "p8_water_inlet_pre_cond_pressure", + "p13_pre_ro_filter_pressure", + "p17_post_ro_filter_pressure", + "x1_pre_ro_pump_pressure", + "m1_water_inlet_pre_reg_temp", + "m3_water_inlet_post_reg_temp", + "p8_water_inlet_pre_cond_temp", + "p13_pre_ro_filter_temp", + "p17_post_ro_filter_temp", + "x1_pre_ro_pump_temp" ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ - Handles published pressure & occlusion data messages. Pressure data are captured + Handles published RO pressure sensor data messages. Pressure data are captured for reference. - @param message: published pressure & occlusion data message + @param message: published RO pressure sensor data message @return: none """ @@ -90,22 +104,46 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) post_ro = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + pre_pump = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) - self.pressure_sensor_water_inlet_pre_reg = pre_reg_wi[0] - self.pressure_sensor_water_inlet_post_reg = post_reg_wi[0] - self.pressure_sensor_water_inlet_pre_cond = pre_cond_wi[0] - self.pressure_sensor_pre_ro_filter = pre_ro[0] - self.pressure_sensor_post_ro_filter = post_ro[0] + pre_reg_wi_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) + post_reg_wi_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + pre_cond_wi_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + pre_ro_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) + post_ro_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) + pre_pump_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) + + self.m1_water_inlet_pre_reg_pressure = pre_reg_wi[0] + self.m3_water_inlet_post_reg_pressure = post_reg_wi[0] + self.p8_water_inlet_pre_cond_pressure = pre_cond_wi[0] + self.p13_pre_ro_filter_pressure = pre_ro[0] + self.p17_post_ro_filter_pressure = post_ro[0] + self.x1_pre_ro_pump_pressure = pre_pump[0] + + self.m1_water_inlet_pre_reg_pressure = pre_reg_wi_temp[0] + self.m3_water_inlet_post_reg_pressure = post_reg_wi_temp[0] + self.p8_water_inlet_pre_cond_pressure = pre_cond_wi_temp[0] + self.p13_pre_ro_filter_pressure = pre_ro_temp[0] + self.p17_post_ro_filter_pressure = post_ro_temp[0] + self.x1_pre_ro_pump_temp = pre_pump_temp[0] + self.ro_pressure_timestamp = timestamp - def cmd_pressure_sensor_override(self, pressure: float, sensor: int, reset: int = NO_RESET) -> int: + def cmd_pressure_sensor_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: """ - Constructs and sends the measured arterial pressure override command + Constructs and sends the measured pressure sensor override command. Constraints: Must be logged into RO. - @param pressure: float - measured arterial pressure (in mmHg) to override with - @param sensor: bool - switch between filtered override and raw override + @param sensor: int - switch between filtered override and raw override + @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 """ @@ -119,7 +157,7 @@ message_id=MsgIds.MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("override pressure sensor") + self.logger.debug("override RO pressure sensor") # Send message received_message = self.can_interface.send(message) @@ -129,8 +167,8 @@ if reset == RESET: str_res = "reset back to normal. " else: - str_res = str(pressure) + " mmHg. " - self.logger.debug("pressure (measured)) overridden to " + str_res + + str_res = str(pressure) + " PSI. " + self.logger.debug("RO 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] @@ -140,7 +178,7 @@ def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the measured pressure sensors broadcast interval override command + Constructs and sends the measured RO pressure sensors broadcast interval override command. Constraints: Must be logged into RO. Given interval must be non-zero and a multiple of the RO general task interval (50 ms). @@ -161,7 +199,7 @@ message_id=MsgIds.MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("override blood flow broadcast interval") + self.logger.debug("override RO pressure broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -173,7 +211,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("RO pressure 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]