1 files changed, 13 insertions, 13 deletions
diff --git a/test/daemon/garmin48.log.chk b/test/daemon/garmin48.log.chk
index 9bef948d..398981b0 100644
--- a/test/daemon/garmin48.log.chk
+++ b/test/daemon/garmin48.log.chk
@@ -4,7 +4,7 @@ $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225308,4527.458,S,16709.165,E,1,05,2.1,14.7,M,1.1,M,,*53
 {"class":"TPV","mode":3,"time":"2001-06-06T22:53:08.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"track":94.5000,"speed":0.000}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.1,2.1,2.0*3A
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:08.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epv":46.000,"track":94.5000,"speed":0.000}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:08.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epe":58.900,"epv":46.000,"track":94.5000,"speed":0.000}
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,48,20,41,333,46,22,65,081,46,24,02,205,00*7B
 $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
@@ -18,7 +18,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225310,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*64
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225310,4527.458,S,16709.165,E,1,05,2.1,14.6,M,1.1,M,,*5B
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:10.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":28.498,"epy":20.134,"epv":46.000,"track":94.5000,"speed":0.000,"climb":-0.030,"eps":57.00,"epc":92.00}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:10.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":28.498,"epy":20.134,"epe":58.900,"epv":46.000,"track":94.5000,"speed":0.000,"climb":-0.030,"eps":57.00,"epc":92.00}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.1,2.1,2.0*3A
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,48,20,41,333,46,22,65,081,46,24,02,205,00*7B
@@ -26,7 +26,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","xdop":1.90,"ydop":1.34,"vdop":2.00,"tdop":2.92,"hdop":2.10,"gdop":5.08,"pdop":3.10,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":9,"az":42,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":4,"el":5,"az":242,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":6,"el":4,"az":149,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":13,"el":37,"az":235,"ss":48,"used":true,"gnssid":0,"svid":13},{"PRN":20,"el":41,"az":333,"ss":46,"used":true,"gnssid":0,"svid":20},{"PRN":22,"el":65,"az":81,"ss":46,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":2,"az":205,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":20,"az":108,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":8,"az":281,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":17,"az":339,"ss":39,"used":true,"gnssid":0,"svid":28}]}
 $PGRME,9.1,M,15.0,M,12.0,M*21
 $GPGLL,4527.458,S,16709.165,E,225311,A*37
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:11.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.498,"epy":20.134,"epv":46.000,"speed":0.000,"eps":41.86,"epc":77.14}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:11.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.498,"epy":20.134,"epe":58.900,"epv":46.000,"speed":0.000,"eps":41.86,"epc":77.14}
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -34,7 +34,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225312,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*66
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225312,4527.458,S,16709.165,E,1,05,2.2,14.7,M,1.1,M,,*5B
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:12.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epx":28.498,"epy":20.134,"epv":46.000,"track":94.5000,"speed":0.000,"climb":0.070,"eps":57.00,"epc":92.00}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:12.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.700,"epx":28.498,"epy":20.134,"epe":58.900,"epv":46.000,"track":94.5000,"speed":0.000,"climb":0.070,"eps":57.00,"epc":92.00}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,41,333,46,22,65,081,46,24,02,205,00*7A
@@ -42,7 +42,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","xdop":1.90,"ydop":1.34,"vdop":2.10,"tdop":2.92,"hdop":2.20,"gdop":5.08,"pdop":3.20,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":9,"az":42,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":4,"el":5,"az":242,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":6,"el":4,"az":149,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":13,"el":37,"az":235,"ss":49,"used":true,"gnssid":0,"svid":13},{"PRN":20,"el":41,"az":333,"ss":46,"used":true,"gnssid":0,"svid":20},{"PRN":22,"el":65,"az":81,"ss":46,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":2,"az":205,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":20,"az":108,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":8,"az":281,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":17,"az":339,"ss":39,"used":true,"gnssid":0,"svid":28}]}
 $PGRME,9.2,M,15.0,M,12.6,M*24
 $GPGLL,4527.458,S,16709.165,E,225313,A*35
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:13.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.498,"epy":20.134,"epv":48.300,"speed":0.000,"eps":42.00,"epc":79.44}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:13.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.498,"epy":20.134,"epe":60.800,"epv":48.300,"speed":0.000,"eps":42.00,"epc":79.44}
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -50,7 +50,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225314,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*60
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225314,4527.458,S,16709.165,E,1,05,2.2,14.6,M,1.1,M,,*5C
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:14.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":28.498,"epy":20.134,"epv":48.300,"track":94.5000,"speed":0.000,"climb":-0.030,"eps":57.00,"epc":96.60}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:14.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.600,"epx":28.498,"epy":20.134,"epe":60.800,"epv":48.300,"track":94.5000,"speed":0.000,"climb":-0.030,"eps":57.00,"epc":96.60}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,41,333,46,22,65,081,46,24,02,205,00*7A
@@ -58,7 +58,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","xdop":1.90,"ydop":1.34,"vdop":2.10,"tdop":2.92,"hdop":2.20,"gdop":5.08,"pdop":3.20,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":9,"az":42,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":4,"el":5,"az":242,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":6,"el":4,"az":149,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":13,"el":37,"az":235,"ss":49,"used":true,"gnssid":0,"svid":13},{"PRN":20,"el":41,"az":333,"ss":46,"used":true,"gnssid":0,"svid":20},{"PRN":22,"el":65,"az":81,"ss":46,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":2,"az":205,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":20,"az":108,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":8,"az":281,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":17,"az":339,"ss":39,"used":true,"gnssid":0,"svid":28}]}
 $PGRME,9.2,M,15.0,M,12.6,M*24
 $GPGLL,4527.458,S,16709.165,E,225315,A*33
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:15.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.498,"epy":20.134,"epv":48.300,"speed":0.000,"eps":42.00,"epc":79.44}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:15.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.498,"epy":20.134,"epe":60.800,"epv":48.300,"speed":0.000,"eps":42.00,"epc":79.44}
 $PGRMZ,48,f,3*27
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -66,7 +66,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225316,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*62
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225316,4527.458,S,16709.165,E,1,05,2.2,14.4,M,1.1,M,,*5C
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:16.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.400,"epx":28.498,"epy":20.134,"epv":48.300,"track":94.5000,"speed":0.000,"climb":-0.230,"eps":57.00,"epc":96.60}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:16.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.400,"epx":28.498,"epy":20.134,"epe":60.800,"epv":48.300,"track":94.5000,"speed":0.000,"climb":-0.230,"eps":57.00,"epc":96.60}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,40,333,46,22,65,081,46,24,02,205,00*7B
@@ -74,7 +74,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,39,,,,*4C
 {"class":"SKY","xdop":1.92,"ydop":1.36,"vdop":2.10,"tdop":2.96,"hdop":2.20,"gdop":5.15,"pdop":3.20,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":9,"az":42,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":4,"el":5,"az":242,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":6,"el":4,"az":149,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":13,"el":37,"az":235,"ss":49,"used":true,"gnssid":0,"svid":13},{"PRN":20,"el":40,"az":333,"ss":46,"used":true,"gnssid":0,"svid":20},{"PRN":22,"el":65,"az":81,"ss":46,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":2,"az":205,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":20,"az":108,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":8,"az":281,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":17,"az":339,"ss":39,"used":true,"gnssid":0,"svid":28}]}
 $PGRME,9.2,M,15.0,M,12.6,M*24
 $GPGLL,4527.458,S,16709.165,E,225317,A*31
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:17.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.754,"epy":20.351,"epv":48.300,"speed":0.000,"eps":42.26,"epc":79.44}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:17.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.754,"epy":20.351,"epe":60.800,"epv":48.300,"speed":0.000,"eps":42.26,"epc":79.44}
 $PGRMZ,46,f,3*29
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -82,7 +82,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225318,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*6C
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225318,4527.458,S,16709.165,E,1,05,2.2,14.0,M,1.1,M,,*56
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:18.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.000,"epx":28.754,"epy":20.351,"epv":48.300,"track":94.5000,"speed":0.000,"climb":-0.021,"eps":57.51,"epc":96.60}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:18.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":14.000,"epx":28.754,"epy":20.351,"epe":60.800,"epv":48.300,"track":94.5000,"speed":0.000,"climb":-0.021,"eps":57.51,"epc":96.60}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,3.2,2.2,2.1*3B
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,40,333,46,22,65,083,46,24,02,205,00*79
@@ -90,7 +90,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,40,,,,*42
 {"class":"SKY","xdop":1.90,"ydop":1.35,"vdop":2.10,"tdop":2.94,"hdop":2.20,"gdop":5.11,"pdop":3.20,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":9,"az":42,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":4,"el":5,"az":242,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":6,"el":4,"az":149,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":13,"el":37,"az":235,"ss":49,"used":true,"gnssid":0,"svid":13},{"PRN":20,"el":40,"az":333,"ss":46,"used":true,"gnssid":0,"svid":20},{"PRN":22,"el":65,"az":83,"ss":46,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":2,"az":205,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":20,"az":108,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":8,"az":281,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":17,"az":339,"ss":40,"used":true,"gnssid":0,"svid":28}]}
 $PGRME,10.3,M,15.2,M,16.7,M*1A
 $GPGLL,4527.458,S,16709.165,E,225333,A*37
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:33.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.431,"epy":20.214,"epv":48.300,"speed":0.000,"eps":2.90,"epc":5.32}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:33.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.431,"epy":20.214,"epe":60.800,"epv":48.300,"speed":0.000,"eps":2.90,"epc":5.32}
 $PGRMZ,41,f,3*2E
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47
@@ -98,7 +98,7 @@ $GPRTE,1,1,c,0*07
 $GPRMC,225334,A,4527.458,S,16709.165,E,000.0,094.5,060601,024.1,E*62
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,225334,4527.458,S,16709.165,E,1,05,2.4,12.5,M,1.1,M,,*5D
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:34.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":12.500,"epx":28.431,"epy":20.214,"epv":48.300,"track":94.5000,"speed":0.000,"climb":0.003,"eps":56.86,"epc":96.60}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:34.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"alt":12.500,"epx":28.431,"epy":20.214,"epe":60.800,"epv":48.300,"track":94.5000,"speed":0.000,"climb":0.003,"eps":56.86,"epc":96.60}
 $GPGSA,A,3,01,,,,13,20,22,,,,28,,4.1,2.4,3.0*39
 $GPGSV,3,1,11,01,78,221,47,03,09,042,00,04,05,242,00,06,04,149,00*70
 $GPGSV,3,2,11,13,37,235,49,20,40,333,46,22,65,083,46,24,02,205,00*79
@@ -106,7 +106,7 @@ $GPGSV,3,3,11,25,20,108,00,27,08,281,00,28,17,339,41,,,,*43
 {"class":"SKY","xdop":1.90,"ydop":1.35,"vdop":3.00,"tdop":2.94,"hdop":2.40,"gdop":5.11,"pdop":4.10,"satellites":[{"PRN":1,"el":78,"az":221,"ss":47,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":9,"az":42,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":4,"el":5,"az":242,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":6,"el":4,"az":149,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":13,"el":37,"az":235,"ss":49,"used":true,"gnssid":0,"svid":13},{"PRN":20,"el":40,"az":333,"ss":46,"used":true,"gnssid":0,"svid":20},{"PRN":22,"el":65,"az":83,"ss":46,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":2,"az":205,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":20,"az":108,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":8,"az":281,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":17,"az":339,"ss":41,"used":true,"gnssid":0,"svid":28}]}
 $PGRME,10.3,M,15.2,M,16.7,M*1A
 $GPGLL,4527.458,S,16709.165,E,225335,A*31
-{"class":"TPV","mode":3,"time":"2001-06-06T22:53:35.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.431,"epy":20.214,"epv":69.000,"speed":0.000,"eps":43.55,"epc":100.56}
+{"class":"TPV","mode":3,"time":"2001-06-06T22:53:35.000Z","ept":0.005,"lat":-45.457633333,"lon":167.152750000,"epx":28.431,"epy":20.214,"epe":77.900,"epv":69.000,"speed":0.000,"eps":43.55,"epc":100.56}
 $PGRMZ,41,f,3*2E
 $PGRMM,WGS 84*06
 $GPBOD,,T,,M,,*47