diff options
| -rw-r--r-- | driver_zodiac.c | 9 | ||||
| -rw-r--r-- | test/daemon/zodiac.log.chk | 42 |
2 files changed, 24 insertions, 27 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index 6bb78123..9f76ee1f 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -239,12 +239,9 @@ static gps_mask_t handle1002(struct gps_device_t *session) break; } } - session->context->gps_week = (unsigned short)gps_week; - session->context->gps_tow = (double)gps_seconds; - session->gpsdata.skyview_time = - gpstime_to_unix(gps_week, session->context->gps_tow); - session->context->valid |= GPS_TIME_VALID; - gpsd_rollover_check(session, session->gpsdata.skyview_time); + session->gpsdata.skyview_time = gpsd_resolve_time(session, + (unsigned short)gps_week, + (double)gps_seconds); gpsd_report(LOG_DATA, "1002: visible=%d used=%d mask={SATELLITE|USED}\n", session->gpsdata.satellites_visible, session->gpsdata.satellites_used); diff --git a/test/daemon/zodiac.log.chk b/test/daemon/zodiac.log.chk index c0b9b2b8..576f8ac7 100644 --- a/test/daemon/zodiac.log.chk +++ b/test/daemon/zodiac.log.chk @@ -3,124 +3,124 @@ $GPRMC,204220,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*23 $GPGSA,A,3,,,,,,,,,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695340.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.230,"track":0.0000,"speed":0.000,"climb":-0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695353.000}
+{"class":"SKY","tag":"1002","time":1118695340.000}
$GPGGA,204221,5203.7576,N,00508.3123,E,1,08,,8.23,M,47.120,M,0.91,W*12
$GPRMC,204221,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*22
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695341.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.230,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695354.000}
+{"class":"SKY","tag":"1002","time":1118695341.000}
$GPGGA,204222,5203.7576,N,00508.3123,E,1,08,,8.20,M,47.120,M,0.91,W*12
$GPRMC,204222,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*21
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695342.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.200,"track":0.0000,"speed":0.000,"climb":-0.020,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695355.000}
+{"class":"SKY","tag":"1002","time":1118695342.000}
$GPGGA,204223,5203.7576,N,00508.3123,E,1,08,,8.28,M,47.120,M,0.91,W*1B
$GPRMC,204223,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*20
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695343.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.280,"track":0.0000,"speed":0.000,"climb":0.050,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695356.000}
+{"class":"SKY","tag":"1002","time":1118695343.000}
$GPGGA,204224,5203.7576,N,00508.3123,E,1,08,,8.27,M,47.120,M,0.91,W*13
$GPRMC,204224,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*27
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695344.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.270,"track":0.0000,"speed":0.000,"climb":0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695357.000}
+{"class":"SKY","tag":"1002","time":1118695344.000}
$GPGGA,204225,5203.7576,N,00508.3123,E,1,08,,8.26,M,47.120,M,0.91,W*13
$GPRMC,204225,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*26
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695345.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.260,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695358.000}
+{"class":"SKY","tag":"1002","time":1118695345.000}
$GPGGA,204226,5203.7576,N,00508.3123,E,1,08,,8.29,M,47.120,M,0.91,W*1F
$GPRMC,204226,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*25
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695346.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.290,"track":0.0000,"speed":0.000,"climb":0.030,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695359.000}
+{"class":"SKY","tag":"1002","time":1118695346.000}
$GPGGA,204227,5203.7576,N,00508.3123,E,1,08,,8.28,M,47.120,M,0.91,W*1F
$GPRMC,204227,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*24
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695347.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.280,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695360.000}
+{"class":"SKY","tag":"1002","time":1118695347.000}
$GPGGA,204228,5203.7576,N,00508.3123,E,1,08,,8.29,M,47.120,M,0.91,W*11
$GPRMC,204228,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*2B
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695348.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.290,"track":0.0000,"speed":0.000,"climb":0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695361.000}
+{"class":"SKY","tag":"1002","time":1118695348.000}
$GPGGA,204229,5203.7576,N,00508.3123,E,1,08,,8.28,M,47.120,M,0.91,W*11
$GPRMC,204229,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*2A
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695349.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.280,"track":0.0000,"speed":0.000,"climb":-0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695362.000}
+{"class":"SKY","tag":"1002","time":1118695349.000}
$GPGGA,204230,5203.7576,N,00508.3123,E,1,08,,8.32,M,47.120,M,0.91,W*12
$GPRMC,204230,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*22
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695350.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.320,"track":0.0000,"speed":0.000,"climb":0.040,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695363.000}
+{"class":"SKY","tag":"1002","time":1118695350.000}
$GPGGA,204231,5203.7576,N,00508.3123,E,1,08,,8.33,M,47.120,M,0.91,W*12
$GPRMC,204231,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*23
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695351.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.330,"track":0.0000,"speed":0.000,"climb":0.030,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695364.000}
+{"class":"SKY","tag":"1002","time":1118695351.000}
$GPGGA,204232,5203.7576,N,00508.3123,E,1,08,,8.31,M,47.120,M,0.91,W*13
$GPRMC,204232,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*20
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695352.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.310,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695365.000}
+{"class":"SKY","tag":"1002","time":1118695352.000}
$GPGGA,204233,5203.7576,N,00508.3123,E,1,08,,8.27,M,47.120,M,0.91,W*15
$GPRMC,204233,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*21
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695353.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.270,"track":0.0000,"speed":0.000,"climb":-0.020,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695366.000}
+{"class":"SKY","tag":"1002","time":1118695353.000}
$GPGGA,204234,5203.7576,N,00508.3123,E,1,08,,8.29,M,47.120,M,0.91,W*1C
$GPRMC,204234,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*26
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695354.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.290,"track":0.0000,"speed":0.000,"climb":0.020,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695367.000}
+{"class":"SKY","tag":"1002","time":1118695354.000}
$GPGGA,204235,5203.7576,N,00508.3123,E,1,08,,8.27,M,47.120,M,0.91,W*13
$GPRMC,204235,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*27
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695355.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.270,"track":0.0000,"speed":0.000,"climb":-0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695368.000}
+{"class":"SKY","tag":"1002","time":1118695355.000}
$GPGGA,204236,5203.7576,N,00508.3123,E,1,08,,8.26,M,47.120,M,0.91,W*11
$GPRMC,204236,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*24
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695356.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.260,"track":0.0000,"speed":0.000,"climb":-0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695369.000}
+{"class":"SKY","tag":"1002","time":1118695356.000}
$GPGGA,204237,5203.7576,N,00508.3123,E,1,08,,8.25,M,47.120,M,0.91,W*13
$GPRMC,204237,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*25
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695357.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.250,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695370.000}
+{"class":"SKY","tag":"1002","time":1118695357.000}
$GPGGA,204238,5203.7576,N,00508.3123,E,1,08,,8.20,M,47.120,M,0.91,W*19
$GPRMC,204238,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*2A
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695358.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.200,"track":0.0000,"speed":0.000,"climb":-0.030,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695371.000}
+{"class":"SKY","tag":"1002","time":1118695358.000}
$GPGGA,204239,5203.7576,N,00508.3123,E,1,08,,8.18,M,47.120,M,0.91,W*13
$GPRMC,204239,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*2B
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695359.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.180,"track":0.0000,"speed":0.000,"climb":-0.030,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695372.000}
+{"class":"SKY","tag":"1002","time":1118695359.000}
$GPGGA,204240,5203.7576,N,00508.3123,E,1,08,,8.19,M,47.120,M,0.91,W*1C
$GPRMC,204240,A,5203.7576,N,00508.3123,E,0.0000,0.000,130605,,*25
$GPGSA,A,3,00,00,00,00,00,00,00,00,,,,,0.0,0.0,0.0*32
{"class":"TPV","tag":"1000","time":1118695360.000,"ept":0.005,"lat":52.062625946,"lon":5.138537608,"alt":8.190,"track":0.0000,"speed":0.000,"climb":-0.010,"mode":3}
$PRWIZCH,01,2,05,7,04,7,14,7,02,0,07,7,30,7,18,6,24,7,09,7,00,0,22,7*4C
-{"class":"SKY","tag":"1002","time":1118695373.000}
+{"class":"SKY","tag":"1002","time":1118695360.000}
|