diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2005-06-21 21:27:30 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2005-06-21 21:27:30 +0000 |
| commit | b8b504de19d4646993fdffa7b6376ebc47e508a8 (patch) | |
| tree | 5b643b558fd5a84619a5ac21d555aae57c11602e | |
| parent | a2b694ddd5c1c305d1b7a185f8f9f6c0a429e4f5 (diff) | |
| download | gpsd-b8b504de19d4646993fdffa7b6376ebc47e508a8.tar.gz | |
Ready to ship 2.26.
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | gpsd.spec.in | 2 | ||||
| -rw-r--r-- | nmea_parse.c | 8 | ||||
| -rw-r--r-- | www/NMEA.txt | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -12,7 +12,7 @@ driver that we haven't figured out. *** PPS code is flaky -Som code attempting to terminate the PPS-monutoring thread when there +Some code attempting to terminate the PPS-monutoring thread when there is no DCD (e.g., on a USB device) seems to have tickled some kind of bug in pthreads -- termination seems to close the GPS device or otherwise do something nasty to the serial I/O layer. diff --git a/gpsd.spec.in b/gpsd.spec.in index 35f40a24..516a0099 100644 --- a/gpsd.spec.in +++ b/gpsd.spec.in @@ -122,7 +122,7 @@ cp gps.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages %{_libdir}/X11/app-defaults/xgpsspeed %changelog -* Sun May 22 2005 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1 +* Tue Jun 21 2005 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1 - Time DOP and total DOP are now passed on from GPSes that report them. Ensure longitude has a leading zero when <100, for compatibility with gpsdrive. Synchronous and thread hooks are now diff --git a/nmea_parse.c b/nmea_parse.c index d7fce195..d44580ae 100644 --- a/nmea_parse.c +++ b/nmea_parse.c @@ -197,7 +197,9 @@ static gps_mask_t processGPGLL(int count, char *field[], struct gps_data_t *out) mask = 0; merge_hhmmss(field[5], out); - if (out->nmea_date.tm_year != 0) { + if (out->nmea_date.tm_year != 0) + gpsd_report(1, "can't use GGA/GGL time until after ZDA or RMC has supplied a year.\n"); + else { mask = TIME_SET; out->newdata.time = (double)mkgmtime(&out->nmea_date)+out->subseconds; if (out->sentence_time != out->newdata.time) @@ -245,7 +247,9 @@ static gps_mask_t processGPGGA(int c UNUSED, char *field[], struct gps_data_t *o double oldfixtime = out->newdata.time; merge_hhmmss(field[1], out); - if (out->nmea_date.tm_year != 0) { + if (out->nmea_date.tm_year == 0) + gpsd_report(1, "can't use GGA/GGL time until after ZDA or RMC has supplied a year.\n"); + else { mask |= TIME_SET; out->newdata.time = (double)mkgmtime(&out->nmea_date)+out->subseconds; } diff --git a/www/NMEA.txt b/www/NMEA.txt index f75583df..d6f9863a 100644 --- a/www/NMEA.txt +++ b/www/NMEA.txt @@ -61,7 +61,7 @@ common, for example, to see latitude/longitude/altitude figures filled with zeros when the GPS has no valid data. The physical-level protocol is RS232C-compatible (actually RS422), -4800bps, 8N1 or 7N2 (the latter is rare bu does occur; the FV18 from +4800bps, 8N1 or 7N2 (the latter is rare but does occur; the FV18 from San Jose Navigation uses it, for example). The data is all ASCII, the high bit is not used. |