driver_nmea0183: Use eph from $PSRFEPE if available.

Use GPS values when possible instead of calculated values.

2 files changed, 12 insertions, 12 deletions

diff --git a/test/daemon/beidou-bd.log.chk b/test/daemon/beidou-bd.log.chk
index 94fe862c..4389dbf7 100644
--- a/test/daemon/beidou-bd.log.chk
+++ b/test/daemon/beidou-bd.log.chk
@@ -52,7 +52,7 @@ $GNRMC,074154.799,V,,,,,,,250215,,,N*56
 $PSRFEPE,074155.799,A,1.3,10.59,52.97,0.6,180.0*16

 $GNGGA,074155.799,3114.8770,N,12135.2463,E,1,05,1.3,156.9,M,8.3,M,,0000,4.9*77

 $GNGNS,074155.799,3114.8770,N,12135.2463,E,ANNA,05,1.3,156.9,8.3,,0000*52

-{"class":"TPV","mode":3,"lat":31.247950000,"lon":121.587438333,"alt":156.900,"epd":180.0000,"eps":0.60,"eph":24.700}

+{"class":"TPV","mode":3,"lat":31.247950000,"lon":121.587438333,"alt":156.900,"epv":52.970,"epd":180.0000,"eps":0.60,"eph":10.590}

 $GPGSA,A,3,25,32,,,,,,,,,,,5.1,1.3,4.9,3.3*3D

 $BDGSA,A,3,02,03,04,,,,,,,,,,5.1,1.3,4.9,3.3*2F

 $GPGSV,5,1,20,25,76,102,50,32,29,284,47,01,02,001,24,07,00,000,23*7A

@@ -68,33 +68,33 @@ $GNRMC,074155.799,A,3114.8770,N,12135.2463,E,0.30,4.94,250215,,,A*76
 $PSRFEPE,074156.799,A,1.1,64.94,58.97,0.2,180.0*1B

 $GNGGA,074156.799,3114.8950,N,12135.2442,E,1,07,1.1,190.7,M,8.3,M,,0000,1.8*7B

 $GNGNS,074156.799,3114.8950,N,12135.2442,E,ANNA,07,1.1,190.7,8.3,,0000*5A

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epv":112.700,"speed":33.429,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":225.40,"eph":20.900,"sep":96.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epv":58.970,"speed":33.429,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":111.94,"eph":64.940,"sep":96.900}

 $GPGSA,A,3,25,32,14,12,,,,,,,,,2.1,1.1,1.8,1.2*39

 $BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

 $GNRMC,074156.799,A,3114.8950,N,12135.2442,E,0.26,4.94,250215,,,A*7D

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epv":112.700,"track":4.9400,"speed":0.134,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":225.40,"eph":20.900,"sep":96.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epv":58.970,"track":4.9400,"speed":0.134,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":111.94,"eph":64.940,"sep":96.900}

 $PSRFEPE,074157.799,A,1.1,24.65,25.14,0.1,61.5*29

 $GNGGA,074157.799,3114.8902,N,12135.2443,E,1,07,1.1,192.9,M,8.3,M,,0000,1.8*70

 $GNGNS,074157.799,3114.8902,N,12135.2443,E,ANNA,07,1.1,192.9,8.3,,0000*51

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epv":41.400,"speed":8.871,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":154.10,"eph":20.900,"sep":39.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epv":25.140,"speed":8.871,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":84.11,"eph":24.650,"sep":39.900}

 $GPGSA,A,3,25,32,12,14,,,,,,,,,2.1,1.1,1.8,1.2*39

 $BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

 $GNRMC,074157.799,A,3114.8902,N,12135.2443,E,0.32,4.94,250215,,,A*7F

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epv":41.400,"track":4.9400,"speed":0.165,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":154.10,"eph":20.900,"sep":39.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epv":25.140,"track":4.9400,"speed":0.165,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":84.11,"eph":24.650,"sep":39.900}

 $PSRFEPE,074158.799,A,1.1,19.32,19.35,0.1,180.0*1D

 $GNGGA,074158.799,3114.8953,N,12135.2439,E,1,07,1.1,198.5,M,8.3,M,,0000,1.8*70

 $GNGNS,074158.799,3114.8953,N,12135.2439,E,ANNA,07,1.1,198.5,8.3,,0000*51

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epv":41.400,"speed":9.446,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":82.80,"eph":20.900,"sep":39.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epv":19.350,"speed":9.446,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":44.49,"eph":19.320,"sep":39.900}

 $GPGSA,A,3,25,32,12,14,,,,,,,,,2.1,1.1,1.8,1.2*39

 $BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

 $GNRMC,074158.799,A,3114.8953,N,12135.2439,E,0.25,4.94,250215,,,A*7F

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epv":41.400,"track":4.9400,"speed":0.129,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":82.80,"eph":20.900,"sep":39.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epv":19.350,"track":4.9400,"speed":0.129,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":44.49,"eph":19.320,"sep":39.900}

 $PSRFEPE,074159.799,A,1.1,14.86,15.59,0.2,180.0*1B

 $GNGGA,074159.799,3114.8943,N,12135.2444,E,1,07,1.1,196.4,M,8.3,M,,0000,1.8*75

 $GNGNS,074159.799,3114.8943,N,12135.2444,E,ANNA,07,1.1,196.4,8.3,,0000*54

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:59.799Z","ept":0.005,"lat":31.248238333,"lon":121.587406667,"alt":196.400,"epx":13.701,"epy":24.264,"epv":41.400,"speed":2.011,"climb":-2.100,"epd":180.0000,"eps":0.20,"epc":82.80,"eph":20.900,"sep":39.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:59.799Z","ept":0.005,"lat":31.248238333,"lon":121.587406667,"alt":196.400,"epx":13.701,"epy":24.264,"epv":15.590,"speed":2.011,"climb":-2.100,"epd":180.0000,"eps":0.20,"epc":34.94,"eph":14.860,"sep":39.900}

 $GPGSA,A,3,25,32,12,14,,,,,,,,,2.1,1.1,1.8,1.2*39

 $BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

 $GNRMC,074159.799,A,3114.8943,N,12135.2444,E,0.23,4.94,250215,,,A*73

-{"class":"TPV","mode":3,"time":"2015-02-25T07:41:59.799Z","ept":0.005,"lat":31.248238333,"lon":121.587406667,"alt":196.400,"epx":13.701,"epy":24.264,"epv":41.400,"track":4.9400,"speed":0.118,"climb":-2.100,"epd":180.0000,"eps":0.20,"epc":82.80,"eph":20.900,"sep":39.900}

+{"class":"TPV","mode":3,"time":"2015-02-25T07:41:59.799Z","ept":0.005,"lat":31.248238333,"lon":121.587406667,"alt":196.400,"epx":13.701,"epy":24.264,"epv":15.590,"track":4.9400,"speed":0.118,"climb":-2.100,"epd":180.0000,"eps":0.20,"epc":34.94,"eph":14.860,"sep":39.900}

 $PSRF151,3,1833,28693,0x7EFFD7FF*67

diff --git a/test/daemon/beidou-gb.log.chk b/test/daemon/beidou-gb.log.chk
index 2c8e11ce..2ff5b5f9 100644
--- a/test/daemon/beidou-gb.log.chk
+++ b/test/daemon/beidou-gb.log.chk
@@ -50,7 +50,7 @@ $GNRMC,053231.438,V,,,,,,,020315,,,N*5F
 $PSRFEPE,053232.438,A,1.2,5.77,12.97,1.2,180.0*21

 $GPGGA,053232.438,3114.8789,N,12135.2442,E,1,06,1.2,153.8,M,8.3,M,,0000*6A

 $GNGNS,053232.438,3114.8789,N,12135.2442,E,ANNA,07,1.2,153.8,8.3,,0000*5F

-{"class":"TPV","mode":3,"lat":31.247981667,"lon":121.587403333,"alt":153.800,"epv":12.970,"epd":180.0000,"eps":1.20,"eph":22.800}

+{"class":"TPV","mode":3,"lat":31.247981667,"lon":121.587403333,"alt":153.800,"epv":12.970,"epd":180.0000,"eps":1.20,"eph":5.770}

 $GNGSA,A,3,22,18,14,12,31,24,,,,,,,2.5,1.2,2.2*23

 $GNGSA,A,3,201,,,,,,,,,,,,2.5,1.2,2.2*1B

 $GPGSV,6,1,21,22,80,039,49,18,50,119,51,14,51,342,48,12,20,061,50*78

@@ -67,7 +67,7 @@ $GNRMC,053232.438,A,3114.8789,N,12135.2442,E,0.26,167.42,020315,,,A*70
 $PSRFEPE,053233.438,A,1.2,25.61,66.06,0.3,180.0*1E

 $GPGGA,053233.438,3114.8821,N,12135.2428,E,1,06,1.2,167.2,M,8.3,M,,0000*67

 $GNGNS,053233.438,3114.8821,N,12135.2428,E,ANNA,07,1.2,167.2,8.3,,0000*52

-{"class":"TPV","mode":3,"time":"2015-03-02T05:32:33.438Z","ept":0.005,"lat":31.248035000,"lon":121.587380000,"alt":167.200,"epx":16.817,"epy":14.633,"epv":66.060,"speed":6.317,"climb":13.400,"epd":180.0000,"eps":0.30,"epc":79.03,"eph":22.800,"sep":47.500}

+{"class":"TPV","mode":3,"time":"2015-03-02T05:32:33.438Z","ept":0.005,"lat":31.248035000,"lon":121.587380000,"alt":167.200,"epx":16.817,"epy":14.633,"epv":66.060,"speed":6.317,"climb":13.400,"epd":180.0000,"eps":0.30,"epc":79.03,"eph":25.610,"sep":47.500}

 $GNGSA,A,3,22,18,14,12,31,24,,,,,,,2.5,1.2,2.2*23

 $GNGSA,A,3,201,,,,,,,,,,,,2.5,1.2,2.2*1B

 $GPGSV,5,1,18,22,73,312,50,18,66,145,51,14,41,330,48,12,34,060,49*7B

@@ -80,4 +80,4 @@ $GBGSV,3,2,11,210,70,270,,207,70,267,,206,55,311,,203,49,208,*6B
 $GBGSV,3,3,11,209,36,317,,214,36,147,,205,11,257,*67

 {"class":"SKY","xdop":0.80,"ydop":0.97,"vdop":2.20,"tdop":1.53,"hdop":1.20,"gdop":2.88,"pdop":2.50,"satellites":[{"PRN":22,"el":73,"az":312,"ss":50,"used":true,"gnssid":0,"svid":22},{"PRN":18,"el":66,"az":145,"ss":51,"used":true,"gnssid":0,"svid":18},{"PRN":14,"el":41,"az":330,"ss":48,"used":true,"gnssid":0,"svid":14},{"PRN":12,"el":34,"az":60,"ss":49,"used":true,"gnssid":0,"svid":12},{"PRN":31,"el":37,"az":248,"ss":34,"used":true,"gnssid":0,"svid":31},{"PRN":24,"el":13,"az":42,"ss":43,"used":true,"gnssid":0,"svid":24},{"PRN":3,"el":0,"az":0,"ss":21,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":0,"az":0,"ss":27,"used":false,"gnssid":0,"svid":6},{"PRN":7,"el":0,"az":0,"ss":23,"used":false,"gnssid":0,"svid":7},{"PRN":16,"el":0,"az":0,"ss":20,"used":false,"gnssid":0,"svid":16},{"PRN":21,"el":0,"az":0,"ss":24,"used":false,"gnssid":0,"svid":21},{"PRN":26,"el":0,"az":0,"ss":23,"used":false,"gnssid":0,"svid":26},{"PRN":25,"el":44,"az":164,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":27,"el":38,"az":28,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":9,"el":22,"az":36,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":30,"el":14,"az":194,"ss":0,"used":false,"gnssid":0,"svid":30},{"PRN":11,"el":11,"az":192,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":15,"el":6,"az":294,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":201,"el":49,"az":147,"ss":44,"used":true},{"PRN":202,"el":23,"az":250,"ss":35,"used":false},{"PRN":204,"el":35,"az":123,"ss":42,"used":false},{"PRN":213,"el":83,"az":243,"ss":0,"used":false},{"PRN":210,"el":70,"az":270,"ss":0,"used":false},{"PRN":207,"el":70,"az":267,"ss":0,"used":false},{"PRN":206,"el":55,"az":311,"ss":0,"used":false},{"PRN":203,"el":49,"az":208,"ss":0,"used":false},{"PRN":209,"el":36,"az":317,"ss":0,"used":false},{"PRN":214,"el":36,"az":147,"ss":0,"used":false},{"PRN":205,"el":11,"az":257,"ss":0,"used":false}]}

 $GNRMC,053233.438,A,3114.8821,N,12135.2428,E,0.07,167.42,020315,,,A*73

-{"class":"TPV","mode":3,"time":"2015-03-02T05:32:33.438Z","ept":0.005,"lat":31.248035000,"lon":121.587380000,"alt":167.200,"epx":16.817,"epy":14.633,"epv":66.060,"track":167.4200,"speed":0.036,"climb":13.400,"epd":180.0000,"eps":0.30,"epc":79.03,"eph":22.800,"sep":47.500}

+{"class":"TPV","mode":3,"time":"2015-03-02T05:32:33.438Z","ept":0.005,"lat":31.248035000,"lon":121.587380000,"alt":167.200,"epx":16.817,"epy":14.633,"epv":66.060,"track":167.4200,"speed":0.036,"climb":13.400,"epd":180.0000,"eps":0.30,"epc":79.03,"eph":25.610,"sep":47.500}