1 files changed, 26 insertions, 26 deletions
diff --git a/test/stable/garmin38.log.chk b/test/stable/garmin38.log.chk
index f5974b90..990a4f58 100644
--- a/test/stable/garmin38.log.chk
+++ b/test/stable/garmin38.log.chk
@@ -1,89 +1,89 @@
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.452,N,11821.142,W,142214,A*3B
-GPSD,O=GLL ? 0.005 33.807533333 -118.352366667 ? 39.864 59.589 ? ? ? ? ? ? 2
+{"class":"TPV","tag":"GLL","ept":0.005,"lat":33.807533333,"lon":-118.352366667,"eph":39.864,"epv":59.589,"mode":2}
 $PGRMZ,125,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,142216,A,3348.452,N,11821.143,W,000.0,353.6,081002,013.8,E*66
-GPSD,O=RMC 1034086936.000 0.005 33.807533333 -118.352383333 ? ? ? 353.6000 0.000 ? ? ? ? 2
+{"class":"TPV","tag":"RMC","time":1034086936.000,"ept":0.005,"lat":33.807533333,"lon":-118.352383333,"track":353.6000,"speed":0.000,"mode":2}
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142216,3348.452,N,11821.143,W,1,05,1.8,38.4,M,-32.4,M,,*4B
-GPSD,O=GGA 1034086936.000 0.005 33.807533333 -118.352383333 38.400 ? ? 353.6000 0.000 0.000 ? ? ? 3
+{"class":"TPV","tag":"GGA","time":1034086936.000,"ept":0.005,"lat":33.807533333,"lon":-118.352383333,"alt":38.400,"track":353.6000,"speed":0.000,"climb":0.000,"mode":3}
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086936.000 0.005 33.807533333 -118.352383333 38.400 27.000 64.400 353.6000 0.000 0.000 ? ? ? 3
+{"class":"TPV","tag":"GSA","time":1034086936.000,"ept":0.005,"lat":33.807533333,"lon":-118.352383333,"alt":38.400,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"mode":3}
 $GPGSV,2,1,08,03,23,224,38,09,06,037,00,11,17,314,41,14,75,015,44*72
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,46,31,27,263,38*7C
-GPSD,Y=GSV 1034086936.000 8:3 23 224 38 1:9 6 37 0 0:11 17 314 41 1:14 75 15 44 1:15 18 138 0 0:18 20 79 0 0:25 27 172 46 1:31 27 263 38 1:
+{"class":"SKY","tag":"GSV","time":1034086936.000 "reported":8,"satellites":[{"PRN":3,"el":23,"az":224,"ss":38,"used":true},{"PRN":9,"el":6,"az":37,"ss":0,"used":false},{"PRN":11,"el":17,"az":314,"ss":41,"used":true},{"PRN":14,"el":75,"az":15,"ss":44,"used":true},{"PRN":15,"el":18,"az":138,"ss":0,"used":false},{"PRN":18,"el":20,"az":79,"ss":0,"used":false},{"PRN":25,"el":27,"az":172,"ss":46,"used":true},{"PRN":31,"el":27,"az":263,"ss":38,"used":true}]}
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.452,N,11821.143,W,142216,A*38
-GPSD,O=GLL 1034086936.000 0.005 33.807533333 -118.352383333 38.400 39.864 59.589 353.6000 0.000 0.000 ? ? ? 3
+{"class":"TPV","tag":"GLL","time":1034086936.000,"ept":0.005,"lat":33.807533333,"lon":-118.352383333,"alt":38.400,"eph":39.864,"epv":59.589,"track":353.6000,"speed":0.000,"climb":0.000,"mode":3}
 $PGRMZ,126,f,3*1E
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,142218,A,3348.451,N,11821.144,W,000.0,353.6,081002,013.8,E*6C
-GPSD,O=RMC 1034086938.000 0.005 33.807516667 -118.352400000 ? 27.000 ? 353.6000 0.000 ? ? 33.43 ? 2
+{"class":"TPV","tag":"RMC","time":1034086938.000,"ept":0.005,"lat":33.807516667,"lon":-118.352400000,"eph":27.000,"track":353.6000,"speed":0.000,"eps":33.43,"mode":2}
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142218,3348.451,N,11821.144,W,1,05,1.8,38.4,M,-32.4,M,,*41
-GPSD,O=GGA 1034086938.000 0.005 33.807516667 -118.352400000 38.400 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GGA","time":1034086938.000,"ept":0.005,"lat":33.807516667,"lon":-118.352400000,"alt":38.400,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086938.000 0.005 33.807516667 -118.352400000 38.400 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GSA","time":1034086938.000,"ept":0.005,"lat":33.807516667,"lon":-118.352400000,"alt":38.400,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSV,2,1,08,03,23,224,43,09,06,037,00,11,17,314,38,14,75,015,44*70
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,42*79
-GPSD,Y=GSV 1034086938.000 8:3 23 224 43 1:9 6 37 0 0:11 17 314 38 1:14 75 15 44 1:15 18 138 0 0:18 20 79 0 0:25 27 172 39 1:31 27 263 42 1:
+{"class":"SKY","tag":"GSV","time":1034086938.000 "reported":8,"satellites":[{"PRN":3,"el":23,"az":224,"ss":43,"used":true},{"PRN":9,"el":6,"az":37,"ss":0,"used":false},{"PRN":11,"el":17,"az":314,"ss":38,"used":true},{"PRN":14,"el":75,"az":15,"ss":44,"used":true},{"PRN":15,"el":18,"az":138,"ss":0,"used":false},{"PRN":18,"el":20,"az":79,"ss":0,"used":false},{"PRN":25,"el":27,"az":172,"ss":39,"used":true},{"PRN":31,"el":27,"az":263,"ss":42,"used":true}]}
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.451,N,11821.144,W,142218,A*32
-GPSD,O=GLL 1034086938.000 0.005 33.807516667 -118.352400000 38.400 39.864 59.589 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GLL","time":1034086938.000,"ept":0.005,"lat":33.807516667,"lon":-118.352400000,"alt":38.400,"eph":39.864,"epv":59.589,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $PGRMZ,126,f,3*1E
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,142220,A,3348.451,N,11821.142,W,000.0,353.6,081002,013.8,E*61
-GPSD,O=RMC 1034086940.000 0.005 33.807516667 -118.352366667 ? 27.000 ? 353.6000 0.000 ? ? 33.43 ? 2
+{"class":"TPV","tag":"RMC","time":1034086940.000,"ept":0.005,"lat":33.807516667,"lon":-118.352366667,"eph":27.000,"track":353.6000,"speed":0.000,"eps":33.43,"mode":2}
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142220,3348.451,N,11821.142,W,1,05,1.8,37.6,M,-32.4,M,,*41
-GPSD,O=GGA 1034086940.000 0.005 33.807516667 -118.352366667 37.600 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GGA","time":1034086940.000,"ept":0.005,"lat":33.807516667,"lon":-118.352366667,"alt":37.600,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086940.000 0.005 33.807516667 -118.352366667 37.600 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GSA","time":1034086940.000,"ept":0.005,"lat":33.807516667,"lon":-118.352366667,"alt":37.600,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSV,2,1,08,03,23,224,43,09,06,037,00,11,17,314,38,14,75,015,43*77
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,41*7A
-GPSD,Y=GSV 1034086940.000 8:3 23 224 43 1:9 6 37 0 0:11 17 314 38 1:14 75 15 43 1:15 18 138 0 0:18 20 79 0 0:25 27 172 39 1:31 27 263 41 1:
+{"class":"SKY","tag":"GSV","time":1034086940.000 "reported":8,"satellites":[{"PRN":3,"el":23,"az":224,"ss":43,"used":true},{"PRN":9,"el":6,"az":37,"ss":0,"used":false},{"PRN":11,"el":17,"az":314,"ss":38,"used":true},{"PRN":14,"el":75,"az":15,"ss":43,"used":true},{"PRN":15,"el":18,"az":138,"ss":0,"used":false},{"PRN":18,"el":20,"az":79,"ss":0,"used":false},{"PRN":25,"el":27,"az":172,"ss":39,"used":true},{"PRN":31,"el":27,"az":263,"ss":41,"used":true}]}
 $PGRME,19.2,M,28.7,M,34.6,M*18
 $GPGLL,3348.451,N,11821.142,W,142220,A*3F
-GPSD,O=GLL 1034086940.000 0.005 33.807516667 -118.352366667 37.600 39.864 59.589 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GLL","time":1034086940.000,"ept":0.005,"lat":33.807516667,"lon":-118.352366667,"alt":37.600,"eph":39.864,"epv":59.589,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $PGRMZ,123,f,3*1B
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,142222,A,3348.451,N,11821.143,W,000.0,353.6,081002,013.8,E*62
-GPSD,O=RMC 1034086942.000 0.005 33.807516667 -118.352383333 ? 27.000 ? 353.6000 0.000 ? ? 33.43 ? 2
+{"class":"TPV","tag":"RMC","time":1034086942.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"eph":27.000,"track":353.6000,"speed":0.000,"eps":33.43,"mode":2}
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142222,3348.451,N,11821.143,W,1,05,1.8,38.0,M,-32.4,M,,*4B
-GPSD,O=GGA 1034086942.000 0.005 33.807516667 -118.352383333 38.000 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GGA","time":1034086942.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086942.000 0.005 33.807516667 -118.352383333 38.000 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GSA","time":1034086942.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSV,2,1,08,03,23,224,42,09,06,037,00,11,17,314,38,14,75,015,43*76
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,40,31,27,263,41*74
-GPSD,Y=GSV 1034086942.000 8:3 23 224 42 1:9 6 37 0 0:11 17 314 38 1:14 75 15 43 1:15 18 138 0 0:18 20 79 0 0:25 27 172 40 1:31 27 263 41 1:
+{"class":"SKY","tag":"GSV","time":1034086942.000 "reported":8,"satellites":[{"PRN":3,"el":23,"az":224,"ss":42,"used":true},{"PRN":9,"el":6,"az":37,"ss":0,"used":false},{"PRN":11,"el":17,"az":314,"ss":38,"used":true},{"PRN":14,"el":75,"az":15,"ss":43,"used":true},{"PRN":15,"el":18,"az":138,"ss":0,"used":false},{"PRN":18,"el":20,"az":79,"ss":0,"used":false},{"PRN":25,"el":27,"az":172,"ss":40,"used":true},{"PRN":31,"el":27,"az":263,"ss":41,"used":true}]}
 $PGRME,19.2,M,28.9,M,34.7,M*17
 $GPGLL,3348.451,N,11821.143,W,142222,A*3C
-GPSD,O=GLL 1034086942.000 0.005 33.807516667 -118.352383333 38.000 39.864 60.004 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GLL","time":1034086942.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"eph":39.864,"epv":60.004,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $PGRMZ,125,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,142224,A,3348.451,N,11821.143,W,000.0,353.6,081002,013.8,E*64
-GPSD,O=RMC 1034086944.000 0.005 33.807516667 -118.352383333 ? 27.000 ? 353.6000 0.000 ? ? 33.43 ? 2
+{"class":"TPV","tag":"RMC","time":1034086944.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"eph":27.000,"track":353.6000,"speed":0.000,"eps":33.43,"mode":2}
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,142224,3348.451,N,11821.143,W,1,05,1.8,38.0,M,-32.4,M,,*4D
-GPSD,O=GGA 1034086944.000 0.005 33.807516667 -118.352383333 38.000 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GGA","time":1034086944.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSA,A,3,03,,11,14,,,25,31,,,,,3.3,1.8,2.8*32
-GPSD,O=GSA 1034086944.000 0.005 33.807516667 -118.352383333 38.000 27.000 64.400 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GSA","time":1034086944.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"eph":27.000,"epv":64.400,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $GPGSV,2,1,08,03,23,224,43,09,06,037,00,11,17,314,39,14,75,015,44*71
 $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,40*7B
-GPSD,Y=GSV 1034086944.000 8:3 23 224 43 1:9 6 37 0 0:11 17 314 39 1:14 75 15 44 1:15 18 138 0 0:18 20 79 0 0:25 27 172 39 1:31 27 263 40 1:
+{"class":"SKY","tag":"GSV","time":1034086944.000 "reported":8,"satellites":[{"PRN":3,"el":23,"az":224,"ss":43,"used":true},{"PRN":9,"el":6,"az":37,"ss":0,"used":false},{"PRN":11,"el":17,"az":314,"ss":39,"used":true},{"PRN":14,"el":75,"az":15,"ss":44,"used":true},{"PRN":15,"el":18,"az":138,"ss":0,"used":false},{"PRN":18,"el":20,"az":79,"ss":0,"used":false},{"PRN":25,"el":27,"az":172,"ss":39,"used":true},{"PRN":31,"el":27,"az":263,"ss":40,"used":true}]}
 $PGRME,19.2,M,28.9,M,34.7,M*17
 $GPGLL,3348.451,N,11821.143,W,142224,A*3A
-GPSD,O=GLL 1034086944.000 0.005 33.807516667 -118.352383333 38.000 39.864 60.004 353.6000 0.000 0.000 ? 33.43 ? 3
+{"class":"TPV","tag":"GLL","time":1034086944.000,"ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"eph":39.864,"epv":60.004,"track":353.6000,"speed":0.000,"climb":0.000,"eps":33.43,"mode":3}
 $PGRMZ,125,f,3*1D