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

Required a regression-test rebuild.

1 files changed, 17 insertions, 17 deletions

diff --git a/test/daemon/motorola-t805.log.chk b/test/daemon/motorola-t805.log.chk
index 38af664d..177f2bd4 100644
--- a/test/daemon/motorola-t805.log.chk
+++ b/test/daemon/motorola-t805.log.chk
@@ -13,55 +13,55 @@ $GPRMC,212612.879,V,,,,,,,181207,0,N*5E
 $GPGGA,212613.879,,,,,0,00,,,M,0.0,M,,0000*55
 $GPRMC,212613.879,V,,,,,,,181207,0,N*5F
 $GPGGA,212614.879,4839.9488,N,00214.8863,E,1,04,2.2,133.1,M,47.3,M,,0000*55
-{"class":"TPV","tag":"GGA","lat":48.665813333,"lon":2.248105000,"alt":133.100,"mode":3}

+{"class":"TPV","tag":"GGA","mode":3,"lat":48.665813333,"lon":2.248105000,"alt":133.100}

 $GPRMC,212614.879,A,4839.9488,N,00214.8863,E,0.56,344.41,181207,0,A*77
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:14.88Z","ept":0.005,"lat":48.665813333,"lon":2.248105000,"alt":133.100,"track":344.4100,"speed":0.288,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:14.879Z","ept":0.005,"lat":48.665813333,"lon":2.248105000,"alt":133.100,"track":344.4100,"speed":0.288}

 $GPGGA,212615.879,4839.9396,N,00214.8909,E,1,04,2.2,140.3,M,47.3,M,,0000*57
 $GPRMC,212615.879,A,4839.9396,N,00214.8909,E,0.78,237.93,181207,0,A*75
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:15.88Z","ept":0.005,"lat":48.665660000,"lon":2.248181667,"alt":140.300,"track":237.9300,"speed":0.401,"climb":7.200,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:15.879Z","ept":0.005,"lat":48.665660000,"lon":2.248181667,"alt":140.300,"track":237.9300,"speed":0.401,"climb":7.200}

 $GPGGA,212617.000,4839.9404,N,00214.9022,E,1,04,2.2,158.4,M,47.3,M,,0000*50
 $GPRMC,212617.000,A,4839.9404,N,00214.9022,E,1.25,21.04,181207,0,A*4E
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:17.00Z","ept":0.005,"lat":48.665673333,"lon":2.248370000,"alt":158.400,"track":21.0400,"speed":0.643,"climb":16.146,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:17.000Z","ept":0.005,"lat":48.665673333,"lon":2.248370000,"alt":158.400,"track":21.0400,"speed":0.643,"climb":16.146}

 $GPGGA,212618.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*5F
 $GPRMC,212618.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*69
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:18.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":9.600,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:18.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":9.600}

 $GPGGA,212619.000,,,,,0,00,50.0,,M,0.0,M,,0000*42
 $GPRMC,212619.000,V,,,,,,,181207,0,N*53
 $GPGGA,212620.000,,,,,0,00,50.0,,M,0.0,M,,0000*48
 $GPRMC,212620.000,V,,,,,,,181207,0,N*59
 $GPGGA,212621.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*55
 $GPRMC,212621.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*63
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:21.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:21.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212622.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*56
 $GPRMC,212622.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*60
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:22.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:22.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212623.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*57
 $GPRMC,212623.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*61
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:23.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:23.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212624.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*50
 $GPRMC,212624.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*66
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:24.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:24.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212625.000,4839.9411,N,00214.9065,E,1,03,3.1,168.0,M,47.3,M,,0000*54
 $GPRMC,212625.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*67
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:25.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:25.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212626.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*52
 $GPRMC,212626.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*64
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:26.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:26.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212627.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*53
 $GPRMC,212627.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*65
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:27.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:27.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212628.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*5C
 $GPRMC,212628.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*6A
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:28.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:28.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212629.000,4839.9411,N,00214.9065,E,1,03,3.1,168.0,M,47.3,M,,0000*58
 $GPRMC,212629.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*6B
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:29.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:29.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212630.000,4839.9411,N,00214.9065,E,1,03,3.1,168.0,M,47.3,M,,0000*50
 $GPRMC,212630.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*63
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:30.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:30.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212631.000,4839.9411,N,00214.9065,E,1,03,3.1,168.0,M,47.3,M,,0000*51
 $GPRMC,212631.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*62
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:31.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:31.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}

 $GPGGA,212632.000,4839.9411,N,00214.9065,E,1,04,2.2,168.0,M,47.3,M,,0000*57
 $GPRMC,212632.000,A,4839.9411,N,00214.9065,E,0.00,,181207,0,A*61
-{"class":"TPV","tag":"RMC","time":"2007-12-18T21:26:32.00Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"RMC","mode":3,"time":"2007-12-18T21:26:32.000Z","ept":0.005,"lat":48.665685000,"lon":2.248441667,"alt":168.000,"track":0.0000,"speed":0.000,"climb":0.000}