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

Required a regression-test rebuild.

1 files changed, 11 insertions, 11 deletions

diff --git a/test/daemon/garmin25lp.log.chk b/test/daemon/garmin25lp.log.chk
index 1c83878f..cf7856a5 100644
--- a/test/daemon/garmin25lp.log.chk
+++ b/test/daemon/garmin25lp.log.chk
@@ -66,23 +66,23 @@ $GPGSV,2,1,08,01,10,158,44,03,72,164,42,11,24,279,,14,30,119,48*74
 $GPGSV,2,2,08,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":44,"used":false},{"PRN":3,"el":72,"az":164,"ss":42,"used":false},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":48,"used":false},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false}]}

 $GPRMC,120326,A,4221.3871,N,01322.0800,E,000.0,000.0,150305,001.4,E*77
-{"class":"TPV","tag":"RMC","time":"2005-03-15T12:03:26.00Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"track":0.0000,"speed":0.000,"mode":2}

+{"class":"TPV","tag":"RMC","mode":2,"time":"2005-03-15T12:03:26.000Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"track":0.0000,"speed":0.000}

 $GPGGA,120326,4221.3871,N,01322.0800,E,1,00,3.1,746.1,M,44.2,M,,*40
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:26.00Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:26.000Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":48,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false}]}

 $GPRMC,120327,A,4221.3872,N,01322.0800,E,000.0,000.0,150305,001.4,E*75
 $GPGGA,120327,4221.3872,N,01322.0800,E,1,03,3.1,746.1,M,44.2,M,,*41
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:27.00Z","ept":0.005,"lat":42.356453333,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:27.000Z","ept":0.005,"lat":42.356453333,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":48,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false}]}

 $GPRMC,120328,A,4221.3873,N,01322.0800,E,000.0,000.0,150305,001.4,E*7B
 $GPGGA,120328,4221.3873,N,01322.0800,E,1,03,3.1,746.1,M,44.2,M,,*4F
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:28.00Z","ept":0.005,"lat":42.356455000,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:28.000Z","ept":0.005,"lat":42.356455000,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -90,7 +90,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":48,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120329,A,4221.3874,N,01322.0805,E,000.0,000.0,150305,001.4,E*78
 $GPGGA,120329,4221.3874,N,01322.0805,E,1,03,3.1,746.1,M,44.2,M,,*4C
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:29.00Z","ept":0.005,"lat":42.356456667,"lon":13.368008333,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:29.000Z","ept":0.005,"lat":42.356456667,"lon":13.368008333,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -98,7 +98,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":48,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120330,A,4221.3875,N,01322.0807,E,000.0,000.0,150305,001.4,E*73
 $GPGGA,120330,4221.3875,N,01322.0807,E,1,03,3.1,746.1,M,44.2,M,,*47
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:30.00Z","ept":0.005,"lat":42.356458333,"lon":13.368011667,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:30.000Z","ept":0.005,"lat":42.356458333,"lon":13.368011667,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -106,7 +106,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":47,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120331,A,4221.3880,N,01322.0808,E,000.0,000.0,150305,001.4,E*77
 $GPGGA,120331,4221.3880,N,01322.0808,E,1,03,3.1,746.1,M,44.2,M,,*43
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:31.00Z","ept":0.005,"lat":42.356466667,"lon":13.368013333,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:31.000Z","ept":0.005,"lat":42.356466667,"lon":13.368013333,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -114,7 +114,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":47,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120332,A,4221.3884,N,01322.0802,E,000.0,000.0,150305,001.4,E*7A
 $GPGGA,120332,4221.3884,N,01322.0802,E,1,03,3.1,746.1,M,44.2,M,,*4E
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:32.00Z","ept":0.005,"lat":42.356473333,"lon":13.368003333,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:32.000Z","ept":0.005,"lat":42.356473333,"lon":13.368003333,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -122,7 +122,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":47,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120333,A,4221.3889,N,01322.0794,E,000.0,000.0,150305,001.4,E*76
 $GPGGA,120333,4221.3889,N,01322.0794,E,1,03,3.1,746.1,M,44.2,M,,*42
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:33.00Z","ept":0.005,"lat":42.356481667,"lon":13.367990000,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:33.000Z","ept":0.005,"lat":42.356481667,"lon":13.367990000,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -130,7 +130,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":47,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120334,A,4221.3893,N,01322.0786,E,000.0,000.0,150305,001.4,E*79
 $GPGGA,120334,4221.3893,N,01322.0786,E,1,03,3.1,746.1,M,44.2,M,,*4D
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:34.00Z","ept":0.005,"lat":42.356488333,"lon":13.367976667,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:34.000Z","ept":0.005,"lat":42.356488333,"lon":13.367976667,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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
@@ -138,7 +138,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44
 {"class":"SKY","tag":"GSV","satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true},{"PRN":3,"el":72,"az":164,"ss":42,"used":true},{"PRN":11,"el":24,"az":279,"ss":0,"used":false},{"PRN":14,"el":30,"az":119,"ss":47,"used":true},{"PRN":15,"el":33,"az":70,"ss":39,"used":false},{"PRN":16,"el":5,"az":184,"ss":0,"used":false},{"PRN":18,"el":20,"az":46,"ss":0,"used":false},{"PRN":19,"el":73,"az":304,"ss":0,"used":false},{"PRN":22,"el":50,"az":54,"ss":0,"used":false}]}

 $GPRMC,120335,A,4221.3898,N,01322.0780,E,000.0,000.0,150305,001.4,E*75
 $GPGGA,120335,4221.3898,N,01322.0780,E,1,03,3.1,746.1,M,44.2,M,,*41
-{"class":"TPV","tag":"GGA","time":"2005-03-15T12:03:35.00Z","ept":0.005,"lat":42.356496667,"lon":13.367966667,"alt":746.100,"track":0.0000,"speed":0.000,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"time":"2005-03-15T12:03:35.000Z","ept":0.005,"lat":42.356496667,"lon":13.367966667,"alt":746.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A
 $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