driver_nmea0183: Enforce NMEA 4.0 type PRNs.

Up until now, the PWN was whatever the GPS said it was.  With NMEA 4.10
this is no longer sustainable.  The u-blox 9 defaults to NMEA 4.10, sort
of.  It sometimes puts NMEA 4.0 PRNs into NMEA 4.10 sentences.

Some people like to use both u-blox binary and NMEA sentences mixed
together, so the time has come to enforce the PRN complies with
NMEA 4.0 extended numbering.  Sadly this can not map exactly into
u-blox numbering, but is a start.

Fixing this uncovered other examples of non NMEA compliant sentences in
the regressions.  So many regressions changed.  The most obvious
change is that NMEA 4.0 puts the SBAS PRN in the range 33-64 and
152-158, not 120-158 as u-blox does.

1 files changed, 4 insertions, 4 deletions

diff --git a/test/daemon/hab-gpspi.log.chk b/test/daemon/hab-gpspi.log.chk
index 104c7913..31c3b869 100644
--- a/test/daemon/hab-gpspi.log.chk
+++ b/test/daemon/hab-gpspi.log.chk
@@ -11,11 +11,11 @@ $GPGSV,4,1,14,01,04,021,,06,03,117,,12,41,246,09,13,20,164,*71
 $GPGSV,4,2,14,14,05,324,,15,43,197,16,17,44,067,26,18,11,273,11*78
 $GPGSV,4,3,14,22,10,306,15,24,68,302,,25,04,245,,28,10,060,30*7C
 $GPGSV,4,4,14,33,27,220,,39,34,168,*7B
-{"class":"SKY","xdop":0.76,"ydop":1.48,"vdop":1.47,"tdop":1.37,"hdop":0.96,"gdop":3.58,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":9,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":26,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":126,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126}]}

+{"class":"SKY","xdop":0.76,"ydop":1.48,"vdop":1.47,"tdop":1.37,"hdop":0.96,"gdop":3.58,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":9,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":26,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":39,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126}]}

 $GLGSV,3,1,09,65,17,335,35,71,18,227,,72,34,282,11,73,65,038,21*65
 $GLGSV,3,2,09,74,41,301,19,80,22,086,20,82,31,039,32,83,45,115,*69
 $GLGSV,3,3,09,84,12,163,*57
-{"class":"SKY","xdop":0.48,"ydop":0.83,"vdop":1.47,"tdop":0.84,"hdop":0.96,"gdop":1.94,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":9,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":26,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":126,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":65,"el":17,"az":335,"ss":35,"used":true,"gnssid":6,"svid":1},{"PRN":71,"el":18,"az":227,"ss":0,"used":false,"gnssid":6,"svid":7},{"PRN":72,"el":34,"az":282,"ss":11,"used":true,"gnssid":6,"svid":8},{"PRN":73,"el":65,"az":38,"ss":21,"used":true,"gnssid":6,"svid":9},{"PRN":74,"el":41,"az":301,"ss":19,"used":false,"gnssid":6,"svid":10},{"PRN":80,"el":22,"az":86,"ss":20,"used":true,"gnssid":6,"svid":16},{"PRN":82,"el":31,"az":39,"ss":32,"used":true,"gnssid":6,"svid":18},{"PRN":83,"el":45,"az":115,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":12,"az":163,"ss":0,"used":false,"gnssid":6,"svid":20}]}

+{"class":"SKY","xdop":0.48,"ydop":0.83,"vdop":1.47,"tdop":0.84,"hdop":0.96,"gdop":1.94,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":9,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":26,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":39,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":65,"el":17,"az":335,"ss":35,"used":true,"gnssid":6,"svid":1},{"PRN":71,"el":18,"az":227,"ss":0,"used":false,"gnssid":6,"svid":7},{"PRN":72,"el":34,"az":282,"ss":11,"used":true,"gnssid":6,"svid":8},{"PRN":73,"el":65,"az":38,"ss":21,"used":true,"gnssid":6,"svid":9},{"PRN":74,"el":41,"az":301,"ss":19,"used":false,"gnssid":6,"svid":10},{"PRN":80,"el":22,"az":86,"ss":20,"used":true,"gnssid":6,"svid":16},{"PRN":82,"el":31,"az":39,"ss":32,"used":true,"gnssid":6,"svid":18},{"PRN":83,"el":45,"az":115,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":12,"az":163,"ss":0,"used":false,"gnssid":6,"svid":20}]}

 $GNGLL,4804.14539,N,01621.54005,E,092835.00,A,A*70
 {"class":"TPV","mode":3,"time":"2015-06-21T09:28:35.000Z","ept":0.005,"lat":48.069089833,"lon":16.359000833,"alt":205.300,"epx":11.424,"epy":22.236,"epv":33.810,"speed":0.129,"eph":18.240,"sep":33.250}

 $GNRMC,092836.00,A,4804.14496,N,01621.53984,E,0.130,,210615,,,A*6A
@@ -30,7 +30,7 @@ $GPGSV,4,4,14,33,27,220,,39,34,168,*7B
 $GLGSV,3,1,09,65,17,335,35,71,18,227,,72,34,282,14,73,65,038,21*60
 $GLGSV,3,2,09,74,41,301,18,80,22,086,19,82,31,039,32,83,45,115,*62
 $GLGSV,3,3,09,84,12,163,*57
-{"class":"SKY","xdop":0.48,"ydop":0.83,"vdop":1.47,"tdop":0.84,"hdop":0.96,"gdop":1.94,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":9,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":17,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":126,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":65,"el":17,"az":335,"ss":35,"used":true,"gnssid":6,"svid":1},{"PRN":71,"el":18,"az":227,"ss":0,"used":false,"gnssid":6,"svid":7},{"PRN":72,"el":34,"az":282,"ss":14,"used":true,"gnssid":6,"svid":8},{"PRN":73,"el":65,"az":38,"ss":21,"used":true,"gnssid":6,"svid":9},{"PRN":74,"el":41,"az":301,"ss":18,"used":false,"gnssid":6,"svid":10},{"PRN":80,"el":22,"az":86,"ss":19,"used":true,"gnssid":6,"svid":16},{"PRN":82,"el":31,"az":39,"ss":32,"used":true,"gnssid":6,"svid":18},{"PRN":83,"el":45,"az":115,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":12,"az":163,"ss":0,"used":false,"gnssid":6,"svid":20}]}

+{"class":"SKY","xdop":0.48,"ydop":0.83,"vdop":1.47,"tdop":0.84,"hdop":0.96,"gdop":1.94,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":9,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":17,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":39,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":65,"el":17,"az":335,"ss":35,"used":true,"gnssid":6,"svid":1},{"PRN":71,"el":18,"az":227,"ss":0,"used":false,"gnssid":6,"svid":7},{"PRN":72,"el":34,"az":282,"ss":14,"used":true,"gnssid":6,"svid":8},{"PRN":73,"el":65,"az":38,"ss":21,"used":true,"gnssid":6,"svid":9},{"PRN":74,"el":41,"az":301,"ss":18,"used":false,"gnssid":6,"svid":10},{"PRN":80,"el":22,"az":86,"ss":19,"used":true,"gnssid":6,"svid":16},{"PRN":82,"el":31,"az":39,"ss":32,"used":true,"gnssid":6,"svid":18},{"PRN":83,"el":45,"az":115,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":12,"az":163,"ss":0,"used":false,"gnssid":6,"svid":20}]}

 $GNGLL,4804.14496,N,01621.53984,E,092836.00,A,A*70
 {"class":"TPV","mode":3,"time":"2015-06-21T09:28:36.000Z","ept":0.005,"lat":48.069082667,"lon":16.358997333,"alt":205.200,"epx":7.156,"epy":12.495,"epv":33.810,"speed":0.067,"climb":-0.100,"eps":34.73,"epc":67.62,"eph":18.240,"sep":33.250}

 $GNRMC,092837.00,A,4804.14430,N,01621.53949,E,0.320,,210615,,,A*65
@@ -45,6 +45,6 @@ $GPGSV,4,4,14,33,27,220,,39,34,168,*7B
 $GLGSV,3,1,09,65,17,335,35,71,18,227,,72,34,282,12,73,65,038,21*66
 $GLGSV,3,2,09,74,41,301,16,80,22,086,18,82,31,039,32,83,45,115,*6D
 $GLGSV,3,3,09,84,12,163,*57
-{"class":"SKY","xdop":0.48,"ydop":0.83,"vdop":1.47,"tdop":0.84,"hdop":0.96,"gdop":1.94,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":10,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":17,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":126,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":65,"el":17,"az":335,"ss":35,"used":true,"gnssid":6,"svid":1},{"PRN":71,"el":18,"az":227,"ss":0,"used":false,"gnssid":6,"svid":7},{"PRN":72,"el":34,"az":282,"ss":12,"used":true,"gnssid":6,"svid":8},{"PRN":73,"el":65,"az":38,"ss":21,"used":true,"gnssid":6,"svid":9},{"PRN":74,"el":41,"az":301,"ss":16,"used":false,"gnssid":6,"svid":10},{"PRN":80,"el":22,"az":86,"ss":18,"used":true,"gnssid":6,"svid":16},{"PRN":82,"el":31,"az":39,"ss":32,"used":true,"gnssid":6,"svid":18},{"PRN":83,"el":45,"az":115,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":12,"az":163,"ss":0,"used":false,"gnssid":6,"svid":20}]}

+{"class":"SKY","xdop":0.48,"ydop":0.83,"vdop":1.47,"tdop":0.84,"hdop":0.96,"gdop":1.94,"pdop":1.75,"satellites":[{"PRN":1,"el":4,"az":21,"ss":0,"used":false,"gnssid":0,"svid":1},{"PRN":6,"el":3,"az":117,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":12,"el":41,"az":246,"ss":10,"used":false,"gnssid":0,"svid":12},{"PRN":13,"el":20,"az":164,"ss":17,"used":false,"gnssid":0,"svid":13},{"PRN":14,"el":5,"az":324,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":15,"el":43,"az":197,"ss":16,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":44,"az":67,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":11,"az":273,"ss":11,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":10,"az":306,"ss":15,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":68,"az":302,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":25,"el":4,"az":245,"ss":0,"used":false,"gnssid":0,"svid":25},{"PRN":28,"el":10,"az":60,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":27,"az":220,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":39,"el":34,"az":168,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":65,"el":17,"az":335,"ss":35,"used":true,"gnssid":6,"svid":1},{"PRN":71,"el":18,"az":227,"ss":0,"used":false,"gnssid":6,"svid":7},{"PRN":72,"el":34,"az":282,"ss":12,"used":true,"gnssid":6,"svid":8},{"PRN":73,"el":65,"az":38,"ss":21,"used":true,"gnssid":6,"svid":9},{"PRN":74,"el":41,"az":301,"ss":16,"used":false,"gnssid":6,"svid":10},{"PRN":80,"el":22,"az":86,"ss":18,"used":true,"gnssid":6,"svid":16},{"PRN":82,"el":31,"az":39,"ss":32,"used":true,"gnssid":6,"svid":18},{"PRN":83,"el":45,"az":115,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":12,"az":163,"ss":0,"used":false,"gnssid":6,"svid":20}]}

 $GNGLL,4804.14430,N,01621.53949,E,092837.00,A,A*7C
 {"class":"TPV","mode":3,"time":"2015-06-21T09:28:37.000Z","ept":0.005,"lat":48.069071667,"lon":16.358991500,"alt":204.800,"epx":7.156,"epy":12.495,"epv":33.810,"speed":0.165,"climb":-0.400,"eps":24.99,"epc":67.62,"eph":18.240,"sep":33.250}