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/garmin38.log.chk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'test/daemon/garmin38.log.chk') diff --git a/test/daemon/garmin38.log.chk b/test/daemon/garmin38.log.chk index ce195327..d8614ede 100644 --- a/test/daemon/garmin38.log.chk +++ b/test/daemon/garmin38.log.chk @@ -2,6 +2,7 @@ $PGRME,19.2,M,28.7,M,34.6,M*18 $GPGLL,3348.452,N,11821.142,W,142214,A*3B {"class":"TPV","mode":2,"lat":33.807533333,"lon":-118.352366667} $PGRMZ,125,f,3*1D +{"class":"TPV","mode":3,"lat":33.807533333,"lon":-118.352366667,"alt":38.100} $PGRMM,NAD83*29 $GPBOD,,T,,M,,*47 $GPRTE,1,1,c,0*07 @@ -14,7 +15,7 @@ $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,46,31,27,263,38*7C {"class":"SKY","xdop":1.56,"ydop":0.91,"vdop":2.80,"tdop":1.99,"hdop":1.80,"gdop":3.80,"pdop":3.30,"satellites":[{"PRN":3,"el":23,"az":224,"ss":38,"used":true,"gnssid":0,"svid":3},{"PRN":9,"el":6,"az":37,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":11,"el":17,"az":314,"ss":41,"used":true,"gnssid":0,"svid":11},{"PRN":14,"el":75,"az":15,"ss":44,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":18,"az":138,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":20,"az":79,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":25,"el":27,"az":172,"ss":46,"used":true,"gnssid":0,"svid":25},{"PRN":31,"el":27,"az":263,"ss":38,"used":true,"gnssid":0,"svid":31}]} $PGRME,19.2,M,28.7,M,34.6,M*18 $GPGLL,3348.452,N,11821.143,W,142216,A*38 -{"class":"TPV","mode":3,"time":"2002-10-08T14:22:16.000Z","ept":0.005,"lat":33.807533333,"lon":-118.352383333,"alt":38.400,"epx":28.188,"epy":28.188,"epv":59.589,"track":353.6000,"speed":0.000,"climb":0.000} +{"class":"TPV","mode":3,"time":"2002-10-08T14:22:16.000Z","ept":0.005,"lat":33.807533333,"lon":-118.352383333,"alt":38.400,"epx":28.188,"epy":28.188,"epv":59.589,"track":353.6000,"speed":0.000} $PGRMZ,126,f,3*1E $PGRMM,NAD83*29 $GPBOD,,T,,M,,*47 @@ -28,7 +29,7 @@ $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,42*79 {"class":"SKY","xdop":1.56,"ydop":0.91,"vdop":2.80,"tdop":1.99,"hdop":1.80,"gdop":3.80,"pdop":3.30,"satellites":[{"PRN":3,"el":23,"az":224,"ss":43,"used":true,"gnssid":0,"svid":3},{"PRN":9,"el":6,"az":37,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":11,"el":17,"az":314,"ss":38,"used":true,"gnssid":0,"svid":11},{"PRN":14,"el":75,"az":15,"ss":44,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":18,"az":138,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":20,"az":79,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":25,"el":27,"az":172,"ss":39,"used":true,"gnssid":0,"svid":25},{"PRN":31,"el":27,"az":263,"ss":42,"used":true,"gnssid":0,"svid":31}]} $PGRME,19.2,M,28.7,M,34.6,M*18 $GPGLL,3348.451,N,11821.144,W,142218,A*32 -{"class":"TPV","mode":3,"time":"2002-10-08T14:22:18.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352400000,"alt":38.400,"epx":28.188,"epy":28.188,"epv":59.589,"track":353.6000,"speed":0.000,"climb":0.000,"eps":25.77} +{"class":"TPV","mode":3,"time":"2002-10-08T14:22:18.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352400000,"alt":38.400,"epx":28.188,"epy":28.188,"epv":59.589,"track":353.6000,"speed":0.000,"climb":-0.002,"eps":25.77,"epc":61.99} $PGRMZ,126,f,3*1E $PGRMM,NAD83*29 $GPBOD,,T,,M,,*47 @@ -42,7 +43,7 @@ $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,41*7A {"class":"SKY","xdop":1.56,"ydop":0.91,"vdop":2.80,"tdop":1.99,"hdop":1.80,"gdop":3.80,"pdop":3.30,"satellites":[{"PRN":3,"el":23,"az":224,"ss":43,"used":true,"gnssid":0,"svid":3},{"PRN":9,"el":6,"az":37,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":11,"el":17,"az":314,"ss":38,"used":true,"gnssid":0,"svid":11},{"PRN":14,"el":75,"az":15,"ss":43,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":18,"az":138,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":20,"az":79,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":25,"el":27,"az":172,"ss":39,"used":true,"gnssid":0,"svid":25},{"PRN":31,"el":27,"az":263,"ss":41,"used":true,"gnssid":0,"svid":31}]} $PGRME,19.2,M,28.7,M,34.6,M*18 $GPGLL,3348.451,N,11821.142,W,142220,A*3F -{"class":"TPV","mode":3,"time":"2002-10-08T14:22:20.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352366667,"alt":37.600,"epx":28.188,"epy":28.188,"epv":59.589,"track":353.6000,"speed":0.000,"climb":0.000,"eps":25.77} +{"class":"TPV","mode":3,"time":"2002-10-08T14:22:20.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352366667,"alt":37.600,"epx":28.188,"epy":28.188,"epv":59.589,"track":353.6000,"speed":0.000,"climb":-0.402,"eps":25.77,"epc":61.99} $PGRMZ,123,f,3*1B $PGRMM,NAD83*29 $GPBOD,,T,,M,,*47 @@ -56,7 +57,7 @@ $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,40,31,27,263,41*74 {"class":"SKY","xdop":1.56,"ydop":0.91,"vdop":2.80,"tdop":1.99,"hdop":1.80,"gdop":3.80,"pdop":3.30,"satellites":[{"PRN":3,"el":23,"az":224,"ss":42,"used":true,"gnssid":0,"svid":3},{"PRN":9,"el":6,"az":37,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":11,"el":17,"az":314,"ss":38,"used":true,"gnssid":0,"svid":11},{"PRN":14,"el":75,"az":15,"ss":43,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":18,"az":138,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":20,"az":79,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":25,"el":27,"az":172,"ss":40,"used":true,"gnssid":0,"svid":25},{"PRN":31,"el":27,"az":263,"ss":41,"used":true,"gnssid":0,"svid":31}]} $PGRME,19.2,M,28.9,M,34.7,M*17 $GPGLL,3348.451,N,11821.143,W,142222,A*3C -{"class":"TPV","mode":3,"time":"2002-10-08T14:22:22.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"epx":28.188,"epy":28.188,"epv":60.004,"track":353.6000,"speed":0.000,"climb":0.000,"eps":25.77} +{"class":"TPV","mode":3,"time":"2002-10-08T14:22:22.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"epx":28.188,"epy":28.188,"epv":60.004,"track":353.6000,"speed":0.000,"climb":0.255,"eps":25.77,"epc":61.99} $PGRMZ,125,f,3*1D $PGRMM,NAD83*29 $GPBOD,,T,,M,,*47 @@ -70,5 +71,5 @@ $GPGSV,2,2,08,15,18,138,00,18,20,079,00,25,27,172,39,31,27,263,40*7B {"class":"SKY","xdop":1.56,"ydop":0.91,"vdop":2.80,"tdop":1.99,"hdop":1.80,"gdop":3.80,"pdop":3.30,"satellites":[{"PRN":3,"el":23,"az":224,"ss":43,"used":true,"gnssid":0,"svid":3},{"PRN":9,"el":6,"az":37,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":11,"el":17,"az":314,"ss":39,"used":true,"gnssid":0,"svid":11},{"PRN":14,"el":75,"az":15,"ss":44,"used":true,"gnssid":0,"svid":14},{"PRN":15,"el":18,"az":138,"ss":0,"used":false,"gnssid":0,"svid":15},{"PRN":18,"el":20,"az":79,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":25,"el":27,"az":172,"ss":39,"used":true,"gnssid":0,"svid":25},{"PRN":31,"el":27,"az":263,"ss":40,"used":true,"gnssid":0,"svid":31}]} $PGRME,19.2,M,28.9,M,34.7,M*17 $GPGLL,3348.451,N,11821.143,W,142224,A*3A -{"class":"TPV","mode":3,"time":"2002-10-08T14:22:24.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"epx":28.188,"epy":28.188,"epv":60.004,"track":353.6000,"speed":0.000,"climb":0.000,"eps":25.77} +{"class":"TPV","mode":3,"time":"2002-10-08T14:22:24.000Z","ept":0.005,"lat":33.807516667,"lon":-118.352383333,"alt":38.000,"epx":28.188,"epy":28.188,"epv":60.004,"track":353.6000,"speed":0.000,"climb":-0.050,"eps":25.77,"epc":62.20} $PGRMZ,125,f,3*1D -- cgit v1.2.1