Prior to branch

Author: peterhinch

gps/as_GPS.py

@@ -649,7 +649,7 @@ def speed_string(self, unit=KPH):
 
     def time(self, local=True):
         t = self.local_time if local else self.utc
-        return '{:02d}:{:02d}:{:2.3f}'.format(*t)
+        return '{:02d}:{:02d}:{:06.3f}'.format(*t)
 
     def date_string(self, formatting=MDY):
         day, month, year = self.date

gps/as_GPS_time.py

@@ -10,6 +10,10 @@
 import as_GPS
 import as_tGPS
 
+print('Available tests:')
+print('calibrate(minutes=5) Set and calibrate the RTC.')
+print('drift(minutes=5) Repeatedly print the difference between RTC and GPS time.')
+
 # Setup for tests. Red LED toggles on fix, blue on PPS interrupt.
 async def setup():
     red = pyb.LED(1)
@@ -20,13 +24,20 @@ async def setup():
     pps_pin = pyb.Pin('X3', pyb.Pin.IN)
     return as_tGPS.GPS_Timer(gps, pps_pin, blue)
 
-async def drift_test(gps_tim, minutes):
-    for _ in range(minutes):
-        for _ in range(6):
-            dt = await gps_tim.delta()
-            print(gps_tim.get_t_split(), end='')
-            print('Delta {}'.format(dt))
-            await asyncio.sleep(10)
+running = True
+
+async def killer(minutes):
+    global running
+    await asyncio.sleep(minutes * 60)
+    running = False
+
+async def drift_test(gps_tim):
+    dstart = await gps_tim.delta()
+    while running:
+        dt = await gps_tim.delta()
+        print('{}  Delta {}μs'.format(gps_tim.gps.time(), dt))
+        await asyncio.sleep(10)
+    return dt - dstart
 
 # Calibrate and set the Pyboard RTC
 async def do_cal(minutes):
@@ -39,9 +50,19 @@ def calibrate(minutes=5):
 
 # Every 10s print the difference between GPS time and RTC time
 async def do_drift(minutes):
+    print('Setting up GPS.')
     gps_tim = await setup()
-    await drift_test(gps_tim, minutes)
+    print('Waiting for time data.')
+    await gps_tim.ready()
+    print('Setting RTC.')
+    await gps_tim.set_rtc()
+    print('Measuring drift.')
+    change = await drift_test(gps_tim)
+    print('Rate of change {}μs/hr'.format(int(60 * change/minutes)))
 
 def drift(minutes=5):
+    global running
+    running = True
     loop = asyncio.get_event_loop()
+    loop.create_task(killer(minutes))
     loop.run_until_complete(do_drift(minutes))