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/ublox-lea-5h.log.chk b/test/daemon/ublox-lea-5h.log.chk
index 620b7905..3b402012 100644
--- a/test/daemon/ublox-lea-5h.log.chk
+++ b/test/daemon/ublox-lea-5h.log.chk
@@ -146,7 +146,7 @@ $GPGSV,4,1,13,08,04,082,17,09,51,276,42,11,01,043,,12,11,214,29*7F
 $GPGSV,4,2,13,15,73,189,40,17,30,099,25,18,33,285,39,22,17,319,37*7E
 $GPGSV,4,3,13,24,03,335,,26,46,142,,27,69,284,44,28,32,052,31*77
 $GPGSV,4,4,13,33,28,204,38*4C
-{"class":"SKY","xdop":0.60,"ydop":0.79,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":214,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":40,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":25,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":31,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

+{"class":"SKY","xdop":0.60,"ydop":0.79,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":214,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":40,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":25,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":37,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":31,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

 $GPGLL,5155.55359,N,00434.65730,E,085515.00,A,A*6A
 {"class":"TPV","mode":3,"time":"2010-08-21T08:55:15.000Z","ept":0.005,"lat":51.925893167,"lon":4.577621667,"alt":2.100,"epx":10.819,"epy":36.045,"epv":50.600,"speed":0.003,"eps":0.07,"epc":0.10,"eph":19.000,"sep":63.270}

 $GPTXT,01,01,02,u-blox ag - www.u-blox.com*50
@@ -165,7 +165,7 @@ $GPGSV,4,1,13,08,04,082,17,09,51,276,43,11,01,043,,12,11,215,29*7F
 $GPGSV,4,2,13,15,73,189,40,17,30,099,25,18,33,285,39,22,17,319,38*71
 $GPGSV,4,3,13,24,03,335,,26,46,142,,27,69,284,44,28,32,052,30*76
 $GPGSV,4,4,13,33,28,204,38*4C
-{"class":"SKY","xdop":0.60,"ydop":0.80,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":43,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":40,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":25,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":38,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

+{"class":"SKY","xdop":0.60,"ydop":0.80,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":43,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":40,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":25,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":38,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

 $GPGLL,5155.55350,N,00434.65733,E,085516.00,A,A*63
 {"class":"TPV","mode":3,"time":"2010-08-21T08:55:16.000Z","ept":0.005,"lat":51.925891667,"lon":4.577622167,"alt":2.000,"epx":9.033,"epy":11.870,"epv":31.510,"speed":0.026,"climb":-0.100,"eps":47.91,"epc":82.11,"eph":19.000,"sep":32.110}

 $GPRMC,085517.00,A,5155.55340,N,00434.65739,E,0.025,,210810,,,A*7D
@@ -177,7 +177,7 @@ $GPGSV,4,1,13,08,04,082,17,09,51,276,43,11,01,043,,12,11,215,29*7F
 $GPGSV,4,2,13,15,73,189,41,17,30,099,25,18,33,285,39,22,17,319,38*70
 $GPGSV,4,3,13,24,03,335,,26,46,142,,27,69,284,44,28,32,052,30*76
 $GPGSV,4,4,13,33,28,204,38*4C
-{"class":"SKY","xdop":0.60,"ydop":0.80,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":43,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":41,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":25,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":38,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

+{"class":"SKY","xdop":0.60,"ydop":0.80,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":43,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":41,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":25,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":38,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

 $GPGLL,5155.55340,N,00434.65739,E,085517.00,A,A*69
 {"class":"TPV","mode":3,"time":"2010-08-21T08:55:17.000Z","ept":0.005,"lat":51.925890000,"lon":4.577623167,"alt":1.800,"epx":9.020,"epy":11.933,"epv":31.510,"speed":0.013,"climb":-0.200,"eps":23.80,"epc":63.02,"eph":19.000,"sep":32.110}

 $GPRMC,085518.00,A,5155.55332,N,00434.65744,E,0.017,,210810,,,A*7C
@@ -189,7 +189,7 @@ $GPGSV,4,1,13,08,04,082,17,09,51,276,42,11,01,043,,12,11,215,29*7E
 $GPGSV,4,2,13,15,73,189,41,17,30,099,27,18,33,285,39,22,17,319,39*73
 $GPGSV,4,3,13,24,03,335,,26,46,142,,27,69,284,44,28,32,052,31*77
 $GPGSV,4,4,13,33,28,204,38*4C
-{"class":"SKY","xdop":0.60,"ydop":0.80,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":41,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":39,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":31,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

+{"class":"SKY","xdop":0.60,"ydop":0.80,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":17,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":29,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":73,"az":189,"ss":41,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":39,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":31,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

 $GPGLL,5155.55332,N,00434.65744,E,085518.00,A,A*69
 {"class":"TPV","mode":3,"time":"2010-08-21T08:55:18.000Z","ept":0.005,"lat":51.925888667,"lon":4.577624000,"alt":1.600,"epx":9.020,"epy":11.933,"epv":31.510,"speed":0.009,"climb":-0.200,"eps":23.87,"epc":63.02,"eph":19.000,"sep":32.110}

 $GPRMC,085519.00,A,5155.55322,N,00434.65748,E,0.056,,210810,,,A*75
@@ -201,7 +201,7 @@ $GPGSV,4,1,13,08,04,082,16,09,51,276,42,11,01,043,,12,11,215,28*7E
 $GPGSV,4,2,13,15,72,188,41,17,30,099,26,18,33,285,39,22,17,319,38*73
 $GPGSV,4,3,13,24,03,335,,26,46,142,,27,69,284,44,28,32,052,30*76
 $GPGSV,4,4,13,33,28,204,38*4C
-{"class":"SKY","xdop":0.60,"ydop":0.79,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":16,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":28,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":72,"az":188,"ss":41,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":26,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":38,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":120,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

+{"class":"SKY","xdop":0.60,"ydop":0.79,"vdop":1.37,"tdop":0.89,"hdop":1.00,"gdop":1.90,"pdop":1.69,"satellites":[{"PRN":8,"el":4,"az":82,"ss":16,"used":false,"gnssid":0,"svid":8},{"PRN":9,"el":51,"az":276,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":1,"az":43,"ss":0,"used":false,"gnssid":0,"svid":11},{"PRN":12,"el":11,"az":215,"ss":28,"used":true,"gnssid":0,"svid":12},{"PRN":15,"el":72,"az":188,"ss":41,"used":true,"gnssid":0,"svid":15},{"PRN":17,"el":30,"az":99,"ss":26,"used":true,"gnssid":0,"svid":17},{"PRN":18,"el":33,"az":285,"ss":39,"used":true,"gnssid":0,"svid":18},{"PRN":22,"el":17,"az":319,"ss":38,"used":true,"gnssid":0,"svid":22},{"PRN":24,"el":3,"az":335,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":26,"el":46,"az":142,"ss":0,"used":false,"gnssid":0,"svid":26},{"PRN":27,"el":69,"az":284,"ss":44,"used":true,"gnssid":0,"svid":27},{"PRN":28,"el":32,"az":52,"ss":30,"used":true,"gnssid":0,"svid":28},{"PRN":33,"el":28,"az":204,"ss":38,"used":false,"gnssid":1,"svid":120}]}

 $GPGLL,5155.55322,N,00434.65748,E,085519.00,A,A*65
 {"class":"TPV","mode":3,"time":"2010-08-21T08:55:19.000Z","ept":0.005,"lat":51.925887000,"lon":4.577624667,"alt":1.500,"epx":9.020,"epy":11.933,"epv":31.510,"speed":0.029,"climb":-0.100,"eps":23.87,"epc":63.02,"eph":19.000,"sep":32.110}

 $GPRMC,085520.00,A,5155.55317,N,00434.65752,E,0.011,,210810,,,A*71