Index: dialin/hd/rtc.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4c82155574ae155fcb658f4c81ca852f65b71193 --- dialin/hd/rtc.py (.../rtc.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/rtc.py (.../rtc.py) (revision 4c82155574ae155fcb658f4c81ca852f65b71193) @@ -98,9 +98,8 @@ # If there is content... if received_message is not None: print(received_message) - # str_res = str(flow) - print("Time and Date in rtc set to seconds: " + str(sec) + " minutes: " + str(min) + " hours: " + - str(hour) + " days: " + str(day) + " months: " + str(month) + " years: " + str(year) + + print("Time and Date in rtc set to seconds: " + str(secs) + " minutes: " + str(mins) + " hours: " + + str(hours) + " days: " + str(days) + " months: " + str(months) + " years: " + str(years) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: tests/set_RTCs.py =================================================================== diff -u -rd134777c4f35ca58a14720a668c155bed3b0c124 -r4c82155574ae155fcb658f4c81ca852f65b71193 --- tests/set_RTCs.py (.../set_RTCs.py) (revision d134777c4f35ca58a14720a668c155bed3b0c124) +++ tests/set_RTCs.py (.../set_RTCs.py) (revision 4c82155574ae155fcb658f4c81ca852f65b71193) @@ -32,6 +32,7 @@ current_time_stamp = time() current_time = localtime(current_time_stamp) + print(current_time) hd.rtc.cmd_set_rtc_time_and_date(current_time.tm_sec, current_time.tm_min, Index: tests/set_accels_cal.py =================================================================== diff -u -ra0370d7df824c38cc35a1ab57b6efe1e2f8b1ca8 -r4c82155574ae155fcb658f4c81ca852f65b71193 --- tests/set_accels_cal.py (.../set_accels_cal.py) (revision a0370d7df824c38cc35a1ab57b6efe1e2f8b1ca8) +++ tests/set_accels_cal.py (.../set_accels_cal.py) (revision 4c82155574ae155fcb658f4c81ca852f65b71193) @@ -31,31 +31,31 @@ # log in to HD and DG as tester if hd.cmd_log_in_to_hd() == 0: exit(1) - #if dg.cmd_log_in_to_dg() == 0: - # exit(1) + if dg.cmd_log_in_to_dg() == 0: + exit(1) sleep(1) #reset calibrations hd.accel.cmd_set_accel_calibration(0, 0, 0) - #dg.accel.cmd_set_accel_calibration(0, 0, 0) + dg.accel.cmd_set_accel_calibration(0, 0, 0) #wait for new readings after calibration reset sleep(5) #calculate offsets (assuming HD and DG systems are level) hd_offsets = hd.accel.get_accel_vector() - #dg_offsets = dg.accel.get_accel_vector() + dg_offsets = dg.accel.get_accel_vector() hd_offsets.x *= -1.0 hd_offsets.y *= -1.0 hd_offsets.z -= 1.0 - hd_offsets.z *= -1 - #dg_offsets.x *= -1.0 - #dg_offsets.y *= -1.0 - #dg_offsets.z -= 1.0 - #dg_offsets.z *= -1.0 + hd_offsets.z *= -1.0 + dg_offsets.x *= -1.0 + dg_offsets.y *= -1.0 + dg_offsets.z -= 1.0 + dg_offsets.z *= -1.0 #set new offsets hd.accel.cmd_set_accel_calibration(hd_offsets.x, hd_offsets.y, hd_offsets.z) - #dg.accel.cmd_set_accel_calibration(dg_offsets.x, dg_offsets.y, dg_offsets.z) + dg.accel.cmd_set_accel_calibration(dg_offsets.x, dg_offsets.y, dg_offsets.z) exit(0) Index: tests/uf_test.py =================================================================== diff -u -r02e6bbf85f0699488317daa135d2530bc5b19507 -r4c82155574ae155fcb658f4c81ca852f65b71193 --- tests/uf_test.py (.../uf_test.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) +++ tests/uf_test.py (.../uf_test.py) (revision 4c82155574ae155fcb658f4c81ca852f65b71193) @@ -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) -