driver_nmea0183: Use eph from $PSRFEPE if available.

Use GPS values when possible instead of calculated values.

1 files changed, 9 insertions, 9 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