Add -v option to gpsfake.

Update regression test because of start-of-cycle check on GGA.
author: Eric S. Raymond <esr@thyrsus.com> 2006-06-09 13:11:02 +0000
committer: Eric S. Raymond <esr@thyrsus.com> 2006-06-09 13:11:02 +0000
commit: 86a39a1a34f2b8891cf80c108651b1d771182258 (patch)
tree: 27aa7080dc3f4a2d452551d804aab164d1d4bb96
parent: 02dc93ea5a9aa8c305403d075d6cd2efe884a188 (diff)
download: gpsd-86a39a1a34f2b8891cf80c108651b1d771182258.tar.gz
16 files changed, 316 insertions, 302 deletions
diff --git a/HACKING b/HACKING
index 27e7b623..77e9352b 100644
--- a/HACKING
+++ b/HACKING
@@ -187,6 +187,26 @@ enough to manage that, consider whether your feature control might be
 implemented with an extension to the gpsd protocol or the
 control-socket command set.
 
+Here are three specific reasons command-line switches are evil:
+
+(1) Command-line switches are often a lazy programmer's way out of
+writing correct adaptive logic.  This is why we keep rejecting
+requests for a baud-rate switch and a GPS type switch -- the *right*
+thing is to make the packet-sniffer work better, and if we relented in
+our opposition the pressure to get that right would disappear.
+Suddenly we'd be back to end-users having to fiddle with settings the
+software ought to figure out for itself, which is unacceptable.
+
+(2) Command-line switches without corresponding protocol commands 
+pin the daemon's behavior for its entire lifespan. Why should the user
+have to fix a policy at startup time and never get to change his/her 
+mind afterwards?  Stupid design...
+
+(3) The command-line switches used for a normal gpsd startup can only
+be changed by modifying the hotplug script.  Requiring end-users to
+modify hotplug scripts (or anything else in admin space) is a crash
+landing.
+
 *** Don't use malloc!
 
 The best way to avoid having dynamic-memory allocation problems is
diff --git a/gpsd.spec.in b/gpsd.spec.in
index cdf84156..a76cf4c7 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -78,7 +78,7 @@ mkdir -p "$RPM_BUILD_ROOT"%{_datadir}/gpsd
 #cp dgpsip-servers "$RPM_BUILD_ROOT"%{_datadir}/gpsd/
 PYVERSION=`python -c "import sys; print sys.version[:3]"`
 mkdir -p "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages
-cp gps.py gpsfake.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages
+cp gps.py gpsfake.py leapsecond.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages
 
 %clean
 [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
@@ -105,6 +105,7 @@ cp gps.py gpsfake.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-package
 %{_sysconfdir}/hotplug/usb/gpsd.usermap
 #%{_datadir}/gpsd/dgpsip-servers
 %{_libdir}/python*/site-packages/gps.py*
+%{_libdir}/python*/site-packages/leapsecond.py*
 
 %files -n gpsd-devel
 %defattr(-,root,root,-)
diff --git a/gpsfake b/gpsfake
index b14e9e47..ac3a98f7 100755
--- a/gpsfake
+++ b/gpsfake
@@ -39,7 +39,7 @@ class Baton:
             self.stream.write("...(%2.2f sec) %s.\n" % (time.time() - self.time, msg))
         return
 
-(options, arguments) = getopt.getopt(sys.argv[1:], "bc:D:ghilm:o:pr:s:")
+(options, arguments) = getopt.getopt(sys.argv[1:], "bc:D:ghilm:o:pr:s:v")
 progress = False
 cycle = 0
 monitor = ""
@@ -49,6 +49,7 @@ pipe = False
 promptme = False
 init = "w+r+"
 doptions = ""
+verbose = False
 for (switch, val) in options:
     if (switch == '-b'):
         progress = True
@@ -73,6 +74,8 @@ for (switch, val) in options:
         init = val
     elif (switch == '-s'):
         speed = int(val)
+    elif (switch == '-v'):
+        verbose = True
     elif (switch == '-h'):
         sys.stderr.write("usage: gpsfake [-h] [-l] [-m monitor] [--D debug] [-o options] [-p] [-s speed] [-c cycle] [-b] logfile\n")
         raise SystemExit,0
@@ -103,7 +106,7 @@ def fakehook(linenumber, fakegps):
 if progress:
     baton = Baton("Processing %s" % logfile, "done")
 
-test = gpsfake.TestSession(prefix=monitor, options=doptions)
+test = gpsfake.TestSession(prefix=monitor, options=doptions, verbose=verbose)
 
 if pipe:
     test.reporter = sys.stdout.write
diff --git a/gpsfake.1 b/gpsfake.1
index e616d886..5d31965c 100644
--- a/gpsfake.1
+++ b/gpsfake.1
@@ -1,97 +1,94 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GPSFAKE" 1 "" "" ""
-.SH NAME
+.\" ** You probably do not want to edit this file directly **
+.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
+.\" Instead of manually editing it, you probably should edit the DocBook XML
+.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.TH "GPSFAKE" "1" "06/09/2006" "12 Feb 2005" "12 Feb 2005"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
 gpsfake \- test harness for gpsd, simulating a GPS
 .SH "SYNOPSIS"
-.ad l
-.hy 0
 .HP 8
 \fBgpsfake\fR [\-h] [\-b] [\-c\ \fIinterval\fR] [\-i] [\-D\ \fIdebuglevel\fR] [\-l] [\-m\ \fImonitor\fR] [\-o\ \fIoptions\fR] [\-p] [\-r\ \fIinitcmd\fR] [\-s\ \fIspeed\fR] [\fIlogfile\fR]
-.ad
-.hy
-
 .SH "DESCRIPTION"
-
 .PP
-gpsfake is a test harness for gpsd and its clients\&. It opens a pty (pseudo\-TTY), launches a gpsd instance that thinks the slave side of the pty is its GPS device, and repeatedly feeds the contents of a test logfile through the master side to the GPS\&.
-
+gpsfake
+is a test harness for
+gpsd
+and its clients. It opens a pty (pseudo\-TTY), launches a
+gpsd
+instance that thinks the slave side of the pty is its GPS device, and repeatedly feeds the contents of a test logfile through the master side to the GPS.
 .PP
-gpsfake does not require root privileges, and can be run concurrently with a production gpsd instance without causing problems\&.
-
+gpsfake
+does not require root privileges, and can be run concurrently with a production
+gpsd
+instance without causing problems.
 .PP
-The logfile may be of NMEA, SiRF\-II packets, or Zodiac packets\&. Leading lines beginning with # will be treated as comments and ignored\&.
-
+The logfile may be of NMEA, SiRF\-II packets, or Zodiac packets. Leading lines beginning with # will be treated as comments and ignored.
 .PP
-The gpsd instance is run in foreground\&. The thread sending fake GPS data to the daemon is run in background\&.
-
+The
+gpsd
+instance is run in foreground. The thread sending fake GPS data to the daemon is run in background.
 .SH "OPTIONS"
-
 .PP
-The \-b option enables a twirling\-baton progress indicator on standard error\&. At termination, it reports elaped time\&.
-
+The \-b option enables a twirling\-baton progress indicator on standard error. At termination, it reports elaped time.
 .PP
-The \-c option sets the delay between sentences in seconds\&. Fractional values of seconds are legal\&. The default is zero (no delay)\&.
-
+The \-c option sets the delay between sentences in seconds. Fractional values of seconds are legal. The default is zero (no delay).
 .PP
-The \-l option makes the program dump a line or packet number just before each sentence is fed to the daemon\&. If the sentence is textual (e\&.g\&. NMEA, the text is dumped as well)\&.
-
+The \-l option makes the program dump a line or packet number just before each sentence is fed to the daemon. If the sentence is textual (e.g. NMEA, the text is dumped as well).
 .PP
-The \-i option is for single\-stepping through logfiles\&. It dumps the line or packet number (and the sentence if the protocol is textual) followed by "? "\&. Only when the user keys Enter is the line actually fed to gpsd\&.
-
+The \-i option is for single\-stepping through logfiles. It dumps the line or packet number (and the sentence if the protocol is textual) followed by "? ". Only when the user keys Enter is the line actually fed to
+gpsd.
 .PP
-The \-m option specifies a monitor program inside which the daemon should be run\&. This option is intended to be used with \fBvalgrind\fR(1), \fBgdb\fR(1) and similar programs\&.
-
+The \-m option specifies a monitor program inside which the daemon should be run. This option is intended to be used with
+\fBvalgrind\fR(1),
+\fBgdb\fR(1)
+and similar programs.
 .PP
-The \-o option specifies options to pass to the daemon\&. Passing "\-n" is often useful\&. The \-D option passes a \-D option to the daemon: thus \-D 4 is shorthand for \-o "\-D 4"\&.
-
+The \-o option specifies options to pass to the daemon. Passing "\-n" is often useful. The \-D option passes a \-D option to the daemon: thus \-D 4 is shorthand for \-o "\-D 4".
 .PP
-The \-p option dumps the NMEA and GPSD notifications generated by the log to standard output\&. The logfile is interpreted once only\&. (This option is intended to facilitate regression testing\&.)
-
+The \-p option dumps the NMEA and GPSD notifications generated by the log to standard output. The logfile is interpreted once only. (This option is intended to facilitate regression testing.)
 .PP
-The \-r option specifies an initialization comand to use\&. The default is "w+r+"; "r=2" might be another interesting value\&.
-
+The \-r option specifies an initialization comand to use. The default is "w+r+"; "r=2" might be another interesting value.
 .PP
-The \-s option sets the baud rate for the slave tty\&. The default is 4800\&.
-
+The \-s option sets the baud rate for the slave tty. The default is 4800.
 .PP
-The \-h option makes gpsfake print a usage message and exit\&.
-
+The \-h option makes
+gpsfake
+print a usage message and exit.
 .PP
-The argument must be the name of a file containing the data to be cycled at the device\&. gpsfake will print a notification each time it cycles\&.
-
+The argument must be the name of a file containing the data to be cycled at the device.
+gpsfake
+will print a notification each time it cycles.
 .SH "CUSTOM TESTS"
-
-.PP
-gpsfake is a trivial wrapper around a Python module, also named gpsfake, that can be used to fully script sessions involving a gpsd instance, any number of client sessions, and any number of fake GPSes feeding the daemon instance with data from specified sentence logs\&.
-
 .PP
-Source and embedded documentation for this module is shipped with the gpsd development tools\&. You can use it to torture\-test either gpsd itself or any gpsd\-aware client application\&.
-
+gpsfake
+is a trivial wrapper around a Python module, also named gpsfake, that can be used to fully script sessions involving a
+gpsd
+instance, any number of client sessions, and any number of fake GPSes feeding the daemon instance with data from specified sentence logs.
+.PP
+Source and embedded documentation for this module is shipped with the
+gpsd
+development tools. You can use it to torture\-test either
+gpsd
+itself or any
+gpsd\-aware client application.
 .SH "SEE ALSO"
-
 .PP
- \fBgpsd\fR(8), \fBgps\fR(1), \fBlibgps\fR(3), \fBlibgpsd\fR(3), \fBgpsprof\fR(1), \fBgnuplot\fR(1)\&.
-
+\fBgpsd\fR(8),
+\fBgps\fR(1),
+\fBlibgps\fR(3),
+\fBlibgpsd\fR(3),
+\fBgpsprof\fR(1),
+\fBgnuplot\fR(1).
 .SH "AUTHOR"
-
 .PP
-Eric S\&. Raymond <esr@thyrsus\&.com>\&. There is a project page for gpsd  here: \fIhttp://gpsd.berlios.de/\fR\&.
-
+Eric S. Raymond
+<esr@thyrsus.com>. There is a project page for
+gpsd[1]\&\fIhere\fR.
+.SH "REFERENCES"
+.TP 3
+1.\ here
+\%http://gpsd.berlios.de/
diff --git a/gpsfake.py b/gpsfake.py
index 93c336a1..3cfe62bd 100644
--- a/gpsfake.py
+++ b/gpsfake.py
@@ -27,7 +27,7 @@ from a pty and a thread that cycles sentences into the master side
 from some specified logfile; gpsd reads the slave side.  A fake GPS is
 identified by the string naming its slave device.
 
-Test session also has methods to start and end client sessions.  Daemon
+TestSession also has methods to start and end client sessions.  Daemon
 responses to a client are fed to a hook function which, by default, discards
 them.  You can change the hook to sys.stdout.write dump responses to standard
 output (this is what the gpsfake executable does) or do something more exotic
@@ -119,7 +119,7 @@ class TestLoad:
             self.legend = None
             self.textual = False
         else:
-            print "gpsfake: unknown log type (not NMEA or SiRF) can't handle it!"
+            sys.stderr.write("gpsfake: unknown log type (not NMEA or SiRF) can't handle it!\n")
             self.sentences = None
     def packet_get(self):
         "Grab a packet.  Unlike the daemon's state machine, this assumes no noise."
@@ -153,7 +153,8 @@ class TestLoad:
 
 class FakeGPS:
     "A fake GPS is a pty with a test log ready to be cycled to it."
-    def __init__(self, logfp, speed=4800):
+    def __init__(self, logfp, speed=4800, verbose=False):
+        self.verbose = verbose
         self.go_predicate = lambda: True
         self.readers = 0
         self.thread = None
@@ -197,7 +198,12 @@ class FakeGPS:
         termios.tcsetattr(ttyfp.fileno(), termios.TCSANOW, raw)
     def slave_is_open(self):
         "Is the slave device of this pty opened?"
-        return os.system("fuser -s " + self.slave) == 0
+        if self.verbose:
+            sys.stderr.write("slave_is_open() begins")
+        isopen = os.system("fuser -s " + self.slave) == 0
+        if self.verbose:
+            sys.stderr.write("slave_is_open() ends")
+        return isopen
     def __feed(self):
         "Feed the contents of the GPS log to the daemon."
         while self.readers and self.go_predicate(self.index, self):
@@ -305,8 +311,9 @@ class TestSessionError(exceptions.Exception):
 
 class TestSession:
     "Manage a session including a daemon with fake GPS and client threads."
-    def __init__(self, prefix=None, options=None):
+    def __init__(self, prefix=None, options=None, verbose=False):
         "Initialize the test session by launching the daemon."
+        self.verbose = verbose
         self.daemon = DaemonInstance()
         self.fakegpslist = {}
         self.clients = []
@@ -332,7 +339,7 @@ class TestSession:
         "Add a simulated GPS being fed by the specified logfile."
         self.progress("gpsfake: gps_add(%s, %d)\n" % (logfile, speed))
         if logfile not in self.fakegpslist:
-            newgps = FakeGPS(logfile, speed=speed)
+            newgps = FakeGPS(logfile, speed=speed, verbose=self.verbose)
             if pred:
                 newgps.go_predicate = pred
             elif self.default_predicate:
diff --git a/gpsfake.xml b/gpsfake.xml
index cb2580ed..cde65a81 100644
--- a/gpsfake.xml
+++ b/gpsfake.xml
@@ -27,6 +27,7 @@
       <arg choice='opt'>-p</arg>
       <arg choice='opt'>-r <replaceable>initcmd</replaceable></arg>
       <arg choice='opt'>-s <replaceable>speed</replaceable></arg>
+      <arg choice='opt'>-v</arg>
       <arg choice='opt'><replaceable>logfile</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -91,6 +92,9 @@ The default is "w+r+"; "r=2" might be another interesting value.</para>
 <para>The -s option sets the baud rate for the slave tty.  The
 default is 4800.</para>
 
+<para>The -v option enables verbose progress reports to stderr.  It
+is mainly useful for debugging gpsfake itself.</para>
+
 <para>The -h option makes <application>gpsfake</application> print 
 a usage message and exit.</para>
 
diff --git a/sirfmon.1 b/sirfmon.1
index d7cc86d1..da2d7e08 100644
--- a/sirfmon.1
+++ b/sirfmon.1
@@ -1,118 +1,100 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "SIRFMON" 1 "" "" ""
-.SH NAME
+.\" ** You probably do not want to edit this file directly **
+.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
+.\" Instead of manually editing it, you probably should edit the DocBook XML
+.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.TH "SIRFMON" "1" "06/08/2006" "23 Mar 2005" "23 Mar 2005"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
 sirfmon \- monitor and control a SiRF GPS in binary mode
 .SH "SYNOPSIS"
-.ad l
-.hy 0
 .HP 8
-\fBsirfmon\fR [\-h] [\-v] [\-F\ \fIcontrol\-socket\fR] [[\fB\fIserver\fR\\ [\fI:port\fR\\ [\fI:device\fR]]\fR\ |\ \fB\fIdevice\fR\fR]]
-.ad
-.hy
-
+\fBsirfmon\fR [\-h] [\-v] [\-F\ \fIcontrol\-socket\fR] [[\ \fIserver\fR\ [\fI:port\fR\ [\fI:device\fR]]\ \fIdevice\fR]]
 .SH "DESCRIPTION"
-
 .PP
-sirfmon is a monitor that watches packets coming from a SiRF GPS (the SiRF chipset is the one by far the most commonly used in GPS mice and other consumer\-grade GPSes, about 80% of them and rising in early 2005)\&. This program is primarily useful as a diagnostic aid for troubleshooting gpsd problems; it deliberately uses decoder logic that different from the decoder in the gpsd SiRF driver, so behaviors that show up in both are unlikely to be due to logic bugs in either\&.
-
+sirfmon
+is a monitor that watches packets coming from a SiRF GPS (the SiRF chipset is the one by far the most commonly used in GPS mice and other consumer\-grade GPSes, about 80% of them and rising in early 2005). This program is primarily useful as a diagnostic aid for troubleshooting
+gpsd
+problems; it deliberately uses decoder logic that different from the decoder in the
+gpsd
+SiRF driver, so behaviors that show up in both are unlikely to be due to logic bugs in either.
 .PP
-xgps accepts an \-h option that displays a usage message, or a \-v option to dump the package version and exit\&.
-
+xgps
+accepts an \-h option that displays a usage message, or a \-v option to dump the package version and exit.
 .PP
-This program may be run in either of two modes, as a client for the gpsd daemon (and its associated control socket) or directly connected to a specified serial device\&. When run with no argument, it attempts to connect to the daemon\&. If the argument looks like a server:port specification it will also attempt to connect to the daemon\&. If the argument looks like a bare server name it will attempt to connect to a daemon running on the default gpsd port on that server\&. Only if the device argument contains slashes but no colons will it be treated as a serial device for direct connection\&. In direct\-connect mode sirfmon will hunt for a correct baud rate and lock on to it automatically\&.
-
+This program may be run in either of two modes, as a client for the
+gpsd
+daemon (and its associated control socket) or directly connected to a specified serial device. When run with no argument, it attempts to connect to the daemon. If the argument looks like a server:port specification it will also attempt to connect to the daemon. If the argument looks like a bare server name it will attempt to connect to a daemon running on the default gpsd port on that server. Only if the device argument contains slashes but no colons will it be treated as a serial device for direct connection. In direct\-connect mode
+sirfmon
+will hunt for a correct baud rate and lock on to it automatically.
 .PP
-The \-F option is only valid in client mode; it specifies a control socket to which the program should send device control strings\&. You must specify a valid pathname of a Unix\-domain socket on your local filesystem\&.
-
+The \-F option is only valid in client mode; it specifies a control socket to which the program should send device control strings. You must specify a valid pathname of a Unix\-domain socket on your local filesystem.
 .PP
-You will probably need to be root to run this program, as the serial devices and control socket it uses are normally privileged\&.
-
+You will probably need to be root to run this program, as the serial devices and control socket it uses are normally privileged.
 .PP
-After startup, the top part of the screen reports the contents of several especially interesting packet types\&. The bottom half of the screen is a scrolling hex dump of all packets the GPS is issuing\&. Dump lines beginning >>> represent control packets sent to the GPS\&.
-
+After startup, the top part of the screen reports the contents of several especially interesting packet types. The bottom half of the screen is a scrolling hex dump of all packets the GPS is issuing. Dump lines beginning >>> represent control packets sent to the GPS.
 .PP
-At SiRF firmware level 231, the "UTC" time displayed is not real UTC, as it is not leap\-second\-corrected\&. This is due to an inadequacy in the SiRF firmware\&.
-
+At SiRF firmware level 231, the "UTC" time displayed is not real UTC, as it is not leap\-second\-corrected. This is due to an inadequacy in the SiRF firmware.
 .PP
-To interpret what you see, you will need a copy of the SiRF Binary Protocol Reference Manual\&.
-
+To interpret what you see, you will need a copy of the
+SiRF Binary Protocol Reference Manual.
 .SH "COMMANDS"
-
 .PP
-The following comands are available while sirfmon is running:
-
+The following comands are available while
+sirfmon
+is running:
 .TP
 n
-Switch device to NMEA mode at current speed and exit\&.
-
-
-
+Switch device to NMEA mode at current speed and exit.
+.sp
 .TP
 b
-Change baud rate\&.
-
+Change baud rate.
 .TP
 c
-Set (c1) or clear (c0) static navigation\&. The SiRF documentation says ``Static navigation is a position filter designed to be used with motor vehicles\&. When the vehicle's velocity falls below a threshold, the position and heading are frozen, and velocity is set to zero\&. This condition will continue until the computed velocity rises above 1\&.2 times the threshold or until the computed position is at least a set distance from the frozen place\&. The threshold velocity and set distance may vary with software versions\&.''
-
-Non\-static mode is designed for use with road navigation software, which often snaps the reported position to the nearest road within some uncertainty radius\&. You probably want to turn static navigation off for pedestrian use, as it is likely to report speed zero and position changing in lsrge jumps\&.
-
+Set (c1) or clear (c0) static navigation. The SiRF documentation says
+\(lqStatic navigation is a position filter designed to be used with motor vehicles. When the vehicle's velocity falls below a threshold, the position and heading are frozen, and velocity is set to zero. This condition will continue until the computed velocity rises above 1.2 times the threshold or until the computed position is at least a set distance from the frozen place. The threshold velocity and set distance may vary with software versions.\(rq
+.sp
+Non\-static mode is designed for use with road navigation software, which often snaps the reported position to the nearest road within some uncertainty radius. You probably want to turn static navigation off for pedestrian use, as it is likely to report speed zero and position changing in lsrge jumps.
 .TP
 l
-Toggle packet logging\&. If packet logging is on, it will be turned off and the log closed\&. If it is off, logging to the filename following the l will be enabled\&. Differs from simply capturing the data from the GPS device in that only whole packets are logged\&. The logfile is opened for append, so you can log more than one portion of the packet stream and they will be stitched together correctly\&.
-
+Toggle packet logging. If packet logging is on, it will be turned off and the log closed. If it is off, logging to the filename following the l will be enabled. Differs from simply capturing the data from the GPS device in that only whole packets are logged. The logfile is opened for append, so you can log more than one portion of the packet stream and they will be stitched together correctly.
 .TP
 s
-Send hex bytes to device\&. Following the 's' you may type hex digit pairs; end with a newline\&. These will become the payload of a SiRF control packet shipped to the device\&.
-
+Send hex bytes to device. Following the 's' you may type hex digit pairs; end with a newline. These will become the payload of a SiRF control packet shipped to the device.
 .TP
 t
-Toggle navigation\-parameter display mode\&. Toggles between normal display and one that shows selected navigation parameters from MID 19, including the Static Navigation bit toggled by the 'c' command\&.
-
+Toggle navigation\-parameter display mode. Toggles between normal display and one that shows selected navigation parameters from MID 19, including the Static Navigation bit toggled by the 'c' command.
 .TP
 Ctrl\-S
-Freeze display, suspend scrolling in debug window\&.
-
+Freeze display, suspend scrolling in debug window.
 .TP
 Ctrl\-Q
-Unfreeze display, resume normal operation\&.
-
+Unfreeze display, resume normal operation.
 .SH "FILES"
-
 .TP
-\fI/var/run/gpsd\&.sock\fR
-The default location of the control socket\&.
-
+\fI/var/run/gpsd.sock\fR
+The default location of the control socket.
 .SH "BUGS AND LIMITATIONS"
-
 .PP
-The logic for hunting the GPS's baud rate is vulnerable to various sorts of RS232 flakiness\&. If it hangs for longer than a few seconds, kill the program and restart\&.
-
+The logic for hunting the GPS's baud rate is vulnerable to various sorts of RS232 flakiness. If it hangs for longer than a few seconds, kill the program and restart.
 .SH "SEE ALSO"
-
 .PP
- \fBgpsd\fR(8), \fBgps\fR(1), \fBlibgps\fR(3), \fBlibgpsd\fR(3), \fBgpsprof\fR(1), \fBgpsfake\fR(1), \fBgnuplot\fR(1)\&.
-
+\fBgpsd\fR(8),
+\fBgps\fR(1),
+\fBlibgps\fR(3),
+\fBlibgpsd\fR(3),
+\fBgpsprof\fR(1),
+\fBgpsfake\fR(1),
+\fBgnuplot\fR(1).
 .SH "AUTHOR"
-
 .PP
-Eric S\&. Raymond <esr@thyrsus\&.com>, based on code originally by Rob Janssen, PE1CHL\&. This code is part of the gpsd toolset; there is a project page for gpsd  here: \fIhttp://gpsd.berlios.de/\fR\&.
-
+Eric S. Raymond
+<esr@thyrsus.com>, based on code originally by Rob Janssen, PE1CHL. This code is part of the gpsd toolset; there is a project page for
+gpsd[1]\&\fIhere\fR.
+.SH "REFERENCES"
+.TP 3
+1.\ here
+\%http://gpsd.berlios.de/
diff --git a/test/eXplorist210.log.chk b/test/eXplorist210.log.chk
index b6b65912..aef04c7a 100644
--- a/test/eXplorist210.log.chk
+++ b/test/eXplorist210.log.chk
@@ -35,30 +35,30 @@ GPSD,Y=GSV ? 12:9 78 288 39 1:17 38 71 0 0:5 34 230 45 1:26 33 163 39 1:29 26 16
 $GPGLL,5313.2228,N,00634.4228,E,200620.303,A*31
 GPSD,O=GLL 1148155579.30 0.005 53.220380 6.573713          ? 20.80 35.20   0.0000    0.000          ?             ?        ?        ? 3
 $GPGGA,200620.30,5313.2228,N,00634.4228,E,1,05,2.5,00000,M,,,,*25
-GPSD,O=GGA 1148155580.30 0.005 53.220380 6.573713    0.00 20.80 35.20   0.0000    0.000  0.000             ? 41.60        ? 3
+GPSD,O=GGA 1148155580.30 0.005 53.220380 6.573713    0.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,200620.30,A,5313.2228,N,00634.4228,E,00.0,000.0,200506,00,W*53
 GPSD,O=RMC 1148155580.30 0.005 53.220380 6.573713          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.0,02.5,04.3*06
-GPSD,O=GSA 1148155580.30 0.005 53.220380 6.573713          ? 20.00 34.40   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GSA 1148155580.30 0.005 53.220380 6.573713          ? 20.00 34.40   0.0000    0.000          ?             ? 40.80        ? 3
 $PMGNST,01.75,3,T,816,11.1,-00496,00*43
 $GPGLL,5313.2227,N,00634.4228,E,200621.297,A*33
-GPSD,O=GLL 1148155580.30 0.005 53.220378 6.573713          ? 20.00 34.40   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GLL 1148155580.30 0.005 53.220378 6.573713          ? 20.00 34.40   0.0000    0.000          ?             ? 40.80        ? 3
 $GPGGA,200621.30,5313.2227,N,00634.4228,E,1,05,2.6,00000,M,,,,*28
-GPSD,O=GGA 1148155581.30 0.005 53.220378 6.573713    0.00 20.00 34.40   0.0000    0.000  0.000 179.2301 40.00        ? 3
+GPSD,O=GGA 1148155581.30 0.005 53.220378 6.573713    0.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,200621.30,A,5313.2227,N,00634.4228,E,00.0,000.0,200506,00,W*5D
 GPSD,O=RMC 1148155581.30 0.005 53.220378 6.573713          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.2,02.6,04.5*01
-GPSD,O=GSA 1148155581.30 0.005 53.220378 6.573713          ? 20.80 36.00   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GSA 1148155581.30 0.005 53.220378 6.573713          ? 20.80 36.00   0.0000    0.000          ? 179.2597 40.80        ? 3
 $GPGSV,3,1,10,09,78,288,38,17,38,071,,05,34,230,45,26,33,163,39*76
 $GPGSV,3,2,10,29,26,162,,18,24,255,42,22,24,298,44,28,10,056,*75
 $GPGSV,3,3,10,14,09,319,,11,03,016,,136,27,157,,124,28,162,*71
 GPSD,Y=GSV ? 12:9 78 288 38 1:17 38 71 0 0:5 34 230 45 1:26 33 163 39 1:29 26 162 0 0:18 24 255 42 1:22 24 298 44 1:28 10 56 0 0:14 9 319 0 0:11 3 16 0 0:136 27 157 0 0:124 28 162 0 0:
 $GPGLL,5313.2227,N,00634.4228,E,200622.305,A*3A
-GPSD,O=GLL 1148155581.30 0.005 53.220378 6.573713          ? 20.80 36.00   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GLL 1148155581.30 0.005 53.220378 6.573713          ? 20.80 36.00   0.0000    0.000          ? 179.2597 40.80        ? 3
 $GPGGA,200622.31,5313.2227,N,00634.4228,E,1,05,2.5,00000,M,,,,*29
-GPSD,O=GGA 1148155582.31 0.005 53.220378 6.573713    0.00 20.80 36.00   0.0000    0.000  0.000 179.2597 41.19        ? 3
+GPSD,O=GGA 1148155582.31 0.005 53.220378 6.573713    0.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,200622.31,A,5313.2227,N,00634.4228,E,00.0,000.0,200506,00,W*5F
 GPSD,O=RMC 1148155582.31 0.005 53.220378 6.573713          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.0,02.5,04.3*06
-GPSD,O=GSA 1148155582.31 0.005 53.220378 6.573713          ? 20.00 34.40   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GSA 1148155582.31 0.005 53.220378 6.573713          ? 20.00 34.40   0.0000    0.000          ? 179.2301 40.40        ? 3
 $PMGNST,01.75,3,T,816,11.1,-00495,00*40
diff --git a/test/garmin17n.log.chk b/test/garmin17n.log.chk
index 8b432247..7f04e0c5 100644
--- a/test/garmin17n.log.chk
+++ b/test/garmin17n.log.chk
@@ -2,13 +2,13 @@ GPSD,W=1,R=1
 $GPRMC,093802,A,5213.1439,N,02100.6511,E,000.0,226.0,160305,004.2,E,D*15
 GPSD,O=RMC 1110965882.00 0.005 52.219065 21.010852          ?        ?        ? 226.0000    0.000          ?             ?        ?        ? 2
 $GPGGA,093802,5213.1439,N,02100.6511,E,2,10,0.9,137.2,M,36.2,M,,*43
-GPSD,O=GGA 1110965882.00 0.005 52.219065 21.010852  137.20        ?        ? 226.0000    0.000  0.000             ?        ?        ? 2
+GPSD,O=GGA 1110965882.00 0.005 52.219065 21.010852  137.20        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,06,15,16,18,19,21,22,,27,29,,1.6,0.9,1.3*34
-GPSD,O=GSA 1110965882.00 0.005 52.219065 21.010852  137.20  1.80  2.60 226.0000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GSA 1110965882.00 0.005 52.219065 21.010852  137.20  1.80  2.60             ?            ?  0.000             ?        ?        ? 3
 $GPGSV,3,2,12,18,50,135,50,19,15,291,46,21,59,069,51,22,30,169,49*75
 $PGRME,1.7,M,2.4,M,3.0,M*2D
 $GPGLL,5213.1439,N,02100.6511,E,093802,A,D*48
-GPSD,O=GLL 1110965882.00 0.005 52.219065 21.010852  137.20  3.53  4.98 226.0000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GLL 1110965882.00 0.005 52.219065 21.010852  137.20  3.53  4.98             ?            ?  0.000             ?        ?        ? 3
 $GPVTG,226,T,222,M,000.0,N,0000.0,K,D*12
 $PGRMV,0.0,0.0,0.0*5C
 $PGRMF,290,293895,160305,093802,13,5213.1439,N,02100.6511,E,A,2,0,226,2,1*11
@@ -17,14 +17,14 @@ $PGRMM,WGS 84*06
 $GPRMC,093803,A,5213.1439,N,02100.6511,E,000.0,226.0,160305,004.2,E,D*14
 GPSD,O=RMC 1110965883.00 0.005 52.219065 21.010852          ?        ?        ? 226.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,093803,5213.1439,N,02100.6511,E,2,10,0.9,137.2,M,36.2,M,,*42
-GPSD,O=GGA 1110965883.00 0.005 52.219065 21.010852  137.20        ?        ? 226.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110965883.00 0.005 52.219065 21.010852  137.20        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,06,15,16,18,19,21,22,,27,29,,1.6,0.9,1.3*34
-GPSD,O=GSA 1110965883.00 0.005 52.219065 21.010852  137.20  1.80  2.60 226.0000    0.000  0.000             ?  5.33        ? 3
+GPSD,O=GSA 1110965883.00 0.005 52.219065 21.010852  137.20  1.80  2.60             ?            ?  0.000             ?  5.33        ? 3
 $GPGSV,3,3,12,26,14,065,48,27,08,336,38,29,14,048,44,44,18,130,41*78
 GPSD,Y=GSV ? 8:18 50 135 50 1:19 15 291 46 1:21 59 69 51 1:22 30 169 49 1:26 14 65 48 0:27 8 336 38 1:29 14 48 44 1:44 18 130 41 0:
 $PGRME,1.7,M,2.4,M,3.0,M*2D
 $GPGLL,5213.1439,N,02100.6511,E,093803,A,D*49
-GPSD,O=GLL 1110965883.00 0.005 52.219065 21.010852  137.20  3.53  4.98 226.0000    0.000  0.000             ?  5.33        ? 3
+GPSD,O=GLL 1110965883.00 0.005 52.219065 21.010852  137.20  3.53  4.98             ?            ?  0.000             ?  5.33        ? 3
 $GPVTG,226,T,222,M,000.0,N,0000.0,K,D*12
 $PGRMV,0.0,0.0,0.0*5C
 $PGRMF,290,293896,160305,093803,13,5213.1439,N,02100.6511,E,A,2,0,226,2,1*13
diff --git a/test/garmin25lp.log.chk b/test/garmin25lp.log.chk
index ac6bd7c1..e0edfe63 100644
--- a/test/garmin25lp.log.chk
+++ b/test/garmin25lp.log.chk
@@ -69,27 +69,27 @@ GPSD,Y=GSV ? 8:1 10 158 44 0:3 72 164 42 0:11 24 279 0 0:14 30 119 48 0:15 33 70
 $GPRMC,120326,A,4221.3871,N,01322.0800,E,000.0,000.0,150305,001.4,E*77
 GPSD,O=RMC 1110888206.00 0.005 42.356452 13.368000          ?        ?        ?   0.0000    0.000          ?             ?        ?        ? 2
 $GPGGA,120326,4221.3871,N,01322.0800,E,1,00,3.1,746.1,M,44.2,M,,*40
-GPSD,O=GGA 1110888206.00 0.005 42.356452 13.368000  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ? 2
+GPSD,O=GGA 1110888206.00 0.005 42.356452 13.368000  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888206.00 0.005 42.356452 13.368000  746.10 24.80  0.00   0.0000    0.000  0.000             ?        ?        ? 2
+GPSD,O=GSA 1110888206.00 0.005 42.356452 13.368000  746.10 24.80  0.00             ?            ?  0.000             ?        ?        ? 2
 $GPGSV,2,1,08,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75
 $GPGSV,2,2,08,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 GPSD,Y=GSV ? 8:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 48 1:15 33 70 39 0:16 5 184 0 0:18 20 46 0 0:19 73 304 0 0:
 $GPRMC,120327,A,4221.3872,N,01322.0800,E,000.0,000.0,150305,001.4,E*75
 GPSD,O=RMC 1110888207.00 0.005 42.356453 13.368000          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120327,4221.3872,N,01322.0800,E,1,03,3.1,746.1,M,44.2,M,,*41
-GPSD,O=GGA 1110888207.00 0.005 42.356453 13.368000  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888207.00 0.005 42.356453 13.368000  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888207.00 0.005 42.356453 13.368000  746.10 24.80  0.00   0.0000    0.000  0.000 178.8406 49.60        ? 2
+GPSD,O=GSA 1110888207.00 0.005 42.356453 13.368000  746.10 24.80  0.00             ?            ?  0.000 178.8406 49.60        ? 2
 $GPGSV,2,1,08,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75
 $GPGSV,2,2,08,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 GPSD,Y=GSV ? 8:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 48 1:15 33 70 39 0:16 5 184 0 0:18 20 46 0 0:19 73 304 0 0:
 $GPRMC,120328,A,4221.3873,N,01322.0800,E,000.0,000.0,150305,001.4,E*7B
 GPSD,O=RMC 1110888208.00 0.005 42.356455 13.368000          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120328,4221.3873,N,01322.0800,E,1,03,3.1,746.1,M,44.2,M,,*4F
-GPSD,O=GGA 1110888208.00 0.005 42.356455 13.368000  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888208.00 0.005 42.356455 13.368000  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888208.00 0.005 42.356455 13.368000  746.10 24.80  0.00   0.0000    0.000  0.000 179.0201 49.60        ? 2
+GPSD,O=GSA 1110888208.00 0.005 42.356455 13.368000  746.10 24.80  0.00             ?            ?  0.000 179.0201 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -97,9 +97,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 48 1:15 33 70
 $GPRMC,120329,A,4221.3874,N,01322.0805,E,000.0,000.0,150305,001.4,E*78
 GPSD,O=RMC 1110888209.00 0.005 42.356457 13.368008          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120329,4221.3874,N,01322.0805,E,1,03,3.1,746.1,M,44.2,M,,*4C
-GPSD,O=GGA 1110888209.00 0.005 42.356457 13.368008  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888209.00 0.005 42.356457 13.368008  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888209.00 0.005 42.356457 13.368008  746.10 24.80  0.00   0.0000    0.000  0.000 176.7215 49.60        ? 2
+GPSD,O=GSA 1110888209.00 0.005 42.356457 13.368008  746.10 24.80  0.00             ?            ?  0.000 176.7215 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -107,9 +107,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 48 1:15 33 70
 $GPRMC,120330,A,4221.3875,N,01322.0807,E,000.0,000.0,150305,001.4,E*73
 GPSD,O=RMC 1110888210.00 0.005 42.356458 13.368012          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120330,4221.3875,N,01322.0807,E,1,03,3.1,746.1,M,44.2,M,,*47
-GPSD,O=GGA 1110888210.00 0.005 42.356458 13.368012  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888210.00 0.005 42.356458 13.368012  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888210.00 0.005 42.356458 13.368012  746.10 24.80  0.00   0.0000    0.000  0.000 178.3604 49.60        ? 2
+GPSD,O=GSA 1110888210.00 0.005 42.356458 13.368012  746.10 24.80  0.00             ?            ?  0.000 178.3604 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -117,9 +117,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 47 1:15 33 70
 $GPRMC,120331,A,4221.3880,N,01322.0808,E,000.0,000.0,150305,001.4,E*77
 GPSD,O=RMC 1110888211.00 0.005 42.356467 13.368013          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120331,4221.3880,N,01322.0808,E,1,03,3.1,746.1,M,44.2,M,,*43
-GPSD,O=GGA 1110888211.00 0.005 42.356467 13.368013  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888211.00 0.005 42.356467 13.368013  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888211.00 0.005 42.356467 13.368013  746.10 24.80  0.00   0.0000    0.000  0.000 175.5981 49.60        ? 2
+GPSD,O=GSA 1110888211.00 0.005 42.356467 13.368013  746.10 24.80  0.00             ?            ?  0.000 175.5981 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -127,9 +127,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 47 1:15 33 70
 $GPRMC,120332,A,4221.3884,N,01322.0802,E,000.0,000.0,150305,001.4,E*7A
 GPSD,O=RMC 1110888212.00 0.005 42.356473 13.368003          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120332,4221.3884,N,01322.0802,E,1,03,3.1,746.1,M,44.2,M,,*4E
-GPSD,O=GGA 1110888212.00 0.005 42.356473 13.368003  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888212.00 0.005 42.356473 13.368003  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888212.00 0.005 42.356473 13.368003  746.10 24.80  0.00   0.0000    0.000  0.000 174.9116 49.60        ? 2
+GPSD,O=GSA 1110888212.00 0.005 42.356473 13.368003  746.10 24.80  0.00             ?            ?  0.000 174.9116 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -137,9 +137,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 47 1:15 33 70
 $GPRMC,120333,A,4221.3889,N,01322.0794,E,000.0,000.0,150305,001.4,E*76
 GPSD,O=RMC 1110888213.00 0.005 42.356482 13.367990          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120333,4221.3889,N,01322.0794,E,1,03,3.1,746.1,M,44.2,M,,*42
-GPSD,O=GGA 1110888213.00 0.005 42.356482 13.367990  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888213.00 0.005 42.356482 13.367990  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888213.00 0.005 42.356482 13.367990  746.10 24.80  0.00   0.0000    0.000  0.000 173.3470 49.60        ? 2
+GPSD,O=GSA 1110888213.00 0.005 42.356482 13.367990  746.10 24.80  0.00             ?            ?  0.000 173.3470 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -147,9 +147,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 47 1:15 33 70
 $GPRMC,120334,A,4221.3893,N,01322.0786,E,000.0,000.0,150305,001.4,E*79
 GPSD,O=RMC 1110888214.00 0.005 42.356488 13.367977          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120334,4221.3893,N,01322.0786,E,1,03,3.1,746.1,M,44.2,M,,*4D
-GPSD,O=GGA 1110888214.00 0.005 42.356488 13.367977  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888214.00 0.005 42.356488 13.367977  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888214.00 0.005 42.356488 13.367977  746.10 24.80  0.00   0.0000    0.000  0.000 173.8396 49.60        ? 2
+GPSD,O=GSA 1110888214.00 0.005 42.356488 13.367977  746.10 24.80  0.00             ?            ?  0.000 173.8396 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
@@ -157,9 +157,9 @@ GPSD,Y=GSV ? 9:1 10 158 45 1:3 72 164 42 1:11 24 279 0 0:14 30 119 47 1:15 33 70
 $GPRMC,120335,A,4221.3898,N,01322.0780,E,000.0,000.0,150305,001.4,E*75
 GPSD,O=RMC 1110888215.00 0.005 42.356497 13.367967          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGGA,120335,4221.3898,N,01322.0780,E,1,03,3.1,746.1,M,44.2,M,,*41
-GPSD,O=GGA 1110888215.00 0.005 42.356497 13.367967  746.10        ?        ?   0.0000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1110888215.00 0.005 42.356497 13.367967  746.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
-GPSD,O=GSA 1110888215.00 0.005 42.356497 13.367967  746.10 24.80  0.00   0.0000    0.000  0.000 174.2910 49.60        ? 2
+GPSD,O=GSA 1110888215.00 0.005 42.356497 13.367967  746.10 24.80  0.00             ?            ?  0.000 174.2910 49.60        ? 2
 $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A
 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
diff --git a/test/garmin38.log.chk b/test/garmin38.log.chk
index 43f92858..ee6834a5 100644
--- a/test/garmin38.log.chk
+++ b/test/garmin38.log.chk
@@ -10,15 +10,15 @@ $GPRMC,142216,A,3348.452,N,11821.143,W,000.0,353.6,081002,013.8,E*66
 GPSD,O=RMC 1034086936.00 0.005 33.807533 -118.352383          ?        ?        ? 353.6000    0.000          ?             ?        ?        ? 2
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142216,3348.452,N,11821.143,W,1,05,1.8,38.4,M,-32.4,M,,*4B
-GPSD,O=GGA 1034086936.00 0.005 33.807533 -118.352383   38.40        ?        ? 353.6000    0.000  0.000             ?        ?        ? 2
+GPSD,O=GGA 1034086936.00 0.005 33.807533 -118.352383   38.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086936.00 0.005 33.807533 -118.352383   38.40 14.40 22.40 353.6000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GSA 1034086936.00 0.005 33.807533 -118.352383   38.40 14.40 22.40             ?            ?  0.000             ?        ?        ? 3
 $GPGSV,2,1,08,03,23,224,38,09,06,037,00,11,17,314,41,14,75,015,44*72
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,46,31,27,263,38*7C
 GPSD,Y=GSV ? 8:3 23 224 38 1:9 6 37 0 0:11 17 314 41 1:14 75 15 44 1:15 18 138 0 0:18 20 79 0 0:25 27 172 46 1:31 27 263 38 1:
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.452,N,11821.143,W,142216,A*38
-GPSD,O=GLL 1034086936.00 0.005 33.807533 -118.352383   38.40 39.86 59.59 353.6000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GLL 1034086936.00 0.005 33.807533 -118.352383   38.40 39.86 59.59             ?            ?  0.000             ?        ?        ? 3
 $PGRMZ,126,f,3*1E
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -27,15 +27,15 @@ $GPRMC,142218,A,3348.451,N,11821.144,W,000.0,353.6,081002,013.8,E*6C
 GPSD,O=RMC 1034086938.00 0.005 33.807517 -118.352400          ?        ?        ? 353.6000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142218,3348.451,N,11821.144,W,1,05,1.8,38.4,M,-32.4,M,,*41
-GPSD,O=GGA 1034086938.00 0.005 33.807517 -118.352400   38.40        ?        ? 353.6000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1034086938.00 0.005 33.807517 -118.352400   38.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086938.00 0.005 33.807517 -118.352400   38.40 14.40 22.40 353.6000    0.000  0.000 161.0927 27.13        ? 3
+GPSD,O=GSA 1034086938.00 0.005 33.807517 -118.352400   38.40 14.40 22.40             ?            ?  0.000 161.0927 27.13        ? 3
 $GPGSV,2,1,08,03,23,224,43,09,06,037,00,11,17,314,38,14,75,015,44*70
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,42*79
 GPSD,Y=GSV ? 8:3 23 224 43 1:9 6 37 0 0:11 17 314 38 1:14 75 15 44 1:15 18 138 0 0:18 20 79 0 0:25 27 172 39 1:31 27 263 42 1:
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.451,N,11821.144,W,142218,A*32
-GPSD,O=GLL 1034086938.00 0.005 33.807517 -118.352400   38.40 39.86 59.59 353.6000    0.000  0.000 161.0927 27.13        ? 3
+GPSD,O=GLL 1034086938.00 0.005 33.807517 -118.352400   38.40 39.86 59.59             ?            ?  0.000 161.0927 27.13        ? 3
 $PGRMZ,126,f,3*1E
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -44,15 +44,15 @@ $GPRMC,142220,A,3348.451,N,11821.142,W,000.0,353.6,081002,013.8,E*61
 GPSD,O=RMC 1034086940.00 0.005 33.807517 -118.352367          ?        ?        ? 353.6000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142220,3348.451,N,11821.142,W,1,05,1.8,37.6,M,-32.4,M,,*41
-GPSD,O=GGA 1034086940.00 0.005 33.807517 -118.352367   37.60        ?        ? 353.6000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1034086940.00 0.005 33.807517 -118.352367   37.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086940.00 0.005 33.807517 -118.352367   37.60 14.40 22.40 353.6000    0.000  0.000 155.9168 27.13        ? 3
+GPSD,O=GSA 1034086940.00 0.005 33.807517 -118.352367   37.60 14.40 22.40             ?            ?  0.000 155.9168 27.13        ? 3
 $GPGSV,2,1,08,03,23,224,43,09,06,037,00,11,17,314,38,14,75,015,43*77
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,41*7A
 GPSD,Y=GSV ? 8:3 23 224 43 1:9 6 37 0 0:11 17 314 38 1:14 75 15 43 1:15 18 138 0 0:18 20 79 0 0:25 27 172 39 1:31 27 263 41 1:
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.451,N,11821.142,W,142220,A*3F
-GPSD,O=GLL 1034086940.00 0.005 33.807517 -118.352367   37.60 39.86 59.59 353.6000    0.000  0.000 155.9168 27.13        ? 3
+GPSD,O=GLL 1034086940.00 0.005 33.807517 -118.352367   37.60 39.86 59.59             ?            ?  0.000 155.9168 27.13        ? 3
 $PGRMZ,123,f,3*1B
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -61,15 +61,15 @@ $GPRMC,142222,A,3348.451,N,11821.143,W,000.0,353.6,081002,013.8,E*62
 GPSD,O=RMC 1034086942.00 0.005 33.807517 -118.352383          ?        ?        ? 353.6000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142222,3348.451,N,11821.143,W,1,05,1.8,38.0,M,-32.4,M,,*4B
-GPSD,O=GGA 1034086942.00 0.005 33.807517 -118.352383   38.00        ?        ? 353.6000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1034086942.00 0.005 33.807517 -118.352383   38.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086942.00 0.005 33.807517 -118.352383   38.00 14.40 22.40 353.6000    0.000  0.000 167.8700 27.13        ? 3
+GPSD,O=GSA 1034086942.00 0.005 33.807517 -118.352383   38.00 14.40 22.40             ?            ?  0.000 167.8700 27.13        ? 3
 $GPGSV,2,1,08,03,23,224,42,09,06,037,00,11,17,314,38,14,75,015,43*76
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,40,31,27,263,41*74
 GPSD,Y=GSV ? 8:3 23 224 42 1:9 6 37 0 0:11 17 314 38 1:14 75 15 43 1:15 18 138 0 0:18 20 79 0 0:25 27 172 40 1:31 27 263 41 1:
 $PGRME,19.2,M,28.9,M,34.7,M*17
 $GPGLL,3348.451,N,11821.143,W,142222,A*3C
-GPSD,O=GLL 1034086942.00 0.005 33.807517 -118.352383   38.00 39.86 60.00 353.6000    0.000  0.000 167.8700 27.13        ? 3
+GPSD,O=GLL 1034086942.00 0.005 33.807517 -118.352383   38.00 39.86 60.00             ?            ?  0.000 167.8700 27.13        ? 3
 $PGRMZ,125,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -78,13 +78,13 @@ $GPRMC,142224,A,3348.451,N,11821.143,W,000.0,353.6,081002,013.8,E*64
 GPSD,O=RMC 1034086944.00 0.005 33.807517 -118.352383          ?        ?        ? 353.6000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142224,3348.451,N,11821.143,W,1,05,1.8,38.0,M,-32.4,M,,*4D
-GPSD,O=GGA 1034086944.00 0.005 33.807517 -118.352383   38.00        ?        ? 353.6000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1034086944.00 0.005 33.807517 -118.352383   38.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086944.00 0.005 33.807517 -118.352383   38.00 14.40 22.40 353.6000    0.000  0.000             ? 27.13        ? 3
+GPSD,O=GSA 1034086944.00 0.005 33.807517 -118.352383   38.00 14.40 22.40             ?            ?  0.000             ? 27.13        ? 3
 $GPGSV,2,1,08,03,23,224,43,09,06,037,00,11,17,314,39,14,75,015,44*71
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,40*7B
 GPSD,Y=GSV ? 8:3 23 224 43 1:9 6 37 0 0:11 17 314 39 1:14 75 15 44 1:15 18 138 0 0:18 20 79 0 0:25 27 172 39 1:31 27 263 40 1:
 $PGRME,19.2,M,28.9,M,34.7,M*17
 $GPGLL,3348.451,N,11821.143,W,142224,A*3A
-GPSD,O=GLL 1034086944.00 0.005 33.807517 -118.352383   38.00 39.86 60.00 353.6000    0.000  0.000             ? 27.13        ? 3
+GPSD,O=GLL 1034086944.00 0.005 33.807517 -118.352383   38.00 39.86 60.00             ?            ?  0.000             ? 27.13        ? 3
 $PGRMZ,125,f,3*1D
diff --git a/test/garmin48.log.chk b/test/garmin48.log.chk
index 94722b0d..7e173df8 100644
--- a/test/garmin48.log.chk
+++ b/test/garmin48.log.chk
@@ -3,16 +3,16 @@ $GPRMC,225308,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*6D
 GPSD,O=RMC 991867988.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ? 2
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225308,4527.458,S,16709.165,E,1,05,2.1,14.7,M,1.1,M,,*53
-GPSD,O=GGA 991867988.00 0.005 -45.457633 167.152750   14.70        ?        ?  94.5000    0.000  0.000             ?        ?        ? 2
+GPSD,O=GGA 991867988.00 0.005 -45.457633 167.152750   14.70        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.1,2.1,2.0*3A
-GPSD,O=GSA 991867988.00 0.005 -45.457633 167.152750   14.70 16.80 16.00  94.5000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GSA 991867988.00 0.005 -45.457633 167.152750   14.70 16.80 16.00             ?            ?  0.000             ?        ?        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,48,20,41,333,46,22,65,081,46,24,02,205,00*7B
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 48 1:20 41 333 46 1:22 65 81 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 39 1:
 $PGRME,9.1,M,15.0,M,12.0,M*21
 $GPGLL,4527.458,S,16709.165,E,225309,A*3E
-GPSD,O=GLL 991867988.00 0.005 -45.457633 167.152750   14.70 18.89 31.14  94.5000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GLL 991867988.00 0.005 -45.457633 167.152750   14.70 18.89 31.14             ?            ?  0.000             ?        ?        ? 3
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -21,16 +21,16 @@ $GPRMC,225310,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*64
 GPSD,O=RMC 991867990.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225310,4527.458,S,16709.165,E,1,05,2.1,14.6,M,1.1,M,,*5B
-GPSD,O=GGA 991867990.00 0.005 -45.457633 167.152750   14.60        ?        ?  94.5000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 991867990.00 0.005 -45.457633 167.152750   14.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.1,2.1,2.0*3A
-GPSD,O=GSA 991867990.00 0.005 -45.457633 167.152750   14.60 16.80 16.00  94.5000    0.000  0.000             ? 17.85        ? 3
+GPSD,O=GSA 991867990.00 0.005 -45.457633 167.152750   14.60 16.80 16.00             ?            ?  0.000             ? 17.85        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,48,20,41,333,46,22,65,081,46,24,02,205,00*7B
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 48 1:20 41 333 46 1:22 65 81 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 39 1:
 $PGRME,9.1,M,15.0,M,12.0,M*21
 $GPGLL,4527.458,S,16709.165,E,225311,A*37
-GPSD,O=GLL 991867990.00 0.005 -45.457633 167.152750   14.60 18.89 31.14  94.5000    0.000  0.000             ? 17.85        ? 3
+GPSD,O=GLL 991867990.00 0.005 -45.457633 167.152750   14.60 18.89 31.14             ?            ?  0.000             ? 17.85        ? 3
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -39,16 +39,16 @@ $GPRMC,225312,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*66
 GPSD,O=RMC 991867992.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225312,4527.458,S,16709.165,E,1,05,2.2,14.7,M,1.1,M,,*5B
-GPSD,O=GGA 991867992.00 0.005 -45.457633 167.152750   14.70        ?        ?  94.5000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 991867992.00 0.005 -45.457633 167.152750   14.70        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
-GPSD,O=GSA 991867992.00 0.005 -45.457633 167.152750   14.70 17.60 16.80  94.5000    0.000  0.000             ? 18.25        ? 3
+GPSD,O=GSA 991867992.00 0.005 -45.457633 167.152750   14.70 17.60 16.80             ?            ?  0.000             ? 18.25        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,41,333,46,22,65,081,46,24,02,205,00*7A
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 49 1:20 41 333 46 1:22 65 81 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 39 1:
 $PGRME,9.2,M,15.0,M,12.6,M*24
 $GPGLL,4527.458,S,16709.165,E,225313,A*35
-GPSD,O=GLL 991867992.00 0.005 -45.457633 167.152750   14.70 19.10 31.14  94.5000    0.000  0.000             ? 18.25        ? 3
+GPSD,O=GLL 991867992.00 0.005 -45.457633 167.152750   14.70 19.10 31.14             ?            ?  0.000             ? 18.25        ? 3
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -57,16 +57,16 @@ $GPRMC,225314,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*60
 GPSD,O=RMC 991867994.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225314,4527.458,S,16709.165,E,1,05,2.2,14.6,M,1.1,M,,*5C
-GPSD,O=GGA 991867994.00 0.005 -45.457633 167.152750   14.60        ?        ?  94.5000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 991867994.00 0.005 -45.457633 167.152750   14.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
-GPSD,O=GSA 991867994.00 0.005 -45.457633 167.152750   14.60 17.60 16.80  94.5000    0.000  0.000             ? 18.35        ? 3
+GPSD,O=GSA 991867994.00 0.005 -45.457633 167.152750   14.60 17.60 16.80             ?            ?  0.000             ? 18.35        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,41,333,46,22,65,081,46,24,02,205,00*7A
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 49 1:20 41 333 46 1:22 65 81 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 39 1:
 $PGRME,9.2,M,15.0,M,12.6,M*24
 $GPGLL,4527.458,S,16709.165,E,225315,A*33
-GPSD,O=GLL 991867994.00 0.005 -45.457633 167.152750   14.60 19.10 31.14  94.5000    0.000  0.000             ? 18.35        ? 3
+GPSD,O=GLL 991867994.00 0.005 -45.457633 167.152750   14.60 19.10 31.14             ?            ?  0.000             ? 18.35        ? 3
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -75,16 +75,16 @@ $GPRMC,225316,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*62
 GPSD,O=RMC 991867996.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225316,4527.458,S,16709.165,E,1,05,2.2,14.4,M,1.1,M,,*5C
-GPSD,O=GGA 991867996.00 0.005 -45.457633 167.152750   14.40        ?        ?  94.5000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 991867996.00 0.005 -45.457633 167.152750   14.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
-GPSD,O=GSA 991867996.00 0.005 -45.457633 167.152750   14.40 17.60 16.80  94.5000    0.000  0.000             ? 18.35        ? 3
+GPSD,O=GSA 991867996.00 0.005 -45.457633 167.152750   14.40 17.60 16.80             ?            ?  0.000             ? 18.35        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,40,333,46,22,65,081,46,24,02,205,00*7B
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 49 1:20 40 333 46 1:22 65 81 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 39 1:
 $PGRME,9.2,M,15.0,M,12.6,M*24
 $GPGLL,4527.458,S,16709.165,E,225317,A*31
-GPSD,O=GLL 991867996.00 0.005 -45.457633 167.152750   14.40 19.10 31.14  94.5000    0.000  0.000             ? 18.35        ? 3
+GPSD,O=GLL 991867996.00 0.005 -45.457633 167.152750   14.40 19.10 31.14             ?            ?  0.000             ? 18.35        ? 3
 $PGRMZ,46,f,3*29
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -93,9 +93,9 @@ $GPRMC,225318,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*6C
 GPSD,O=RMC 991867998.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225318,4527.458,S,16709.165,E,1,05,2.2,14.0,M,1.1,M,,*56
-GPSD,O=GGA 991867998.00 0.005 -45.457633 167.152750   14.00        ?        ?  94.5000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 991867998.00 0.005 -45.457633 167.152750   14.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
-GPSD,O=GSA 991867998.00 0.005 -45.457633 167.152750   14.00 17.60 16.80  94.5000    0.000  0.000             ? 18.35        ? 3
+GPSD,O=GSA 991867998.00 0.005 -45.457633 167.152750   14.00 17.60 16.80             ?            ?  0.000             ? 18.35        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*7
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,40,333,46,22,65,083,46,24,02,205,00*79
@@ -103,7 +103,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,40,,,,*42
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 49 1:20 40 333 46 1:22 65 83 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 40 1:
 $PGRME,10.3,M,15.2,M,16.7,M*1A
 $GPGLL,4527.458,S,16709.165,E,225333,A*37
-GPSD,O=GLL 991867998.00 0.005 -45.457633 167.152750   14.00 21.39 31.56  94.5000    0.000  0.000             ? 18.35        ? 3
+GPSD,O=GLL 991867998.00 0.005 -45.457633 167.152750   14.00 21.39 31.56             ?            ?  0.000             ? 18.35        ? 3
 $PGRMZ,41,f,3*2E
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -112,16 +112,16 @@ $GPRMC,225334,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*62
 GPSD,O=RMC 991868014.00 0.005 -45.457633 167.152750          ?        ?        ?  94.5000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225334,4527.458,S,16709.165,E,1,05,2.4,12.5,M,1.1,M,,*5D
-GPSD,O=GGA 991868014.00 0.005 -45.457633 167.152750   12.50        ?        ?  94.5000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 991868014.00 0.005 -45.457633 167.152750   12.50        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,4.1,2.4,3.0*39
-GPSD,O=GSA 991868014.00 0.005 -45.457633 167.152750   12.50 19.20 24.00  94.5000    0.000  0.000             ?  2.54        ? 3
+GPSD,O=GSA 991868014.00 0.005 -45.457633 167.152750   12.50 19.20 24.00             ?            ?  0.000             ?  2.54        ? 3
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,40,333,46,22,65,083,46,24,02,205,00*79
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,41,,,,*43
 GPSD,Y=GSV ? 11:1 78 221 47 1:3 9 42 0 0:4 5 242 0 0:6 4 149 0 0:13 37 235 49 1:20 40 333 46 1:22 65 83 46 1:24 2 205 0 0:25 20 108 0 0:27 8 281 0 0:28 17 339 41 1:
 $PGRME,10.3,M,15.2,M,16.7,M*1A
 $GPGLL,4527.458,S,16709.165,E,225335,A*31
-GPSD,O=GLL 991868014.00 0.005 -45.457633 167.152750   12.50 21.39 31.56  94.5000    0.000  0.000             ?  2.54        ? 3
+GPSD,O=GLL 991868014.00 0.005 -45.457633 167.152750   12.50 21.39 31.56             ?            ?  0.000             ?  2.54        ? 3
 $PGRMZ,41,f,3*2E
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
diff --git a/test/iTrek.log.chk b/test/iTrek.log.chk
index e3bcda67..fdde2578 100644
--- a/test/iTrek.log.chk
+++ b/test/iTrek.log.chk
@@ -19,7 +19,7 @@ GPSD,O=GSA 1122440329.00 0.005 35.331747 136.671052          ? 17.60 15.20  92.1
 $GPRMC,045850.000,A,3519.9047,N,13640.2631,E,0.11,99.12,270705,,*39
 GPSD,O=RMC 1122440330.00 0.005 35.331745 136.671052          ?        ?        ?  99.1200    0.057          ?             ?        ?        ?        ?
 $GPGGA,045851.000,3519.9046,N,13640.2631,E,1,04,2.2,80.4,M,,,,0000*39
-GPSD,O=GGA 1122440331.00 0.005 35.331743 136.671052   80.40        ?        ?  99.1200    0.057  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440331.00 0.005 35.331743 136.671052   80.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,045851.000,A,3519.9046,N,13640.2631,E,0.12,114.35,270705,,*0B
 GPSD,O=RMC 1122440331.00 0.005 35.331743 136.671052          ?        ?        ? 114.3500    0.062          ?             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -29,9 +29,9 @@ GPSD,Y=GSV ? 4:22 62 272 24 0:18 55 192 16 0:30 50 179 18 0:15 9 229 0 0:
 $GPRMC,045852.000,A,3519.9046,N,13640.2632,E,0.10,104.21,270705,,*0D
 GPSD,O=RMC 1122440332.00 0.005 35.331743 136.671053          ?        ?        ? 104.2100    0.051          ?             ?        ?        ?        ?
 $GPGGA,045853.000,3519.9045,N,13640.2632,E,1,04,2.2,80.4,M,,,,0000*3B
-GPSD,O=GGA 1122440333.00 0.005 35.331742 136.671053   80.40        ?        ? 104.2100    0.051  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440333.00 0.005 35.331742 136.671053   80.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440333.00 0.005 35.331742 136.671053   80.40 17.60 15.20 104.2100    0.051  0.000 178.3683 17.60        ? 3
+GPSD,O=GSA 1122440333.00 0.005 35.331742 136.671053   80.40 17.60 15.20             ?            ?  0.000 178.3683 17.60        ? 3
 $GPRMC,045853.000,A,3519.9045,N,13640.2632,E,0.11,97.51,270705,,*32
 GPSD,O=RMC 1122440333.00 0.005 35.331742 136.671053          ?        ?        ?  97.5100    0.057          ?             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -39,19 +39,19 @@ GPSD,O=GSA 1122440333.00 0.005 35.331742 136.671053          ? 17.60 15.20  97.5
 $GPRMC,045854.000,A,3519.9044,N,13640.2632,E,0.12,108.39,270705,,*0E
 GPSD,O=RMC 1122440334.00 0.005 35.331740 136.671053          ?        ?        ? 108.3900    0.062          ?             ?        ?        ?        ?
 $GPGGA,045855.000,3519.9043,N,13640.2632,E,1,04,2.2,80.4,M,,,,0000*3B
-GPSD,O=GGA 1122440335.00 0.005 35.331738 136.671053   80.40        ?        ? 108.3900    0.062  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440335.00 0.005 35.331738 136.671053   80.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440335.00 0.005 35.331738 136.671053   80.40 17.60 15.20 108.3900    0.062  0.000 177.6926 17.60        ? 3
+GPSD,O=GSA 1122440335.00 0.005 35.331738 136.671053   80.40 17.60 15.20             ?            ?  0.000 177.6926 17.60        ? 3
 $GPRMC,045855.000,A,3519.9043,N,13640.2632,E,0.11,99.16,270705,,*3F
 GPSD,O=RMC 1122440335.00 0.005 35.331738 136.671053          ?        ?        ?  99.1600    0.057          ?             ?        ?        ?        ?
 $GPGGA,045856.000,3519.9042,N,13640.2632,E,1,04,2.2,80.4,M,,,,0000*39
-GPSD,O=GGA 1122440336.00 0.005 35.331737 136.671053   80.40        ?        ?  99.1600    0.057  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440336.00 0.005 35.331737 136.671053   80.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440336.00 0.005 35.331737 136.671053   80.40 17.60 15.20  99.1600    0.057  0.000 178.9318 35.20        ? 3
+GPSD,O=GSA 1122440336.00 0.005 35.331737 136.671053   80.40 17.60 15.20             ?            ?  0.000 178.9318 35.20        ? 3
 $GPRMC,045856.000,A,3519.9042,N,13640.2632,E,0.11,115.12,270705,,*0C
 GPSD,O=RMC 1122440336.00 0.005 35.331737 136.671053          ?        ?        ? 115.1200    0.057          ?             ?        ?        ?        ?
 $GPGGA,045857.000,3519.9040,N,13640.2632,E,1,04,2.2,80.5,M,,,,0000*3B
-GPSD,O=GGA 1122440337.00 0.005 35.331733 136.671053   80.50        ?        ? 115.1200    0.057  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440337.00 0.005 35.331733 136.671053   80.50        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSV,2,1,08,05,67,099,26,09,41,047,46,14,32,311,43,26,08,109,30*78
 $GPGSV,2,2,08,22,62,272,25,18,55,192,24,30,50,179,19,15,09,229,*75
 GPSD,Y=GSV ? 8:5 67 99 26 1:9 41 47 46 1:14 32 311 43 1:26 8 109 30 1:22 62 272 25 0:18 55 192 24 0:30 50 179 19 0:15 9 229 0 0:
@@ -66,9 +66,9 @@ GPSD,O=GSA 1122440338.00 0.005 35.331732 136.671053          ? 17.60 15.20 115.5
 $GPRMC,045859.000,A,3519.9038,N,13640.2632,E,0.10,107.70,270705,,*08
 GPSD,O=RMC 1122440339.00 0.005 35.331730 136.671053          ?        ?        ? 107.7000    0.051          ?             ?        ?        ?        ?
 $GPGGA,045900.000,3519.9036,N,13640.2632,E,1,04,2.2,80.8,M,,,,0000*34
-GPSD,O=GGA 1122440340.00 0.005 35.331727 136.671053   80.80        ?        ? 107.7000    0.051  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440340.00 0.005 35.331727 136.671053   80.80        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440340.00 0.005 35.331727 136.671053   80.80 17.60 15.20 107.7000    0.051  0.000 176.3524 17.60        ? 3
+GPSD,O=GSA 1122440340.00 0.005 35.331727 136.671053   80.80 17.60 15.20             ?            ?  0.000 176.3524 17.60        ? 3
 $GPRMC,045900.000,A,3519.9036,N,13640.2632,E,0.12,130.75,270705,,*08
 GPSD,O=RMC 1122440340.00 0.005 35.331727 136.671053          ?        ?        ? 130.7500    0.062          ?             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -76,55 +76,55 @@ GPSD,O=GSA 1122440340.00 0.005 35.331727 136.671053          ? 17.60 15.20 130.7
 $GPRMC,045901.000,A,3519.9035,N,13640.2632,E,0.11,121.44,270705,,*0B
 GPSD,O=RMC 1122440341.00 0.005 35.331725 136.671053          ?        ?        ? 121.4400    0.057          ?             ?        ?        ?        ?
 $GPGGA,045902.000,3519.9034,N,13640.2633,E,1,04,2.2,81.0,M,,,,0000*3C
-GPSD,O=GGA 1122440342.00 0.005 35.331723 136.671055   81.00        ?        ? 121.4400    0.057  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440342.00 0.005 35.331723 136.671055   81.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440342.00 0.005 35.331723 136.671055   81.00 17.60 15.20 121.4400    0.057  0.000 177.1742 17.60        ? 3
+GPSD,O=GSA 1122440342.00 0.005 35.331723 136.671055   81.00 17.60 15.20             ?            ?  0.000 177.1742 17.60        ? 3
 $GPGSV,2,1,08,05,67,099,26,09,41,047,46,14,32,311,42,26,08,109,29*71
 $GPGSV,2,2,08,22,62,272,24,18,55,192,24,30,50,179,25,15,09,229,23*7A
 GPSD,Y=GSV ? 8:5 67 99 26 1:9 41 47 46 1:14 32 311 42 1:26 8 109 29 1:22 62 272 24 0:18 55 192 24 0:30 50 179 25 0:15 9 229 23 0:
 $GPRMC,045902.000,A,3519.9034,N,13640.2633,E,0.13,137.85,270705,,*00
 GPSD,O=RMC 1122440342.00 0.005 35.331723 136.671055          ?        ?        ? 137.8500    0.067          ?             ?        ?        ?        ?
 $GPGGA,045903.000,3519.9032,N,13640.2633,E,1,04,2.2,81.1,M,,,,0000*3A
-GPSD,O=GGA 1122440343.00 0.005 35.331720 136.671055   81.10        ?        ? 137.8500    0.067  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440343.00 0.005 35.331720 136.671055   81.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440343.00 0.005 35.331720 136.671055   81.10 17.60 15.20 137.8500    0.067  0.000 177.4574 35.20        ? 3
+GPSD,O=GSA 1122440343.00 0.005 35.331720 136.671055   81.10 17.60 15.20             ?            ?  0.000 177.4574 35.20        ? 3
 $GPRMC,045903.000,A,3519.9032,N,13640.2633,E,0.15,142.32,270705,,*0F
 GPSD,O=RMC 1122440343.00 0.005 35.331720 136.671055          ?        ?        ? 142.3200    0.077          ?             ?        ?        ?        ?
 $GPGGA,045904.000,3519.9030,N,13640.2633,E,1,04,2.2,80.8,M,,,,0000*37
-GPSD,O=GGA 1122440344.00 0.005 35.331717 136.671055   80.80        ?        ? 142.3200    0.077  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440344.00 0.005 35.331717 136.671055   80.80        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440344.00 0.005 35.331717 136.671055   80.80 17.60 15.20 142.3200    0.077  0.000 177.5333 35.20        ? 3
+GPSD,O=GSA 1122440344.00 0.005 35.331717 136.671055   80.80 17.60 15.20             ?            ?  0.000 177.5333 35.20        ? 3
 $GPRMC,045904.000,A,3519.9030,N,13640.2633,E,0.55,168.73,270705,,*03
 GPSD,O=RMC 1122440344.00 0.005 35.331717 136.671055          ?        ?        ? 168.7300    0.283          ?             ?        ?        ?        ?
 $GPGGA,045905.000,3519.9028,N,13640.2633,E,1,04,2.2,80.7,M,,,,0000*30
-GPSD,O=GGA 1122440345.00 0.005 35.331713 136.671055   80.70        ?        ? 168.7300    0.283  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440345.00 0.005 35.331713 136.671055   80.70        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440345.00 0.005 35.331713 136.671055   80.70 17.60 15.20 168.7300    0.283  0.000 177.5333 35.20        ? 3
+GPSD,O=GSA 1122440345.00 0.005 35.331713 136.671055   80.70 17.60 15.20             ?            ?  0.000 177.5333 35.20        ? 3
 $GPRMC,045905.000,A,3519.9028,N,13640.2633,E,0.11,51.58,270705,,*39
 GPSD,O=RMC 1122440345.00 0.005 35.331713 136.671055          ?        ?        ?  51.5800    0.057          ?             ?        ?        ?        ?
 $GPGGA,045906.000,3519.9027,N,13640.2633,E,1,04,2.2,80.6,M,,,,0000*3D
-GPSD,O=GGA 1122440346.00 0.005 35.331712 136.671055   80.60        ?        ?  51.5800    0.057  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440346.00 0.005 35.331712 136.671055   80.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440346.00 0.005 35.331712 136.671055   80.60 17.60 15.20  51.5800    0.057  0.000 178.6209 35.20        ? 3
+GPSD,O=GSA 1122440346.00 0.005 35.331712 136.671055   80.60 17.60 15.20             ?            ?  0.000 178.6209 35.20        ? 3
 $GPRMC,045906.000,A,3519.9027,N,13640.2633,E,0.17,42.56,270705,,*3F
 GPSD,O=RMC 1122440346.00 0.005 35.331712 136.671055          ?        ?        ?  42.5600    0.087          ?             ?        ?        ?        ?
 $GPGGA,045907.000,3519.9026,N,13640.2633,E,1,04,2.2,80.6,M,,,,0000*3D
-GPSD,O=GGA 1122440347.00 0.005 35.331710 136.671055   80.60        ?        ?  42.5600    0.087  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440347.00 0.005 35.331710 136.671055   80.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440347.00 0.005 35.331710 136.671055   80.60 17.60 15.20  42.5600    0.087  0.000 178.3683 35.20        ? 3
+GPSD,O=GSA 1122440347.00 0.005 35.331710 136.671055   80.60 17.60 15.20             ?            ?  0.000 178.3683 35.20        ? 3
 $GPGSV,2,1,08,05,67,099,32,09,41,047,46,14,32,311,42,26,08,109,24*79
 $GPGSV,2,2,08,22,62,272,25,18,55,192,25,30,50,179,26,15,09,229,*78
 GPSD,Y=GSV ? 8:5 67 99 32 1:9 41 47 46 1:14 32 311 42 1:26 8 109 24 1:22 62 272 25 0:18 55 192 25 0:30 50 179 26 0:15 9 229 0 0:
 $GPRMC,045907.000,A,3519.9026,N,13640.2633,E,0.12,56.07,270705,,*3B
 GPSD,O=RMC 1122440347.00 0.005 35.331710 136.671055          ?        ?        ?  56.0700    0.062          ?             ?        ?        ?        ?
 $GPGGA,045908.000,3519.9026,N,13640.2633,E,1,04,2.2,80.8,M,,,,0000*3C
-GPSD,O=GGA 1122440348.00 0.005 35.331710 136.671055   80.80        ?        ?  56.0700    0.062  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440348.00 0.005 35.331710 136.671055   80.80        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,045908.000,A,3519.9026,N,13640.2633,E,0.38,14.44,270705,,*3D
 GPSD,O=RMC 1122440348.00 0.005 35.331710 136.671055          ?        ?        ?  14.4400    0.195          ?             ?        ?        ?        ?
 $GPGGA,045909.000,3519.9026,N,13640.2634,E,1,04,2.2,81.0,M,,,,0000*33
-GPSD,O=GGA 1122440349.00 0.005 35.331710 136.671057   81.00        ?        ?  14.4400    0.195  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440349.00 0.005 35.331710 136.671057   81.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440349.00 0.005 35.331710 136.671057   81.00 17.60 15.20  14.4400    0.195  0.000 179.1278 17.60        ? 3
+GPSD,O=GSA 1122440349.00 0.005 35.331710 136.671057   81.00 17.60 15.20             ?            ?  0.000 179.1278 17.60        ? 3
 $GPRMC,045909.000,A,3519.9026,N,13640.2634,E,0.35,16.55,270705,,*34
 GPSD,O=RMC 1122440349.00 0.005 35.331710 136.671057          ?        ?        ?  16.5500    0.180          ?             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -132,24 +132,24 @@ GPSD,O=GSA 1122440349.00 0.005 35.331710 136.671057          ? 17.60 15.20  16.5
 $GPRMC,045910.000,A,3519.9026,N,13640.2634,E,0.18,28.96,270705,,*31
 GPSD,O=RMC 1122440350.00 0.005 35.331710 136.671057          ?        ?        ?  28.9600    0.093          ?             ?        ?        ?        ?
 $GPGGA,045911.000,3519.9026,N,13640.2634,E,1,04,2.2,81.3,M,,,,0000*39
-GPSD,O=GGA 1122440351.00 0.005 35.331710 136.671057   81.30        ?        ?  28.9600    0.093  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440351.00 0.005 35.331710 136.671057   81.30        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,045911.000,A,3519.9026,N,13640.2634,E,0.42,13.19,270705,,*30
 GPSD,O=RMC 1122440351.00 0.005 35.331710 136.671057          ?        ?        ?  13.1900    0.216          ?             ?        ?        ?        ?
 $GPGGA,045912.000,3519.9026,N,13640.2634,E,1,04,2.2,81.3,M,,,,0000*3A
-GPSD,O=GGA 1122440352.00 0.005 35.331710 136.671057   81.30        ?        ?  13.1900    0.216  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440352.00 0.005 35.331710 136.671057   81.30        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSV,2,1,08,05,67,099,33,09,41,047,46,14,32,311,42,26,08,109,23*7F
 $GPGSV,2,2,08,22,62,272,25,18,55,192,18,30,50,179,21,15,09,229,*71
 GPSD,Y=GSV ? 8:5 67 99 33 1:9 41 47 46 1:14 32 311 42 1:26 8 109 23 1:22 62 272 25 0:18 55 192 18 0:30 50 179 21 0:15 9 229 0 0:
 $GPRMC,045912.000,A,3519.9026,N,13640.2634,E,0.36,13.64,270705,,*3A
 GPSD,O=RMC 1122440352.00 0.005 35.331710 136.671057          ?        ?        ?  13.6400    0.185          ?             ?        ?        ?        ?
 $GPGGA,045913.000,3519.9025,N,13640.2634,E,1,04,2.2,81.2,M,,,,0000*39
-GPSD,O=GGA 1122440353.00 0.005 35.331708 136.671057   81.20        ?        ?  13.6400    0.185  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440353.00 0.005 35.331708 136.671057   81.20        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440353.00 0.005 35.331708 136.671057   81.20 17.60 15.20  13.6400    0.185  0.000 178.9318  8.80        ? 3
+GPSD,O=GSA 1122440353.00 0.005 35.331708 136.671057   81.20 17.60 15.20             ?            ?  0.000 178.9318  8.80        ? 3
 $GPRMC,045913.000,A,3519.9025,N,13640.2634,E,0.30,15.65,270705,,*39
 GPSD,O=RMC 1122440353.00 0.005 35.331708 136.671057          ?        ?        ?  15.6500    0.154          ?             ?        ?        ?        ?
 $GPGGA,045914.000,3519.9024,N,13640.2635,E,1,04,2.2,80.8,M,,,,0000*35
-GPSD,O=GGA 1122440354.00 0.005 35.331707 136.671058   80.80        ?        ?  15.6500    0.154  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440354.00 0.005 35.331707 136.671058   80.80        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,045914.000,A,3519.9024,N,13640.2635,E,0.30,160.36,270705,,*0B
 GPSD,O=RMC 1122440354.00 0.005 35.331707 136.671058          ?        ?        ? 160.3600    0.154          ?             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -161,7 +161,7 @@ GPSD,O=GSA 1122440355.00 0.005 35.331702 136.671058          ? 17.60 15.20 165.8
 $GPRMC,045916.000,A,3519.9019,N,13640.2636,E,0.31,160.03,270705,,*03
 GPSD,O=RMC 1122440356.00 0.005 35.331698 136.671060          ?        ?        ? 160.0300    0.159          ?             ?        ?        ?        ?
 $GPGGA,045917.000,3519.9017,N,13640.2636,E,1,04,2.2,79.0,M,,,,0000*3B
-GPSD,O=GGA 1122440357.00 0.005 35.331695 136.671060   79.00        ?        ? 160.0300    0.159  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440357.00 0.005 35.331695 136.671060   79.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSV,2,1,08,05,67,099,34,09,41,047,46,14,32,311,42,26,08,109,19*71
 $GPGSV,2,2,08,22,62,272,20,18,55,192,19,30,50,179,13,15,09,229,24*72
 GPSD,Y=GSV ? 8:5 67 99 34 1:9 41 47 46 1:14 32 311 42 1:26 8 109 19 1:22 62 272 20 0:18 55 192 19 0:30 50 179 13 0:15 9 229 24 0:
@@ -172,25 +172,25 @@ GPSD,O=GSA 1122440357.00 0.005 35.331695 136.671060          ? 17.60 15.20 160.3
 $GPRMC,045918.000,A,3519.9017,N,13640.2636,E,0.21,29.38,270705,,*36
 GPSD,O=RMC 1122440358.00 0.005 35.331695 136.671060          ?        ?        ?  29.3800    0.108          ?             ?        ?        ?        ?
 $GPGGA,045919.000,3519.9017,N,13640.2637,E,1,04,2.2,78.9,M,,,,0000*3C
-GPSD,O=GGA 1122440359.00 0.005 35.331695 136.671062   78.90        ?        ?  29.3800    0.108  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440359.00 0.005 35.331695 136.671062   78.90        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440359.00 0.005 35.331695 136.671062   78.90 17.60 15.20  29.3800    0.108  0.000 178.9318 17.60        ? 3
+GPSD,O=GSA 1122440359.00 0.005 35.331695 136.671062   78.90 17.60 15.20             ?            ?  0.000 178.9318 17.60        ? 3
 $GPRMC,045919.000,A,3519.9017,N,13640.2637,E,0.37,18.86,270705,,*36
 GPSD,O=RMC 1122440359.00 0.005 35.331695 136.671062          ?        ?        ?  18.8600    0.190          ?             ?        ?        ?        ?
 $GPGGA,045920.000,3519.9017,N,13640.2637,E,1,04,2.2,78.8,M,,,,0000*37
-GPSD,O=GGA 1122440360.00 0.005 35.331695 136.671062   78.80        ?        ?  18.8600    0.190  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440360.00 0.005 35.331695 136.671062   78.80        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,045920.000,A,3519.9017,N,13640.2637,E,0.29,165.15,270705,,*02
 GPSD,O=RMC 1122440360.00 0.005 35.331695 136.671062          ?        ?        ? 165.1500    0.149          ?             ?        ?        ?        ?
 $GPGGA,045921.000,3519.9015,N,13640.2637,E,1,04,2.2,78.5,M,,,,0000*39
-GPSD,O=GGA 1122440361.00 0.005 35.331692 136.671062   78.50        ?        ? 165.1500    0.149  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440361.00 0.005 35.331692 136.671062   78.50        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440361.00 0.005 35.331692 136.671062   78.50 17.60 15.20 165.1500    0.149  0.000 177.4574 17.60        ? 3
+GPSD,O=GSA 1122440361.00 0.005 35.331692 136.671062   78.50 17.60 15.20             ?            ?  0.000 177.4574 17.60        ? 3
 $GPRMC,045921.000,A,3519.9015,N,13640.2637,E,1.17,164.92,270705,,*03
 GPSD,O=RMC 1122440361.00 0.005 35.331692 136.671062          ?        ?        ? 164.9200    0.602          ?             ?        ?        ?        ?
 $GPGGA,045922.000,3519.9007,N,13640.2636,E,1,04,2.2,78.6,M,,,,0000*3B
-GPSD,O=GGA 1122440362.00 0.005 35.331678 136.671060   78.60        ?        ? 164.9200    0.602  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1122440362.00 0.005 35.331678 136.671060   78.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
-GPSD,O=GSA 1122440362.00 0.005 35.331678 136.671060   78.60 17.60 15.20 164.9200    0.602  0.000 170.3492 35.20        ? 3
+GPSD,O=GSA 1122440362.00 0.005 35.331678 136.671060   78.60 17.60 15.20             ?            ?  0.000 170.3492 35.20        ? 3
 $GPGSV,2,1,08,05,67,099,21,09,41,047,36,14,32,311,26,26,08,109,21*7B
 $GPGSV,2,2,08,22,62,272,20,18,55,192,18,30,50,179,,15,09,229,*77
 GPSD,Y=GSV ? 8:5 67 99 21 1:9 41 47 36 1:14 32 311 26 1:26 8 109 21 1:22 62 272 20 0:18 55 192 18 0:30 50 179 0 0:15 9 229 0 0:
diff --git a/test/magellan315.log.chk b/test/magellan315.log.chk
index ec4b8834..0680305b 100644
--- a/test/magellan315.log.chk
+++ b/test/magellan315.log.chk
@@ -14,23 +14,23 @@ GPSD,Y=GSV ? 12:19 77 349 45 1:3 68 117 41 1:22 39 52 52 1:11 35 274 56 1:15 22
 $GPGLL,3908.8200,N,00023.0832,W,120827.523,A*2C
 GPSD,O=GLL 1110715704.76 0.005 39.147000 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ?        ?        ? 3
 $GPGGA,120827.52,3908.8200,N,00023.0832,W,1,06,2.1,00176,M,,,,*3F
-GPSD,O=GGA 1110715707.52 0.005 39.147000 -0.384720  176.00 16.80 21.60   0.0000    0.000  0.000             ? 12.17        ? 3
+GPSD,O=GGA 1110715707.52 0.005 39.147000 -0.384720  176.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,120827.52,A,3908.8200,N,00023.0832,W,00.0,000.0,130305,01.,W*64
 GPSD,O=RMC 1110715707.52 0.005 39.147000 -0.384720          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGSA,A,3,19,15,03,18,22,11,,,,,,,3.5,2.1,2.7*34
-GPSD,O=GSA 1110715707.52 0.005 39.147000 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GSA 1110715707.52 0.005 39.147000 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ? 12.17        ? 3
 $GPGSV,3,1,12,19,77,349,46,03,68,117,42,22,39,052,50,11,35,274,55*7F
 $GPGSV,3,2,12,15,22,062,52,14,21,106,,16,10,171,,18,10,040,49*7D
 $GPGSV,3,3,12,01,08,146,,20,04,211,,08,02,294,,28,02,328,*70
 GPSD,Y=GSV ? 12:19 77 349 46 1:3 68 117 42 1:22 39 52 50 1:11 35 274 55 1:15 22 62 52 1:14 21 106 0 0:16 10 171 0 0:18 10 40 49 1:1 8 146 0 0:20 4 211 0 0:8 2 294 0 0:28 2 328 0 0:
 $GPGLL,3908.8201,N,00023.0832,W,120829.500,A*22
-GPSD,O=GLL 1110715707.52 0.005 39.147002 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GLL 1110715707.52 0.005 39.147002 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ? 12.17        ? 3
 $GPGGA,120829.50,3908.8201,N,00023.0832,W,1,06,2.1,00176,M,,,,*32
-GPSD,O=GGA 1110715709.50 0.005 39.147002 -0.384720  176.00 16.80 21.60   0.0000    0.000  0.000             ? 16.97        ? 3
+GPSD,O=GGA 1110715709.50 0.005 39.147002 -0.384720  176.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPRMC,120829.50,A,3908.8201,N,00023.0832,W,00.0,000.0,130305,01.,W*69
 GPSD,O=RMC 1110715709.50 0.005 39.147002 -0.384720          ?        ?        ?   0.0000    0.000          ?             ?        ?        ?        ?
 $GPGSA,A,3,19,15,03,18,22,11,,,,,,,3.5,2.1,2.7*34
-GPSD,O=GSA 1110715709.50 0.005 39.147002 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ?        ?        ? 3
+GPSD,O=GSA 1110715709.50 0.005 39.147002 -0.384720          ? 16.80 21.60   0.0000    0.000          ?             ? 16.97        ? 3
 $GPGSV,3,1,12,19,77,349,44,03,68,117,42,22,39,052,52,11,35,274,56*7C
 $GPGSV,3,2,12,15,22,062,52,14,21,106,,16,10,171,,18,10,040,47*73
 $GPGSV,3,3,12,01,08,146,,20,04,211,,08,02,294,,28,02,328,*70
diff --git a/test/oncore.log.chk b/test/oncore.log.chk
index 1266f8d9..09333e82 100644
--- a/test/oncore.log.chk
+++ b/test/oncore.log.chk
@@ -6,11 +6,11 @@ GPSD,Y=GSV ? 9:2 33 299 27 0:4 43 242 26 0:8 12 202 0 0:13 85 356 0 0:16 22 59 0
 $GPRMC,171244.00,A,5209.7838,N,02048.4818,E,0.6,71.0,080405,3.5,E*63
 GPSD,O=RMC 1112980364.00 0.005 52.163063 20.808030          ?        ?        ?  71.0000    0.309          ?             ?        ?        ? 2
 $GPGGA,171245.00,5209.7838,N,02048.4819,E,1,03,5.3,76.6,M,36.5,M,,*5A
-GPSD,O=GGA 1112980365.00 0.005 52.163063 20.808032   76.60        ?        ?  71.0000    0.309  0.000             ?        ?        ? 2
+GPSD,O=GGA 1112980365.00 0.005 52.163063 20.808032   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGLL,5209.7838,N,02048.4819,E,171245.00,A*00
-GPSD,O=GLL 1112980365.00 0.005 52.163063 20.808032   76.60        ?        ?  71.0000    0.309  0.000             ?        ?        ? 2
+GPSD,O=GLL 1112980365.00 0.005 52.163063 20.808032   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,02,04,27,,,,,,,,,,,5.3,*36
-GPSD,O=GSA 1112980365.00 0.005 52.163063 20.808032   76.60 42.40  0.00  71.0000    0.309  0.000             ?        ?        ? 2
+GPSD,O=GSA 1112980365.00 0.005 52.163063 20.808032   76.60 42.40  0.00             ?            ?  0.000             ?        ?        ? 2
 $GPGSV,3,1,09,02,33,299,27,04,43,242,26,08,12,202,,13,85,356,*70
 $GPGSV,3,2,09,16,22,059,,20,21,131,,23,54,074,,24,23,195,*71
 $GPGSV,3,3,09,27,39,195,13,,,,,,,,,,,,*40
@@ -18,11 +18,11 @@ GPSD,Y=GSV ? 9:2 33 299 27 1:4 43 242 26 1:8 12 202 0 0:13 85 356 0 0:16 22 59 0
 $GPRMC,171245.00,A,5209.7838,N,02048.4819,E,0.3,41.9,080405,3.5,E*6C
 GPSD,O=RMC 1112980365.00 0.005 52.163063 20.808032          ?        ?        ?  41.9000    0.154          ?             ?        ?        ?        ?
 $GPGGA,171246.00,5209.7839,N,02048.4824,E,1,03,5.3,76.6,M,36.5,M,,*56
-GPSD,O=GGA 1112980366.00 0.005 52.163065 20.808040   76.60        ?        ?  41.9000    0.154  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1112980366.00 0.005 52.163065 20.808040   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGLL,5209.7839,N,02048.4824,E,171246.00,A*0C
-GPSD,O=GLL 1112980366.00 0.005 52.163065 20.808040   76.60        ?        ?  41.9000    0.154  0.000             ?        ?        ?        ?
+GPSD,O=GLL 1112980366.00 0.005 52.163065 20.808040   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,02,04,27,,,,,,,,,,,5.3,*36
-GPSD,O=GSA 1112980366.00 0.005 52.163065 20.808040   76.60 42.40  0.00  41.9000    0.154  0.000 178.4174 84.80        ? 2
+GPSD,O=GSA 1112980366.00 0.005 52.163065 20.808040   76.60 42.40  0.00             ?            ?  0.000 178.4174 84.80        ? 2
 $GPGSV,3,1,09,02,33,299,27,04,43,242,26,08,12,202,,13,85,356,*70
 $GPGSV,3,2,09,16,22,059,,20,21,131,,23,54,074,,24,23,195,*71
 $GPGSV,3,3,09,27,39,195,16,,,,,,,,,,,,*45
@@ -30,11 +30,11 @@ GPSD,Y=GSV ? 9:2 33 299 27 1:4 43 242 26 1:8 12 202 0 0:13 85 356 0 0:16 22 59 0
 $GPRMC,171246.00,A,5209.7839,N,02048.4824,E,0.5,75.4,080405,3.5,E*6C
 GPSD,O=RMC 1112980366.00 0.005 52.163065 20.808040          ?        ?        ?  75.4000    0.257          ?             ?        ?        ?        ?
 $GPGGA,171247.00,5209.7838,N,02048.4821,E,1,03,5.3,76.6,M,36.5,M,,*53
-GPSD,O=GGA 1112980367.00 0.005 52.163063 20.808035   76.60        ?        ?  75.4000    0.257  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1112980367.00 0.005 52.163063 20.808035   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGLL,5209.7838,N,02048.4821,E,171247.00,A*09
-GPSD,O=GLL 1112980367.00 0.005 52.163063 20.808035   76.60        ?        ?  75.4000    0.257  0.000             ?        ?        ?        ?
+GPSD,O=GLL 1112980367.00 0.005 52.163063 20.808035   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,02,04,27,,,,,,,,,,,5.3,*36
-GPSD,O=GSA 1112980367.00 0.005 52.163063 20.808035   76.60 42.40  0.00  75.4000    0.257  0.000 178.9730 84.80        ? 2
+GPSD,O=GSA 1112980367.00 0.005 52.163063 20.808035   76.60 42.40  0.00             ?            ?  0.000 178.9730 84.80        ? 2
 $GPGSV,3,1,09,02,33,299,28,04,43,242,26,08,12,202,,13,85,357,*7E
 $GPGSV,3,2,09,16,22,059,,20,21,131,,23,54,074,,24,23,195,*71
 $GPGSV,3,3,09,27,40,195,15,,,,,,,,,,,,*48
@@ -42,11 +42,11 @@ GPSD,Y=GSV ? 9:2 33 299 28 1:4 43 242 26 1:8 12 202 0 0:13 85 357 0 0:16 22 59 0
 $GPRMC,171247.00,A,5209.7838,N,02048.4821,E,0.5,269.3,080405,3.5,E*51
 GPSD,O=RMC 1112980367.00 0.005 52.163063 20.808035          ?        ?        ? 269.3000    0.257          ?             ?        ?        ?        ?
 $GPGGA,171248.00,5209.7839,N,02048.4824,E,1,03,5.3,76.6,M,36.5,M,,*58
-GPSD,O=GGA 1112980368.00 0.005 52.163065 20.808040   76.60        ?        ? 269.3000    0.257  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1112980368.00 0.005 52.163065 20.808040   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGLL,5209.7839,N,02048.4824,E,171248.00,A*02
-GPSD,O=GLL 1112980368.00 0.005 52.163065 20.808040   76.60        ?        ? 269.3000    0.257  0.000             ?        ?        ?        ?
+GPSD,O=GLL 1112980368.00 0.005 52.163065 20.808040   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,02,04,27,,,,,,,,,,,5.3,*36
-GPSD,O=GSA 1112980368.00 0.005 52.163065 20.808040   76.60 42.40  0.00 269.3000    0.257  0.000 178.9730 84.80        ? 2
+GPSD,O=GSA 1112980368.00 0.005 52.163065 20.808040   76.60 42.40  0.00             ?            ?  0.000 178.9730 84.80        ? 2
 $GPGSV,3,1,09,02,33,299,28,04,43,242,25,08,12,202,,13,85,357,*7D
 $GPGSV,3,2,09,16,22,059,,20,21,131,,23,54,074,,24,23,195,*71
 $GPGSV,3,3,09,27,40,195,15,,,,,,,,,,,,*48
@@ -54,11 +54,11 @@ GPSD,Y=GSV ? 9:2 33 299 28 1:4 43 242 25 1:8 12 202 0 0:13 85 357 0 0:16 22 59 0
 $GPRMC,171248.00,A,5209.7839,N,02048.4824,E,0.2,0.0,080405,3.5,E*53
 GPSD,O=RMC 1112980368.00 0.005 52.163065 20.808040          ?        ?        ?   0.0000    0.103          ?             ?        ?        ?        ?
 $GPGGA,171249.00,5209.7839,N,02048.4827,E,1,03,5.3,76.6,M,36.5,M,,*5A
-GPSD,O=GGA 1112980369.00 0.005 52.163065 20.808045   76.60        ?        ?   0.0000    0.103  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1112980369.00 0.005 52.163065 20.808045   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGLL,5209.7839,N,02048.4827,E,171249.00,A*00
-GPSD,O=GLL 1112980369.00 0.005 52.163065 20.808045   76.60        ?        ?   0.0000    0.103  0.000             ?        ?        ?        ?
+GPSD,O=GLL 1112980369.00 0.005 52.163065 20.808045   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,02,04,27,,,,,,,,,,,5.3,*36
-GPSD,O=GSA 1112980369.00 0.005 52.163065 20.808045   76.60 42.40  0.00   0.0000    0.103  0.000 179.1106 84.80        ? 2
+GPSD,O=GSA 1112980369.00 0.005 52.163065 20.808045   76.60 42.40  0.00             ?            ?  0.000 179.1106 84.80        ? 2
 $GPGSV,3,1,09,02,33,299,27,04,43,242,26,08,12,202,,13,85,357,*71
 $GPGSV,3,2,09,16,22,059,,20,21,131,,23,54,074,,24,23,195,*71
 $GPGSV,3,3,09,27,40,195,15,,,,,,,,,,,,*48
@@ -66,11 +66,11 @@ GPSD,Y=GSV ? 9:2 33 299 27 1:4 43 242 26 1:8 12 202 0 0:13 85 357 0 0:16 22 59 0
 $GPRMC,171249.00,A,5209.7839,N,02048.4827,E,0.3,80.9,080405,3.5,E*61
 GPSD,O=RMC 1112980369.00 0.005 52.163065 20.808045          ?        ?        ?  80.9000    0.154          ?             ?        ?        ?        ?
 $GPGGA,171250.00,5209.7839,N,02048.4829,E,1,03,5.3,76.6,M,36.5,M,,*5C
-GPSD,O=GGA 1112980370.00 0.005 52.163065 20.808048   76.60        ?        ?  80.9000    0.154  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1112980370.00 0.005 52.163065 20.808048   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGLL,5209.7839,N,02048.4829,E,171250.00,A*06
-GPSD,O=GLL 1112980370.00 0.005 52.163065 20.808048   76.60        ?        ?  80.9000    0.154  0.000             ?        ?        ?        ?
+GPSD,O=GLL 1112980370.00 0.005 52.163065 20.808048   76.60        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,2,02,04,27,,,,,,,,,,,5.3,*36
-GPSD,O=GSA 1112980370.00 0.005 52.163065 20.808048   76.60 42.40  0.00  80.9000    0.154  0.000 179.4259 84.80        ? 2
+GPSD,O=GSA 1112980370.00 0.005 52.163065 20.808048   76.60 42.40  0.00             ?            ?  0.000 179.4259 84.80        ? 2
 $GPGSV,3,1,09,02,33,299,28,04,43,242,26,08,12,202,,13,85,357,*7E
 $GPGSV,3,2,09,16,22,059,,20,21,131,,23,54,074,,24,23,195,*71
 $GPGSV,3,3,09,27,40,195,15,,,,,,,,,,,,*48
diff --git a/test/tn204.log.chk b/test/tn204.log.chk
index 50114bb9..af3594e5 100644
--- a/test/tn204.log.chk
+++ b/test/tn204.log.chk
@@ -3,15 +3,15 @@ $GPRMC,230148,A,3348.605,N,11821.126,W,000.0,209.4,261002,013.8,E*6B
 GPSD,O=RMC 1035673308.00 0.005 33.810083 -118.352100          ?        ?        ? 209.4000    0.000          ?             ?        ?        ? 2
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230149,3348.605,N,11821.126,W,1,05,1.7,49.4,M,-32.4,M,,*4E
-GPSD,O=GGA 1035673309.00 0.005 33.810083 -118.352100   49.40        ?        ? 209.4000    0.000  0.000             ?        ?        ? 2
+GPSD,O=GGA 1035673309.00 0.005 33.810083 -118.352100   49.40        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,07,08,,,27,28,29,,,,,,4.2,1.7,3.8*32
-GPSD,O=GSA 1035673309.00 0.005 33.810083 -118.352100   49.40 13.60 30.40 209.4000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GSA 1035673309.00 0.005 33.810083 -118.352100   49.40 13.60 30.40             ?            ?  0.000             ?        ?        ? 3
 $GPGSV,2,1,08,07,43,197,44,08,68,062,43,11,18,089,00,26,24,314,43*73
 $GPGSV,2,2,08,27,48,103,46,28,66,323,42,29,33,306,43,31,10,040,00*78
 GPSD,Y=GSV ? 8:7 43 197 44 1:8 68 62 43 1:11 18 89 0 0:26 24 314 43 0:27 48 103 46 1:28 66 323 42 1:29 33 306 43 1:31 10 40 0 0:
 $PGRME,17.4,M,40.3,M,43.9,M*15
 $GPGLL,3348.605,N,11821.126,W,230149,A*34
-GPSD,O=GLL 1035673309.00 0.005 33.810083 -118.352100   49.40 36.13 83.67 209.4000    0.000  0.000             ?        ?        ? 3
+GPSD,O=GLL 1035673309.00 0.005 33.810083 -118.352100   49.40 36.13 83.67             ?            ?  0.000             ?        ?        ? 3
 $PGRMZ,162,f,3*1E
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -20,15 +20,15 @@ $GPRMC,230150,A,3348.606,N,11821.125,W,000.0,209.4,261002,013.8,E*62
 GPSD,O=RMC 1035673310.00 0.005 33.810100 -118.352083          ?        ?        ? 209.4000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230151,3348.607,N,11821.124,W,1,05,1.7,49.2,M,-32.4,M,,*41
-GPSD,O=GGA 1035673311.00 0.005 33.810117 -118.352067   49.20        ?        ? 209.4000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1035673311.00 0.005 33.810117 -118.352067   49.20        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,07,08,,,27,28,29,,,,,,4.2,1.7,3.8*32
-GPSD,O=GSA 1035673311.00 0.005 33.810117 -118.352067   49.20 13.60 30.40 209.4000    0.000  0.000 141.1115 24.86        ? 3
+GPSD,O=GSA 1035673311.00 0.005 33.810117 -118.352067   49.20 13.60 30.40             ?            ?  0.000 141.1115 24.86        ? 3
 $GPGSV,2,1,08,07,43,197,45,08,68,062,42,11,18,089,00,26,24,314,43*73
 $GPGSV,2,2,08,27,48,103,46,28,66,323,42,29,33,306,44,31,10,040,00*7F
 GPSD,Y=GSV ? 8:7 43 197 45 1:8 68 62 42 1:11 18 89 0 0:26 24 314 43 0:27 48 103 46 1:28 66 323 42 1:29 33 306 44 1:31 10 40 0 0:
 $PGRME,17.4,M,40.3,M,43.9,M*15
 $GPGLL,3348.607,N,11821.124,W,230151,A*3D
-GPSD,O=GLL 1035673311.00 0.005 33.810117 -118.352067   49.20 36.13 83.67 209.4000    0.000  0.000 141.1115 24.86        ? 3
+GPSD,O=GLL 1035673311.00 0.005 33.810117 -118.352067   49.20 36.13 83.67             ?            ?  0.000 141.1115 24.86        ? 3
 $PGRMZ,161,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -37,15 +37,15 @@ $GPRMC,230152,A,3348.607,N,11821.124,W,000.0,209.4,261002,013.8,E*60
 GPSD,O=RMC 1035673312.00 0.005 33.810117 -118.352067          ?        ?        ? 209.4000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230153,3348.607,N,11821.124,W,1,05,1.7,49.1,M,-32.4,M,,*40
-GPSD,O=GGA 1035673313.00 0.005 33.810117 -118.352067   49.10        ?        ? 209.4000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1035673313.00 0.005 33.810117 -118.352067   49.10        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,,08,,,,,29,,,,,,4.2,1.7,3.8*3A
-GPSD,O=GSA 1035673313.00 0.005 33.810117 -118.352067   49.10 13.60 30.40 209.4000    0.000  0.000             ? 24.86        ? 3
+GPSD,O=GSA 1035673313.00 0.005 33.810117 -118.352067   49.10 13.60 30.40             ?            ?  0.000             ? 24.86        ? 3
 $GPGSV,2,1,08,07,43,197,45,08,68,062,42,11,18,089,00,26,24,314,41*71
 $GPGSV,2,2,08,27,48,103,46,28,66,323,42,29,33,306,44,31,10,040,00*7F
 GPSD,Y=GSV ? 8:7 43 197 45 0:8 68 62 42 1:11 18 89 0 0:26 24 314 41 0:27 48 103 46 0:28 66 323 42 0:29 33 306 44 1:31 10 40 0 0:
 $PGRME,17.4,M,40.3,M,43.9,M*15
 $GPGLL,3348.607,N,11821.124,W,230153,A*3F
-GPSD,O=GLL 1035673313.00 0.005 33.810117 -118.352067   49.10 36.13 83.67 209.4000    0.000  0.000             ? 24.86        ? 3
+GPSD,O=GLL 1035673313.00 0.005 33.810117 -118.352067   49.10 36.13 83.67             ?            ?  0.000             ? 24.86        ? 3
 $PGRMZ,161,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -54,15 +54,15 @@ $GPRMC,230154,A,3348.607,N,11821.124,W,000.0,209.4,261002,013.8,E*66
 GPSD,O=RMC 1035673314.00 0.005 33.810117 -118.352067          ?        ?        ? 209.4000    0.000          ?             ?        ?        ?        ?
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230155,3348.608,N,11821.124,W,1,02,1.9,49.0,M,-32.4,M,,*41
-GPSD,O=GGA 1035673315.00 0.005 33.810133 -118.352067   49.00        ?        ? 209.4000    0.000  0.000             ?        ?        ?        ?
+GPSD,O=GGA 1035673315.00 0.005 33.810133 -118.352067   49.00        ?        ?             ?            ?  0.000             ?        ?        ?        ?
 $GPGSA,A,3,07,08,,,27,28,,,,,,,1.9,1.9,1.0*33
-GPSD,O=GSA 1035673315.00 0.005 33.810133 -118.352067   49.00 15.20  8.00 209.4000    0.000  0.000 166.1138 25.66        ? 3
+GPSD,O=GSA 1035673315.00 0.005 33.810133 -118.352067   49.00 15.20  8.00             ?            ?  0.000 166.1138 25.66        ? 3
 $GPGSV,2,1,08,07,43,197,45,08,68,062,43,11,18,089,00,26,24,314,41*70
 $GPGSV,2,2,08,27,48,103,46,28,66,323,43,29,33,306,44,31,10,040,00*7E
 GPSD,Y=GSV ? 8:7 43 197 45 1:8 68 62 43 1:11 18 89 0 0:26 24 314 41 0:27 48 103 46 1:28 66 323 43 1:29 33 306 44 0:31 10 40 0 0:
 $PGRME,19.2,M,150.0,M,151.2,M*17
 $GPGLL,3348.608,N,11821.124,W,230155,A*36
-GPSD,O=GLL 1035673315.00 0.005 33.810133 -118.352067   49.00 39.86 311.44 209.4000    0.000  0.000 166.1138 25.66        ? 3
+GPSD,O=GLL 1035673315.00 0.005 33.810133 -118.352067   49.00 39.86 311.44             ?            ?  0.000 166.1138 25.66        ? 3
 $PGRMZ,161,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
author	Eric S. Raymond <esr@thyrsus.com>	2006-06-09 13:11:02 +0000
committer	Eric S. Raymond <esr@thyrsus.com>	2006-06-09 13:11:02 +0000
commit	86a39a1a34f2b8891cf80c108651b1d771182258 (patch)
tree	27aa7080dc3f4a2d452551d804aab164d1d4bb96
parent	02dc93ea5a9aa8c305403d075d6cd2efe884a188 (diff)
download	gpsd-86a39a1a34f2b8891cf80c108651b1d771182258.tar.gz