Emit "mode" before its dependent attributes in TPV, and timestamps with .3f.

Required a regression-test rebuild.

1 files changed, 6 insertions, 6 deletions

diff --git a/test/daemon/magellan315.log.chk b/test/daemon/magellan315.log.chk
index d8d58ade..ef0457c6 100644
--- a/test/daemon/magellan315.log.chk
+++ b/test/daemon/magellan315.log.chk
@@ -1,11 +1,11 @@
 $GPGLL,3908.8199,N,00023.0832,W,120824.758,A*22
-{"class":"TPV","tag":"GLL","lat":39.146998333,"lon":-0.384720000,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"lat":39.146998333,"lon":-0.384720000}

 $GPGGA,120824.76,3908.8199,N,00023.0832,W,1,06,2.1,00176,M,,,,*39
-{"class":"TPV","tag":"GGA","lat":39.146998333,"lon":-0.384720000,"alt":176.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"lat":39.146998333,"lon":-0.384720000,"alt":176.000}

 $GPRMC,120824.76,A,3908.8199,N,00023.0832,W,00.0,000.0,130305,01.,W*62
-{"class":"TPV","tag":"RMC","time":"2005-03-13T12:08:24.76Z","ept":0.005,"lat":39.146998333,"lon":-0.384720000,"alt":176.000,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2005-03-13T12:08:24.760Z","ept":0.005,"lat":39.146998333,"lon":-0.384720000,"alt":176.000,"track":0.0000,"speed":0.000}

 $GPGSA,A,3,19,15,03,18,22,11,,,,,,,3.5,2.1,2.7*34
-{"class":"TPV","tag":"GSA","time":"2005-03-13T12:08:24.76Z","ept":0.005,"lat":39.146998333,"lon":-0.384720000,"alt":176.000,"epv":62.100,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"GSA","mode":3,"time":"2005-03-13T12:08:24.760Z","ept":0.005,"lat":39.146998333,"lon":-0.384720000,"alt":176.000,"epv":62.100,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGSV,3,1,12,19,77,349,45,03,68,117,41,22,39,052,52,11,35,274,56*7E
 $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
@@ -13,7 +13,7 @@ $GPGSV,3,3,12,01,08,146,,20,04,211,,08,02,294,,28,02,328,*70
 $GPGLL,3908.8200,N,00023.0832,W,120827.523,A*2C
 $GPGGA,120827.52,3908.8200,N,00023.0832,W,1,06,2.1,00176,M,,,,*3F
 $GPRMC,120827.52,A,3908.8200,N,00023.0832,W,00.0,000.0,130305,01.,W*64
-{"class":"TPV","tag":"RMC","time":"2005-03-13T12:08:27.52Z","ept":0.005,"lat":39.147000000,"lon":-0.384720000,"alt":176.000,"epx":11.328,"epy":22.003,"epv":42.504,"track":0.0000,"speed":0.000,"climb":0.000,"eps":15.93,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2005-03-13T12:08:27.520Z","ept":0.005,"lat":39.147000000,"lon":-0.384720000,"alt":176.000,"epx":11.328,"epy":22.003,"epv":42.504,"track":0.0000,"speed":0.000,"climb":0.000,"eps":15.93}

 $GPGSA,A,3,19,15,03,18,22,11,,,,,,,3.5,2.1,2.7*34
 $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
@@ -22,7 +22,7 @@ $GPGSV,3,3,12,01,08,146,,20,04,211,,08,02,294,,28,02,328,*70
 $GPGLL,3908.8201,N,00023.0832,W,120829.500,A*22
 $GPGGA,120829.50,3908.8201,N,00023.0832,W,1,06,2.1,00176,M,,,,*32
 $GPRMC,120829.50,A,3908.8201,N,00023.0832,W,00.0,000.0,130305,01.,W*69
-{"class":"TPV","tag":"RMC","time":"2005-03-13T12:08:29.50Z","ept":0.005,"lat":39.147001667,"lon":-0.384720000,"alt":176.000,"epx":11.328,"epy":22.003,"epv":42.504,"track":0.0000,"speed":0.000,"climb":0.000,"eps":22.23,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2005-03-13T12:08:29.500Z","ept":0.005,"lat":39.147001667,"lon":-0.384720000,"alt":176.000,"epx":11.328,"epy":22.003,"epv":42.504,"track":0.0000,"speed":0.000,"climb":0.000,"eps":22.23}

 $GPGSA,A,3,19,15,03,18,22,11,,,,,,,3.5,2.1,2.7*34
 $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