Index: tests/uf_test.py =================================================================== diff -u -r42f9e1c68d750dd5a412aeb23120a57771277417 -r13a03d199a7b202d61423587ca7c72e00c0df439 --- tests/uf_test.py (.../uf_test.py) (revision 42f9e1c68d750dd5a412aeb23120a57771277417) +++ tests/uf_test.py (.../uf_test.py) (revision 13a03d199a7b202d61423587ca7c72e00c0df439) @@ -27,6 +27,9 @@ dg = DG() sleep(2) +# hd.ui.cmd_ui_start_treatment_request() +# exit(0) + # log in to HD and DG as tester # if hd.cmd_log_in_to_hd() == 0: # exit(1) @@ -72,11 +75,20 @@ dgPres = ", ROi, " + '{:9.2f}'.format(dg.pressures.ro_pump_inlet_pressure) + \ ", ROo, " + '{:9.2f}'.format(dg.pressures.ro_pump_outlet_pressure) + \ ", DRi, " + '{:9.2f}'.format(dg.pressures.drain_pump_inlet_pressure) + \ - ", DRo, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure) - alarms = ", AL.s, " + hd.alarms.getCurrentAlarmsState() + \ + ", DRo, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure) + 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) + \ + ", AC.y, " + '{:9.4f}'.format(hd.accel.get_accel_vector().y) + \ + ", AC.z, " + '{:9.4f}'.format(hd.accel.get_accel_vector().z) + \ + ", ACm.x, " + '{:9.4f}'.format(hd.accel.get_accel_max_vector().x) + \ + ", ACm.y, " + '{:9.4f}'.format(hd.accel.get_accel_max_vector().y) + \ + ", ACm.z, " + '{:9.4f}'.format(hd.accel.get_accel_max_vector().z) + \ + ", ACt.x, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().x) + \ + ", ACt.y, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().y) + \ + ", ACt.z, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().z) - # log data + # log data f.write(modes) f.write(loadCells) f.write(ultraFilt) @@ -86,6 +98,7 @@ f.write(pumpPWMs) f.write(dgPres) f.write(alarms) + f.write(accels) f.write("\n") # print to console @@ -97,6 +110,6 @@ print(" Pump Speeds: "+pumpMeasSpds) print(" Pump PWMs/DACs: "+pumpPWMs) print(" DG Pressures: "+dgPres) + print(" Accelerometer: "+accels) print(" Alarms: "+alarms) -