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/eXplorist210.log.chk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'test/daemon/eXplorist210.log.chk') diff --git a/test/daemon/eXplorist210.log.chk b/test/daemon/eXplorist210.log.chk index 98bc11ba..ef843e1e 100644 --- a/test/daemon/eXplorist210.log.chk +++ b/test/daemon/eXplorist210.log.chk @@ -2,23 +2,28 @@ $GPGSV,3,1,00,,,,,,,,,,,,,,,,*7B $GPGSV,3,2,00,,,,,,,,,,,,,,,,*78 $GPGSV,3,3,00,,,,,,,,,,,,,,,,*79 $PMGNST,01.75,3,F,816,11.1,+00000,20*5E +{"class":"TPV","mode":1} $GPGSV,3,1,00,,,,,,,,,,,,,,,,*7B $GPGSV,3,2,00,,,,,,,,,,,,,,,,*78 $GPGSV,3,3,00,,,,,,,,,,,,,,,,*79 $PMGNST,01.75,3,F,816,11.1,+00000,20*5E +{"class":"TPV","mode":1} $GPGSV,3,1,00,,,,,,,,,,,,,,,,*7B $GPGSV,3,2,00,,,,,,,,,,,,,,,,*78 $GPGSV,3,3,00,,,,,,,,,,,,,,,,*79 $PMGNST,01.75,3,F,822,11.2,+00000,20*5A +{"class":"TPV","mode":1} $GPGSV,3,1,00,,,,,,,,,,,,,,,,*7B $GPGSV,3,2,00,,,,,,,,,,,,,,,,*78 $GPGSV,3,3,00,,,,,,,,,,,,,,,,*79 $PMGNST,01.75,3,F,822,11.2,+00000,20*5A +{"class":"TPV","mode":1} $GPGSV,3,1,12,09,76,287,,17,38,073,36,26,34,163,,05,33,230,*72 $GPGSV,3,2,12,29,27,161,,18,24,256,,22,24,299,,28,11,055,*73 $GPGSV,3,3,12,14,08,319,,11,03,017,,30,02,232,,24,00,084,*71 {"class":"SKY","satellites":[{"PRN":9,"el":76,"az":287,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":17,"el":38,"az":73,"ss":36,"used":false,"gnssid":0,"svid":17},{"PRN":26,"el":34,"az":163,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":5,"el":33,"az":230,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":29,"el":27,"az":161,"ss":0,"used":false,"gnssid":0,"svid":29},{"PRN":18,"el":24,"az":256,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":22,"el":24,"az":299,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":28,"el":11,"az":55,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":14,"el":8,"az":319,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":11,"el":3,"az":17,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":30,"el":2,"az":232,"ss":0,"used":false,"gnssid":0,"svid":30},{"PRN":24,"el":0,"az":84,"ss":0,"used":false,"gnssid":0,"svid":24}]} $PMGNST,01.75,3,F,822,11.2,-00673,20*5E +{"class":"TPV","mode":1} $GPGLL,5313.2228,N,00634.4228,E,200619.295,A*35 {"class":"TPV","mode":2,"lat":53.220380000,"lon":6.573713333} $GPGGA,200619.30,5313.2228,N,00634.4228,E,1,05,2.6,00000,M,,,,*2C @@ -26,7 +31,7 @@ $GPGGA,200619.30,5313.2228,N,00634.4228,E,1,05,2.6,00000,M,,,,*2C $GPRMC,200619.30,A,5313.2228,N,00634.4228,E,00.0,000.0,200506,00,W*59 {"class":"TPV","mode":3,"time":"2006-05-20T20:06:19.300Z","ept":0.005,"lat":53.220380000,"lon":6.573713333,"alt":0.000,"track":0.0000,"speed":0.000} $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.1,02.6,04.4*03 -{"class":"TPV","mode":3,"time":"2006-05-20T20:06:19.300Z","ept":0.005,"lat":53.220380000,"lon":6.573713333,"alt":0.000,"epv":101.200,"track":0.0000,"speed":0.000,"climb":0.000} +{"class":"TPV","mode":3,"time":"2006-05-20T20:06:19.300Z","ept":0.005,"lat":53.220380000,"lon":6.573713333,"alt":0.000,"epv":101.200,"track":0.0000,"speed":0.000} $GPGSV,3,1,10,09,78,288,39,17,38,071,,05,34,230,45,26,33,163,39*77 $GPGSV,3,2,10,29,26,162,,18,24,255,42,22,24,298,44,28,10,056,*75 $GPGSV,3,3,10,14,09,319,,11,03,016,,136,27,157,,124,28,162,*71 @@ -34,13 +39,13 @@ $GPGSV,3,3,10,14,09,319,,11,03,016,,136,27,157,,124,28,162,*71 $GPGLL,5313.2228,N,00634.4228,E,200620.303,A*31 $GPGGA,200620.30,5313.2228,N,00634.4228,E,1,05,2.5,00000,M,,,,*25 $GPRMC,200620.30,A,5313.2228,N,00634.4228,E,00.0,000.0,200506,00,W*53 -{"class":"TPV","mode":3,"time":"2006-05-20T20:06:20.300Z","ept":0.005,"lat":53.220380000,"lon":6.573713333,"alt":0.000,"epx":24.247,"epy":20.724,"epv":101.200,"track":0.0000,"speed":0.000,"climb":0.000,"eps":48.35} +{"class":"TPV","mode":3,"time":"2006-05-20T20:06:20.300Z","ept":0.005,"lat":53.220380000,"lon":6.573713333,"alt":0.000,"epx":24.247,"epy":20.724,"epv":101.200,"track":0.0000,"speed":0.000,"climb":0.000,"eps":48.35,"epc":201.79} $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.0,02.5,04.3*06 $PMGNST,01.75,3,T,816,11.1,-00496,00*43 $GPGLL,5313.2227,N,00634.4228,E,200621.297,A*33 $GPGGA,200621.30,5313.2227,N,00634.4228,E,1,05,2.6,00000,M,,,,*28 $GPRMC,200621.30,A,5313.2227,N,00634.4228,E,00.0,000.0,200506,00,W*5D -{"class":"TPV","mode":3,"time":"2006-05-20T20:06:21.300Z","ept":0.005,"lat":53.220378333,"lon":6.573713333,"alt":0.000,"epx":24.247,"epy":20.724,"epv":98.900,"track":0.0000,"speed":0.000,"climb":0.000,"eps":48.64} +{"class":"TPV","mode":3,"time":"2006-05-20T20:06:21.300Z","ept":0.005,"lat":53.220378333,"lon":6.573713333,"alt":0.000,"epx":24.247,"epy":20.724,"epv":98.900,"track":0.0000,"speed":0.000,"eps":48.64,"epc":200.70} $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.2,02.6,04.5*01 $GPGSV,3,1,10,09,78,288,38,17,38,071,,05,34,230,45,26,33,163,39*76 $GPGSV,3,2,10,29,26,162,,18,24,255,42,22,24,298,44,28,10,056,*75 @@ -49,6 +54,6 @@ $GPGSV,3,3,10,14,09,319,,11,03,016,,136,27,157,,124,28,162,*71 $GPGLL,5313.2227,N,00634.4228,E,200622.305,A*3A $GPGGA,200622.31,5313.2227,N,00634.4228,E,1,05,2.5,00000,M,,,,*29 $GPRMC,200622.31,A,5313.2227,N,00634.4228,E,00.0,000.0,200506,00,W*5F -{"class":"TPV","mode":3,"time":"2006-05-20T20:06:22.310Z","ept":0.005,"lat":53.220378333,"lon":6.573713333,"alt":0.000,"epx":24.247,"epy":20.724,"epv":103.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":48.25} +{"class":"TPV","mode":3,"time":"2006-05-20T20:06:22.310Z","ept":0.005,"lat":53.220378333,"lon":6.573713333,"alt":0.000,"epx":24.247,"epy":20.724,"epv":103.500,"track":0.0000,"speed":0.000,"eps":48.25,"epc":201.39} $GPGSA,A,3,26,05,22,09,18,,,,,,,,05.0,02.5,04.3*06 $PMGNST,01.75,3,T,816,11.1,-00495,00*40 -- cgit v1.2.1