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/skytraq-fixB.log.chk b/test/daemon/skytraq-fixB.log.chk
index e4ad4829..7bbe9df4 100644
--- a/test/daemon/skytraq-fixB.log.chk
+++ b/test/daemon/skytraq-fixB.log.chk
@@ -33,9 +33,9 @@ $GPGSV,4,1,13,23,66,310,29,03,65,186,34,26,43,081,27,16,41,124,39*7E
 $GPGSV,4,2,13,51,37,160,38,04,37,066,25,09,34,291,10,22,26,156,37*71

 $GPGSV,4,3,13,06,19,301,,31,17,052,21,193,11,307,,07,11,232,25*4C

 $GPGSV,4,4,13,01,03,202,30*4A

-{"class":"SKY","xdop":0.79,"ydop":0.86,"vdop":1.40,"tdop":0.97,"hdop":1.10,"gdop":2.11,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true,"gnssid":0,"svid":23},{"PRN":3,"el":65,"az":186,"ss":34,"used":true,"gnssid":0,"svid":3},{"PRN":26,"el":43,"az":81,"ss":27,"used":false,"gnssid":0,"svid":26},{"PRN":16,"el":41,"az":124,"ss":39,"used":true,"gnssid":0,"svid":16},{"PRN":138,"el":37,"az":160,"ss":38,"used":false,"gnssid":1,"svid":138},{"PRN":4,"el":37,"az":66,"ss":25,"used":false,"gnssid":0,"svid":4},{"PRN":9,"el":34,"az":291,"ss":10,"used":false,"gnssid":0,"svid":9},{"PRN":22,"el":26,"az":156,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":6,"el":19,"az":301,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":31,"el":17,"az":52,"ss":21,"used":true,"gnssid":0,"svid":31},{"PRN":193,"el":11,"az":307,"ss":0,"used":false,"gnssid":5,"svid":1},{"PRN":7,"el":11,"az":232,"ss":25,"used":true,"gnssid":0,"svid":7},{"PRN":1,"el":3,"az":202,"ss":30,"used":false,"gnssid":0,"svid":1}]}

+{"class":"SKY","xdop":0.79,"ydop":0.86,"vdop":1.40,"tdop":0.97,"hdop":1.10,"gdop":2.11,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true,"gnssid":0,"svid":23},{"PRN":3,"el":65,"az":186,"ss":34,"used":true,"gnssid":0,"svid":3},{"PRN":26,"el":43,"az":81,"ss":27,"used":false,"gnssid":0,"svid":26},{"PRN":16,"el":41,"az":124,"ss":39,"used":true,"gnssid":0,"svid":16},{"PRN":51,"el":37,"az":160,"ss":38,"used":false,"gnssid":1,"svid":138},{"PRN":4,"el":37,"az":66,"ss":25,"used":false,"gnssid":0,"svid":4},{"PRN":9,"el":34,"az":291,"ss":10,"used":false,"gnssid":0,"svid":9},{"PRN":22,"el":26,"az":156,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":6,"el":19,"az":301,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":31,"el":17,"az":52,"ss":21,"used":true,"gnssid":0,"svid":31},{"PRN":193,"el":11,"az":307,"ss":0,"used":false,"gnssid":5,"svid":1},{"PRN":7,"el":11,"az":232,"ss":25,"used":true,"gnssid":0,"svid":7},{"PRN":1,"el":3,"az":202,"ss":30,"used":false,"gnssid":0,"svid":1}]}

 $BDGSV,1,1,02,214,55,153,40,208,01,299,*67

-{"class":"SKY","xdop":0.78,"ydop":0.83,"vdop":1.40,"tdop":0.95,"hdop":1.10,"gdop":2.02,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true,"gnssid":0,"svid":23},{"PRN":3,"el":65,"az":186,"ss":34,"used":true,"gnssid":0,"svid":3},{"PRN":26,"el":43,"az":81,"ss":27,"used":false,"gnssid":0,"svid":26},{"PRN":16,"el":41,"az":124,"ss":39,"used":true,"gnssid":0,"svid":16},{"PRN":138,"el":37,"az":160,"ss":38,"used":false,"gnssid":1,"svid":138},{"PRN":4,"el":37,"az":66,"ss":25,"used":false,"gnssid":0,"svid":4},{"PRN":9,"el":34,"az":291,"ss":10,"used":false,"gnssid":0,"svid":9},{"PRN":22,"el":26,"az":156,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":6,"el":19,"az":301,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":31,"el":17,"az":52,"ss":21,"used":true,"gnssid":0,"svid":31},{"PRN":193,"el":11,"az":307,"ss":0,"used":false,"gnssid":5,"svid":1},{"PRN":7,"el":11,"az":232,"ss":25,"used":true,"gnssid":0,"svid":7},{"PRN":1,"el":3,"az":202,"ss":30,"used":false,"gnssid":0,"svid":1},{"PRN":214,"el":55,"az":153,"ss":40,"used":true},{"PRN":208,"el":1,"az":299,"ss":0,"used":false}]}

+{"class":"SKY","xdop":0.78,"ydop":0.83,"vdop":1.40,"tdop":0.95,"hdop":1.10,"gdop":2.02,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true,"gnssid":0,"svid":23},{"PRN":3,"el":65,"az":186,"ss":34,"used":true,"gnssid":0,"svid":3},{"PRN":26,"el":43,"az":81,"ss":27,"used":false,"gnssid":0,"svid":26},{"PRN":16,"el":41,"az":124,"ss":39,"used":true,"gnssid":0,"svid":16},{"PRN":51,"el":37,"az":160,"ss":38,"used":false,"gnssid":1,"svid":138},{"PRN":4,"el":37,"az":66,"ss":25,"used":false,"gnssid":0,"svid":4},{"PRN":9,"el":34,"az":291,"ss":10,"used":false,"gnssid":0,"svid":9},{"PRN":22,"el":26,"az":156,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":6,"el":19,"az":301,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":31,"el":17,"az":52,"ss":21,"used":true,"gnssid":0,"svid":31},{"PRN":193,"el":11,"az":307,"ss":0,"used":false,"gnssid":5,"svid":1},{"PRN":7,"el":11,"az":232,"ss":25,"used":true,"gnssid":0,"svid":7},{"PRN":1,"el":3,"az":202,"ss":30,"used":false,"gnssid":0,"svid":1},{"PRN":414,"el":55,"az":153,"ss":40,"used":true,"gnssid":3,"svid":14},{"PRN":408,"el":1,"az":299,"ss":0,"used":false,"gnssid":3,"svid":8}]}

 $GPRMC,182141.000,A,4404.1164403,N,12118.8704326,W,000.0,329.9,290316,,,D*7E

 $GPVTG,329.9,T,,M,000.0,N,000.0,K,D*09

 $GPZDA,182141.000,29,03,2016,00,00*54

@@ -74,7 +74,7 @@ $GPGSV,4,2,13,51,37,160,38,04,37,066,25,09,34,291,07,22,26,156,37*77
 $GPGSV,4,3,13,06,19,301,,31,17,052,20,193,11,307,,07,11,232,27*4F

 $GPGSV,4,4,13,01,03,202,30*4A

 $BDGSV,1,1,02,214,55,153,40,208,01,299,*67

-{"class":"SKY","xdop":0.78,"ydop":0.83,"vdop":1.40,"tdop":0.95,"hdop":1.10,"gdop":2.02,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true,"gnssid":0,"svid":23},{"PRN":3,"el":65,"az":186,"ss":33,"used":true,"gnssid":0,"svid":3},{"PRN":26,"el":43,"az":81,"ss":27,"used":false,"gnssid":0,"svid":26},{"PRN":16,"el":41,"az":124,"ss":38,"used":true,"gnssid":0,"svid":16},{"PRN":138,"el":37,"az":160,"ss":38,"used":false,"gnssid":1,"svid":138},{"PRN":4,"el":37,"az":66,"ss":25,"used":false,"gnssid":0,"svid":4},{"PRN":9,"el":34,"az":291,"ss":7,"used":false,"gnssid":0,"svid":9},{"PRN":22,"el":26,"az":156,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":6,"el":19,"az":301,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":31,"el":17,"az":52,"ss":20,"used":true,"gnssid":0,"svid":31},{"PRN":193,"el":11,"az":307,"ss":0,"used":false,"gnssid":5,"svid":1},{"PRN":7,"el":11,"az":232,"ss":27,"used":true,"gnssid":0,"svid":7},{"PRN":1,"el":3,"az":202,"ss":30,"used":false,"gnssid":0,"svid":1},{"PRN":214,"el":55,"az":153,"ss":40,"used":true},{"PRN":208,"el":1,"az":299,"ss":0,"used":false}]}

+{"class":"SKY","xdop":0.78,"ydop":0.83,"vdop":1.40,"tdop":0.95,"hdop":1.10,"gdop":2.02,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true,"gnssid":0,"svid":23},{"PRN":3,"el":65,"az":186,"ss":33,"used":true,"gnssid":0,"svid":3},{"PRN":26,"el":43,"az":81,"ss":27,"used":false,"gnssid":0,"svid":26},{"PRN":16,"el":41,"az":124,"ss":38,"used":true,"gnssid":0,"svid":16},{"PRN":51,"el":37,"az":160,"ss":38,"used":false,"gnssid":1,"svid":138},{"PRN":4,"el":37,"az":66,"ss":25,"used":false,"gnssid":0,"svid":4},{"PRN":9,"el":34,"az":291,"ss":7,"used":false,"gnssid":0,"svid":9},{"PRN":22,"el":26,"az":156,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":6,"el":19,"az":301,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":31,"el":17,"az":52,"ss":20,"used":true,"gnssid":0,"svid":31},{"PRN":193,"el":11,"az":307,"ss":0,"used":false,"gnssid":5,"svid":1},{"PRN":7,"el":11,"az":232,"ss":27,"used":true,"gnssid":0,"svid":7},{"PRN":1,"el":3,"az":202,"ss":30,"used":false,"gnssid":0,"svid":1},{"PRN":414,"el":55,"az":153,"ss":40,"used":true,"gnssid":3,"svid":14},{"PRN":408,"el":1,"az":299,"ss":0,"used":false,"gnssid":3,"svid":8}]}

 $GPRMC,182144.000,A,4404.1163490,N,12118.8703790,W,000.0,329.9,290316,,,D*78

 $GPVTG,329.9,T,,M,000.0,N,000.0,K,D*09

 $GPZDA,182144.000,29,03,2016,00,00*51