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, 3 insertions, 3 deletions

diff --git a/test/daemon/ch-4711.log.chk b/test/daemon/ch-4711.log.chk
index 5a58eac1..fad862e1 100644
--- a/test/daemon/ch-4711.log.chk
+++ b/test/daemon/ch-4711.log.chk
@@ -21,10 +21,10 @@ $GPGSV,4,1,14,03,50,217,,06,49,201,,09,10,068,,14,30,153,*74
 $GPGSV,4,2,14,18,42,068,,19,58,270,36,21,16,107,,22,76,109,*75

 $GPGSV,4,3,14,26,42,127,,27,13,055,25,28,08,344,22,33,11,238,*75

 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

-{"class":"SKY","vdop":0.90,"hdop":1.80,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":49,"az":201,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":9,"el":10,"az":68,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":14,"el":30,"az":153,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":18,"el":42,"az":68,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":58,"az":270,"ss":36,"used":true,"gnssid":0,"svid":19},{"PRN":21,"el":16,"az":107,"ss":0,"used":false,"gnssid":0,"svid":21},{"PRN":22,"el":76,"az":109,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":26,"el":42,"az":127,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":13,"az":55,"ss":25,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":8,"az":344,"ss":22,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":11,"az":238,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":25,"az":199,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":25,"az":194,"ss":0,"used":false,"gnssid":1,"svid":126}]}

+{"class":"SKY","vdop":0.90,"hdop":1.80,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":49,"az":201,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":9,"el":10,"az":68,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":14,"el":30,"az":153,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":18,"el":42,"az":68,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":58,"az":270,"ss":36,"used":true,"gnssid":0,"svid":19},{"PRN":21,"el":16,"az":107,"ss":0,"used":false,"gnssid":0,"svid":21},{"PRN":22,"el":76,"az":109,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":26,"el":42,"az":127,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":13,"az":55,"ss":25,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":8,"az":344,"ss":22,"used":false,"gnssid":0,"svid":28},{"PRN":33,"el":11,"az":238,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":37,"el":25,"az":199,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":25,"az":194,"ss":0,"used":false,"gnssid":1,"svid":126}]}

 $GLGSV,2,1,06,66,18,048,,67,72,050,32,75,16,358,39,82,47,171,*6A

 $GLGSV,2,2,06,83,66,291,37,84,17,325,34*6F

-{"class":"SKY","xdop":0.93,"ydop":2.64,"vdop":0.90,"tdop":2.85,"hdop":1.80,"gdop":4.99,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":49,"az":201,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":9,"el":10,"az":68,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":14,"el":30,"az":153,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":18,"el":42,"az":68,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":58,"az":270,"ss":36,"used":true,"gnssid":0,"svid":19},{"PRN":21,"el":16,"az":107,"ss":0,"used":false,"gnssid":0,"svid":21},{"PRN":22,"el":76,"az":109,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":26,"el":42,"az":127,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":13,"az":55,"ss":25,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":8,"az":344,"ss":22,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":11,"az":238,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":25,"az":199,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":25,"az":194,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":66,"el":18,"az":48,"ss":0,"used":false,"gnssid":6,"svid":2},{"PRN":67,"el":72,"az":50,"ss":32,"used":true,"gnssid":6,"svid":3},{"PRN":75,"el":16,"az":358,"ss":39,"used":true,"gnssid":6,"svid":11},{"PRN":82,"el":47,"az":171,"ss":0,"used":false,"gnssid":6,"svid":18},{"PRN":83,"el":66,"az":291,"ss":37,"used":true,"gnssid":6,"svid":19},{"PRN":84,"el":17,"az":325,"ss":34,"used":true,"gnssid":6,"svid":20}]}

+{"class":"SKY","xdop":0.93,"ydop":2.64,"vdop":0.90,"tdop":2.85,"hdop":1.80,"gdop":4.99,"pdop":2.10,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":49,"az":201,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":9,"el":10,"az":68,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":14,"el":30,"az":153,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":18,"el":42,"az":68,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":58,"az":270,"ss":36,"used":true,"gnssid":0,"svid":19},{"PRN":21,"el":16,"az":107,"ss":0,"used":false,"gnssid":0,"svid":21},{"PRN":22,"el":76,"az":109,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":26,"el":42,"az":127,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":13,"az":55,"ss":25,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":8,"az":344,"ss":22,"used":false,"gnssid":0,"svid":28},{"PRN":33,"el":11,"az":238,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":37,"el":25,"az":199,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":25,"az":194,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":66,"el":18,"az":48,"ss":0,"used":false,"gnssid":6,"svid":2},{"PRN":67,"el":72,"az":50,"ss":32,"used":true,"gnssid":6,"svid":3},{"PRN":75,"el":16,"az":358,"ss":39,"used":true,"gnssid":6,"svid":11},{"PRN":82,"el":47,"az":171,"ss":0,"used":false,"gnssid":6,"svid":18},{"PRN":83,"el":66,"az":291,"ss":37,"used":true,"gnssid":6,"svid":19},{"PRN":84,"el":17,"az":325,"ss":34,"used":true,"gnssid":6,"svid":20}]}

 $GNGSA,A,2,19,27,,,,,,,,,,,02.1,01.8,00.9*13

 $GNGSA,A,2,67,84,83,75,,,,,,,,,02.1,01.8,00.9*1A

 $GLGGA,135654.997,5543.0328,N,03724.7197,E,1,04,02.3,165.6,M,14.6,M,,*71

@@ -64,7 +64,7 @@ $GPGSV,4,3,14,26,42,127,,27,13,055,,28,08,344,,33,11,238,*72
 $GPGSV,4,4,14,37,25,199,,39,25,194,*7F

 $GLGSV,2,1,06,66,18,048,,67,72,050,,75,16,358,26,82,47,171,*65

 $GLGSV,2,2,06,83,66,291,,84,17,325,22*6C

-{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":49,"az":201,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":9,"el":10,"az":68,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":14,"el":30,"az":153,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":18,"el":42,"az":68,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":58,"az":270,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":21,"el":16,"az":107,"ss":0,"used":false,"gnssid":0,"svid":21},{"PRN":22,"el":76,"az":109,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":26,"el":42,"az":127,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":13,"az":55,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":8,"az":344,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":120,"el":11,"az":238,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":124,"el":25,"az":199,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":25,"az":194,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":66,"el":18,"az":48,"ss":0,"used":false,"gnssid":6,"svid":2},{"PRN":67,"el":72,"az":50,"ss":0,"used":false,"gnssid":6,"svid":3},{"PRN":75,"el":16,"az":358,"ss":26,"used":false,"gnssid":6,"svid":11},{"PRN":82,"el":47,"az":171,"ss":0,"used":false,"gnssid":6,"svid":18},{"PRN":83,"el":66,"az":291,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":17,"az":325,"ss":22,"used":false,"gnssid":6,"svid":20}]}

+{"class":"SKY","vdop":0.00,"hdop":0.00,"pdop":0.00,"satellites":[{"PRN":3,"el":50,"az":217,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":6,"el":49,"az":201,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":9,"el":10,"az":68,"ss":0,"used":false,"gnssid":0,"svid":9},{"PRN":14,"el":30,"az":153,"ss":0,"used":false,"gnssid":0,"svid":14},{"PRN":18,"el":42,"az":68,"ss":0,"used":false,"gnssid":0,"svid":18},{"PRN":19,"el":58,"az":270,"ss":0,"used":false,"gnssid":0,"svid":19},{"PRN":21,"el":16,"az":107,"ss":0,"used":false,"gnssid":0,"svid":21},{"PRN":22,"el":76,"az":109,"ss":0,"used":false,"gnssid":0,"svid":22},{"PRN":26,"el":42,"az":127,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":13,"az":55,"ss":0,"used":false,"gnssid":0,"svid":27},{"PRN":28,"el":8,"az":344,"ss":0,"used":false,"gnssid":0,"svid":28},{"PRN":33,"el":11,"az":238,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":37,"el":25,"az":199,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":25,"az":194,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":66,"el":18,"az":48,"ss":0,"used":false,"gnssid":6,"svid":2},{"PRN":67,"el":72,"az":50,"ss":0,"used":false,"gnssid":6,"svid":3},{"PRN":75,"el":16,"az":358,"ss":26,"used":false,"gnssid":6,"svid":11},{"PRN":82,"el":47,"az":171,"ss":0,"used":false,"gnssid":6,"svid":18},{"PRN":83,"el":66,"az":291,"ss":0,"used":false,"gnssid":6,"svid":19},{"PRN":84,"el":17,"az":325,"ss":22,"used":false,"gnssid":6,"svid":20}]}

 $GPGSA,A,1,,,,,,,,,,,,,00.0,00.0,00.0*00

 $GPGBS,135659.997,,,,,,,*55

 $GPGGA,135700.997,5543.0322,N,03724.7208,E,0,,,165.6,M,14.6,M,,*78