From 1bc06df9cb9ee58c6497311ae14aad50f9bc69d9 Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Mon, 25 Mar 2019 16:43:28 -0700 Subject: VERR_SET: Removed flag from daemon. No regressions changed. Obviously redundant. --- driver_garmin.c | 2 +- driver_greis.c | 2 +- driver_navcom.c | 4 ++-- driver_nmea0183.c | 1 - driver_ubx.c | 3 +-- pseudonmea.c | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/driver_garmin.c b/driver_garmin.c index e5233be7..2841b01e 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -492,7 +492,7 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, /* data only valid with a fix */ mask |= TIME_SET | LATLON_SET | ALTITUDE_SET | STATUS_SET | MODE_SET | - SPEED_SET | TRACK_SET | CLIMB_SET | HERR_SET | VERR_SET | PERR_IS | + SPEED_SET | TRACK_SET | CLIMB_SET | HERR_SET | PERR_IS | CLEAR_IS | REPORT_IS; /* * Garmin documentation says we should wait until four good fixes diff --git a/driver_greis.c b/driver_greis.c index 0392f87e..9e170e6a 100644 --- a/driver_greis.c +++ b/driver_greis.c @@ -317,7 +317,7 @@ static gps_mask_t greis_msg_SG(struct gps_device_t *session, session->newdata.epx, session->newdata.epy, session->newdata.eps, session->newdata.epc); - return HERR_SET | VERR_SET | SPEEDERR_SET | CLIMBERR_SET; + return HERR_SET | SPEEDERR_SET | CLIMBERR_SET; } /** diff --git a/driver_navcom.c b/driver_navcom.c index ed2152ae..e35e8011 100644 --- a/driver_navcom.c +++ b/driver_navcom.c @@ -496,7 +496,7 @@ static gps_mask_t handle_0xb1(struct gps_device_t *session) #undef DOP_UNDEFINED mask = LATLON_SET | ALTITUDE_SET | CLIMB_SET | SPEED_SET | TRACK_SET - | STATUS_SET | MODE_SET | USED_IS | HERR_SET | VERR_SET + | STATUS_SET | MODE_SET | USED_IS | HERR_SET | TIMERR_SET | DOP_SET | TIME_SET | NTPTIME_IS; gpsd_log(&session->context->errout, LOG_DATA, @@ -903,7 +903,7 @@ static gps_mask_t handle_0xb5(struct gps_device_t *session) #ifdef __UNUSED__ session->newdata.eph = hrms * 1.96; session->newdata.epv = alt_sd * 1.96; - mask |= (HERR_SET | VERR_SET); + mask |= HERR_SET; #endif /* __UNUSED__ */ session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short)week, diff --git a/driver_nmea0183.c b/driver_nmea0183.c index 7fa4e182..542860f8 100644 --- a/driver_nmea0183.c +++ b/driver_nmea0183.c @@ -1563,7 +1563,6 @@ static gps_mask_t processPSRFEPE(int c UNUSED, char *field[], if ('\0' != field[5][0]) { /* Estimated Vertical Position Error (meters, 0.01 resolution) */ session->newdata.epv = safe_atof(field[5]); - mask |= VERR_SET; } if ('\0' != field[6][0]) { diff --git a/driver_ubx.c b/driver_ubx.c index b52bf1d9..970d7074 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -277,7 +277,7 @@ ubx_msg_nav_pvt(struct gps_device_t *session, unsigned char *buf, session->newdata.epx = session->newdata.epy = hacc; session->newdata.epv = vacc; session->newdata.eps = sacc; - mask |= HERR_SET | VERR_SET | SPEEDERR_SET; + mask |= HERR_SET | SPEEDERR_SET; gpsd_log(&session->context->errout, LOG_DATA, "NAV_PVT: flags=%02x time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d used=%d\n", flags, @@ -346,7 +346,6 @@ ubx_msg_nav_sol(struct gps_device_t *session, unsigned char *buf, if (session->driver.ubx.last_verr > 0.0) { session->newdata.epv = session->driver.ubx.last_verr; - mask |= VERR_SET; session->driver.ubx.last_verr = 0.0; } diff --git a/pseudonmea.c b/pseudonmea.c index f6d701be..7eef32e5 100644 --- a/pseudonmea.c +++ b/pseudonmea.c @@ -486,7 +486,7 @@ void nmea_tpv_dump(struct gps_device_t *session, len - strlen(bufp)); } if ((session->gpsdata.set - & (MODE_SET | DOP_SET | USED_IS | HERR_SET | VERR_SET)) != 0) + & (MODE_SET | DOP_SET | USED_IS | HERR_SET)) != 0) gpsd_binary_quality_dump(session, bufp + strlen(bufp), len - strlen(bufp)); } -- cgit v1.2.1