summaryrefslogtreecommitdiff
path: root/driver_navcom.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2009-09-03 10:16:43 +0000
committerEric S. Raymond <esr@thyrsus.com>2009-09-03 10:16:43 +0000
commitff1a623dbdca3fa26de67d88739d9a039b8e39ea (patch)
treee5dd06d01abeba8e9210f65f79d4c19eeeb4cb94 /driver_navcom.c
parentd5755a55b8681c04ee0de3dc683124e581e47a9b (diff)
downloadgpsd-ff1a623dbdca3fa26de67d88739d9a039b8e39ea.tar.gz
Split eph into epx and epy internally...
...but still report eph by re-mixing them in the JSON dumper. This was worth doing because all regression tests still pass, showing that visible behavior for old-protocol users gas not changed.
Diffstat (limited to 'driver_navcom.c')
-rw-r--r--driver_navcom.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/driver_navcom.c b/driver_navcom.c
index 5ab00a33..2a1d05ed 100644
--- a/driver_navcom.c
+++ b/driver_navcom.c
@@ -483,7 +483,7 @@ static gps_mask_t handle_0xb1(struct gps_device_t *session)
/* splint apparently gets confused about C promotion rules. */
/* "Assignment of arbitrary unsigned integral type to double" on these */
#ifndef S_SPLINT_S
- session->gpsdata.fix.eph = fom/100.0*1.96/*Two sigma*/;
+ session->gpsdata.fix.epx = session->gpsdata.fix.epy = fom/100.0*1.96/*Two sigma*/;
/* FIXME - Which units is tfom in (spec doesn't say) and
which units does gpsd require? (docs don't say) */
session->gpsdata.fix.ept = tfom*1.96/*Two sigma*/;
@@ -525,10 +525,11 @@ static gps_mask_t handle_0xb1(struct gps_device_t *session)
"Navcom: velocities: north = %f, east = %f, up = %f (track = %f, speed = %f)\n",
vel_north*VEL_RES, vel_east*VEL_RES, vel_up*VEL_RES,
session->gpsdata.fix.track, session->gpsdata.fix.speed);
+ /* relies on the fact that expcx and epy are set to same value */
gpsd_report(LOG_IO,
"Navcom: hrms = %f, vrms = %f, gdop = %f, pdop = %f, "
"hdop = %f, vdop = %f, tdop = %f\n",
- session->gpsdata.fix.eph, session->gpsdata.fix.epv,
+ session->gpsdata.fix.epx, session->gpsdata.fix.epv,
session->gpsdata.gdop, session->gpsdata.pdop,
session->gpsdata.hdop, session->gpsdata.vdop,
session->gpsdata.tdop);