diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | gps.h | 5 | ||||
| -rw-r--r-- | libgps_core.c | 5 |
3 files changed, 6 insertions, 7 deletions
@@ -9,7 +9,8 @@ are no longer required to define a gpsd_report() hook. gpsd no longer emits probe strings to unidentified USB devices at startup. The client API cleanup is finished; set_raw_hook is gone. JSON timestamps in TPV and - SKY are now ISO8601 rather than seconds since the Unix epoch. + SKY are now ISO8601 rather than seconds since the Unix epoch. GPGST sentences + are now parsed for noise statistics when a device emits them. * Tue Jul 13 2010 Eric S. Raymond <esr@snark.thyrsus.com> - 2.95 The autonomous robot submarine total world domination release! @@ -1328,7 +1328,6 @@ struct gps_data_t { #define PACKET_SET 0x20000000u #define SUBFRAME_SET 0x40000000u #define NOISE_SET 0x80000000u -#define AUXDATA_SET 0x8000000000000000llu /* reserved */ double online; /* NZ if GPS is on line, 0 if not. * * Note: gpsd clears this time when sentences @@ -1346,8 +1345,6 @@ struct gps_data_t { #endif struct gps_fix_t fix; /* accumulated PVT data */ - struct gps_noise_stats_t noise_stats; /* GPGST stats */ - double separation; /* Geoidal separation, MSL - WGS84 (Meters) */ /* GPS status -- always valid */ @@ -1384,7 +1381,6 @@ struct gps_data_t { /* pack things never reported together to reduce structure size */ #define UNION_SET (RTCM2_SET|RTCM3_SET|SUBFRAME_SET|AIS_SET|VERSION_SET|DEVICELIST_SET|ERROR_SET) - gps_mask_t auxmask; /* for future expansion */ union { /* unusual forms of sensor data that might come up the pipe */ struct rtcm2_t rtcm2; @@ -1400,6 +1396,7 @@ struct gps_data_t { int ndevices; struct devconfig_t list[MAXUSERDEVS]; } devices; + struct gps_noise_stats_t noise_stats; /* GPGST stats */ char error[80]; }; diff --git a/libgps_core.c b/libgps_core.c index 06f0fb47..6abc6063 100644 --- a/libgps_core.c +++ b/libgps_core.c @@ -165,8 +165,9 @@ static void libgps_dump_state(struct gps_data_t *collect) /* no need to dump the entire state, this is a sanity check */ #ifndef USE_QT - (void)fprintf(debugfp, "flags: (0x%04llx) %s\n", - collect->set, gps_maskdump(collect->set)); + /* will fail on a 32-bit macine */ + (void)fprintf(debugfp, "flags: (0x%04x) %s\n", + (unsigned int)collect->set, gps_maskdump(collect->set)); #endif if (collect->set & ONLINE_SET) (void)fprintf(debugfp, "ONLINE: %lf\n", collect->online); |