Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r7aaeb8b04744443272aaadb2c5cbb1d409a7e191 -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 7aaeb8b04744443272aaadb2c5cbb1d409a7e191) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) @@ -68,21 +68,9 @@ self.x2_pres = 0.0 self.x3_pres = 0.0 self.x4_pres = 0.0 - self.m1_pres_temp = 0.0 - self.m3_pres_temp = 0.0 - self.p8_pres_temp = 0.0 - self.p13_pres_temp = 0.0 - self.p17_pres_temp = 0.0 - self.x1_pres_temp = 0.0 - self.x2_pres_temp = 0.0 - self.x3_pres_temp = 0.0 - self.x4_pres_temp = 0.0 - @publish([ "fp_pressure_timestamp", "m1_pres", "m3_pres", "p8_pres", "p13_pres", "p17_pres", "x1_pres", "x2_pres", "x3_pres", "x4_pres", - "m1_pres_temp", "m3_pres_temp", "p8_pres_temp", "p13_pres_temp", "p17_pres_temp", - "x1_pres_temp", "x2_pres_temp", "x3_pres_temp", "x4_pres_temp", ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -112,25 +100,6 @@ self.x4_pres = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.m1_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.m3_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.p8_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.p13_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.p17_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - self.x1_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.x2_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] - self.x3_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] - self.x4_pres_temp = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - self.fp_pressure_timestamp = timestamp def cmd_pressure_sensor_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -r94611b3f768625ef245c7143f193e090fc518fe3 -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 94611b3f768625ef245c7143f193e090fc518fe3) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) @@ -54,6 +54,9 @@ 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", @@ -66,6 +69,9 @@ "venous_pressure_limit_max", "h2_arterial_long_filtered_pressure", "h14_venous_long_filtered_pressure", + "tmp_pressure", + "tmp_min_limit", + "tmp_max_limit", ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -94,6 +100,12 @@ 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_9:MsgFieldPositions.END_POS_FIELD_9])) + tmin = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + tmax = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.h2_arterial_pressure = art[0] self.h14_venous_pressure = ven[0] @@ -104,6 +116,9 @@ self.venous_pressure_limit_max = vpu[0] self.h2_arterial_long_filtered_pressure = lfa[0] self.h14_venous_long_filtered_pressure = lfv[0] + self.tmp_pressure = tps[0] + self.tmp_min_limit = tmin[0] + self.tmp_max_limit = tmax[0] self.td_pressure_timestamp = timestamp def cmd_pressure_sensor_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: Index: tests/data_capture_helpers/fp_helpers.py =================================================================== diff -u -r256ffed682a9c78ee890a3f3132eb6c6518e7ee8 -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 --- tests/data_capture_helpers/fp_helpers.py (.../fp_helpers.py) (revision 256ffed682a9c78ee890a3f3132eb6c6518e7ee8) +++ tests/data_capture_helpers/fp_helpers.py (.../fp_helpers.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) @@ -227,7 +227,7 @@ with open(log_path, "a") as f: # collect data and log it ro = "op_mode, " + '{}'.format(fp.fp_operation_mode) + \ - ", sub_mode, " + '{}'.format(fp.fp_operation_mode) + \ + ", sub_mode, " + '{}'.format(fp.fp_operation_sub_mode) + \ ", {}\n".format(fp.fp_op_mode_timestamp) f.write(ro) f.close() Index: tests/fp_dianogistic_logger.py =================================================================== diff -u -r256ffed682a9c78ee890a3f3132eb6c6518e7ee8 -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 --- tests/fp_dianogistic_logger.py (.../fp_dianogistic_logger.py) (revision 256ffed682a9c78ee890a3f3132eb6c6518e7ee8) +++ tests/fp_dianogistic_logger.py (.../fp_dianogistic_logger.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) @@ -63,8 +63,8 @@ fp_log_setup() print ("Starting threads...") - #float_control_thread = threading.Thread(target=fp_float_controller, args=(fp, CONTROL_INTERVAL),daemon=True) - #float_control_thread.start() + float_control_thread = threading.Thread(target=fp_float_controller, args=(fp, CONTROL_INTERVAL),daemon=True) + float_control_thread.start() pressure_log_writer_thread = threading.Thread(target=fp_pressure_recorder, args=(fp, RECORDING_INTERVAL), daemon=True) temp_log_writer_thread = threading.Thread(target=fp_temperature_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)