driver_sirf: Report ECEF in TPV.

4 files changed, 32 insertions, 32 deletions

diff --git a/test/daemon/bu303-climbing.log.chk b/test/daemon/bu303-climbing.log.chk
index e6f41a43..8d1b2bc7 100644
--- a/test/daemon/bu303-climbing.log.chk
+++ b/test/daemon/bu303-climbing.log.chk
@@ -6,7 +6,7 @@ $GPGGA,161222,4629.8923,N,00734.0837,E,1,06,3.20,1327.69,M,48.183,M,,*7A
 $GPRMC,161222,A,4629.8923,N,00734.0837,E,0.1673,180.000,190605,,*2D

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,3.2,2.6*0D

 $GPGBS,161222,15.28,M,16.17,M,58.85,M*05

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:22.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":180.0000,"speed":0.086,"climb":-0.091}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:22.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":180.0000,"speed":0.086,"climb":-0.091,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604541.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":-0.12}

 $GPGSV,2,1,07,10,45,196,08,29,67,310,41,28,59,108,40,26,51,304,43*7D

 $GPGSV,2,2,07,08,44,058,42,27,16,066,36,21,10,301,00*4A

 {"class":"SKY","time":"2005-06-19T16:12:23.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":3.20,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":8,"used":true},{"PRN":29,"el":67,"az":310,"ss":41,"used":true},{"PRN":28,"el":59,"az":108,"ss":40,"used":true},{"PRN":26,"el":51,"az":304,"ss":43,"used":true},{"PRN":8,"el":44,"az":58,"ss":42,"used":true},{"PRN":27,"el":16,"az":66,"ss":36,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -14,7 +14,7 @@ $GPZDA,161223.89,19,06,2005,00,00*6B
 $GPGGA,161223,4629.8923,N,00734.0837,E,1,06,3.20,1327.69,M,48.183,M,,*7B

 $GPRMC,161223,A,4629.8923,N,00734.0837,E,0.1776,10.380,190605,,*1B

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,3.2,2.6*0D

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:23.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":10.3797,"speed":0.091,"climb":-0.085,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:23.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":10.3797,"speed":0.091,"climb":-0.085,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604541.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,07,10,45,196,33,29,67,310,42,28,59,108,42,26,51,304,43*74

 $GPGSV,2,2,07,08,44,058,44,27,16,066,36,21,10,301,00*4C

 {"class":"SKY","time":"2005-06-19T16:12:24.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":3.20,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":33,"used":true},{"PRN":29,"el":67,"az":310,"ss":42,"used":true},{"PRN":28,"el":59,"az":108,"ss":42,"used":true},{"PRN":26,"el":51,"az":304,"ss":43,"used":true},{"PRN":8,"el":44,"az":58,"ss":44,"used":true},{"PRN":27,"el":16,"az":66,"ss":36,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -22,7 +22,7 @@ $GPZDA,161224.89,19,06,2005,00,00*6C
 $GPGGA,161224,4629.8923,N,00734.0837,E,1,06,1.40,1327.69,M,48.183,M,,*78

 $GPRMC,161224,A,4629.8923,N,00734.0837,E,0.1673,180.000,190605,,*2B

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,1.4,2.6*09

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:24.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":180.0000,"speed":0.086,"climb":-0.091,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:24.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":180.0000,"speed":0.086,"climb":-0.091,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604541.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":-0.12}

 $GPGSV,2,1,07,10,45,196,31,29,67,310,43,28,59,108,42,26,51,304,45*71

 $GPGSV,2,2,07,08,44,058,46,27,16,066,42,21,10,301,00*4D

 {"class":"SKY","time":"2005-06-19T16:12:25.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":1.40,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":31,"used":true},{"PRN":29,"el":67,"az":310,"ss":43,"used":true},{"PRN":28,"el":59,"az":108,"ss":42,"used":true},{"PRN":26,"el":51,"az":304,"ss":45,"used":true},{"PRN":8,"el":44,"az":58,"ss":46,"used":true},{"PRN":27,"el":16,"az":66,"ss":42,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -30,7 +30,7 @@ $GPZDA,161225.89,19,06,2005,00,00*6D
 $GPGGA,161225,4629.8923,N,00734.0837,E,1,06,1.40,1327.69,M,48.183,M,,*79

 $GPRMC,161225,A,4629.8923,N,00734.0837,E,0.0000,0.000,190605,,*20

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,1.4,2.6*09

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:25.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:25.890Z","ept":0.005,"lat":46.498204497,"lon":7.568061439,"alt":1327.689,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604541.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,07,10,45,196,33,29,67,310,40,28,59,108,41,26,51,304,43*75

 $GPGSV,2,2,07,08,44,058,44,27,16,066,40,21,10,301,00*4D

 {"class":"SKY","time":"2005-06-19T16:12:26.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":1.40,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":33,"used":true},{"PRN":29,"el":67,"az":310,"ss":40,"used":true},{"PRN":28,"el":59,"az":108,"ss":41,"used":true},{"PRN":26,"el":51,"az":304,"ss":43,"used":true},{"PRN":8,"el":44,"az":58,"ss":44,"used":true},{"PRN":27,"el":16,"az":66,"ss":40,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -38,7 +38,7 @@ $GPZDA,161226.89,19,06,2005,00,00*6E
 $GPGGA,161226,4629.8919,N,00734.0837,E,1,06,1.40,1326.96,M,48.183,M,,*72

 $GPRMC,161226,A,4629.8919,N,00734.0837,E,0.1673,180.000,190605,,*20

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,1.4,2.6*09

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:26.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":180.0000,"speed":0.086,"climb":-0.091,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:26.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":180.0000,"speed":0.086,"climb":-0.091,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604540.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":-0.12}

 $GPGSV,2,1,07,10,45,196,34,29,67,310,40,28,59,108,43,26,51,304,43*70

 $GPGSV,2,2,07,08,44,058,42,27,16,066,39,21,10,301,00*45

 {"class":"SKY","time":"2005-06-19T16:12:27.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":1.40,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":34,"used":true},{"PRN":29,"el":67,"az":310,"ss":40,"used":true},{"PRN":28,"el":59,"az":108,"ss":43,"used":true},{"PRN":26,"el":51,"az":304,"ss":43,"used":true},{"PRN":8,"el":44,"az":58,"ss":42,"used":true},{"PRN":27,"el":16,"az":66,"ss":39,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -46,7 +46,7 @@ $GPZDA,161227.89,19,06,2005,00,00*6F
 $GPGGA,161227,4629.8919,N,00734.0837,E,1,06,1.40,1326.96,M,48.183,M,,*73

 $GPRMC,161227,A,4629.8919,N,00734.0837,E,0.0000,0.000,190605,,*2B

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,1.4,2.6*09

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:27.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:27.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604540.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,07,10,45,196,35,29,67,310,39,28,59,108,43,26,51,304,43*7F

 $GPGSV,2,2,07,08,44,058,42,27,16,066,38,21,10,301,00*44

 {"class":"SKY","time":"2005-06-19T16:12:28.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":1.40,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":35,"used":true},{"PRN":29,"el":67,"az":310,"ss":39,"used":true},{"PRN":28,"el":59,"az":108,"ss":43,"used":true},{"PRN":26,"el":51,"az":304,"ss":43,"used":true},{"PRN":8,"el":44,"az":58,"ss":42,"used":true},{"PRN":27,"el":16,"az":66,"ss":38,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -54,7 +54,7 @@ $GPZDA,161228.89,19,06,2005,00,00*60
 $GPGGA,161228,4629.8919,N,00734.0837,E,1,06,1.40,1326.96,M,48.183,M,,*7C

 $GPRMC,161228,A,4629.8919,N,00734.0837,E,0.0000,0.000,190605,,*24

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,1.4,2.6*09

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:28.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:28.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604540.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,07,10,45,196,37,29,67,310,40,28,59,108,45,26,51,304,42*74

 $GPGSV,2,2,07,08,44,058,42,27,16,066,38,21,10,301,00*44

 {"class":"SKY","time":"2005-06-19T16:12:29.890Z","xdop":1.02,"ydop":1.08,"vdop":2.56,"tdop":1.96,"hdop":1.40,"gdop":3.55,"pdop":2.96,"satellites":[{"PRN":10,"el":45,"az":196,"ss":37,"used":true},{"PRN":29,"el":67,"az":310,"ss":40,"used":true},{"PRN":28,"el":59,"az":108,"ss":45,"used":true},{"PRN":26,"el":51,"az":304,"ss":42,"used":true},{"PRN":8,"el":44,"az":58,"ss":42,"used":true},{"PRN":27,"el":16,"az":66,"ss":38,"used":true},{"PRN":21,"el":10,"az":301,"ss":0,"used":false}]}

@@ -62,4 +62,4 @@ $GPZDA,161229.89,19,06,2005,00,00*61
 $GPGGA,161229,4629.8919,N,00734.0837,E,1,06,1.40,1326.96,M,48.183,M,,*7D

 $GPRMC,161229,A,4629.8919,N,00734.0837,E,0.0000,0.000,190605,,*25

 $GPGSA,A,3,10,29,28,26,8,27,,,,,,,3.0,1.4,2.6*09

-{"class":"TPV","mode":3,"time":"2005-06-19T16:12:29.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69}

+{"class":"TPV","mode":3,"time":"2005-06-19T16:12:29.890Z","ept":0.005,"lat":46.498198306,"lon":7.568061439,"alt":1326.964,"epx":15.279,"epy":16.167,"epv":58.845,"track":0.0000,"speed":0.000,"climb":0.000,"eps":32.33,"epc":117.69,"ecefx":4360943.00,"ecefy":579400.00,"ecefz":4604540.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

diff --git a/test/daemon/bu303-moving.log.chk b/test/daemon/bu303-moving.log.chk
index 67d4ae81..0c7e6d3c 100644
--- a/test/daemon/bu303-moving.log.chk
+++ b/test/daemon/bu303-moving.log.chk
@@ -2,7 +2,7 @@ $GPZDA,143443.28,09,06,2005,00,00*61
 $GPGGA,143443,4629.8972,N,00734.0447,E,1,00,2.40,1342.40,M,48.183,M,,*7D

 $GPRMC,143443,A,4629.8972,N,00734.0447,E,0.1776,10.379,090605,,*13

 $GPGSA,A,3,,,,,,,,,,,,,,2.4,*34

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:43.280Z","ept":0.005,"lat":46.498287178,"lon":7.567411672,"alt":1342.402,"track":10.3788,"speed":0.091,"climb":-0.085}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:43.280Z","ept":0.005,"lat":46.498287178,"lon":7.567411672,"alt":1342.402,"track":10.3788,"speed":0.091,"climb":-0.085,"ecefx":4360953.00,"ecefy":579351.00,"ecefz":4604558.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,44,29,13,273,00*74

 $GPGSV,2,2,08,10,51,304,29,04,15,199,36,02,34,241,43,27,71,076,43*7C

 {"class":"SKY","time":"2005-06-09T14:34:44.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":44,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":29,"used":true},{"PRN":4,"el":15,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":43,"used":true},{"PRN":27,"el":71,"az":76,"ss":43,"used":true}]}

@@ -10,7 +10,7 @@ $GPZDA,143444.28,09,06,2005,00,00*66
 $GPGGA,143444,4629.8976,N,00734.0447,E,1,05,2.40,1343.13,M,48.183,M,,*7C

 $GPRMC,143444,A,4629.8976,N,00734.0447,E,0.1776,10.379,090605,,*10

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:44.280Z","ept":0.005,"lat":46.498293369,"lon":7.567411672,"alt":1343.127,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:44.280Z","ept":0.005,"lat":46.498293369,"lon":7.567411672,"alt":1343.127,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360953.00,"ecefy":579351.00,"ecefz":4604559.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,44,29,13,273,00*74

 $GPGSV,2,2,08,10,51,304,28,04,15,199,37,02,34,241,43,27,71,076,43*7C

 {"class":"SKY","time":"2005-06-09T14:34:45.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":44,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":28,"used":true},{"PRN":4,"el":15,"az":199,"ss":37,"used":true},{"PRN":2,"el":34,"az":241,"ss":43,"used":true},{"PRN":27,"el":71,"az":76,"ss":43,"used":true}]}

@@ -18,7 +18,7 @@ $GPZDA,143445.28,09,06,2005,00,00*67
 $GPGGA,143445,4629.8980,N,00734.0440,E,1,05,2.40,1342.35,M,48.183,M,,*76

 $GPRMC,143445,A,4629.8980,N,00734.0440,E,0.1776,10.379,090605,,*1F

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:45.280Z","ept":0.005,"lat":46.498300695,"lon":7.567400477,"alt":1342.354,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:45.280Z","ept":0.005,"lat":46.498300695,"lon":7.567400477,"alt":1342.354,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360952.00,"ecefy":579350.00,"ecefz":4604559.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,44,29,13,273,00*74

 $GPGSV,2,2,08,10,51,304,27,04,15,199,35,02,34,241,42,27,71,076,42*71

 {"class":"SKY","time":"2005-06-09T14:34:46.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":44,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":27,"used":true},{"PRN":4,"el":15,"az":199,"ss":35,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -26,7 +26,7 @@ $GPZDA,143446.28,09,06,2005,00,00*64
 $GPGGA,143446,4629.8984,N,00734.0440,E,1,05,3.20,1343.08,M,48.183,M,,*79

 $GPRMC,143446,A,4629.8984,N,00734.0440,E,0.1776,10.379,090605,,*18

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,3.2,3.4*08

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:46.280Z","ept":0.005,"lat":46.498306887,"lon":7.567400477,"alt":1343.079,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:46.280Z","ept":0.005,"lat":46.498306887,"lon":7.567400477,"alt":1343.079,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360952.00,"ecefy":579350.00,"ecefz":4604560.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,44,29,13,273,00*74

 $GPGSV,2,2,08,10,51,304,28,04,15,199,36,02,34,241,42,27,71,076,42*7D

 {"class":"SKY","time":"2005-06-09T14:34:47.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":3.20,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":44,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":28,"used":true},{"PRN":4,"el":15,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -34,7 +34,7 @@ $GPZDA,143447.28,09,06,2005,00,00*65
 $GPGGA,143447,4629.8984,N,00734.0440,E,1,05,2.40,1343.08,M,48.183,M,,*7F

 $GPRMC,143447,A,4629.8984,N,00734.0440,E,0.1776,10.379,090605,,*19

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:47.280Z","ept":0.005,"lat":46.498306887,"lon":7.567400477,"alt":1343.079,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:47.280Z","ept":0.005,"lat":46.498306887,"lon":7.567400477,"alt":1343.079,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360952.00,"ecefy":579350.00,"ecefz":4604560.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,45,29,13,273,00*75

 $GPGSV,2,2,08,10,51,304,28,04,15,199,38,02,34,241,43,27,71,076,42*72

 {"class":"SKY","time":"2005-06-09T14:34:48.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":28,"used":true},{"PRN":4,"el":15,"az":199,"ss":38,"used":true},{"PRN":2,"el":34,"az":241,"ss":43,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -42,7 +42,7 @@ $GPZDA,143448.28,09,06,2005,00,00*6A
 $GPGGA,143448,4629.8992,N,00734.0441,E,1,05,2.40,1343.12,M,48.183,M,,*7D

 $GPRMC,143448,A,4629.8992,N,00734.0441,E,0.1776,10.379,090605,,*10

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:48.280Z","ept":0.005,"lat":46.498319545,"lon":7.567402192,"alt":1343.122,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:48.280Z","ept":0.005,"lat":46.498319545,"lon":7.567402192,"alt":1343.122,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360951.00,"ecefy":579350.00,"ecefz":4604561.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,45,29,13,273,00*75

 $GPGSV,2,2,08,10,51,304,29,04,15,199,37,02,34,241,42,27,71,076,42*7D

 {"class":"SKY","time":"2005-06-09T14:34:49.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":29,"used":true},{"PRN":4,"el":15,"az":199,"ss":37,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -50,7 +50,7 @@ $GPZDA,143449.28,09,06,2005,00,00*6B
 $GPGGA,143449,4629.8992,N,00734.0441,E,1,05,2.40,1343.12,M,48.183,M,,*7C

 $GPRMC,143449,A,4629.8992,N,00734.0441,E,0.1776,10.379,090605,,*11

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:49.280Z","ept":0.005,"lat":46.498319545,"lon":7.567402192,"alt":1343.122,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:49.280Z","ept":0.005,"lat":46.498319545,"lon":7.567402192,"alt":1343.122,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360951.00,"ecefy":579350.00,"ecefz":4604561.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,45,29,13,273,00*75

 $GPGSV,2,2,08,10,51,304,32,04,15,199,36,02,34,241,43,27,71,076,42*77

 {"class":"SKY","time":"2005-06-09T14:34:50.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":32,"used":true},{"PRN":4,"el":15,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":43,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -58,7 +58,7 @@ $GPZDA,143450.28,09,06,2005,00,00*63
 $GPGGA,143450,4629.8992,N,00734.0441,E,1,05,2.40,1343.12,M,48.183,M,,*74

 $GPRMC,143450,A,4629.8992,N,00734.0441,E,0.1776,10.379,090605,,*19

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:50.280Z","ept":0.005,"lat":46.498319545,"lon":7.567402192,"alt":1343.122,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:50.280Z","ept":0.005,"lat":46.498319545,"lon":7.567402192,"alt":1343.122,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360951.00,"ecefy":579350.00,"ecefz":4604561.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,45,29,13,273,00*75

 $GPGSV,2,2,08,10,51,304,29,04,15,199,36,02,34,241,41,27,71,076,42*7F

 {"class":"SKY","time":"2005-06-09T14:34:51.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":29,"used":true},{"PRN":4,"el":15,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":41,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -66,7 +66,7 @@ $GPZDA,143451.28,09,06,2005,00,00*62
 $GPGGA,143451,4629.8999,N,00734.0442,E,1,05,2.40,1343.17,M,48.183,M,,*78

 $GPRMC,143451,A,4629.8999,N,00734.0442,E,0.1776,10.379,090605,,*10

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:51.280Z","ept":0.005,"lat":46.498332203,"lon":7.567403907,"alt":1343.165,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:51.280Z","ept":0.005,"lat":46.498332203,"lon":7.567403907,"alt":1343.165,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360950.00,"ecefy":579350.00,"ecefz":4604562.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,45,29,13,273,00*75

 $GPGSV,2,2,08,10,51,304,25,04,15,199,36,02,34,241,42,27,71,076,42*70

 {"class":"SKY","time":"2005-06-09T14:34:52.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":25,"used":true},{"PRN":4,"el":15,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -74,7 +74,7 @@ $GPZDA,143452.28,09,06,2005,00,00*61
 $GPGGA,143452,4629.8999,N,00734.0442,E,1,05,3.20,1343.17,M,48.183,M,,*7C

 $GPRMC,143452,A,4629.8999,N,00734.0442,E,0.1776,10.379,090605,,*13

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,3.2,3.4*08

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:52.280Z","ept":0.005,"lat":46.498332203,"lon":7.567403907,"alt":1343.165,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:52.280Z","ept":0.005,"lat":46.498332203,"lon":7.567403907,"alt":1343.165,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360950.00,"ecefy":579350.00,"ecefz":4604562.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,46,29,13,273,00*76

 $GPGSV,2,2,08,10,51,304,32,04,15,199,36,02,34,241,42,27,71,076,42*76

 {"class":"SKY","time":"2005-06-09T14:34:53.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":3.20,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":46,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":32,"used":true},{"PRN":4,"el":15,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -82,7 +82,7 @@ $GPZDA,143453.28,09,06,2005,00,00*60
 $GPGGA,143453,4629.9000,N,00734.0435,E,1,05,2.40,1343.07,M,48.183,M,,*73

 $GPRMC,143453,A,4629.9000,N,00734.0435,E,0.1776,10.379,090605,,*1A

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:53.280Z","ept":0.005,"lat":46.498333062,"lon":7.567390997,"alt":1343.075,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3787,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:53.280Z","ept":0.005,"lat":46.498333062,"lon":7.567390997,"alt":1343.075,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3787,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360950.00,"ecefy":579349.00,"ecefz":4604562.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,66,189,46,29,13,273,00*76

 $GPGSV,2,2,08,10,51,304,31,04,15,199,37,02,34,241,42,27,71,076,43*75

 {"class":"SKY","time":"2005-06-09T14:34:54.280Z","xdop":1.66,"ydop":1.69,"vdop":3.42,"tdop":3.05,"hdop":2.40,"gdop":5.15,"pdop":4.16,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":66,"az":189,"ss":46,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":51,"az":304,"ss":31,"used":true},{"PRN":4,"el":15,"az":199,"ss":37,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":43,"used":true}]}

@@ -90,4 +90,4 @@ $GPZDA,143454.28,09,06,2005,00,00*67
 $GPGGA,143454,4629.9004,N,00734.0436,E,1,05,2.40,1342.39,M,48.183,M,,*7F

 $GPRMC,143454,A,4629.9004,N,00734.0436,E,0.1776,10.379,090605,,*1A

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.4*0F

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:54.280Z","ept":0.005,"lat":46.498339529,"lon":7.567392712,"alt":1342.392,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3787,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:54.280Z","ept":0.005,"lat":46.498339529,"lon":7.567392712,"alt":1342.392,"epx":24.829,"epy":25.326,"epv":78.615,"track":10.3787,"speed":0.091,"climb":-0.085,"eps":50.65,"epc":157.23,"ecefx":4360949.00,"ecefy":579349.00,"ecefz":4604562.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

diff --git a/test/daemon/bu303-stillfix.log.chk b/test/daemon/bu303-stillfix.log.chk
index 7370546d..f6056460 100644
--- a/test/daemon/bu303-stillfix.log.chk
+++ b/test/daemon/bu303-stillfix.log.chk
@@ -6,7 +6,7 @@ $GPGGA,143411,4629.8901,N,00734.0471,E,1,05,2.40,1349.51,M,48.183,M,,*75
 $GPRMC,143411,A,4629.8901,N,00734.0471,E,0.1776,10.379,090605,,*15

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

 $GPGBS,143411,25.19,M,24.69,M,80.26,M*06

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:11.280Z","ept":0.005,"lat":46.498167579,"lon":7.567452213,"alt":1349.507,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:11.280Z","ept":0.005,"lat":46.498167579,"lon":7.567452213,"alt":1349.507,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"ecefx":4360967.00,"ecefy":579356.00,"ecefz":4604554.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,43,29,13,273,00*70

 $GPGSV,2,2,08,10,50,304,36,04,16,199,36,02,34,241,44,27,71,076,43*77

 {"class":"SKY","time":"2005-06-09T14:34:12.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":43,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":36,"used":true},{"PRN":4,"el":16,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":44,"used":true},{"PRN":27,"el":71,"az":76,"ss":43,"used":true}]}

@@ -14,7 +14,7 @@ $GPZDA,143412.28,09,06,2005,00,00*65
 $GPGGA,143412,4629.8905,N,00734.0473,E,1,05,2.40,1347.42,M,48.183,M,,*7C

 $GPRMC,143412,A,4629.8905,N,00734.0473,E,0.1776,10.379,090605,,*10

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:12.280Z","ept":0.005,"lat":46.498174322,"lon":7.567455643,"alt":1347.417,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:12.280Z","ept":0.005,"lat":46.498174322,"lon":7.567455643,"alt":1347.417,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52,"ecefx":4360965.00,"ecefy":579356.00,"ecefz":4604553.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,44,29,13,273,00*77

 $GPGSV,2,2,08,10,50,304,38,04,16,199,35,02,34,241,44,27,71,076,42*7B

 {"class":"SKY","time":"2005-06-09T14:34:13.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":44,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":38,"used":true},{"PRN":4,"el":16,"az":199,"ss":35,"used":true},{"PRN":2,"el":34,"az":241,"ss":44,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -22,7 +22,7 @@ $GPZDA,143413.28,09,06,2005,00,00*64
 $GPGGA,143413,4629.8908,N,00734.0474,E,1,05,2.40,1346.73,M,48.183,M,,*74

 $GPRMC,143413,A,4629.8908,N,00734.0474,E,0.0000,0.000,090605,,*20

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:13.280Z","ept":0.005,"lat":46.498180789,"lon":7.567457358,"alt":1346.734,"epx":25.195,"epy":24.691,"epv":80.261,"track":0.0000,"speed":0.000,"climb":0.000,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:13.280Z","ept":0.005,"lat":46.498180789,"lon":7.567457358,"alt":1346.734,"epx":25.195,"epy":24.691,"epv":80.261,"track":0.0000,"speed":0.000,"climb":0.000,"eps":50.39,"epc":160.52,"ecefx":4360964.00,"ecefy":579356.00,"ecefz":4604553.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,45,29,13,273,00*76

 $GPGSV,2,2,08,10,50,304,38,04,16,199,35,02,34,241,43,27,71,076,43*7D

 {"class":"SKY","time":"2005-06-09T14:34:14.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":38,"used":true},{"PRN":4,"el":16,"az":199,"ss":35,"used":true},{"PRN":2,"el":34,"az":241,"ss":43,"used":true},{"PRN":27,"el":71,"az":76,"ss":43,"used":true}]}

@@ -30,7 +30,7 @@ $GPZDA,143414.28,09,06,2005,00,00*63
 $GPGGA,143414,4629.8912,N,00734.0475,E,1,05,2.40,1346.05,M,48.183,M,,*78

 $GPRMC,143414,A,4629.8912,N,00734.0475,E,0.1776,10.379,090605,,*16

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:14.280Z","ept":0.005,"lat":46.498187256,"lon":7.567459073,"alt":1346.052,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:14.280Z","ept":0.005,"lat":46.498187256,"lon":7.567459073,"alt":1346.052,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52,"ecefx":4360963.00,"ecefy":579356.00,"ecefz":4604553.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,44,29,13,273,00*77

 $GPGSV,2,2,08,10,50,304,36,04,16,199,32,02,34,241,39,27,71,076,41*7B

 {"class":"SKY","time":"2005-06-09T14:34:15.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":44,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":36,"used":true},{"PRN":4,"el":16,"az":199,"ss":32,"used":true},{"PRN":2,"el":34,"az":241,"ss":39,"used":true},{"PRN":27,"el":71,"az":76,"ss":41,"used":true}]}

@@ -38,7 +38,7 @@ $GPZDA,143415.28,09,06,2005,00,00*62
 $GPGGA,143415,4629.8909,N,00734.0475,E,1,05,2.40,1345.33,M,48.183,M,,*75

 $GPRMC,143415,A,4629.8909,N,00734.0475,E,0.1776,10.379,090605,,*1D

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:15.280Z","ept":0.005,"lat":46.498181065,"lon":7.567459073,"alt":1345.327,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:15.280Z","ept":0.005,"lat":46.498181065,"lon":7.567459073,"alt":1345.327,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52,"ecefx":4360963.00,"ecefy":579356.00,"ecefz":4604552.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,46,29,13,273,00*75

 $GPGSV,2,2,08,10,50,304,38,04,16,199,34,02,34,241,41,27,71,076,41*7C

 {"class":"SKY","time":"2005-06-09T14:34:16.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":46,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":38,"used":true},{"PRN":4,"el":16,"az":199,"ss":34,"used":true},{"PRN":2,"el":34,"az":241,"ss":41,"used":true},{"PRN":27,"el":71,"az":76,"ss":41,"used":true}]}

@@ -46,7 +46,7 @@ $GPZDA,143416.28,09,06,2005,00,00*61
 $GPGGA,143416,4629.8913,N,00734.0476,E,1,05,2.40,1344.64,M,48.183,M,,*7D

 $GPRMC,143416,A,4629.8913,N,00734.0476,E,0.1673,180.000,090605,,*27

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:16.280Z","ept":0.005,"lat":46.498187532,"lon":7.567460788,"alt":1344.644,"epx":25.195,"epy":24.691,"epv":80.261,"track":180.0000,"speed":0.086,"climb":-0.091,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:16.280Z","ept":0.005,"lat":46.498187532,"lon":7.567460788,"alt":1344.644,"epx":25.195,"epy":24.691,"epv":80.261,"track":180.0000,"speed":0.086,"climb":-0.091,"eps":50.39,"epc":160.52,"ecefx":4360962.00,"ecefy":579356.00,"ecefz":4604552.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":-0.12}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,46,29,13,273,00*75

 $GPGSV,2,2,08,10,50,304,37,04,16,199,36,02,34,241,43,27,71,076,41*73

 {"class":"SKY","time":"2005-06-09T14:34:17.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":46,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":37,"used":true},{"PRN":4,"el":16,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":43,"used":true},{"PRN":27,"el":71,"az":76,"ss":41,"used":true}]}

@@ -54,7 +54,7 @@ $GPZDA,143417.28,09,06,2005,00,00*60
 $GPGGA,143417,4629.8916,N,00734.0478,E,1,05,2.40,1343.96,M,48.183,M,,*7D

 $GPRMC,143417,A,4629.8916,N,00734.0478,E,0.1776,10.379,090605,,*1C

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:17.280Z","ept":0.005,"lat":46.498193999,"lon":7.567462504,"alt":1343.962,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:17.280Z","ept":0.005,"lat":46.498193999,"lon":7.567462504,"alt":1343.962,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3789,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52,"ecefx":4360961.00,"ecefy":579356.00,"ecefz":4604552.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,45,29,13,273,00*76

 $GPGSV,2,2,08,10,50,304,38,04,16,199,36,02,34,241,42,27,71,076,42*7E

 {"class":"SKY","time":"2005-06-09T14:34:18.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":38,"used":true},{"PRN":4,"el":16,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -62,7 +62,7 @@ $GPZDA,143418.28,09,06,2005,00,00*6F
 $GPGGA,143418,4629.8916,N,00734.0478,E,1,05,2.40,1343.96,M,48.183,M,,*72

 $GPRMC,143418,A,4629.8916,N,00734.0478,E,0.0000,0.000,090605,,*28

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:18.280Z","ept":0.005,"lat":46.498193999,"lon":7.567462504,"alt":1343.962,"epx":25.195,"epy":24.691,"epv":80.261,"track":0.0000,"speed":0.000,"climb":0.000,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:18.280Z","ept":0.005,"lat":46.498193999,"lon":7.567462504,"alt":1343.962,"epx":25.195,"epy":24.691,"epv":80.261,"track":0.0000,"speed":0.000,"climb":0.000,"eps":50.39,"epc":160.52,"ecefx":4360961.00,"ecefy":579356.00,"ecefz":4604552.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,45,29,13,273,00*76

 $GPGSV,2,2,08,10,50,304,37,04,16,199,36,02,34,241,42,27,71,076,43*70

 {"class":"SKY","time":"2005-06-09T14:34:19.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":45,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":37,"used":true},{"PRN":4,"el":16,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":43,"used":true}]}

@@ -70,7 +70,7 @@ $GPZDA,143419.28,09,06,2005,00,00*6E
 $GPGGA,143419,4629.8917,N,00734.0470,E,1,05,2.40,1343.87,M,48.183,M,,*7A

 $GPRMC,143419,A,4629.8917,N,00734.0470,E,0.0000,0.000,090605,,*20

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:19.280Z","ept":0.005,"lat":46.498194858,"lon":7.567449593,"alt":1343.871,"epx":25.195,"epy":24.691,"epv":80.261,"track":0.0000,"speed":0.000,"climb":0.000,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:19.280Z","ept":0.005,"lat":46.498194858,"lon":7.567449593,"alt":1343.871,"epx":25.195,"epy":24.691,"epv":80.261,"track":0.0000,"speed":0.000,"climb":0.000,"eps":50.39,"epc":160.52,"ecefx":4360961.00,"ecefy":579355.00,"ecefz":4604552.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,46,29,13,273,00*75

 $GPGSV,2,2,08,10,50,304,36,04,16,199,36,02,34,241,42,27,71,076,42*70

 {"class":"SKY","time":"2005-06-09T14:34:20.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":46,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":36,"used":true},{"PRN":4,"el":16,"az":199,"ss":36,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -78,7 +78,7 @@ $GPZDA,143420.28,09,06,2005,00,00*64
 $GPGGA,143420,4629.8921,N,00734.0471,E,1,05,2.40,1343.19,M,48.183,M,,*73

 $GPRMC,143420,A,4629.8921,N,00734.0471,E,0.1776,10.379,090605,,*15

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:20.280Z","ept":0.005,"lat":46.498201325,"lon":7.567451308,"alt":1343.189,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:20.280Z","ept":0.005,"lat":46.498201325,"lon":7.567451308,"alt":1343.189,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52,"ecefx":4360960.00,"ecefy":579355.00,"ecefz":4604552.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

 $GPGSV,2,1,08,23,06,084,00,28,07,160,00,08,65,189,46,29,13,273,00*75

 $GPGSV,2,2,08,10,50,304,36,04,16,199,37,02,34,241,42,27,71,076,42*71

 {"class":"SKY","time":"2005-06-09T14:34:21.280Z","xdop":1.68,"ydop":1.65,"vdop":3.49,"tdop":3.10,"hdop":2.40,"gdop":5.23,"pdop":4.21,"satellites":[{"PRN":23,"el":6,"az":84,"ss":0,"used":false},{"PRN":28,"el":7,"az":160,"ss":0,"used":false},{"PRN":8,"el":65,"az":189,"ss":46,"used":true},{"PRN":29,"el":13,"az":273,"ss":0,"used":false},{"PRN":10,"el":50,"az":304,"ss":36,"used":true},{"PRN":4,"el":16,"az":199,"ss":37,"used":true},{"PRN":2,"el":34,"az":241,"ss":42,"used":true},{"PRN":27,"el":71,"az":76,"ss":42,"used":true}]}

@@ -86,4 +86,4 @@ $GPZDA,143421.28,09,06,2005,00,00*65
 $GPGGA,143421,4629.8921,N,00734.0471,E,1,05,2.40,1343.19,M,48.183,M,,*72

 $GPRMC,143421,A,4629.8921,N,00734.0471,E,0.1776,10.379,090605,,*14

 $GPGSA,A,3,8,10,4,2,27,,,,,,,,4.2,2.4,3.5*0E

-{"class":"TPV","mode":3,"time":"2005-06-09T14:34:21.280Z","ept":0.005,"lat":46.498201325,"lon":7.567451308,"alt":1343.189,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52}

+{"class":"TPV","mode":3,"time":"2005-06-09T14:34:21.280Z","ept":0.005,"lat":46.498201325,"lon":7.567451308,"alt":1343.189,"epx":25.195,"epy":24.691,"epv":80.261,"track":10.3788,"speed":0.091,"climb":-0.085,"eps":50.39,"epc":160.52,"ecefx":4360960.00,"ecefy":579355.00,"ecefz":4604552.00,"ecefvx":-0.12,"ecefvy":0.00,"ecefvz":0.00}

diff --git a/test/daemon/ublox-sirf1.log.chk b/test/daemon/ublox-sirf1.log.chk
index 575fcc38..f984c1c9 100644
--- a/test/daemon/ublox-sirf1.log.chk
+++ b/test/daemon/ublox-sirf1.log.chk
@@ -7,7 +7,7 @@ $GPGGA,090607,5203.7606,N,00508.3161,E,1,08,1.80,33.30,M,46.772,M,,*73
 $GPRMC,090607,A,5203.7606,N,00508.3161,E,0.0000,0.000,110605,,*2D

 $GPGSA,A,3,11,23,20,7,1,14,25,24,,,,,1.9,1.8,1.6*35

 $GPGBS,090607,9.63,M,11.27,M,37.03,M*38

-{"class":"TPV","mode":3,"time":"2005-06-11T09:06:07.990Z","ept":0.005,"lat":52.062675884,"lon":5.138600900,"alt":33.299,"epx":9.631,"epy":11.267,"epv":37.032,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","mode":3,"time":"2005-06-11T09:06:07.990Z","ept":0.005,"lat":52.062675884,"lon":5.138600900,"alt":33.299,"epx":9.631,"epy":11.267,"epv":37.032,"track":0.0000,"speed":0.000,"climb":0.000,"ecefx":3913719.00,"ecefy":351948.00,"ecefz":5007157.00,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00}

 $GPZDA,090614.00,11,06,2005,00,00*6D

 $GPGGA,090613,5203.7605,N,00508.3168,E,1,08,1.80,34.43,M,46.772,M,,*7F

 $GPRMC,090613,A,5203.7605,N,00508.3168,E,0.0447,54.442,110605,,*16