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

diff --git a/test/daemon/polarx2.log.chk b/test/daemon/polarx2.log.chk
index cb335df1..7cbf1862 100644
--- a/test/daemon/polarx2.log.chk
+++ b/test/daemon/polarx2.log.chk
@@ -19,7 +19,7 @@ $GPGSV,5,2,17,08,22,167,,10,65,329,44,13,62,040,44,17,06,199,*79
 $GPGSV,5,3,17,20,11,098,,23,31,049,45,33,45,190,,35,26,238,*77
 $GPGSV,5,4,17,37,16,112,,39,33,133,,44,04,101,,49,33,133,*7C
 $GPGSV,5,5,17,50,45,190,*43
-{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":44,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":45,"used":true,"gnssid":0,"svid":23},{"PRN":120,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":124,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":131,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":136,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":137,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

+{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":44,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":45,"used":true,"gnssid":0,"svid":23},{"PRN":33,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":35,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":37,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":44,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":49,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":50,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

 $GPGST,112258.00,0.223,320.494,3.861,1.782,320.339,10.685,182.631*6C
 {"class":"GST","time":"2012-03-23T18:33:55.000Z","rms":0.223,"major":320.494,"minor":3.861,"orient":1.782,"lat":320.339,"lon":10.685,"alt":182.631}

 $GPGBS,112258.00,155.875,14.949,71.523,13,0.000,0.000,0.000*68
@@ -37,7 +37,7 @@ $GPGSV,5,2,17,08,22,167,,10,65,329,44,13,62,040,44,17,06,199,*79
 $GPGSV,5,3,17,20,11,098,,23,31,049,44,33,45,190,,35,26,238,*76
 $GPGSV,5,4,17,37,16,112,,39,33,133,,44,04,101,,49,33,133,*7C
 $GPGSV,5,5,17,50,45,190,*43
-{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":44,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":120,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":124,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":131,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":136,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":137,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

+{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":44,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":33,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":35,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":37,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":44,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":49,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":50,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

 $GPGST,112259.00,0.374,324.240,3.859,1.775,324.084,10.757,184.716*6B
 {"class":"GST","time":"2012-03-23T18:33:57.000Z","rms":0.374,"major":324.240,"minor":3.859,"orient":1.775,"lat":324.084,"lon":10.757,"alt":184.716}

 $GPGBS,112259.00,98.761,11.743,50.103,13,0.000,0.000,0.000*57
@@ -55,7 +55,7 @@ $GPGSV,5,2,17,08,22,167,,10,65,329,44,13,62,040,43,17,06,199,*7E
 $GPGSV,5,3,17,20,11,098,,23,31,049,44,33,45,190,,35,26,238,*76
 $GPGSV,5,4,17,37,16,112,,39,33,133,,44,04,101,,49,33,133,*7C
 $GPGSV,5,5,17,50,45,190,*43
-{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":43,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":120,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":124,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":131,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":136,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":137,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

+{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":43,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":33,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":35,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":37,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":44,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":49,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":50,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

 $GPGST,112300.00,0.593,328.088,3.859,1.768,327.932,10.833,186.824*69
 {"class":"GST","time":"2012-03-23T18:34:39.000Z","rms":0.593,"major":328.088,"minor":3.859,"orient":1.768,"lat":327.932,"lon":10.833,"alt":186.824}

 $GPGBS,112300.00,76.953,10.529,42.020,13,0.000,0.000,0.000*59
@@ -73,7 +73,7 @@ $GPGSV,5,2,17,08,22,167,,10,65,329,44,13,62,040,43,17,06,199,*7E
 $GPGSV,5,3,17,20,11,098,,23,31,049,44,33,45,190,,35,26,238,*76
 $GPGSV,5,4,17,37,16,112,,39,33,133,,44,04,101,,49,33,133,*7C
 $GPGSV,5,5,17,50,45,190,*43
-{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":43,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":120,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":124,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":131,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":136,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":137,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

+{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":44,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":43,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":33,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":35,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":37,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":44,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":49,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":50,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

 $GPGST,112301.00,0.737,331.967,3.860,1.762,331.810,10.910,188.939*61
 {"class":"GST","time":"2012-03-23T18:34:41.000Z","rms":0.737,"major":331.967,"minor":3.860,"orient":1.762,"lat":331.810,"lon":10.910,"alt":188.939}

 $GPGBS,112301.00,64.299,9.828,45.570,13,0.000,0.000,0.000*65
@@ -91,4 +91,4 @@ $GPGSV,5,2,17,08,22,167,,10,65,329,43,13,62,040,43,17,06,199,*79
 $GPGSV,5,3,17,20,11,098,,23,31,049,44,33,45,190,,35,26,238,*76
 $GPGSV,5,4,17,37,16,112,,39,33,133,,44,04,101,,49,33,133,*7C
 $GPGSV,5,5,17,50,45,190,*43
-{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":43,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":43,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":120,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":124,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":126,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":131,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":136,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":137,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}

+{"class":"SKY","hdop":10.50,"pdop":10.50,"satellites":[{"PRN":2,"el":46,"az":305,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":74,"az":240,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":5,"el":14,"az":290,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":7,"el":46,"az":134,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":22,"az":167,"ss":0,"used":false,"gnssid":0,"svid":8},{"PRN":10,"el":65,"az":329,"ss":43,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":62,"az":40,"ss":43,"used":true,"gnssid":0,"svid":13},{"PRN":17,"el":6,"az":199,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":20,"el":11,"az":98,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":23,"el":31,"az":49,"ss":44,"used":true,"gnssid":0,"svid":23},{"PRN":33,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":35,"el":26,"az":238,"ss":0,"used":false,"gnssid":1,"svid":122},{"PRN":37,"el":16,"az":112,"ss":0,"used":false,"gnssid":1,"svid":124},{"PRN":39,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":126},{"PRN":44,"el":4,"az":101,"ss":0,"used":false,"gnssid":1,"svid":131},{"PRN":49,"el":33,"az":133,"ss":0,"used":false,"gnssid":1,"svid":136},{"PRN":50,"el":45,"az":190,"ss":0,"used":false,"gnssid":1,"svid":137}]}