From a8d12eea466d66d28104fb4b24274dc2168227f0 Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Sun, 24 Apr 2016 15:26:48 -0700 Subject: PPSTIME -> NTPTIME NTPTIME is from the serial stream, it never had anything to do with PPS and it just confused everyone. --- driver_evermore.c | 6 +++--- driver_garmin.c | 2 +- driver_geostar.c | 2 +- driver_italk.c | 4 ++-- driver_navcom.c | 2 +- driver_nmea0183.c | 2 +- driver_oncore.c | 2 +- driver_proto.c | 2 +- driver_sirf.c | 8 ++++---- driver_skytraq.c | 1 + driver_superstar2.c | 4 ++-- driver_tsip.c | 12 ++++++------ driver_ubx.c | 4 ++-- driver_zodiac.c | 2 +- gpsd.c | 4 ++-- gpsd.h-tail | 2 +- timehint.c | 2 +- 17 files changed, 31 insertions(+), 30 deletions(-) diff --git a/driver_evermore.c b/driver_evermore.c index be040e87..0f4b221e 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -198,7 +198,7 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, session->newdata.mode = MODE_3D; mask |= ALTITUDE_SET | CLIMB_SET; } - mask |= TIME_SET | PPSTIME_IS | LATLON_SET | TRACK_SET | SPEED_SET | MODE_SET; + mask |= TIME_SET | NTPTIME_IS | LATLON_SET | TRACK_SET | SPEED_SET | MODE_SET; if (session->subtype[0] == '\0') { (void)snprintf(session->subtype, sizeof(session->subtype), "%3.2f", version); @@ -248,7 +248,7 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, break; } /* that's all the information in this packet */ - mask = TIME_SET | PPSTIME_IS | DOP_SET | MODE_SET | STATUS_SET; + mask = TIME_SET | NTPTIME_IS | DOP_SET | MODE_SET | STATUS_SET; gpsd_log(&session->context->errout, LOG_DATA, "DDO 0x04: gdop=%.2f pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f mode=%d, status=%d mask={TIME| DOP|MODE|STATUS}\n", session->gpsdata.dop.gdop, session->gpsdata.dop.pdop, @@ -350,7 +350,7 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, gpsd_log(&session->context->errout, LOG_DATA, "MDO 0x04: time=%.2f mask={TIME|RAW}\n", session->newdata.time); - return TIME_SET | PPSTIME_IS | RAW_IS; + return TIME_SET | NTPTIME_IS | RAW_IS; case 0x20: /* LogConfig Info, could be used as a probe for EverMore GPS */ gpsd_log(&session->context->errout, LOG_DATA, diff --git a/driver_garmin.c b/driver_garmin.c index 8f581698..c80b8428 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -499,7 +499,7 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, * time service. */ if (session->fixcnt > 3) - mask |= PPSTIME_IS; + mask |= NTPTIME_IS; } gpsd_log(&session->context->errout, LOG_DATA, "Garmin: PVT_DATA: time=%.2f, lat=%.2f lon=%.2f " diff --git a/driver_geostar.c b/driver_geostar.c index c6cb5f0d..a8719a86 100644 --- a/driver_geostar.c +++ b/driver_geostar.c @@ -203,7 +203,7 @@ static gps_mask_t geostar_analyze(struct gps_device_t *session) mask |= STATUS_SET; } } - mask |= TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | TRACK_SET | DOP_SET | USED_IS | REPORT_IS; + mask |= TIME_SET | NTPTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | TRACK_SET | DOP_SET | USED_IS | REPORT_IS; gpsd_log(&session->context->errout, LOG_INF, "Geographic coordinates %f %g %g %g %g %g\n", diff --git a/driver_italk.c b/driver_italk.c index 7bd47d11..15d1d990 100644 --- a/driver_italk.c +++ b/driver_italk.c @@ -61,7 +61,7 @@ static gps_mask_t decode_itk_navfix(struct gps_device_t *session, session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short) getles16(buf, 7 + 82), (unsigned int)getleu32(buf, 7 + 84) / 1000.0); - mask |= TIME_SET | PPSTIME_IS; + mask |= TIME_SET | NTPTIME_IS; epx = (double)(getles32(buf, 7 + 96) / 100.0); epy = (double)(getles32(buf, 7 + 100) / 100.0); @@ -194,7 +194,7 @@ static gps_mask_t decode_itk_utcionomodel(struct gps_device_t *session, gpsd_log(&session->context->errout, LOG_DATA, "UTC_IONO_MODEL: time=%.2f mask={TIME}\n", session->newdata.time); - return TIME_SET | PPSTIME_IS; + return TIME_SET | NTPTIME_IS; } static gps_mask_t decode_itk_subframe(struct gps_device_t *session, diff --git a/driver_navcom.c b/driver_navcom.c index ffb7f393..2680571c 100644 --- a/driver_navcom.c +++ b/driver_navcom.c @@ -497,7 +497,7 @@ static gps_mask_t handle_0xb1(struct gps_device_t *session) mask = LATLON_SET | ALTITUDE_SET | CLIMB_SET | SPEED_SET | TRACK_SET | STATUS_SET | MODE_SET | USED_IS | HERR_SET | VERR_SET | TIMERR_SET | DOP_SET - | TIME_SET | PPSTIME_IS; + | TIME_SET | NTPTIME_IS; gpsd_log(&session->context->errout, LOG_DATA, "PVT 0xb1: time=%.2f, lat=%.2f lon=%.2f alt=%.f " "speed=%.2f track=%.2f climb=%.2f mode=%d status=%d " diff --git a/driver_nmea0183.c b/driver_nmea0183.c index 80944e63..eff633a0 100644 --- a/driver_nmea0183.c +++ b/driver_nmea0183.c @@ -1851,7 +1851,7 @@ gps_mask_t nmea_parse(char *sentence, struct gps_device_t * session) * information for a sharper test, so we'll leave it up to the * PPS code to do its own sanity filtering. */ - retval |= PPSTIME_IS; + retval |= NTPTIME_IS; } /* diff --git a/driver_oncore.c b/driver_oncore.c index 43f65f0a..caeb3575 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -176,7 +176,7 @@ oncore_msg_navsol(struct gps_device_t *session, unsigned char *buf, } /* bit 2 of the status word: using for time solution */ if (status & 0x02) - mask |= PPSTIME_IS | GOODTIME_IS; + mask |= NTPTIME_IS | GOODTIME_IS; /* * The GOODTIME_IS mask bit exists distinctly from TIME_SET exactly * so an OnCore running in time-service mode (and other GPS clocks) diff --git a/driver_proto.c b/driver_proto.c index f42cfcce..408dfdb3 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -156,7 +156,7 @@ _proto__msg_utctime(struct gps_device_t *session, unsigned char *buf, size_t dat session->context->leap_seconds = GET_GPS_LEAPSECONDS(); session->newdata.time = gpsd_gpstime_resolve(session, gps_week, tow / 1000.0); - return TIME_SET | PPSTIME_IS | ONLINE_SET; + return TIME_SET | NTPTIME_IS | ONLINE_SET; } /** diff --git a/driver_sirf.c b/driver_sirf.c index 0cb23d44..a377d7f8 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -749,7 +749,7 @@ static gps_mask_t sirf_msg_navsol(struct gps_device_t *session, TIME_SET | LATLON_SET | ALTITUDE_SET | TRACK_SET | SPEED_SET | STATUS_SET | MODE_SET | DOP_SET | USED_IS; if ( 3 <= session->gpsdata.satellites_visible ) { - mask |= PPSTIME_IS; + mask |= NTPTIME_IS; } gpsd_log(&session->context->errout, LOG_DATA, "SiRF: MND 0x02: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f mode=%d status=%d hdop=%.2f used=%d\n", @@ -896,7 +896,7 @@ static gps_mask_t sirf_msg_geodetic(struct gps_device_t *session, session->driver.sirf.time_seen); } if ( 3 <= session->gpsdata.satellites_visible ) { - mask |= PPSTIME_IS; + mask |= NTPTIME_IS; } #endif /* TIMEHINT_ENABLE */ @@ -995,7 +995,7 @@ static gps_mask_t sirf_msg_ublox(struct gps_device_t *session, double subseconds; mask |= TIME_SET; if ( 3 <= session->gpsdata.satellites_visible ) { - mask |= PPSTIME_IS; + mask |= NTPTIME_IS; } unpacked_date.tm_year = (int)getbeu16(buf, 26) - 1900; unpacked_date.tm_mon = (int)getub(buf, 28) - 1; @@ -1074,7 +1074,7 @@ static gps_mask_t sirf_msg_ppstime(struct gps_device_t *session, #endif /* TIMEHINT_ENABLE */ mask |= TIME_SET; if ( 3 <= session->gpsdata.satellites_visible ) { - mask |= PPSTIME_IS; + mask |= NTPTIME_IS; } } return mask; diff --git a/driver_skytraq.c b/driver_skytraq.c index 565d8608..14169d58 100644 --- a/driver_skytraq.c +++ b/driver_skytraq.c @@ -543,3 +543,4 @@ const struct gps_type_t driver_skytraq = }; /* *INDENT-ON* */ #endif /* defined( SKYTRAQ_ENABLE) && defined(BINARY_ENABLE) */ + diff --git a/driver_superstar2.c b/driver_superstar2.c index bd4aab1e..53b8ad49 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -101,7 +101,7 @@ superstar2_msg_navsol_lla(struct gps_device_t *session, tm.tm_year = (int)getleu16(buf, 16) - 1900; tm.tm_isdst = 0; session->newdata.time = (timestamp_t)mkgmtime(&tm) + (d - tm.tm_sec); - mask |= TIME_SET | PPSTIME_IS; + mask |= TIME_SET | NTPTIME_IS; /* extract the local tangential plane (ENU) solution */ session->newdata.latitude = getled64((char *)buf, 18) * RAD_2_DEG; @@ -268,7 +268,7 @@ superstar2_msg_timing(struct gps_device_t *session, unsigned char *buf, tm.tm_isdst = 0; session->newdata.time = (timestamp_t)mkgmtime(&tm); session->context->leap_seconds = (int)getsb(buf, 20); - mask = TIME_SET | PPSTIME_IS; + mask = TIME_SET | NTPTIME_IS; } gpsd_log(&session->context->errout, LOG_DATA, "TIMING: time=%.2f mask={TIME}\n", diff --git a/driver_tsip.c b/driver_tsip.c index a77cbaa3..6fa79b66 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -254,7 +254,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->context->valid |= LEAP_SECOND_VALID; session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short)s1, (double)f1); - mask |= TIME_SET | PPSTIME_IS; + mask |= TIME_SET | NTPTIME_IS; } gpsd_log(&session->context->errout, LOG_INF, "GPS Time %f %d %f\n", f1, s1, f2); @@ -359,7 +359,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) gpsd_gpstime_resolve(session, (unsigned short)session->context->gps_week, (double)f2); - mask |= TIME_SET | PPSTIME_IS; + mask |= TIME_SET | NTPTIME_IS; } mask |= LATLON_SET | ALTITUDE_SET | CLEAR_IS | REPORT_IS; gpsd_log(&session->context->errout, LOG_DATA, @@ -621,7 +621,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) gpsd_gpstime_resolve(session, (unsigned short)session->context->gps_week, (double)f1); - mask |= TIME_SET | PPSTIME_IS; + mask |= TIME_SET | NTPTIME_IS; } gpsd_log(&session->context->errout, LOG_INF, "GPS DP LLA %f %f %f %f\n", @@ -713,7 +713,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) (unsigned short)s4, (double)ul1 *1e-3); mask |= - TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | + TIME_SET | NTPTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | TRACK_SET | CLIMB_SET | STATUS_SET | MODE_SET | CLEAR_IS | REPORT_IS; gpsd_log(&session->context->errout, LOG_DATA, @@ -783,7 +783,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) if ((session->newdata.track = atan2(d1, d2) * RAD_2_DEG) < 0) session->newdata.track += 360.0; mask |= - TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | + TIME_SET | NTPTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | TRACK_SET |CLIMB_SET | STATUS_SET | MODE_SET | CLEAR_IS | REPORT_IS; gpsd_log(&session->context->errout, LOG_DATA, @@ -811,7 +811,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->context->valid |= LEAP_SECOND_VALID; session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short)s1, (double)ul1); - mask |= TIME_SET | PPSTIME_IS | CLEAR_IS; + mask |= TIME_SET | NTPTIME_IS | CLEAR_IS; gpsd_log(&session->context->errout, LOG_DATA, "SP-TTS 0xab time=%.2f mask={TIME}\n", session->newdata.time); diff --git a/driver_ubx.c b/driver_ubx.c index 5862cf0a..473ac9c5 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -170,7 +170,7 @@ ubx_msg_nav_sol(struct gps_device_t *session, unsigned char *buf, tow = (unsigned int)getleu32(buf, 0); gw = (unsigned short)getles16(buf, 8); session->newdata.time = gpsd_gpstime_resolve(session, gw, tow / 1000.0); - mask |= TIME_SET | PPSTIME_IS; + mask |= TIME_SET | NTPTIME_IS; } #undef DATE_VALID @@ -309,7 +309,7 @@ ubx_msg_nav_timegps(struct gps_device_t *session, unsigned char *buf, gpsd_log(&session->context->errout, LOG_DATA, "TIMEGPS: time=%.2f leap=%d, mask={TIME}\n", session->newdata.time, session->context->leap_seconds); - return TIME_SET | PPSTIME_IS; + return TIME_SET | NTPTIME_IS; } /** diff --git a/driver_zodiac.c b/driver_zodiac.c index 8304b87f..65f76f0b 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -194,7 +194,7 @@ static gps_mask_t handle1000(struct gps_device_t *session) /* clock_drift_sd = (int)getzlong(53) * 1e-2; */ mask = - TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | CLIMB_SET | SPEED_SET | + TIME_SET | NTPTIME_IS | LATLON_SET | ALTITUDE_SET | CLIMB_SET | SPEED_SET | TRACK_SET | STATUS_SET | MODE_SET; gpsd_log(&session->context->errout, LOG_DATA, "1000: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d\n", diff --git a/gpsd.c b/gpsd.c index 28148e31..031ba1f6 100644 --- a/gpsd.c +++ b/gpsd.c @@ -1511,11 +1511,11 @@ static void all_reports(struct gps_device_t *device, gps_mask_t changed) #ifdef NTP_ENABLE /* * Time is eligible for shipping to NTPD if the driver has - * asserted PPSTIME_IS at any point in the current cycle. + * asserted NTPTIME_IS at any point in the current cycle. */ if ((changed & CLEAR_IS)!=0) device->ship_to_ntpd = false; - if ((changed & PPSTIME_IS)!=0) + if ((changed & NTPTIME_IS)!=0) device->ship_to_ntpd = true; /* * Only update the NTP time if we've seen the leap-seconds data. diff --git a/gpsd.h-tail b/gpsd.h-tail index 4a15d34b..27cbd68b 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -311,7 +311,7 @@ typedef enum { #define CLEAR_IS INTERNAL_SET(4) /* starts a reporting cycle */ #define REPORT_IS INTERNAL_SET(5) /* ends a reporting cycle */ #define NODATA_IS INTERNAL_SET(6) /* no data read from fd */ -#define PPSTIME_IS INTERNAL_SET(7) /* precision time is available */ +#define NTPTIME_IS INTERNAL_SET(7) /* precision time is available */ #define PERR_IS INTERNAL_SET(8) /* PDOP set */ #define PASSTHROUGH_IS INTERNAL_SET(9) /* passthrough mode */ #define EOF_IS INTERNAL_SET(10) /* synthetic EOF */ diff --git a/timehint.c b/timehint.c index 3462223b..84c68506 100644 --- a/timehint.c +++ b/timehint.c @@ -356,7 +356,7 @@ static char *report_hook(volatile struct pps_thread_t *pps_thread, struct gps_device_t *session = (struct gps_device_t *)pps_thread->context; /* PPS only source never get any serial info - * so no PPSTIME_IS or fixcnt */ + * so no NTPTIME_IS or fixcnt */ if ( source_pps != session->sourcetype) { /* FIXME! these two validations need to move back into ppsthread.c */ -- cgit v1.2.1