Index: tests/test_uf.py =================================================================== diff -u -re21625cbe20d1a836cb78dbc1350fcd894bdcb9f -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- tests/test_uf.py (.../test_uf.py) (revision e21625cbe20d1a836cb78dbc1350fcd894bdcb9f) +++ tests/test_uf.py (.../test_uf.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -18,7 +18,7 @@ sys.path.append("..") from dialin.hd.hemodialysis_device import HD from dialin.dg.dialysate_generator import DG -from dialin.dg.temperature_sensors import TemperatureSensorsNames +from dialin.dg.temperature_sensors import DGTemperaturesNames from time import sleep if __name__ == "__main__": @@ -88,10 +88,10 @@ hdPress = ", PBA, " + '{:9.2f}'.format(hd.pressure_occlusion.arterial_pressure) + \ ", PBV, " + '{:9.2f}'.format(hd.pressure_occlusion.venous_pressure) + \ ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion) - Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name]) + \ - ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name]) + \ - ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_DIALYSATE.name]) + \ - ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name]) + "," + Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_PRIMARY_HEATER.name]) + \ + ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name]) + \ + ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_DIALYSATE.name]) + \ + ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name]) + "," alarms = ", AL.s, " + hd.alarms.get_current_alarms_state() + \ ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top) accels = ", AC.x, " + '{:9.4f}'.format(hd.accel.get_accel_vector().x) + \