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

diff --git a/test/daemon/mt3339.log.chk b/test/daemon/mt3339.log.chk
index 94ae0fca..8cbd1e04 100644
--- a/test/daemon/mt3339.log.chk
+++ b/test/daemon/mt3339.log.chk
@@ -20,7 +20,7 @@ $GPGSA,A,3,20,16,09,03,07,10,23,19,27,30,05,,1.33,0.84,1.03*0E
 $GPGSV,3,1,12,09,88,089,31,07,60,281,44,23,55,123,33,10,44,274,32*78

 $GPGSV,3,2,12,16,39,051,29,30,30,262,20,20,23,308,30,27,23,093,34*7F

 $GPGSV,3,3,12,19,13,123,27,03,07,176,19,05,05,328,13,47,,,*41

-{"class":"SKY","xdop":0.51,"ydop":0.66,"vdop":1.03,"tdop":0.61,"hdop":0.84,"gdop":1.46,"pdop":1.33,"satellites":[{"PRN":9,"el":88,"az":89,"ss":31,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":55,"az":123,"ss":33,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":32,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":29,"used":true,"gnssid":0,"svid":16},{"PRN":30,"el":30,"az":262,"ss":20,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":23,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":93,"ss":34,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":27,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":19,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":13,"used":true,"gnssid":0,"svid":5},{"PRN":134,"el":0,"az":0,"ss":0,"used":false,"gnssid":1,"svid":134}]}

+{"class":"SKY","xdop":0.51,"ydop":0.66,"vdop":1.03,"tdop":0.61,"hdop":0.84,"gdop":1.46,"pdop":1.33,"satellites":[{"PRN":9,"el":88,"az":89,"ss":31,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":55,"az":123,"ss":33,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":32,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":29,"used":true,"gnssid":0,"svid":16},{"PRN":30,"el":30,"az":262,"ss":20,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":23,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":93,"ss":34,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":27,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":19,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":13,"used":true,"gnssid":0,"svid":5},{"PRN":47,"el":0,"az":0,"ss":0,"used":false,"gnssid":1,"svid":134}]}

 $GPRMC,202643.000,A,4404.1305,N,12118.8515,W,0.02,171.47,130415,,,D*7D

 {"class":"TPV","status":2,"mode":3,"time":"2015-04-13T20:26:43.000Z","ept":0.005,"lat":44.068841667,"lon":-121.314191667,"alt":1127.700,"epx":1.919,"epy":2.470,"epv":5.923,"track":171.4700,"speed":0.010,"climb":0.000,"epc":11.85,"eph":3.990,"sep":6.318}

 $GPZDA,202643.000,13,04,2015,,*57

@@ -49,7 +49,7 @@ $GPGSA,A,3,20,16,09,03,07,10,23,19,27,30,,,1.64,0.98,1.31*05
 $GPGSV,3,1,12,09,88,089,32,07,60,281,44,23,55,123,34,10,44,274,31*7F

 $GPGSV,3,2,12,16,39,051,31,30,30,262,23,20,24,308,30,27,23,093,34*72

 $GPGSV,3,3,12,19,13,123,27,03,07,176,22,05,05,328,,49,,,*45

-{"class":"SKY","xdop":0.52,"ydop":0.84,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":32,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":55,"az":123,"ss":34,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":30,"el":30,"az":262,"ss":23,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":93,"ss":34,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":27,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":22,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":136,"el":0,"az":0,"ss":0,"used":false,"gnssid":1,"svid":136}]}

+{"class":"SKY","xdop":0.52,"ydop":0.84,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":32,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":55,"az":123,"ss":34,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":30,"el":30,"az":262,"ss":23,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":93,"ss":34,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":27,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":22,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":49,"el":0,"az":0,"ss":0,"used":false,"gnssid":1,"svid":136}]}

 $GPRMC,202648.000,A,4404.1305,N,12118.8515,W,0.00,152.04,130415,,,D*72

 {"class":"TPV","status":2,"mode":3,"time":"2015-04-13T20:26:48.000Z","ept":0.005,"lat":44.068841667,"lon":-121.314191667,"alt":1127.700,"epx":1.919,"epy":2.470,"epv":7.533,"track":152.0400,"speed":0.000,"climb":0.000,"eps":4.94,"epc":15.07,"eph":4.655,"sep":7.790}

 $GPZDA,202648.000,13,04,2015,,*5C

@@ -78,7 +78,7 @@ $GPGSA,A,3,20,16,09,03,07,10,23,19,27,30,,,1.64,0.98,1.31*05
 $GPGSV,3,1,12,09,88,089,31,07,60,281,44,23,54,124,33,10,44,274,31*7D

 $GPGSV,3,2,12,16,39,051,31,30,30,262,24,20,24,308,31,27,23,093,34*74

 $GPGSV,3,3,12,19,13,123,26,03,07,176,19,05,05,328,,49,,,*4C

-{"class":"SKY","xdop":0.52,"ydop":0.84,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":31,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":33,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":30,"el":30,"az":262,"ss":24,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":31,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":93,"ss":34,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":26,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":19,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":136,"el":0,"az":0,"ss":0,"used":false,"gnssid":1,"svid":136}]}

+{"class":"SKY","xdop":0.52,"ydop":0.84,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":31,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":33,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":30,"el":30,"az":262,"ss":24,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":31,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":93,"ss":34,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":26,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":19,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":49,"el":0,"az":0,"ss":0,"used":false,"gnssid":1,"svid":136}]}

 $GPRMC,202653.000,A,4404.1305,N,12118.8515,W,0.04,191.42,130415,,,D*71

 {"class":"TPV","status":2,"mode":3,"time":"2015-04-13T20:26:53.000Z","ept":0.005,"lat":44.068841667,"lon":-121.314191667,"alt":1127.700,"epx":1.932,"epy":3.141,"epv":7.533,"track":191.4200,"speed":0.021,"climb":0.000,"eps":6.28,"epc":15.07,"eph":4.655,"sep":7.790}

 $GPZDA,202653.000,13,04,2015,,*56

@@ -107,7 +107,7 @@ $GPGSA,A,3,20,16,09,03,07,10,23,19,27,30,,,1.64,0.98,1.31*05
 $GPGSV,3,1,12,09,88,089,32,07,60,281,44,23,54,124,36,10,44,274,31*7B

 $GPGSV,3,2,12,16,39,051,31,46,37,146,,30,30,262,24,20,24,308,32*7B

 $GPGSV,3,3,12,27,23,092,33,19,13,123,26,03,07,176,22,05,05,328,*76

-{"class":"SKY","xdop":0.51,"ydop":0.83,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":32,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":133,"el":37,"az":146,"ss":0,"used":false,"gnssid":1,"svid":133},{"PRN":30,"el":30,"az":262,"ss":24,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":32,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":92,"ss":33,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":26,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":22,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5}]}

+{"class":"SKY","xdop":0.51,"ydop":0.83,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":32,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":46,"el":37,"az":146,"ss":0,"used":false,"gnssid":1,"svid":133},{"PRN":30,"el":30,"az":262,"ss":24,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":32,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":92,"ss":33,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":26,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":22,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5}]}

 $GPRMC,202658.000,A,4404.1304,N,12118.8515,W,0.03,213.30,130415,,,D*70

 {"class":"TPV","status":2,"mode":3,"time":"2015-04-13T20:26:58.000Z","ept":0.005,"lat":44.068840000,"lon":-121.314191667,"alt":1127.700,"epx":1.932,"epy":3.135,"epv":7.533,"track":213.3000,"speed":0.015,"climb":0.000,"eps":6.27,"epc":15.07,"eph":4.655,"sep":7.790}

 $GPZDA,202658.000,13,04,2015,,*5D

@@ -136,7 +136,7 @@ $GPGSA,A,3,20,16,09,03,07,10,23,19,27,30,,,1.64,0.98,1.31*05
 $GPGSV,3,1,12,09,88,089,33,07,60,281,44,23,54,124,37,10,44,274,31*7B

 $GPGSV,3,2,12,16,39,051,30,46,37,146,,30,30,262,28,20,24,308,30*74

 $GPGSV,3,3,12,27,23,092,31,19,13,123,27,03,07,176,20,05,05,328,*77

-{"class":"SKY","xdop":0.51,"ydop":0.83,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":33,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":30,"used":true,"gnssid":0,"svid":16},{"PRN":133,"el":37,"az":146,"ss":0,"used":false,"gnssid":1,"svid":133},{"PRN":30,"el":30,"az":262,"ss":28,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":92,"ss":31,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":27,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":20,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5}]}

+{"class":"SKY","xdop":0.51,"ydop":0.83,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":33,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":30,"used":true,"gnssid":0,"svid":16},{"PRN":46,"el":37,"az":146,"ss":0,"used":false,"gnssid":1,"svid":133},{"PRN":30,"el":30,"az":262,"ss":28,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":92,"ss":31,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":27,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":20,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5}]}

 $GPRMC,202703.000,A,4404.1304,N,12118.8515,W,0.01,202.78,130415,,,D*71

 {"class":"TPV","status":2,"mode":3,"time":"2015-04-13T20:27:03.000Z","ept":0.005,"lat":44.068840000,"lon":-121.314191667,"alt":1127.700,"epx":1.930,"epy":3.125,"epv":7.533,"track":202.7800,"speed":0.005,"climb":0.000,"eps":6.25,"epc":15.07,"eph":4.655,"sep":7.790}

 $GPZDA,202703.000,13,04,2015,,*52

@@ -165,7 +165,7 @@ $GPGSA,A,3,20,16,09,03,07,10,23,19,27,30,,,1.64,0.98,1.31*05
 $GPGSV,3,1,12,09,88,089,33,07,60,281,44,23,54,124,38,10,44,274,31*74

 $GPGSV,3,2,12,16,39,051,31,46,37,146,,30,30,262,29,20,24,308,30*74

 $GPGSV,3,3,12,27,23,092,32,19,13,123,25,03,07,176,19,05,05,328,*7C

-{"class":"SKY","xdop":0.51,"ydop":0.83,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":33,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":38,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":133,"el":37,"az":146,"ss":0,"used":false,"gnssid":1,"svid":133},{"PRN":30,"el":30,"az":262,"ss":29,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":92,"ss":32,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":25,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":19,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5}]}

+{"class":"SKY","xdop":0.51,"ydop":0.83,"vdop":1.31,"tdop":0.84,"hdop":0.98,"gdop":1.84,"pdop":1.64,"satellites":[{"PRN":9,"el":88,"az":89,"ss":33,"used":true,"gnssid":0,"svid":9},{"PRN":7,"el":60,"az":281,"ss":44,"used":true,"gnssid":0,"svid":7},{"PRN":23,"el":54,"az":124,"ss":38,"used":true,"gnssid":0,"svid":23},{"PRN":10,"el":44,"az":274,"ss":31,"used":true,"gnssid":0,"svid":10},{"PRN":16,"el":39,"az":51,"ss":31,"used":true,"gnssid":0,"svid":16},{"PRN":46,"el":37,"az":146,"ss":0,"used":false,"gnssid":1,"svid":133},{"PRN":30,"el":30,"az":262,"ss":29,"used":true,"gnssid":0,"svid":30},{"PRN":20,"el":24,"az":308,"ss":30,"used":true,"gnssid":0,"svid":20},{"PRN":27,"el":23,"az":92,"ss":32,"used":true,"gnssid":0,"svid":27},{"PRN":19,"el":13,"az":123,"ss":25,"used":true,"gnssid":0,"svid":19},{"PRN":3,"el":7,"az":176,"ss":19,"used":true,"gnssid":0,"svid":3},{"PRN":5,"el":5,"az":328,"ss":0,"used":false,"gnssid":0,"svid":5}]}

 $GPRMC,202708.000,A,4404.1298,N,12118.8513,W,0.06,182.52,130415,,,D*7C

 {"class":"TPV","status":2,"mode":3,"time":"2015-04-13T20:27:08.000Z","ept":0.005,"lat":44.068830000,"lon":-121.314188333,"alt":1127.400,"epx":1.930,"epy":3.125,"epv":7.533,"track":182.5200,"speed":0.031,"climb":-0.200,"eps":6.25,"epc":15.07,"eph":4.655,"sep":7.790}

 $GPZDA,202708.000,13,04,2015,,*59