From f9621160cc83851ca8e8c8672c7df46dad5505f1 Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Thu, 7 Mar 2019 18:30:53 -0800 Subject: 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... --- test/daemon/garmin25lp.log.chk | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'test/daemon/garmin25lp.log.chk') diff --git a/test/daemon/garmin25lp.log.chk b/test/daemon/garmin25lp.log.chk index ed1349dc..2dc1b6d7 100644 --- a/test/daemon/garmin25lp.log.chk +++ b/test/daemon/garmin25lp.log.chk @@ -68,8 +68,9 @@ $GPGSV,2,2,08,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 $GPRMC,120326,A,4221.3871,N,01322.0800,E,000.0,000.0,150305,001.4,E*77 {"class":"TPV","mode":2,"time":"2005-03-15T12:03:26.000Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"track":0.0000,"speed":0.000} $GPGGA,120326,4221.3871,N,01322.0800,E,1,00,3.1,746.1,M,44.2,M,,*40 -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:26.000Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":2,"time":"2005-03-15T12:03:26.000Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A +{"class":"TPV","mode":2,"time":"2005-03-15T12:03:26.000Z","ept":0.005,"lat":42.356451667,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000} $GPGSV,2,1,08,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75 $GPGSV,2,2,08,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":48,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19}]} @@ -82,7 +83,7 @@ $GPGSV,2,2,08,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":48,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19}]} $GPRMC,120328,A,4221.3873,N,01322.0800,E,000.0,000.0,150305,001.4,E*7B $GPGGA,120328,4221.3873,N,01322.0800,E,1,03,3.1,746.1,M,44.2,M,,*4F -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:28.000Z","ept":0.005,"lat":42.356455000,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:28.000Z","ept":0.005,"lat":42.356455000,"lon":13.368000000,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -90,7 +91,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":48,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120329,A,4221.3874,N,01322.0805,E,000.0,000.0,150305,001.4,E*78 $GPGGA,120329,4221.3874,N,01322.0805,E,1,03,3.1,746.1,M,44.2,M,,*4C -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:29.000Z","ept":0.005,"lat":42.356456667,"lon":13.368008333,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:29.000Z","ept":0.005,"lat":42.356456667,"lon":13.368008333,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,48*75 $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -98,7 +99,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":48,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120330,A,4221.3875,N,01322.0807,E,000.0,000.0,150305,001.4,E*73 $GPGGA,120330,4221.3875,N,01322.0807,E,1,03,3.1,746.1,M,44.2,M,,*47 -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:30.000Z","ept":0.005,"lat":42.356458333,"lon":13.368011667,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:30.000Z","ept":0.005,"lat":42.356458333,"lon":13.368011667,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -106,7 +107,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":47,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120331,A,4221.3880,N,01322.0808,E,000.0,000.0,150305,001.4,E*77 $GPGGA,120331,4221.3880,N,01322.0808,E,1,03,3.1,746.1,M,44.2,M,,*43 -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:31.000Z","ept":0.005,"lat":42.356466667,"lon":13.368013333,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:31.000Z","ept":0.005,"lat":42.356466667,"lon":13.368013333,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -114,7 +115,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":47,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120332,A,4221.3884,N,01322.0802,E,000.0,000.0,150305,001.4,E*7A $GPGGA,120332,4221.3884,N,01322.0802,E,1,03,3.1,746.1,M,44.2,M,,*4E -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:32.000Z","ept":0.005,"lat":42.356473333,"lon":13.368003333,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:32.000Z","ept":0.005,"lat":42.356473333,"lon":13.368003333,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -122,7 +123,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":47,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120333,A,4221.3889,N,01322.0794,E,000.0,000.0,150305,001.4,E*76 $GPGGA,120333,4221.3889,N,01322.0794,E,1,03,3.1,746.1,M,44.2,M,,*42 -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:33.000Z","ept":0.005,"lat":42.356481667,"lon":13.367990000,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:33.000Z","ept":0.005,"lat":42.356481667,"lon":13.367990000,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -130,7 +131,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":47,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120334,A,4221.3893,N,01322.0786,E,000.0,000.0,150305,001.4,E*79 $GPGGA,120334,4221.3893,N,01322.0786,E,1,03,3.1,746.1,M,44.2,M,,*4D -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:34.000Z","ept":0.005,"lat":42.356488333,"lon":13.367976667,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:34.000Z","ept":0.005,"lat":42.356488333,"lon":13.367976667,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 @@ -138,7 +139,7 @@ $GPGSV,3,3,09,22,50,054,,,,,,,,,,,,,*44 {"class":"SKY","hdop":3.10,"pdop":3.10,"satellites":[{"PRN":1,"el":10,"az":158,"ss":45,"used":true,"gnssid":0,"svid":1},{"PRN":3,"el":72,"az":164,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":11,"el":24,"az":279,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":14,"el":30,"az":119,"ss":47,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":33,"az":70,"ss":39,"used":false,"gnssid":0,"svid":15},{"PRN":16,"el":5,"az":184,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":18,"el":20,"az":46,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":73,"az":304,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":22,"el":50,"az":54,"ss":0,"used":false,"gnssid":0,"svid":22}]} $GPRMC,120335,A,4221.3898,N,01322.0780,E,000.0,000.0,150305,001.4,E*75 $GPGGA,120335,4221.3898,N,01322.0780,E,1,03,3.1,746.1,M,44.2,M,,*41 -{"class":"TPV","mode":3,"time":"2005-03-15T12:03:35.000Z","ept":0.005,"lat":42.356496667,"lon":13.367966667,"alt":746.100,"track":0.0000,"speed":0.000} +{"class":"TPV","mode":3,"time":"2005-03-15T12:03:35.000Z","ept":0.005,"lat":42.356496667,"lon":13.367966667,"alt":746.100,"track":0.0000,"speed":0.000,"climb":0.000} $GPGSA,A,2,01,03,,14,,,,,,,,,3.1,3.1,*1A $GPGSV,3,1,09,01,10,158,45,03,72,164,42,11,24,279,,14,30,119,47*7A $GPGSV,3,2,09,15,33,070,39,16,05,184,,18,20,046,,19,73,304,*75 -- cgit v1.2.1