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

diff --git a/test/daemon/tr737A+.log.chk b/test/daemon/tr737A+.log.chk
index c1dc08a2..e861d7d5 100644
--- a/test/daemon/tr737A+.log.chk
+++ b/test/daemon/tr737A+.log.chk
@@ -19,14 +19,14 @@ $GPGGA,071736.000,4404.1316,N,12118.8445,W,1,4,5.21,1134.4,M,-19.6,M,,*5F
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.30,5.21,0.98*03
 $GPGSV,2,1,06,20,73,204,41,23,56,298,37,32,54,148,43,48,37,196,*70
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.21,"gdop":8.87,"pdop":5.30,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":0,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.21,"gdop":8.87,"pdop":5.30,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":0,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071736.000,A,4404.1316,N,12118.8445,W,0.20,0.00,111111,,,A*7D
 $GPGGA,071737.000,4404.1258,N,12118.8537,W,1,4,5.20,1131.0,M,-19.6,M,,*51
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:37.000Z","ept":0.005,"lat":44.068763333,"lon":-121.314228333,"alt":1131.000,"epx":59.364,"epy":68.891,"epv":22.540,"speed":16.318,"climb":-3.400,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.700}

 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,37,32,54,148,43,48,37,196,44*70
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":44,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":44,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071737.000,A,4404.1258,N,12118.8537,W,0.12,0.00,111111,,,A*72
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:37.000Z","ept":0.005,"lat":44.068763333,"lon":-121.314228333,"alt":1131.000,"epx":59.364,"epy":68.891,"epv":22.540,"track":0.0000,"speed":0.062,"climb":-3.400,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.700}

 $GPGGA,071738.000,4404.1279,N,12118.8515,W,1,4,5.20,1137.3,M,-19.6,M,,*58
@@ -34,7 +34,7 @@ $GPGGA,071738.000,4404.1279,N,12118.8515,W,1,4,5.20,1137.3,M,-19.6,M,,*58
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,37,32,54,148,43,48,37,196,45*71
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071738.000,A,4404.1279,N,12118.8515,W,0.05,0.00,111111,,,A*78
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:38.000Z","ept":0.005,"lat":44.068798333,"lon":-121.314191667,"alt":1137.300,"epx":59.364,"epy":68.891,"epv":22.540,"track":0.0000,"speed":0.026,"climb":6.300,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.510}

 $GPGGA,071739.000,4404.1284,N,12118.8506,W,1,4,5.20,1135.9,M,-19.6,M,,*51
@@ -42,7 +42,7 @@ $GPGGA,071739.000,4404.1284,N,12118.8506,W,1,4,5.20,1135.9,M,-19.6,M,,*51
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,37,32,54,148,43,48,37,196,44*70
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":44,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":37,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":44,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071739.000,A,4404.1284,N,12118.8506,W,0.05,0.00,111111,,,A*79
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:39.000Z","ept":0.005,"lat":44.068806667,"lon":-121.314176667,"alt":1135.900,"epx":59.364,"epy":68.891,"epv":22.540,"track":0.0000,"speed":0.026,"climb":-1.400,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.510}

 $GPGGA,071740.000,4404.1303,N,12118.8486,W,1,4,5.20,1134.7,M,-19.6,M,,*57
@@ -50,7 +50,7 @@ $GPGGA,071740.000,4404.1303,N,12118.8486,W,1,4,5.20,1134.7,M,-19.6,M,,*57
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,36,32,54,148,43,48,37,196,45*70
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071740.000,A,4404.1303,N,12118.8486,W,0.11,0.00,111111,,,A*75
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:40.000Z","ept":0.005,"lat":44.068838333,"lon":-121.314143333,"alt":1134.700,"epx":59.364,"epy":68.891,"epv":22.540,"track":0.0000,"speed":0.057,"climb":-1.200,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.510}

 $GPGGA,071741.000,4404.1316,N,12118.8473,W,1,4,5.20,1135.3,M,-19.6,M,,*5D
@@ -58,7 +58,7 @@ $GPGGA,071741.000,4404.1316,N,12118.8473,W,1,4,5.20,1135.3,M,-19.6,M,,*5D
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,36,32,54,148,43,48,37,196,45*70
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071741.000,A,4404.1316,N,12118.8473,W,0.08,0.00,111111,,,A*72
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:41.000Z","ept":0.005,"lat":44.068860000,"lon":-121.314121667,"alt":1135.300,"epx":59.364,"epy":68.891,"epv":22.540,"track":0.0000,"speed":0.041,"climb":0.600,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.510}

 $GPGGA,071742.000,4404.1314,N,12118.8476,W,1,4,5.20,1134.4,M,-19.6,M,,*5F
@@ -66,7 +66,7 @@ $GPGGA,071742.000,4404.1314,N,12118.8476,W,1,4,5.20,1134.4,M,-19.6,M,,*5F
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,36,32,54,148,43,48,37,196,45*70
 $GPGSV,2,2,06,13,30,282,34,31,,,30*40
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":30,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":30,"used":false,"gnssid":0,"svid":31}]}

 $GPRMC,071742.000,A,4404.1314,N,12118.8476,W,0.03,0.00,111111,,,A*7D
 {"class":"TPV","mode":3,"time":"2011-11-11T07:17:42.000Z","ept":0.005,"lat":44.068856667,"lon":-121.314126667,"alt":1134.400,"epx":59.364,"epy":68.891,"epv":22.540,"track":0.0000,"speed":0.015,"climb":-0.900,"eps":137.78,"epc":45.08,"eph":98.800,"sep":100.510}

 $GPGGA,071743.000,4404.1312,N,12118.8480,W,1,4,5.20,1134.6,M,-19.6,M,,*53
@@ -74,4 +74,4 @@ $GPGGA,071743.000,4404.1312,N,12118.8480,W,1,4,5.20,1134.6,M,-19.6,M,,*53
 $GPGSA,A,3,23,13,32,20,,,,,,,,,5.29,5.20,0.98*0A
 $GPGSV,2,1,06,20,73,204,41,23,56,298,36,32,54,148,43,48,37,196,45*70
 $GPGSV,2,2,06,13,30,282,34,31,,,31*41
-{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":135,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}

+{"class":"SKY","xdop":3.96,"ydop":4.59,"vdop":0.98,"tdop":4.62,"hdop":5.20,"gdop":8.87,"pdop":5.29,"satellites":[{"PRN":20,"el":73,"az":204,"ss":41,"used":true,"gnssid":0,"svid":20},{"PRN":23,"el":56,"az":298,"ss":36,"used":true,"gnssid":0,"svid":23},{"PRN":32,"el":54,"az":148,"ss":43,"used":true,"gnssid":0,"svid":32},{"PRN":48,"el":37,"az":196,"ss":45,"used":false,"gnssid":1,"svid":135},{"PRN":13,"el":30,"az":282,"ss":34,"used":true,"gnssid":0,"svid":13},{"PRN":31,"el":0,"az":0,"ss":31,"used":false,"gnssid":0,"svid":31}]}