Change NMEA mode setting, thus major changes in gpsd_error_model().

The start of this overly large patch was to simply move the test
for MODE_2D/3D flipping, which only affect NMEA 183, back into
driver_nmea0813.c

But that was intertwined with how gpsd_error_model() computes
derived variables, which required major changes to how NMEA 183
mode_2D/3D are set.

This ultimatly led to major regression test results.  Almost all for
the better.

I tried to break it up, but moving from one paradigm to another
needed one big jump...

1 files changed, 15 insertions, 7 deletions

diff --git a/test/daemon/foretrex-201.log.chk b/test/daemon/foretrex-201.log.chk
index 2bf6203e..d2f74871 100644
--- a/test/daemon/foretrex-201.log.chk
+++ b/test/daemon/foretrex-201.log.chk
@@ -2,6 +2,7 @@ $GPGLL,,,,,,V,N*64
 $GPBOD,,T,,M,,*47

 $PGRME,,M,,M,,M*00

 $PGRMZ,,f,1*29

+{"class":"TPV","mode":1}

 $GPRTE,1,1,c,*37

 $GPRMC,,V,,,,,,,260810,1.0,E,N*34

 $GPRMB,V,,,,,,,,,,,,A,N*13

@@ -15,6 +16,7 @@ $GPGLL,,,,,,V,N*64
 $GPBOD,,T,,M,,*47

 $PGRME,,M,,M,,M*00

 $PGRMZ,,f,1*29

+{"class":"TPV","mode":1}

 $GPRTE,1,1,c,*37

 $GPRMC,,V,,,,,,,260810,1.0,E,N*34

 $GPRMB,V,,,,,,,,,,,,A,N*13

@@ -28,6 +30,7 @@ $GPGLL,,,,,,V,N*64
 $GPBOD,,T,,M,,*47

 $PGRME,,M,,M,,M*00

 $PGRMZ,,f,1*29

+{"class":"TPV","mode":1}

 $GPRTE,1,1,c,*37

 $GPRMC,,V,,,,,,,260810,1.0,E,N*34

 $GPRMB,V,,,,,,,,,,,,A,N*13

@@ -41,6 +44,7 @@ $GPGLL,,,,,,V,N*64
 $GPBOD,,T,,M,,*47

 $PGRME,,M,,M,,M*00

 $PGRMZ,,f,1*29

+{"class":"TPV","mode":1}

 $GPRTE,1,1,c,*37

 $GPRMC,,V,,,,,,,260810,1.0,E,N*34

 $GPRMB,V,,,,,,,,,,,,A,N*13

@@ -54,26 +58,30 @@ $GPGLL,,,,,,V,N*64
 $GPBOD,,T,,M,,*47

 $PGRME,,M,,M,,M*00

 $PGRMZ,,f,1*29

+{"class":"TPV","mode":1}

 $GPRTE,1,1,c,*37

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04

+{"class":"TPV","mode":2,"alt":-9.144,"epx":29.216,"epy":29.216}

 $GPRTE,1,1,c,*37

 $GPRMC,200004,A,5504.4343,N,01025.5386,E,0.0,0.0,260810,1.0,E,D*1E

-{"class":"TPV","mode":2,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"track":0.0000,"speed":0.000}

+{"class":"TPV","mode":3,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"track":0.0000,"speed":0.000}

 $GPRMB,A,,,,,,,,,,,,A,D*0E

 $GPGGA,200004,5504.4343,N,01025.5386,E,2,03,2.5,-9.1,M,43.9,M,,*62

 {"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.100,"track":0.0000,"speed":0.000}

 $GPGSA,A,2,06,,,,,,19,22,,,,,2.7,2.5,1.0*3E

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000}

 $GPGSV,3,1,12,06,43,153,43,08,05,301,00,11,19,274,00,14,18,127,00*77

 $GPGSV,3,2,12,15,01,013,00,18,25,053,00,19,75,249,43,22,55,078,32*78

 $GPGSV,3,3,12,24,83,092,00,28,17,327,00,33,23,211,42,37,26,166,42*74

 {"class":"SKY","vdop":1.00,"hdop":2.50,"pdop":2.70,"satellites":[{"PRN":6,"el":43,"az":153,"ss":43,"used":true,"gnssid":0,"svid":6},{"PRN":8,"el":5,"az":301,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":11,"el":19,"az":274,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":18,"az":127,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":1,"az":13,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":25,"az":53,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":75,"az":249,"ss":43,"used":true,"gnssid":0,"svid":19},{"PRN":22,"el":55,"az":78,"ss":32,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":83,"az":92,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":17,"az":327,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":23,"az":211,"ss":42,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":26,"az":166,"ss":42,"used":false,"gnssid":1,"svid":124}]}

 $GPGLL,5504.4343,N,01025.5386,E,200004,A,D*4E

-{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000}

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:04.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.144,"epx":29.216,"epy":29.216,"epv":103.814,"track":0.0000,"speed":0.000}

 $GPRTE,1,1,c,*37

 $GPRMC,200006,A,5504.4343,N,01025.5386,E,0.0,0.0,260810,1.0,E,D*1C

 $GPRMB,A,,,,,,,,,,,,A,D*0E

@@ -84,7 +92,7 @@ $GPGSV,3,2,12,15,01,013,00,18,25,053,00,19,75,249,43,22,55,078,31*7B
 $GPGSV,3,3,12,24,83,092,00,28,17,327,00,33,23,211,42,37,26,166,42*74

 {"class":"SKY","vdop":1.00,"hdop":2.50,"pdop":2.70,"satellites":[{"PRN":6,"el":43,"az":153,"ss":43,"used":true,"gnssid":0,"svid":6},{"PRN":8,"el":5,"az":301,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":11,"el":19,"az":274,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":18,"az":127,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":1,"az":13,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":25,"az":53,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":75,"az":249,"ss":43,"used":true,"gnssid":0,"svid":19},{"PRN":22,"el":55,"az":78,"ss":31,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":83,"az":92,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":17,"az":327,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":23,"az":211,"ss":42,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":26,"az":166,"ss":42,"used":false,"gnssid":1,"svid":124}]}

 $GPGLL,5504.4343,N,01025.5386,E,200006,A,D*4C

-{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:06.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:06.000Z","ept":0.005,"lat":55.073905000,"lon":10.425643333,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.022,"epc":54.78}

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04

@@ -98,7 +106,7 @@ $GPGSV,3,2,12,15,01,013,00,18,25,053,00,19,75,249,43,22,55,078,31*7B
 $GPGSV,3,3,12,24,83,092,00,28,17,327,00,33,23,211,42,37,26,166,42*74

 {"class":"SKY","vdop":1.00,"hdop":2.50,"pdop":2.70,"satellites":[{"PRN":6,"el":43,"az":153,"ss":44,"used":true,"gnssid":0,"svid":6},{"PRN":8,"el":4,"az":301,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":11,"el":19,"az":274,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":18,"az":127,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":1,"az":13,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":25,"az":53,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":75,"az":249,"ss":43,"used":true,"gnssid":0,"svid":19},{"PRN":22,"el":55,"az":78,"ss":31,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":83,"az":92,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":17,"az":327,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":23,"az":211,"ss":42,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":26,"az":166,"ss":42,"used":false,"gnssid":1,"svid":124}]}

 $GPGLL,5504.4344,N,01025.5385,E,200008,A,D*46

-{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:08.000Z","ept":0.005,"lat":55.073906667,"lon":10.425641667,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:08.000Z","ept":0.005,"lat":55.073906667,"lon":10.425641667,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.022,"epc":54.78}

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04

@@ -112,7 +120,7 @@ $GPGSV,3,2,12,15,01,013,00,18,25,053,00,19,75,249,43,22,55,078,31*7B
 $GPGSV,3,3,12,24,83,092,00,28,17,327,00,33,23,211,42,37,26,166,42*74

 {"class":"SKY","vdop":1.00,"hdop":2.50,"pdop":2.70,"satellites":[{"PRN":6,"el":43,"az":153,"ss":44,"used":false,"gnssid":0,"svid":6},{"PRN":8,"el":4,"az":301,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":11,"el":19,"az":274,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":18,"az":127,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":1,"az":13,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":25,"az":53,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":75,"az":249,"ss":43,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":55,"az":78,"ss":31,"used":false,"gnssid":0,"svid":22},{"PRN":24,"el":83,"az":92,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":17,"az":327,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":23,"az":211,"ss":42,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":26,"az":166,"ss":42,"used":false,"gnssid":1,"svid":124}]}

 $GPGLL,5504.4344,N,01025.5385,E,200010,A,D*4F

-{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:10.000Z","ept":0.005,"lat":55.073906667,"lon":10.425641667,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:10.000Z","ept":0.005,"lat":55.073906667,"lon":10.425641667,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.022,"epc":54.78}

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04

@@ -126,7 +134,7 @@ $GPGSV,3,2,12,15,01,013,00,18,25,053,00,19,75,249,43,22,55,078,31*7B
 $GPGSV,3,3,12,24,83,092,00,28,17,327,00,33,23,211,42,37,26,166,42*74

 {"class":"SKY","vdop":1.00,"hdop":2.50,"pdop":2.70,"satellites":[{"PRN":6,"el":43,"az":153,"ss":44,"used":false,"gnssid":0,"svid":6},{"PRN":8,"el":4,"az":301,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":11,"el":19,"az":274,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":18,"az":127,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":1,"az":13,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":25,"az":53,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":75,"az":249,"ss":43,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":55,"az":78,"ss":31,"used":false,"gnssid":0,"svid":22},{"PRN":24,"el":83,"az":92,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":17,"az":327,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":23,"az":211,"ss":42,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":26,"az":166,"ss":42,"used":false,"gnssid":1,"svid":124}]}

 $GPGLL,5504.4344,N,01025.5385,E,200012,A,D*4D

-{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:12.000Z","ept":0.005,"lat":55.073906667,"lon":10.425641667,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:12.000Z","ept":0.005,"lat":55.073906667,"lon":10.425641667,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.022,"epc":54.78}

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04

@@ -140,7 +148,7 @@ $GPGSV,3,2,12,15,01,013,00,18,25,053,00,19,75,249,43,22,55,078,31*7B
 $GPGSV,3,3,12,24,83,092,00,28,17,327,00,33,23,211,42,37,26,166,42*74

 {"class":"SKY","vdop":1.00,"hdop":2.50,"pdop":2.70,"satellites":[{"PRN":6,"el":43,"az":153,"ss":44,"used":false,"gnssid":0,"svid":6},{"PRN":8,"el":4,"az":301,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":11,"el":19,"az":274,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":18,"az":127,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":1,"az":13,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":25,"az":53,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":75,"az":249,"ss":43,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":55,"az":78,"ss":31,"used":false,"gnssid":0,"svid":22},{"PRN":24,"el":83,"az":92,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":17,"az":327,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":23,"az":211,"ss":42,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":26,"az":166,"ss":42,"used":false,"gnssid":1,"svid":124}]}

 $GPGLL,5504.4344,N,01025.5384,E,200014,A,D*4A

-{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:14.000Z","ept":0.005,"lat":55.073906667,"lon":10.425640000,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.000}

+{"class":"TPV","status":2,"mode":3,"time":"2010-08-26T20:00:14.000Z","ept":0.005,"lat":55.073906667,"lon":10.425640000,"alt":-9.100,"epv":5.750,"track":0.0000,"speed":0.000,"climb":0.022,"epc":54.78}

 $GPBOD,,T,,M,,*47

 $PGRME,19.9,M,50.0,M,53.8,M*14

 $PGRMZ,-30,f,2*04