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

Required a regression-test rebuild.

1 files changed, 15 insertions, 15 deletions

diff --git a/test/daemon/garmin48.log.chk b/test/daemon/garmin48.log.chk
index c3c0b321..beb7d449 100644
--- a/test/daemon/garmin48.log.chk
+++ b/test/daemon/garmin48.log.chk
@@ -1,10 +1,10 @@
 $GPRMC,225308,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*6D

-{"class":"TPV","tag":"RMC","time":"2001-06-06T22:53:08.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"track":94.5000,"speed":0.000,"mode":2}

+{"class":"TPV","tag":"RMC","mode":2,"time":"2001-06-06T22:53:08.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"track":94.5000,"speed":0.000}

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225308,4527.458,S,16709.165,E,1,05,2.1,14.7,M,1.1,M,,*53

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:08.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"track":94.5000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:08.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"track":94.5000,"speed":0.000}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.1,2.1,2.0*3A

-{"class":"TPV","tag":"GSA","time":"2001-06-06T22:53:08.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epv":46.000,"track":94.5000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"GSA","mode":3,"time":"2001-06-06T22:53:08.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epv":46.000,"track":94.5000,"speed":0.000,"climb":0.000}

 $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

@@ -18,7 +18,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225310,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*64

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225310,4527.458,S,16709.165,E,1,05,2.1,14.6,M,1.1,M,,*5B

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:10.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:10.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.1,2.1,2.0*3A

 $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

@@ -26,7 +26,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","tag":"GSV","xdop":0.84,"ydop":0.92,"vdop":1.31,"tdop":0.71,"hdop":1.25,"gdop":1.94,"pdop":1.81,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true},{"PRN":3,"el":9,"az":42,"ss":0,"used":false},{"PRN":4,"el":5,"az":242,"ss":0,"used":false},{"PRN":6,"el":4,"az":149,"ss":0,"used":false},{"PRN":13,"el":37,"az":235,"ss":48,"used":true},{"PRN":20,"el":41,"az":333,"ss":46,"used":true},{"PRN":22,"el":65,"az":81,"ss":46,"used":true},{"PRN":24,"el":2,"az":205,"ss":0,"used":false},{"PRN":25,"el":20,"az":108,"ss":0,"used":false},{"PRN":27,"el":8,"az":281,"ss":0,"used":false},{"PRN":28,"el":17,"az":339,"ss":39,"used":true}]}

 $PGRME,9.1,M,15.0,M,12.0,M*21

 $GPGLL,4527.458,S,16709.165,E,225311,A*37

-{"class":"TPV","tag":"GLL","time":"2001-06-06T22:53:11.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.23,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"time":"2001-06-06T22:53:11.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.23}

 $PGRMZ,48,f,3*27

 $PGRMM,WGS 84*06

 $GPBOD,,T,,M,,*47

@@ -34,7 +34,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225312,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*66

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225312,4527.458,S,16709.165,E,1,05,2.2,14.7,M,1.1,M,,*5B

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:12.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:12.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B

 $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

@@ -42,7 +42,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","tag":"GSV","xdop":0.84,"ydop":0.92,"vdop":1.31,"tdop":0.71,"hdop":1.25,"gdop":1.94,"pdop":1.81,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true},{"PRN":3,"el":9,"az":42,"ss":0,"used":false},{"PRN":4,"el":5,"az":242,"ss":0,"used":false},{"PRN":6,"el":4,"az":149,"ss":0,"used":false},{"PRN":13,"el":37,"az":235,"ss":49,"used":true},{"PRN":20,"el":41,"az":333,"ss":46,"used":true},{"PRN":22,"el":65,"az":81,"ss":46,"used":true},{"PRN":24,"el":2,"az":205,"ss":0,"used":false},{"PRN":25,"el":20,"az":108,"ss":0,"used":false},{"PRN":27,"el":8,"az":281,"ss":0,"used":false},{"PRN":28,"el":17,"az":339,"ss":39,"used":true}]}

 $PGRME,9.2,M,15.0,M,12.6,M*24

 $GPGLL,4527.458,S,16709.165,E,225313,A*35

-{"class":"TPV","tag":"GLL","time":"2001-06-06T22:53:13.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.38,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"time":"2001-06-06T22:53:13.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.38}

 $PGRMZ,48,f,3*27

 $PGRMM,WGS 84*06

 $GPBOD,,T,,M,,*47

@@ -50,7 +50,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225314,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*60

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225314,4527.458,S,16709.165,E,1,05,2.2,14.6,M,1.1,M,,*5C

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:14.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:14.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B

 $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

@@ -58,7 +58,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","tag":"GSV","xdop":0.84,"ydop":0.92,"vdop":1.31,"tdop":0.71,"hdop":1.25,"gdop":1.94,"pdop":1.81,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true},{"PRN":3,"el":9,"az":42,"ss":0,"used":false},{"PRN":4,"el":5,"az":242,"ss":0,"used":false},{"PRN":6,"el":4,"az":149,"ss":0,"used":false},{"PRN":13,"el":37,"az":235,"ss":49,"used":true},{"PRN":20,"el":41,"az":333,"ss":46,"used":true},{"PRN":22,"el":65,"az":81,"ss":46,"used":true},{"PRN":24,"el":2,"az":205,"ss":0,"used":false},{"PRN":25,"el":20,"az":108,"ss":0,"used":false},{"PRN":27,"el":8,"az":281,"ss":0,"used":false},{"PRN":28,"el":17,"az":339,"ss":39,"used":true}]}

 $PGRME,9.2,M,15.0,M,12.6,M*24

 $GPGLL,4527.458,S,16709.165,E,225315,A*33

-{"class":"TPV","tag":"GLL","time":"2001-06-06T22:53:15.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.38,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"time":"2001-06-06T22:53:15.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.38}

 $PGRMZ,48,f,3*27

 $PGRMM,WGS 84*06

 $GPBOD,,T,,M,,*47

@@ -66,7 +66,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225316,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*62

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225316,4527.458,S,16709.165,E,1,05,2.2,14.4,M,1.1,M,,*5C

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:16.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.400,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:16.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.400,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B

 $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

@@ -74,7 +74,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","tag":"GSV","xdop":0.84,"ydop":0.92,"vdop":1.31,"tdop":0.71,"hdop":1.25,"gdop":1.94,"pdop":1.81,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true},{"PRN":3,"el":9,"az":42,"ss":0,"used":false},{"PRN":4,"el":5,"az":242,"ss":0,"used":false},{"PRN":6,"el":4,"az":149,"ss":0,"used":false},{"PRN":13,"el":37,"az":235,"ss":49,"used":true},{"PRN":20,"el":40,"az":333,"ss":46,"used":true},{"PRN":22,"el":65,"az":81,"ss":46,"used":true},{"PRN":24,"el":2,"az":205,"ss":0,"used":false},{"PRN":25,"el":20,"az":108,"ss":0,"used":false},{"PRN":27,"el":8,"az":281,"ss":0,"used":false},{"PRN":28,"el":17,"az":339,"ss":39,"used":true}]}

 $PGRME,9.2,M,15.0,M,12.6,M*24

 $GPGLL,4527.458,S,16709.165,E,225317,A*31

-{"class":"TPV","tag":"GLL","time":"2001-06-06T22:53:17.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.38,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"time":"2001-06-06T22:53:17.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":27.38}

 $PGRMZ,46,f,3*29

 $PGRMM,WGS 84*06

 $GPBOD,,T,,M,,*47

@@ -82,7 +82,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225318,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*6C

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225318,4527.458,S,16709.165,E,1,05,2.2,14.0,M,1.1,M,,*56

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:18.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.000,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:18.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.000,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B

 $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

@@ -90,7 +90,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,40,,,,*42
 {"class":"SKY","tag":"GSV","xdop":0.84,"ydop":0.92,"vdop":1.31,"tdop":0.71,"hdop":1.25,"gdop":1.94,"pdop":1.81,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true},{"PRN":3,"el":9,"az":42,"ss":0,"used":false},{"PRN":4,"el":5,"az":242,"ss":0,"used":false},{"PRN":6,"el":4,"az":149,"ss":0,"used":false},{"PRN":13,"el":37,"az":235,"ss":49,"used":true},{"PRN":20,"el":40,"az":333,"ss":46,"used":true},{"PRN":22,"el":65,"az":83,"ss":46,"used":true},{"PRN":24,"el":2,"az":205,"ss":0,"used":false},{"PRN":25,"el":20,"az":108,"ss":0,"used":false},{"PRN":27,"el":8,"az":281,"ss":0,"used":false},{"PRN":28,"el":17,"az":339,"ss":40,"used":true}]}

 $PGRME,10.3,M,15.2,M,16.7,M*1A

 $GPGLL,4527.458,S,16709.165,E,225333,A*37

-{"class":"TPV","tag":"GLL","time":"2001-06-06T22:53:33.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":1.93,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"time":"2001-06-06T22:53:33.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":1.93}

 $PGRMZ,41,f,3*2E

 $PGRMM,WGS 84*06

 $GPBOD,,T,,M,,*47

@@ -98,7 +98,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225334,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*62

 $GPRMB,A,,,,,,,,,,,,V*71

 $GPGGA,225334,4527.458,S,16709.165,E,1,05,2.4,12.5,M,1.1,M,,*5D

-{"class":"TPV","tag":"GGA","time":"2001-06-06T22:53:34.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":12.500,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2001-06-06T22:53:34.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":12.500,"epx":12.536,"epy":13.872,"epv":30.148,"track":94.5000,"speed":0.000,"eps":27.74}

 $GPGSA,A,3,01,,,,13,20,22,,,,28,,4.1,2.4,3.0*39

 $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

@@ -106,7 +106,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,41,,,,*43
 {"class":"SKY","tag":"GSV","xdop":0.84,"ydop":0.92,"vdop":1.31,"tdop":0.71,"hdop":1.25,"gdop":1.94,"pdop":1.81,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true},{"PRN":3,"el":9,"az":42,"ss":0,"used":false},{"PRN":4,"el":5,"az":242,"ss":0,"used":false},{"PRN":6,"el":4,"az":149,"ss":0,"used":false},{"PRN":13,"el":37,"az":235,"ss":49,"used":true},{"PRN":20,"el":40,"az":333,"ss":46,"used":true},{"PRN":22,"el":65,"az":83,"ss":46,"used":true},{"PRN":24,"el":2,"az":205,"ss":0,"used":false},{"PRN":25,"el":20,"az":108,"ss":0,"used":false},{"PRN":27,"el":8,"az":281,"ss":0,"used":false},{"PRN":28,"el":17,"az":339,"ss":41,"used":true}]}

 $PGRME,10.3,M,15.2,M,16.7,M*1A

 $GPGLL,4527.458,S,16709.165,E,225335,A*31

-{"class":"TPV","tag":"GLL","time":"2001-06-06T22:53:35.00Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":28.99,"mode":2}

+{"class":"TPV","tag":"GLL","mode":2,"time":"2001-06-06T22:53:35.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":12.536,"epy":13.872,"speed":0.000,"eps":28.99}

 $PGRMZ,41,f,3*2E

 $PGRMM,WGS 84*06

 $GPBOD,,T,,M,,*47