diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-10-02 02:46:31 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-10-02 02:46:31 +0000 |
| commit | 58717950a7882ba920aeb2044119237fb01f8085 (patch) | |
| tree | 65c40626e4d470b67512d8a94fa8c9bea703648d /driver_zodiac.c | |
| parent | ee286538bb8476ed968615383f938c6c7719a5f3 (diff) | |
| download | gpsd-58717950a7882ba920aeb2044119237fb01f8085.tar.gz | |
My bright idea to use timestamp() to set skyview times backfired...
...making the regression tests nondeterministic. Oh well. Fixed.
All drivers now use the LOG_DATA convention.
Diffstat (limited to 'driver_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index 93bfaf45..4f830012 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -248,8 +248,8 @@ static gps_mask_t handle1002(struct gps_device_t *session) /* ticks = getzlong(6); */ /* sequence = getzword(8); */ /* measurement_sequence = getzword(9); */ - /* gps_week = getzword(10); */ - /* gps_seconds = getzlong(11); */ + int gps_week = getzword(10); + int gps_seconds = getzlong(11); /* gps_nanoseconds = getzlong(13); */ for (i = 0; i < ZODIAC_CHANNELS; i++) { /*@ -type @*/ @@ -274,9 +274,9 @@ static gps_mask_t handle1002(struct gps_device_t *session) break; } } - session->gpsdata.skyview_time = timestamp(); + session->gpsdata.skyview_time = gpstime_to_unix(gps_week, gps_seconds); gpsd_report(LOG_DATA, - "1002: visible=%d used=%d mask=SATELLITE|USED\n", + "1002: visible=%d used=%d mask={SATELLITE|USED}\n", session->gpsdata.satellites_visible, session->gpsdata.satellites_used); return SATELLITE_SET | USED_SET; @@ -321,9 +321,9 @@ static gps_mask_t handle1003(struct gps_device_t *session) session->gpsdata.elevation[i] = 0; } } - session->gpsdata.skyview_time = timestamp(); + session->gpsdata.skyview_time = NAN; gpsd_report(LOG_DATA, "NAVDOP: visible=%d gdop=%.2f pdop=.2%f " - "hdop=.2%f vdop=.2%f tdop=.2%f mask=SATELLITE|DOP\n", + "hdop=.2%f vdop=.2%f tdop=.2%f mask={SATELLITE|DOP}\n", session->gpsdata.satellites_visible, session->gpsdata.dop.gdop, session->gpsdata.dop.hdop, @@ -378,7 +378,7 @@ static gps_mask_t handle1011(struct gps_device_t *session) getstringz(session->subtype, session->packet.outbuffer, 19, 28); /* software version field */ - gpsd_report(LOG_DATA, "1011: subtype=%s mask=DEVICEID\n", session->subtype); + gpsd_report(LOG_DATA, "1011: subtype=%s mask={DEVICEID}\n", session->subtype); return DEVICEID_SET; } |