Index: tests/test_uf.py =================================================================== diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -r10bd08a612562df62c94e3d304f17ba24f4275a6 --- tests/test_uf.py (.../test_uf.py) (revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3) +++ tests/test_uf.py (.../test_uf.py) (revision 10bd08a612562df62c94e3d304f17ba24f4275a6) @@ -5,12 +5,12 @@ # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # -# @file test_uf.py +# @file uf_test.py # # @author (last) Peter Lucia -# @date (last) 06-Aug-2020 -# @author (original) Peter Lucia -# @date (original) 14-Jul-2020 +# @date (last) 02-Jun-2020 +# @author (original) Sean Nash +# @date (original) 20-May-2020 # ############################################################################ @@ -75,8 +75,17 @@ ", 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 +95,7 @@ f.write(pumpPWMs) f.write(dgPres) f.write(alarms) + f.write(accels) f.write("\n") # print to console @@ -97,6 +107,6 @@ print(" Pump Speeds: "+pumpMeasSpds) print(" Pump PWMs/DACs: "+pumpPWMs) print(" DG Pressures: "+dgPres) + print(" Accelerometer: "+accels) print(" Alarms: "+alarms) -