1 files changed, 27 insertions, 28 deletions
diff --git a/test/stable/ac12.log.chk b/test/stable/ac12.log.chk
index 5d568f7c..1e4640c0 100644
--- a/test/stable/ac12.log.chk
+++ b/test/stable/ac12.log.chk
@@ -1,79 +1,78 @@
 $GPGGA,193221.00,2037.72792,N,08704.08478,W,1,04,1.7,-30.40,M,-13.9,M,,*7D
-GPSD,O=GGA ? 0.005 20.628798667 -87.068079667 -30.400 ? ? ? ? 0.000 ? ? ? 3
+{"class":"TPV","tag":"GGA","ept":0.005,"lat":20.628798667,"lon":-87.068079667,"alt":-30.400,"climb":0.000,"mode":3}
 $GPGSA,A,3,10,28,09,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA ? 0.005 20.628798667 -87.068079667 -30.400 25.500 69.000 ? ? 0.000 ? ? ? 3
+{"class":"TPV","tag":"GSA","ept":0.005,"lat":20.628798667,"lon":-87.068079667,"alt":-30.400,"eph":25.500,"epv":69.000,"climb":0.000,"mode":3}
 $GPGSV,3,1,12,28,14,150,41,09,15,254,41,10,43,192,47,13,06,081,36*7A
 $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
-GPSD,Y=GSV 0.000 12:28 14 150 41 1:9 15 254 41 1:10 43 192 47 1:13 6 81 36 1:2 56 323 0 0:4 41 24 0 0:12 31 317 0 0:17 31 85 0 0:5 15 318 0 0:24 2 246 0 0:33 8 96 0 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":0.000 "reported":12,"satellites":[{"PRN":28,"el":14,"az":150,"ss":41,"used":true},{"PRN":9,"el":15,"az":254,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":47,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":323,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":31,"az":317,"ss":0,"used":false},{"PRN":17,"el":31,"az":85,"ss":0,"used":false},{"PRN":5,"el":15,"az":318,"ss":0,"used":false},{"PRN":24,"el":2,"az":246,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":0,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193221.00,A,2037.7279,N,08704.0848,W,00.1,201.8,231207,01,W,A*2D
-GPSD,O=RMC 1198438341.000 0.005 20.628798333 -87.068080000 ? 25.500 ? 201.8000 0.051 ? ? ? ? 2
+{"class":"TPV","tag":"RMC","time":1198438341.000,"ept":0.005,"lat":20.628798333,"lon":-87.068080000,"eph":25.500,"track":201.8000,"speed":0.051,"mode":2}
 $GPZDA,193223.00,23,12,2007,00,00*69
 $GPGGA,193222.00,2037.72832,N,08704.08469,W,1,04,1.7,-30.00,M,-13.9,M,,*7F
-GPSD,O=GGA 1198438342.000 0.005 20.628805333 -87.068078167 -30.000 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GGA","time":1198438342.000,"ept":0.005,"lat":20.628805333,"lon":-87.068078167,"alt":-30.000,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA 1198438342.000 0.005 20.628805333 -87.068078167 -30.000 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GSA","time":1198438342.000,"ept":0.005,"lat":20.628805333,"lon":-87.068078167,"alt":-30.000,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSV,3,1,12,28,14,150,40,09,15,254,41,10,43,192,47,13,06,081,36*7B
 $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,39,35,45,118,*77
-GPSD,Y=GSV 1198438342.000 12:28 14 150 40 1:9 15 254 41 1:10 43 192 47 1:13 6 81 36 1:2 56 323 0 0:4 41 24 0 0:12 31 317 0 0:17 31 85 0 0:5 15 318 0 0:24 2 246 0 0:33 8 96 39 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":1198438342.000 "reported":12,"satellites":[{"PRN":28,"el":14,"az":150,"ss":40,"used":true},{"PRN":9,"el":15,"az":254,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":47,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":323,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":31,"az":317,"ss":0,"used":false},{"PRN":17,"el":31,"az":85,"ss":0,"used":false},{"PRN":5,"el":15,"az":318,"ss":0,"used":false},{"PRN":24,"el":2,"az":246,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":39,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193222.00,A,2037.7283,N,08704.0847,W,00.0,201.8,231207,01,W,A*25
-GPSD,O=RMC 1198438342.000 0.005 20.628805000 -87.068078333 -30.000 25.500 69.000 201.8000 0.000 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"RMC","time":1198438342.000,"ept":0.005,"lat":20.628805000,"lon":-87.068078333,"alt":-30.000,"eph":25.500,"epv":69.000,"track":201.8000,"speed":0.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPZDA,193224.00,23,12,2007,00,00*6E
 $GPGGA,193223.00,2037.72880,N,08704.08455,W,1,04,1.7,-29.55,M,-13.9,M,,*70
-GPSD,O=GGA 1198438343.000 0.005 20.628813333 -87.068075833 -29.550 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GGA","time":1198438343.000,"ept":0.005,"lat":20.628813333,"lon":-87.068075833,"alt":-29.550,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA 1198438343.000 0.005 20.628813333 -87.068075833 -29.550 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GSA","time":1198438343.000,"ept":0.005,"lat":20.628813333,"lon":-87.068075833,"alt":-29.550,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSV,3,1,12,28,14,150,39,09,15,254,41,10,43,192,47,13,06,081,36*75
 $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
-GPSD,Y=GSV 1198438343.000 12:28 14 150 39 1:9 15 254 41 1:10 43 192 47 1:13 6 81 36 1:2 56 323 0 0:4 41 24 0 0:12 31 317 0 0:17 31 85 0 0:5 15 318 0 0:24 2 246 0 0:33 8 96 0 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":1198438343.000 "reported":12,"satellites":[{"PRN":28,"el":14,"az":150,"ss":39,"used":true},{"PRN":9,"el":15,"az":254,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":47,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":323,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":31,"az":317,"ss":0,"used":false},{"PRN":17,"el":31,"az":85,"ss":0,"used":false},{"PRN":5,"el":15,"az":318,"ss":0,"used":false},{"PRN":24,"el":2,"az":246,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":0,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193223.00,A,2037.7288,N,08704.0846,W,00.1,201.8,231207,01,W,A*2F
-GPSD,O=RMC 1198438343.000 0.005 20.628813333 -87.068076667 -29.550 25.500 69.000 201.8000 0.051 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"RMC","time":1198438343.000,"ept":0.005,"lat":20.628813333,"lon":-87.068076667,"alt":-29.550,"eph":25.500,"epv":69.000,"track":201.8000,"speed":0.051,"climb":0.000,"eps":51.00,"mode":3}
 $GPZDA,193225.00,23,12,2007,00,00*6F
 $GPGGA,193224.00,2037.72912,N,08704.08451,W,1,04,1.7,-29.53,M,-13.9,M,,*7F
-GPSD,O=GGA 1198438344.000 0.005 20.628818667 -87.068075167 -29.530 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GGA","time":1198438344.000,"ept":0.005,"lat":20.628818667,"lon":-87.068075167,"alt":-29.530,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA 1198438344.000 0.005 20.628818667 -87.068075167 -29.530 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GSA","time":1198438344.000,"ept":0.005,"lat":20.628818667,"lon":-87.068075167,"alt":-29.530,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSV,3,1,12,28,14,150,39,09,15,254,41,10,43,192,47,13,06,081,36*75
 $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
-GPSD,Y=GSV 1198438344.000 12:28 14 150 39 1:9 15 254 41 1:10 43 192 47 1:13 6 81 36 1:2 56 323 0 0:4 41 24 0 0:12 31 317 0 0:17 31 85 0 0:5 15 318 0 0:24 2 246 0 0:33 8 96 0 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":1198438344.000 "reported":12,"satellites":[{"PRN":28,"el":14,"az":150,"ss":39,"used":true},{"PRN":9,"el":15,"az":254,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":47,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":323,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":31,"az":317,"ss":0,"used":false},{"PRN":17,"el":31,"az":85,"ss":0,"used":false},{"PRN":5,"el":15,"az":318,"ss":0,"used":false},{"PRN":24,"el":2,"az":246,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":0,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193224.00,A,2037.7291,N,08704.0845,W,00.0,201.8,231207,01,W,A*22
-GPSD,O=RMC 1198438344.000 0.005 20.628818333 -87.068075000 -29.530 25.500 69.000 201.8000 0.000 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"RMC","time":1198438344.000,"ept":0.005,"lat":20.628818333,"lon":-87.068075000,"alt":-29.530,"eph":25.500,"epv":69.000,"track":201.8000,"speed":0.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPZDA,193226.00,23,12,2007,00,00*6C
 $GPGGA,193225.00,2037.72949,N,08704.08443,W,1,04,1.7,-29.21,M,-13.9,M,,*76
-GPSD,O=GGA 1198438345.000 0.005 20.628824833 -87.068073833 -29.210 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GGA","time":1198438345.000,"ept":0.005,"lat":20.628824833,"lon":-87.068073833,"alt":-29.210,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA 1198438345.000 0.005 20.628824833 -87.068073833 -29.210 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GSA","time":1198438345.000,"ept":0.005,"lat":20.628824833,"lon":-87.068073833,"alt":-29.210,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSV,4,1,13,28,13,151,39,09,15,253,42,10,43,192,48,13,06,081,36*7E
 $GPGSV,4,2,13,02,56,325,,04,41,024,,12,32,317,,17,30,086,*73
 $GPGSV,4,3,13,05,16,318,,24,03,247,,30,00,323,,33,08,096,*76
 $GPGSV,4,4,13,35,45,118,*44
-GPSD,Y=GSV 1198438345.000 13:28 13 151 39 1:9 15 253 42 1:10 43 192 48 1:13 6 81 36 1:2 56 325 0 0:4 41 24 0 0:12 32 317 0 0:17 30 86 0 0:5 16 318 0 0:24 3 247 0 0:30 0 323 0 0:33 8 96 0 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":1198438345.000 "reported":13,"satellites":[{"PRN":28,"el":13,"az":151,"ss":39,"used":true},{"PRN":9,"el":15,"az":253,"ss":42,"used":true},{"PRN":10,"el":43,"az":192,"ss":48,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":325,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":32,"az":317,"ss":0,"used":false},{"PRN":17,"el":30,"az":86,"ss":0,"used":false},{"PRN":5,"el":16,"az":318,"ss":0,"used":false},{"PRN":24,"el":3,"az":247,"ss":0,"used":false},{"PRN":30,"el":0,"az":323,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":0,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193225.00,A,2037.7295,N,08704.0844,W,00.1,201.8,231207,01,W,A*27
-GPSD,O=RMC 1198438345.000 0.005 20.628825000 -87.068073333 -29.210 25.500 69.000 201.8000 0.051 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"RMC","time":1198438345.000,"ept":0.005,"lat":20.628825000,"lon":-87.068073333,"alt":-29.210,"eph":25.500,"epv":69.000,"track":201.8000,"speed":0.051,"climb":0.000,"eps":51.00,"mode":3}
 $GPZDA,193227.00,23,12,2007,00,00*6D
 $GPGGA,193226.00,2037.72992,N,08704.08433,W,1,04,1.7,-28.69,M,-13.9,M,,*79
-GPSD,O=GGA 1198438346.000 0.005 20.628832000 -87.068072167 -28.690 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GGA","time":1198438346.000,"ept":0.005,"lat":20.628832000,"lon":-87.068072167,"alt":-28.690,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA 1198438346.000 0.005 20.628832000 -87.068072167 -28.690 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GSA","time":1198438346.000,"ept":0.005,"lat":20.628832000,"lon":-87.068072167,"alt":-28.690,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSV,4,1,13,28,13,151,41,09,15,253,41,10,43,192,48,13,06,081,36*72
 $GPGSV,4,2,13,02,56,325,,04,41,024,,12,32,317,,17,30,086,*73
 $GPGSV,4,3,13,05,16,318,,24,03,247,,30,00,323,,33,08,096,*76
 $GPGSV,4,4,13,35,45,118,*44
-GPSD,Y=GSV 1198438346.000 13:28 13 151 41 1:9 15 253 41 1:10 43 192 48 1:13 6 81 36 1:2 56 325 0 0:4 41 24 0 0:12 32 317 0 0:17 30 86 0 0:5 16 318 0 0:24 3 247 0 0:30 0 323 0 0:33 8 96 0 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":1198438346.000 "reported":13,"satellites":[{"PRN":28,"el":13,"az":151,"ss":41,"used":true},{"PRN":9,"el":15,"az":253,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":48,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":325,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":32,"az":317,"ss":0,"used":false},{"PRN":17,"el":30,"az":86,"ss":0,"used":false},{"PRN":5,"el":16,"az":318,"ss":0,"used":false},{"PRN":24,"el":3,"az":247,"ss":0,"used":false},{"PRN":30,"el":0,"az":323,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":0,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193226.00,A,2037.7299,N,08704.0843,W,00.1,201.8,231207,01,W,A*2F
-GPSD,O=RMC 1198438346.000 0.005 20.628831667 -87.068071667 -28.690 25.500 69.000 201.8000 0.051 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"RMC","time":1198438346.000,"ept":0.005,"lat":20.628831667,"lon":-87.068071667,"alt":-28.690,"eph":25.500,"epv":69.000,"track":201.8000,"speed":0.051,"climb":0.000,"eps":51.00,"mode":3}
 $GPZDA,193228.00,23,12,2007,00,00*62
 $GPGGA,193227.00,2037.73032,N,08704.08423,W,1,04,1.7,-28.28,M,-13.9,M,,*7E
-GPSD,O=GGA 1198438347.000 0.005 20.628838667 -87.068070500 -28.280 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GGA","time":1198438347.000,"ept":0.005,"lat":20.628838667,"lon":-87.068070500,"alt":-28.280,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSA,A,3,10,28,09,13,,,,,,,,,03.4,01.7,03.0*00
-GPSD,O=GSA 1198438347.000 0.005 20.628838667 -87.068070500 -28.280 25.500 69.000 ? ? 0.000 ? 51.00 ? 3
+{"class":"TPV","tag":"GSA","time":1198438347.000,"ept":0.005,"lat":20.628838667,"lon":-87.068070500,"alt":-28.280,"eph":25.500,"epv":69.000,"climb":0.000,"eps":51.00,"mode":3}
 $GPGSV,4,1,13,28,13,151,41,09,15,253,41,10,43,192,48,13,06,081,36*72
 $GPGSV,4,2,13,02,56,325,,04,41,024,,12,32,317,,17,30,086,*73
 $GPGSV,4,3,13,05,16,318,,24,03,247,,30,00,323,,33,08,096,*76
 $GPGSV,4,4,13,35,45,118,*44
-GPSD,Y=GSV 1198438347.000 13:28 13 151 41 1:9 15 253 41 1:10 43 192 48 1:13 6 81 36 1:2 56 325 0 0:4 41 24 0 0:12 32 317 0 0:17 30 86 0 0:5 16 318 0 0:24 3 247 0 0:30 0 323 0 0:33 8 96 0 0:35 45 118 0 0:
+{"class":"SKY","tag":"GSV","time":1198438347.000 "reported":13,"satellites":[{"PRN":28,"el":13,"az":151,"ss":41,"used":true},{"PRN":9,"el":15,"az":253,"ss":41,"used":true},{"PRN":10,"el":43,"az":192,"ss":48,"used":true},{"PRN":13,"el":6,"az":81,"ss":36,"used":true},{"PRN":2,"el":56,"az":325,"ss":0,"used":false},{"PRN":4,"el":41,"az":24,"ss":0,"used":false},{"PRN":12,"el":32,"az":317,"ss":0,"used":false},{"PRN":17,"el":30,"az":86,"ss":0,"used":false},{"PRN":5,"el":16,"az":318,"ss":0,"used":false},{"PRN":24,"el":3,"az":247,"ss":0,"used":false},{"PRN":30,"el":0,"az":323,"ss":0,"used":false},{"PRN":33,"el":8,"az":96,"ss":0,"used":false},{"PRN":35,"el":45,"az":118,"ss":0,"used":false}]}
 $GPRMC,193227.00,A,2037.7303,N,08704.0842,W,00.0,201.8,231207,01,W,A*2C
-GPSD,O=RMC 1198438347.000 0.005 20.628838333 -87.068070000 -28.280 25.500 69.000 201.8000 0.000 0.000 ? 51.00 ? 3