driver_navcom: Move error math to gpsd_error_model()

The numbers look better now.

1 files changed, 11 insertions, 12 deletions

diff --git a/test/daemon/navcom.log.chk b/test/daemon/navcom.log.chk
index 2ae040eb..6d5b6e09 100644
--- a/test/daemon/navcom.log.chk
+++ b/test/daemon/navcom.log.chk
@@ -2,8 +2,7 @@ $GPZDA,102005.00,15,01,2007,00,00*60
 $GPGGA,102005.00,3020.5010,N,01213.7241,E,2,00,1.00,627.59,M,31.479,M,,*6B

 $GPRMC,102005.00,A,3020.5010,N,01213.7241,E,0.0019,90.000,150107,,*32

 $GPGSA,A,3,,,,,,,,,,,,,2.0,1.0,1.8*38

-$GPGBS,102005.00,0.222,0.222,10.350,,,,*70

-{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:05.000Z","ept":3.920,"lat":30.341683155,"lon":12.228735775,"alt":627.588,"epx":0.222,"epy":0.222,"epv":10.350,"track":90.0000,"speed":0.001,"climb":0.006,"eph":4.750,"sep":9.500}

+{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:05.000Z","ept":0.005,"lat":30.341683155,"lon":12.228735775,"alt":627.588,"epv":10.350,"track":90.0000,"speed":0.001,"climb":0.006,"eph":4.750,"sep":9.500}

 $GPGSV,3,1,10,21,78,040,46,31,39,230,44,06,36,062,43,25,36,245,43*7F

 $GPGSV,3,2,10,30,26,132,38,16,40,321,42,18,31,140,39,03,10,284,34*7F

 $GPGSV,3,3,10,07,43,056,43,22,13,173,34*7C

@@ -12,8 +11,8 @@ $GPZDA,102006.00,15,01,2007,00,00*63
 $GPGGA,102006.00,3020.5010,N,01213.7241,E,2,09,1.00,627.58,M,31.479,M,,*60

 $GPRMC,102006.00,A,3020.5010,N,01213.7241,E,0.0135,0.000,150107,,*07

 $GPGSA,A,3,21,31,6,25,30,16,18,3,7,,,,2.0,1.0,1.8*01

-$GPGBS,102006.00,0.222,0.222,10.350,,,,*73

-{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:06.000Z","ept":3.920,"lat":30.341683205,"lon":12.228735818,"alt":627.577,"epx":0.222,"epy":0.222,"epv":10.350,"track":0.0000,"speed":0.007,"climb":0.008,"eps":0.44,"epc":20.70,"eph":4.750,"sep":9.500}

+$GPGBS,102006.00,2.047,2.792,10.350,,,,*7C

+{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:06.000Z","ept":0.005,"lat":30.341683205,"lon":12.228735818,"alt":627.577,"epx":2.047,"epy":2.792,"epv":10.350,"track":0.0000,"speed":0.007,"climb":0.008,"eps":5.58,"epc":20.70,"eph":4.750,"sep":9.500}

 $GPGSV,3,1,10,21,78,040,46,31,39,230,44,06,36,062,43,25,36,245,43*7F

 $GPGSV,3,2,10,30,26,132,38,16,40,321,42,18,31,140,39,03,10,284,34*7F

 $GPGSV,3,3,10,07,43,056,43,22,13,173,32*7A

@@ -22,8 +21,8 @@ $GPZDA,102007.00,15,01,2007,00,00*62
 $GPGGA,102007.00,3020.5010,N,01213.7242,E,2,09,1.00,627.56,M,31.479,M,,*6C

 $GPRMC,102007.00,A,3020.5010,N,01213.7242,E,0.0019,90.000,150107,,*33

 $GPGSA,A,3,21,31,6,25,30,16,18,3,7,,,,2.0,1.0,1.8*01

-$GPGBS,102007.00,0.222,0.222,10.350,,,,*72

-{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:07.000Z","ept":3.920,"lat":30.341683095,"lon":12.228735894,"alt":627.558,"epx":0.222,"epy":0.222,"epv":10.350,"track":90.0000,"speed":0.001,"climb":-0.019,"eps":0.44,"epc":20.70,"eph":4.750,"sep":9.500}

+$GPGBS,102007.00,2.047,2.792,10.350,,,,*7D

+{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:07.000Z","ept":0.005,"lat":30.341683095,"lon":12.228735894,"alt":627.558,"epx":2.047,"epy":2.792,"epv":10.350,"track":90.0000,"speed":0.001,"climb":-0.019,"eps":5.58,"epc":20.70,"eph":4.750,"sep":9.500}

 $GPGSV,3,1,10,21,78,040,46,31,39,230,44,06,36,062,43,25,36,245,43*7F

 $GPGSV,3,2,10,30,26,132,38,16,40,321,42,18,31,140,39,03,10,284,34*7F

 $GPGSV,3,3,10,07,43,056,43,22,13,173,44*7B

@@ -32,8 +31,8 @@ $GPZDA,102008.00,15,01,2007,00,00*6D
 $GPGGA,102008.00,3020.5010,N,01213.7242,E,2,09,1.00,627.55,M,31.479,M,,*60

 $GPRMC,102008.00,A,3020.5010,N,01213.7242,E,0.0019,90.000,150107,,*3C

 $GPGSA,A,3,21,31,6,25,30,16,18,3,7,,,,2.0,1.0,1.8*01

-$GPGBS,102008.00,0.222,0.222,10.350,,,,*7D

-{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:08.000Z","ept":3.920,"lat":30.341683146,"lon":12.228735886,"alt":627.552,"epx":0.222,"epy":0.222,"epv":10.350,"track":90.0000,"speed":0.001,"climb":0.001,"eps":0.44,"epc":20.70,"eph":4.750,"sep":9.500}

+$GPGBS,102008.00,2.047,2.792,10.350,,,,*72

+{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:08.000Z","ept":0.005,"lat":30.341683146,"lon":12.228735886,"alt":627.552,"epx":2.047,"epy":2.792,"epv":10.350,"track":90.0000,"speed":0.001,"climb":0.001,"eps":5.58,"epc":20.70,"eph":4.750,"sep":9.500}

 $GPGSV,3,1,10,21,78,040,46,31,39,230,44,06,36,062,43,25,36,245,43*7F

 $GPGSV,3,2,10,30,26,132,38,16,40,321,42,18,31,140,39,03,10,284,34*7F

 $GPGSV,3,3,10,07,43,056,43,22,13,173,44*7B

@@ -42,8 +41,8 @@ $GPZDA,102009.00,15,01,2007,00,00*6C
 $GPGGA,102009.00,3020.5010,N,01213.7242,E,2,09,1.00,627.55,M,31.480,M,,*67

 $GPRMC,102009.00,A,3020.5010,N,01213.7242,E,0.0019,0.000,150107,,*04

 $GPGSA,A,3,21,31,6,25,30,16,18,3,7,,,,2.0,1.0,1.8*01

-$GPGBS,102009.00,0.222,0.222,10.350,,,,*7C

-{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:09.000Z","ept":3.920,"lat":30.341683214,"lon":12.228735860,"alt":627.552,"epx":0.222,"epy":0.222,"epv":10.350,"track":0.0000,"speed":0.001,"climb":0.000,"eps":0.44,"epc":20.70,"eph":4.750,"sep":9.500}

+$GPGBS,102009.00,2.047,2.792,10.350,,,,*73

+{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:09.000Z","ept":0.005,"lat":30.341683214,"lon":12.228735860,"alt":627.552,"epx":2.047,"epy":2.792,"epv":10.350,"track":0.0000,"speed":0.001,"climb":0.000,"eps":5.58,"epc":20.70,"eph":4.750,"sep":9.500}

 $GPGSV,3,1,10,21,78,040,46,31,39,230,44,06,36,062,43,25,36,245,43*7F

 $GPGSV,3,2,10,30,26,132,38,16,40,321,42,18,31,140,38,03,10,284,34*7E

 $GPGSV,3,3,10,07,43,056,43,22,13,173,44*7B

@@ -52,8 +51,8 @@ $GPZDA,102010.00,15,01,2007,00,00*64
 $GPGGA,102010.00,3020.5010,N,01213.7242,E,2,09,1.00,627.54,M,31.479,M,,*68

 $GPRMC,102010.00,A,3020.5010,N,01213.7242,E,0.0019,0.000,150107,,*0C

 $GPGSA,A,3,21,31,6,25,30,16,18,3,7,,,,2.0,1.0,1.8*01

-$GPGBS,102010.00,0.222,0.222,10.350,,,,*74

-{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:10.000Z","ept":3.920,"lat":30.341683205,"lon":12.228735860,"alt":627.538,"epx":0.222,"epy":0.222,"epv":10.350,"track":0.0000,"speed":0.001,"climb":0.001,"eps":0.44,"epc":20.70,"eph":4.750,"sep":9.500}

+$GPGBS,102010.00,2.047,2.792,10.350,,,,*7B

+{"class":"TPV","status":2,"mode":3,"time":"2007-01-15T10:20:10.000Z","ept":0.005,"lat":30.341683205,"lon":12.228735860,"alt":627.538,"epx":2.047,"epy":2.792,"epv":10.350,"track":0.0000,"speed":0.001,"climb":0.001,"eps":5.58,"epc":20.70,"eph":4.750,"sep":9.500}

 $GPGSV,3,1,10,21,78,040,46,31,39,230,44,06,36,062,43,25,36,245,43*7F

 $GPGSV,3,2,10,30,26,132,38,16,40,321,42,18,31,140,38,03,10,284,34*7E

 $GPGSV,3,3,10,07,43,056,43,22,13,173,35*7D