1 files changed, 27 insertions, 28 deletions
diff --git a/test/stable/blumax-gps009.log.chk b/test/stable/blumax-gps009.log.chk
index c2857eec..ec076e96 100644
--- a/test/stable/blumax-gps009.log.chk
+++ b/test/stable/blumax-gps009.log.chk
@@ -9,87 +9,86 @@ $PSRFTXTBaud rate: 57600 *51
 $GPGGA,142816.359,,,,,0,00,,,M,0.0,M,,0000*51
 $GPGLL,,,,,142816.359,V,N*7D
 $GPGSA,A,1,,,,,,,,,,,,,,,*1E
-GPSD,O=?
+{"class":"TPV","tag":"GSA","ept":0.005,"mode":1}
 $GPGSV,3,1,12,12,48,233,,17,39,066,,15,29,172,,22,19,291,*70
 $GPGSV,3,2,12,26,17,161,,09,81,300,,05,32,240,,29,31,171,*70
 $GPGSV,3,3,12,18,15,251,,14,14,319,,28,08,059,,30,08,239,*77
-GPSD,Y=GSV 0.000 12:12 48 233 0 0:17 39 66 0 0:15 29 172 0 0:22 19 291 0 0:26 17 161 0 0:9 81 300 0 0:5 32 240 0 0:29 31 171 0 0:18 15 251 0 0:14 14 319 0 0:28 8 59 0 0:30 8 239 0 0:
+{"class":"SKY","tag":"GSV","time":0.000 "reported":12,"satellites":[{"PRN":12,"el":48,"az":233,"ss":0,"used":false},{"PRN":17,"el":39,"az":66,"ss":0,"used":false},{"PRN":15,"el":29,"az":172,"ss":0,"used":false},{"PRN":22,"el":19,"az":291,"ss":0,"used":false},{"PRN":26,"el":17,"az":161,"ss":0,"used":false},{"PRN":9,"el":81,"az":300,"ss":0,"used":false},{"PRN":5,"el":32,"az":240,"ss":0,"used":false},{"PRN":29,"el":31,"az":171,"ss":0,"used":false},{"PRN":18,"el":15,"az":251,"ss":0,"used":false},{"PRN":14,"el":14,"az":319,"ss":0,"used":false},{"PRN":28,"el":8,"az":59,"ss":0,"used":false},{"PRN":30,"el":8,"az":239,"ss":0,"used":false}]}
 $GPRMC,142816.359,V,,,,,,,180708,,,N*4C
 $GPGGA,142817.299,,,,,0,00,,,M,0.0,M,,0000*5D
 $GPGLL,,,,,142817.299,V,N*71
 $GPGSA,A,1,,,,,,,,,,,,,,,*1E
-GPSD,O=?
+{"class":"TPV","tag":"GSA","ept":0.005,"mode":1}
 $GPGSV,3,1,12,12,48,233,,17,39,066,,15,29,172,,22,19,291,*70
 $GPGSV,3,2,12,26,17,161,28,09,81,300,,05,32,240,,29,31,171,*7A
 $GPGSV,3,3,12,18,15,251,,14,14,319,,28,08,059,,30,08,239,*77
-GPSD,Y=GSV 0.000 12:12 48 233 0 0:17 39 66 0 0:15 29 172 0 0:22 19 291 0 0:26 17 161 28 0:9 81 300 0 0:5 32 240 0 0:29 31 171 0 0:18 15 251 0 0:14 14 319 0 0:28 8 59 0 0:30 8 239 0 0:
+{"class":"SKY","tag":"GSV","time":0.000 "reported":12,"satellites":[{"PRN":12,"el":48,"az":233,"ss":0,"used":false},{"PRN":17,"el":39,"az":66,"ss":0,"used":false},{"PRN":15,"el":29,"az":172,"ss":0,"used":false},{"PRN":22,"el":19,"az":291,"ss":0,"used":false},{"PRN":26,"el":17,"az":161,"ss":28,"used":false},{"PRN":9,"el":81,"az":300,"ss":0,"used":false},{"PRN":5,"el":32,"az":240,"ss":0,"used":false},{"PRN":29,"el":31,"az":171,"ss":0,"used":false},{"PRN":18,"el":15,"az":251,"ss":0,"used":false},{"PRN":14,"el":14,"az":319,"ss":0,"used":false},{"PRN":28,"el":8,"az":59,"ss":0,"used":false},{"PRN":30,"el":8,"az":239,"ss":0,"used":false}]}
 $GPRMC,142817.299,V,,,,,,,180708,,,N*40
 $GPGGA,142818.299,,,,,0,00,,,M,0.0,M,,0000*52
 $GPGLL,,,,,142818.299,V,N*7E
 $GPGSA,A,1,,,,,,,,,,,,,,,*1E
-GPSD,O=?
+{"class":"TPV","tag":"GSA","ept":0.005,"mode":1}
 $GPGSV,3,1,12,12,48,233,,17,39,066,,15,29,172,,22,19,291,*70
 $GPGSV,3,2,12,26,17,161,29,09,81,300,,05,32,240,21,29,31,171,*78
 $GPGSV,3,3,12,18,15,251,,14,14,319,,28,08,059,,30,08,239,*77
-GPSD,Y=GSV 0.000 12:12 48 233 0 0:17 39 66 0 0:15 29 172 0 0:22 19 291 0 0:26 17 161 29 0:9 81 300 0 0:5 32 240 21 0:29 31 171 0 0:18 15 251 0 0:14 14 319 0 0:28 8 59 0 0:30 8 239 0 0:
+{"class":"SKY","tag":"GSV","time":0.000 "reported":12,"satellites":[{"PRN":12,"el":48,"az":233,"ss":0,"used":false},{"PRN":17,"el":39,"az":66,"ss":0,"used":false},{"PRN":15,"el":29,"az":172,"ss":0,"used":false},{"PRN":22,"el":19,"az":291,"ss":0,"used":false},{"PRN":26,"el":17,"az":161,"ss":29,"used":false},{"PRN":9,"el":81,"az":300,"ss":0,"used":false},{"PRN":5,"el":32,"az":240,"ss":21,"used":false},{"PRN":29,"el":31,"az":171,"ss":0,"used":false},{"PRN":18,"el":15,"az":251,"ss":0,"used":false},{"PRN":14,"el":14,"az":319,"ss":0,"used":false},{"PRN":28,"el":8,"az":59,"ss":0,"used":false},{"PRN":30,"el":8,"az":239,"ss":0,"used":false}]}
 $GPRMC,142818.299,V,,,,,,,180708,,,N*4F
 $GPGGA,142818.899,5201.0687,N,00832.0645,E,0,04,,35.8,M,47.2,M,,0000*47
 $GPGLL,5201.0687,N,00832.0645,E,142818.899,V,N*4E
 $GPGSA,A,1,26,22,12,15,,,,,,,,,,,*1D
-GPSD,O=?
+{"class":"TPV","tag":"GSA","ept":0.005,"mode":1}
 $GPGSV,3,1,12,12,48,233,28,17,39,066,,15,29,172,33,22,19,290,23*7A
 $GPGSV,3,2,12,26,17,161,31,09,81,300,,05,32,240,23,29,31,171,*73
 $GPGSV,3,3,12,18,15,251,,14,14,319,,28,08,059,,30,08,239,*77
-GPSD,Y=GSV 0.000 12:12 48 233 28 1:17 39 66 0 0:15 29 172 33 1:22 19 290 23 1:26 17 161 31 1:9 81 300 0 0:5 32 240 23 0:29 31 171 0 0:18 15 251 0 0:14 14 319 0 0:28 8 59 0 0:30 8 239 0 0:
+{"class":"SKY","tag":"GSV","time":0.000 "reported":12,"satellites":[{"PRN":12,"el":48,"az":233,"ss":28,"used":true},{"PRN":17,"el":39,"az":66,"ss":0,"used":false},{"PRN":15,"el":29,"az":172,"ss":33,"used":true},{"PRN":22,"el":19,"az":290,"ss":23,"used":true},{"PRN":26,"el":17,"az":161,"ss":31,"used":true},{"PRN":9,"el":81,"az":300,"ss":0,"used":false},{"PRN":5,"el":32,"az":240,"ss":23,"used":false},{"PRN":29,"el":31,"az":171,"ss":0,"used":false},{"PRN":18,"el":15,"az":251,"ss":0,"used":false},{"PRN":14,"el":14,"az":319,"ss":0,"used":false},{"PRN":28,"el":8,"az":59,"ss":0,"used":false},{"PRN":30,"el":8,"az":239,"ss":0,"used":false}]}
 $GPRMC,142818.899,V,5201.0687,N,00832.0645,E,,,180708,,,N*7F
 $GPGGA,142819.299,5201.0809,N,00832.0852,E,1,04,4.9,32.1,M,47.2,M,,0000*60
-GPSD,O=GGA ? 0.005 52.018015000 8.534753333 32.100 0.000 0.000 ? ? 0.000 ? ? ? 3
+{"class":"TPV","tag":"GGA","ept":0.005,"lat":52.018015000,"lon":8.534753333,"alt":32.100,"eph":0.000,"epv":0.000,"climb":0.000,"mode":3}
 $GPGLL,5201.0809,N,00832.0852,E,142819.299,A,A*5D
-GPSD,O=GLL ? 0.005 52.018015000 8.534753333 32.100 0.000 0.000 ? ? 0.000 ? ? ? 3
+{"class":"TPV","tag":"GLL","ept":0.005,"lat":52.018015000,"lon":8.534753333,"alt":32.100,"eph":0.000,"epv":0.000,"climb":0.000,"mode":3}
 $GPGSA,A,3,26,22,12,15,,,,,,,,,5.0,4.9,1.0*38
-GPSD,O=GSA ? 0.005 52.018015000 8.534753333 32.100 0.000 0.000 ? ? 0.000 ? ? ? 3
+{"class":"TPV","tag":"GSA","ept":0.005,"lat":52.018015000,"lon":8.534753333,"alt":32.100,"eph":0.000,"epv":0.000,"climb":0.000,"mode":3}
 $GPGSV,3,1,12,12,48,233,29,17,39,066,,15,29,172,35,22,19,290,22*7C
 $GPGSV,3,2,12,26,17,161,31,09,81,300,,05,32,240,24,29,31,171,*74
 $GPGSV,3,3,12,18,15,251,,14,14,319,,28,08,059,,30,08,239,*77
-GPSD,Y=GSV 0.000 12:12 48 233 29 1:17 39 66 0 0:15 29 172 35 1:22 19 290 22 1:26 17 161 31 1:9 81 300 0 0:5 32 240 24 0:29 31 171 0 0:18 15 251 0 0:14 14 319 0 0:28 8 59 0 0:30 8 239 0 0:
+{"class":"SKY","tag":"GSV","time":0.000 "reported":12,"satellites":[{"PRN":12,"el":48,"az":233,"ss":29,"used":true},{"PRN":17,"el":39,"az":66,"ss":0,"used":false},{"PRN":15,"el":29,"az":172,"ss":35,"used":true},{"PRN":22,"el":19,"az":290,"ss":22,"used":true},{"PRN":26,"el":17,"az":161,"ss":31,"used":true},{"PRN":9,"el":81,"az":300,"ss":0,"used":false},{"PRN":5,"el":32,"az":240,"ss":24,"used":false},{"PRN":29,"el":31,"az":171,"ss":0,"used":false},{"PRN":18,"el":15,"az":251,"ss":0,"used":false},{"PRN":14,"el":14,"az":319,"ss":0,"used":false},{"PRN":28,"el":8,"az":59,"ss":0,"used":false},{"PRN":30,"el":8,"az":239,"ss":0,"used":false}]}
 $GPRMC,142819.299,A,5201.0809,N,00832.0852,E,0.87,249.59,180708,,,A*60
-GPSD,O=RMC 1216391299.299 0.005 52.018015000 8.534753333 ? 73.500 ? 249.5900 0.448 ? ? ? ? 2
+{"class":"TPV","tag":"RMC","time":1216391299.299,"ept":0.005,"lat":52.018015000,"lon":8.534753333,"eph":73.500,"track":249.5900,"speed":0.448,"mode":2}
 $GPZDA,143054.000,18,07,2008,,*55
 $GPGGA,143054.000,5201.1302,N,00832.1652,E,1,05,1.2,72.2,M,47.2,M,,0000*64
-GPSD,O=GGA 1216391454.000 0.005 52.018836667 8.536086667 72.200 73.500 23.000 ? ? 0.000 59.2379 0.95 ? 3
+{"class":"TPV","tag":"GGA","time":1216391454.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":73.500,"epv":23.000,"climb":0.000,"epd":59.2379,"eps":0.95,"mode":3}
 $GPGLL,5201.1302,N,00832.1652,E,143054.000,A,A*51
-GPSD,O=GLL 1216391454.000 0.005 52.018836667 8.536086667 72.200 73.500 23.000 ? ? 0.000 59.2379 0.95 ? 3
+{"class":"TPV","tag":"GLL","time":1216391454.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":73.500,"epv":23.000,"climb":0.000,"epd":59.2379,"eps":0.95,"mode":3}
 $GPGSA,A,3,26,17,22,12,15,,,,,,,,2.9,1.2,2.6*3B
-GPSD,O=GSA 1216391454.000 0.005 52.018836667 8.536086667 72.200 73.500 23.000 ? ? 0.000 59.2379 0.95 ? 3
+{"class":"TPV","tag":"GSA","time":1216391454.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":73.500,"epv":23.000,"climb":0.000,"epd":59.2379,"eps":0.95,"mode":3}
 $GPGSV,3,1,12,09,82,301,19,12,49,234,27,17,39,065,33,05,33,241,22*72
 $GPGSV,3,2,12,29,30,171,,15,27,172,38,22,19,289,29,26,15,162,30*7C
 $GPGSV,3,3,12,14,15,319,21,18,14,250,13,30,09,240,17,28,07,059,15*75
-GPSD,Y=GSV 1216391454.000 12:9 82 301 19 0:12 49 234 27 1:17 39 65 33 1:5 33 241 22 0:29 30 171 0 0:15 27 172 38 1:22 19 289 29 1:26 15 162 30 1:14 15 319 21 0:18 14 250 13 0:30 9 240 17 0:28 7 59 15 0:
+{"class":"SKY","tag":"GSV","time":1216391454.000 "reported":12,"satellites":[{"PRN":9,"el":82,"az":301,"ss":19,"used":false},{"PRN":12,"el":49,"az":234,"ss":27,"used":true},{"PRN":17,"el":39,"az":65,"ss":33,"used":true},{"PRN":5,"el":33,"az":241,"ss":22,"used":false},{"PRN":29,"el":30,"az":171,"ss":0,"used":false},{"PRN":15,"el":27,"az":172,"ss":38,"used":true},{"PRN":22,"el":19,"az":289,"ss":29,"used":true},{"PRN":26,"el":15,"az":162,"ss":30,"used":true},{"PRN":14,"el":15,"az":319,"ss":21,"used":false},{"PRN":18,"el":14,"az":250,"ss":13,"used":false},{"PRN":30,"el":9,"az":240,"ss":17,"used":false},{"PRN":28,"el":7,"az":59,"ss":15,"used":false}]}
 $GPRMC,143054.000,A,5201.1302,N,00832.1652,E,0.06,48.00,180708,,,A*5A
-GPSD,O=RMC 1216391454.000 0.005 52.018836667 8.536086667 72.200 73.500 23.000 48.0000 0.031 0.000 59.2379 0.95 ? 3
+{"class":"TPV","tag":"RMC","time":1216391454.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":73.500,"epv":23.000,"track":48.0000,"speed":0.031,"climb":0.000,"epd":59.2379,"eps":0.95,"mode":3}
 $GPZDA,143055.000,18,07,2008,,*54
 $GPGGA,143055.000,5201.1302,N,00832.1652,E,1,05,1.2,72.2,M,47.2,M,,0000*65
-GPSD,O=GGA 1216391455.000 0.005 52.018836667 8.536086667 72.200 18.000 59.800 ? ? 0.000 ? 91.50 ? 3
+{"class":"TPV","tag":"GGA","time":1216391455.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":18.000,"epv":59.800,"climb":0.000,"eps":91.50,"mode":3}
 $GPGLL,5201.1302,N,00832.1652,E,143055.000,A,A*50
-GPSD,O=GLL 1216391455.000 0.005 52.018836667 8.536086667 72.200 18.000 59.800 ? ? 0.000 ? 91.50 ? 3
+{"class":"TPV","tag":"GLL","time":1216391455.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":18.000,"epv":59.800,"climb":0.000,"eps":91.50,"mode":3}
 $GPGSA,A,3,26,17,22,12,15,,,,,,,,2.9,1.2,2.6*3B
-GPSD,O=GSA 1216391455.000 0.005 52.018836667 8.536086667 72.200 18.000 59.800 ? ? 0.000 ? 91.50 ? 3
+{"class":"TPV","tag":"GSA","time":1216391455.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":18.000,"epv":59.800,"climb":0.000,"eps":91.50,"mode":3}
 $GPGSV,3,1,12,09,82,301,20,12,49,234,27,17,39,065,33,05,33,241,22*78
 $GPGSV,3,2,12,29,30,171,,15,27,172,38,22,19,289,29,26,15,162,30*7C
 $GPGSV,3,3,12,14,15,319,21,18,14,250,13,30,09,240,17,28,07,059,15*75
-GPSD,Y=GSV 1216391455.000 12:9 82 301 20 0:12 49 234 27 1:17 39 65 33 1:5 33 241 22 0:29 30 171 0 0:15 27 172 38 1:22 19 289 29 1:26 15 162 30 1:14 15 319 21 0:18 14 250 13 0:30 9 240 17 0:28 7 59 15 0:
+{"class":"SKY","tag":"GSV","time":1216391455.000 "reported":12,"satellites":[{"PRN":9,"el":82,"az":301,"ss":20,"used":false},{"PRN":12,"el":49,"az":234,"ss":27,"used":true},{"PRN":17,"el":39,"az":65,"ss":33,"used":true},{"PRN":5,"el":33,"az":241,"ss":22,"used":false},{"PRN":29,"el":30,"az":171,"ss":0,"used":false},{"PRN":15,"el":27,"az":172,"ss":38,"used":true},{"PRN":22,"el":19,"az":289,"ss":29,"used":true},{"PRN":26,"el":15,"az":162,"ss":30,"used":true},{"PRN":14,"el":15,"az":319,"ss":21,"used":false},{"PRN":18,"el":14,"az":250,"ss":13,"used":false},{"PRN":30,"el":9,"az":240,"ss":17,"used":false},{"PRN":28,"el":7,"az":59,"ss":15,"used":false}]}
 $GPRMC,143055.000,A,5201.1302,N,00832.1652,E,0.08,64.91,180708,,,A*53
-GPSD,O=RMC 1216391455.000 0.005 52.018836667 8.536086667 72.200 18.000 59.800 64.9100 0.041 0.000 ? 91.50 ? 3
+{"class":"TPV","tag":"RMC","time":1216391455.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.200,"eph":18.000,"epv":59.800,"track":64.9100,"speed":0.041,"climb":0.000,"eps":91.50,"mode":3}
 $GPZDA,143056.000,18,07,2008,,*57
 $GPGGA,143056.000,5201.1302,N,00832.1652,E,1,05,1.2,72.3,M,47.2,M,,0000*67
-GPSD,O=GGA 1216391456.000 0.005 52.018836667 8.536086667 72.300 18.000 59.800 ? ? 0.000 ? 36.00 ? 3
+{"class":"TPV","tag":"GGA","time":1216391456.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.300,"eph":18.000,"epv":59.800,"climb":0.000,"eps":36.00,"mode":3}
 $GPGLL,5201.1302,N,00832.1652,E,143056.000,A,A*53
-GPSD,O=GLL 1216391456.000 0.005 52.018836667 8.536086667 72.300 18.000 59.800 ? ? 0.000 ? 36.00 ? 3
+{"class":"TPV","tag":"GLL","time":1216391456.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.300,"eph":18.000,"epv":59.800,"climb":0.000,"eps":36.00,"mode":3}
 $GPGSA,A,3,26,17,22,12,15,,,,,,,,2.9,1.2,2.6*3B
-GPSD,O=GSA 1216391456.000 0.005 52.018836667 8.536086667 72.300 18.000 59.800 ? ? 0.000 ? 36.00 ? 3
+{"class":"TPV","tag":"GSA","time":1216391456.000,"ept":0.005,"lat":52.018836667,"lon":8.536086667,"alt":72.300,"eph":18.000,"epv":59.800,"climb":0.000,"eps":36.00,"mode":3}
 $GPGSV,3,1,12,09,82,301,20,12,49,234,27,17,39,065,33,05,33,241,22*78
 $GPGSV,3,2,12,29,30,171,,15,27,172,38,22,19,289,29,26,15,162,31*7D
 $GPGSV,3,3,12,14,15,319,20,18,14,250,13,30,09,240,16,28,07,059,15*75
-GPSD,Y=GSV 1216391456.000 12:9 82 301 20 0:12 49 234 27 1:17 39 65 33 1:5 33 241 22 0:29 30 171 0 0:15 27 172 38 1:22 19 289 29 1:26 15 162 31 1:14 15 319 20 0:18 14 250 13 0:30 9 240 16 0:28 7 59 15 0:
+{"class":"SKY","tag":"GSV","time":1216391456.000 "reported":12,"satellites":[{"PRN":9,"el":82,"az":301,"ss":20,"used":false},{"PRN":12,"el":49,"az":234,"ss":27,"used":true},{"PRN":17,"el":39,"az":65,"ss":33,"used":true},{"PRN":5,"el":33,"az":241,"ss":22,"used":false},{"PRN":29,"el":30,"az":171,"ss":0,"used":false},{"PRN":15,"el":27,"az":172,"ss":38,"used":true},{"PRN":22,"el":19,"az":289,"ss":29,"used":true},{"PRN":26,"el":15,"az":162,"ss":31,"used":true},{"PRN":14,"el":15,"az":319,"ss":20,"used":false},{"PRN":18,"el":14,"az":250,"ss":13,"used":false},{"PRN":30,"el":9,"az":240,"ss":16,"used":false},{"PRN":28,"el":7,"az":59,"ss":15,"used":false}]}
 $GPRMC,143056.000,A,5201.1302,N,00832.1652,E,0.07,45.54,180708,,,A*55
-GPSD,O=RMC 1216391456.000 0.005 52.018836667 8.536086667 72.300 18.000 59.800 45.5400 0.036 0.000 ? 36.00 ? 3