Support Galileo $GA... talkers and fix a couple of $GB cases

Now that the Galileo constellation is live, the NMEA 4.1 standard
appears to have standardized on the "$GA..." prefix for
Galileo-specific messages. The lexer currently filters these out; this
patch ensures they go through to e.g. gpspipe -r. (I tore my hair out
for days trying to figure out why these were not being passed through
even though I could see them using screen etc.)

Also added logic to the GSA and GSV message parsing to account for the
Galileo messages. It probably needs more work to match up satellite
numbers between the GSA and GSV messages and to account for the GNSS
type field in NMEA 4.1, but it's a start at least.

I also fixed a couple of situations where the 'GB' prefix was being
ignored even though 'BD' was not. This leads to a regression in
test/daemon/beidou-gb.log, but the "regression" is actually incorrect
old behavior (JSON messages omitting BeiDou satellites) exposed by the
patch.

Signed-off-by: Gary E. Miller <gem@rellim.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/test/daemon/beidou-gb.log.chk b/test/daemon/beidou-gb.log.chk
index edc23a93..5ddbaac3 100644
--- a/test/daemon/beidou-gb.log.chk
+++ b/test/daemon/beidou-gb.log.chk
@@ -25,7 +25,6 @@ $GPGSV,6,3,21,21,00,000,23,22,57,198,50,24,15,335,42,25,00,000,22*7C
 $GPGSV,6,4,21,26,00,000,23,28,00,000,22,31,58,140,35,27,56,093,*77

 $GPGSV,6,5,21,09,44,071,,15,24,255,,04,18,332,,17,15,022,*7B

 $GPGSV,6,6,21,23,05,259,*40

-{"class":"SKY","satellites":[{"PRN":5,"el":0,"az":0,"ss":21,"used":false},{"PRN":6,"el":0,"az":0,"ss":24,"used":false},{"PRN":7,"el":0,"az":0,"ss":23,"used":false},{"PRN":11,"el":0,"az":0,"ss":22,"used":false},{"PRN":12,"el":0,"az":0,"ss":49,"used":false},{"PRN":14,"el":57,"az":107,"ss":47,"used":false},{"PRN":16,"el":0,"az":0,"ss":21,"used":false},{"PRN":18,"el":55,"az":190,"ss":50,"used":false},{"PRN":21,"el":0,"az":0,"ss":23,"used":false},{"PRN":22,"el":57,"az":198,"ss":50,"used":false},{"PRN":24,"el":15,"az":335,"ss":42,"used":false},{"PRN":25,"el":0,"az":0,"ss":22,"used":false},{"PRN":26,"el":0,"az":0,"ss":23,"used":false},{"PRN":28,"el":0,"az":0,"ss":22,"used":false},{"PRN":31,"el":58,"az":140,"ss":35,"used":false},{"PRN":27,"el":56,"az":93,"ss":0,"used":false},{"PRN":9,"el":44,"az":71,"ss":0,"used":false},{"PRN":15,"el":24,"az":255,"ss":0,"used":false},{"PRN":4,"el":18,"az":332,"ss":0,"used":false},{"PRN":17,"el":15,"az":22,"ss":0,"used":false},{"PRN":23,"el":5,"az":259,"ss":0,"used":false}]}

 $GBGSV,2,1,05,201,00,000,44,202,14,089,35,204,00,000,42,205,27,091,*66

 $GBGSV,2,2,05,209,07,033,*62

 {"class":"SKY","satellites":[{"PRN":5,"el":0,"az":0,"ss":21,"used":false},{"PRN":6,"el":0,"az":0,"ss":24,"used":false},{"PRN":7,"el":0,"az":0,"ss":23,"used":false},{"PRN":11,"el":0,"az":0,"ss":22,"used":false},{"PRN":12,"el":0,"az":0,"ss":49,"used":false},{"PRN":14,"el":57,"az":107,"ss":47,"used":false},{"PRN":16,"el":0,"az":0,"ss":21,"used":false},{"PRN":18,"el":55,"az":190,"ss":50,"used":false},{"PRN":21,"el":0,"az":0,"ss":23,"used":false},{"PRN":22,"el":57,"az":198,"ss":50,"used":false},{"PRN":24,"el":15,"az":335,"ss":42,"used":false},{"PRN":25,"el":0,"az":0,"ss":22,"used":false},{"PRN":26,"el":0,"az":0,"ss":23,"used":false},{"PRN":28,"el":0,"az":0,"ss":22,"used":false},{"PRN":31,"el":58,"az":140,"ss":35,"used":false},{"PRN":27,"el":56,"az":93,"ss":0,"used":false},{"PRN":9,"el":44,"az":71,"ss":0,"used":false},{"PRN":15,"el":24,"az":255,"ss":0,"used":false},{"PRN":4,"el":18,"az":332,"ss":0,"used":false},{"PRN":17,"el":15,"az":22,"ss":0,"used":false},{"PRN":23,"el":5,"az":259,"ss":0,"used":false},{"PRN":201,"el":0,"az":0,"ss":44,"used":false},{"PRN":202,"el":14,"az":89,"ss":35,"used":false},{"PRN":204,"el":0,"az":0,"ss":42,"used":false},{"PRN":205,"el":27,"az":91,"ss":0,"used":false},{"PRN":209,"el":7,"az":33,"ss":0,"used":false}]}

@@ -41,7 +40,6 @@ $GPGSV,6,3,21,21,00,000,24,22,57,198,49,24,15,335,42,25,00,000,22*73
 $GPGSV,6,4,21,26,00,000,22,28,00,000,22,31,58,140,34,27,56,093,*77

 $GPGSV,6,5,21,09,44,071,,15,24,255,,04,18,332,,17,15,022,*7B

 $GPGSV,6,6,21,23,05,259,*40

-{"class":"SKY","satellites":[{"PRN":3,"el":0,"az":0,"ss":0,"used":false},{"PRN":5,"el":0,"az":0,"ss":25,"used":false},{"PRN":7,"el":0,"az":0,"ss":24,"used":false},{"PRN":11,"el":0,"az":0,"ss":22,"used":false},{"PRN":12,"el":0,"az":0,"ss":49,"used":false},{"PRN":14,"el":57,"az":107,"ss":48,"used":false},{"PRN":16,"el":0,"az":0,"ss":22,"used":false},{"PRN":18,"el":55,"az":190,"ss":51,"used":false},{"PRN":21,"el":0,"az":0,"ss":24,"used":false},{"PRN":22,"el":57,"az":198,"ss":49,"used":false},{"PRN":24,"el":15,"az":335,"ss":42,"used":false},{"PRN":25,"el":0,"az":0,"ss":22,"used":false},{"PRN":26,"el":0,"az":0,"ss":22,"used":false},{"PRN":28,"el":0,"az":0,"ss":22,"used":false},{"PRN":31,"el":58,"az":140,"ss":34,"used":false},{"PRN":27,"el":56,"az":93,"ss":0,"used":false},{"PRN":9,"el":44,"az":71,"ss":0,"used":false},{"PRN":15,"el":24,"az":255,"ss":0,"used":false},{"PRN":4,"el":18,"az":332,"ss":0,"used":false},{"PRN":17,"el":15,"az":22,"ss":0,"used":false},{"PRN":23,"el":5,"az":259,"ss":0,"used":false}]}

 $GBGSV,2,1,05,201,00,000,44,202,14,089,35,204,00,000,42,205,27,091,*66

 $GBGSV,2,2,05,209,07,033,*62

 {"class":"SKY","satellites":[{"PRN":3,"el":0,"az":0,"ss":0,"used":false},{"PRN":5,"el":0,"az":0,"ss":25,"used":false},{"PRN":7,"el":0,"az":0,"ss":24,"used":false},{"PRN":11,"el":0,"az":0,"ss":22,"used":false},{"PRN":12,"el":0,"az":0,"ss":49,"used":false},{"PRN":14,"el":57,"az":107,"ss":48,"used":false},{"PRN":16,"el":0,"az":0,"ss":22,"used":false},{"PRN":18,"el":55,"az":190,"ss":51,"used":false},{"PRN":21,"el":0,"az":0,"ss":24,"used":false},{"PRN":22,"el":57,"az":198,"ss":49,"used":false},{"PRN":24,"el":15,"az":335,"ss":42,"used":false},{"PRN":25,"el":0,"az":0,"ss":22,"used":false},{"PRN":26,"el":0,"az":0,"ss":22,"used":false},{"PRN":28,"el":0,"az":0,"ss":22,"used":false},{"PRN":31,"el":58,"az":140,"ss":34,"used":false},{"PRN":27,"el":56,"az":93,"ss":0,"used":false},{"PRN":9,"el":44,"az":71,"ss":0,"used":false},{"PRN":15,"el":24,"az":255,"ss":0,"used":false},{"PRN":4,"el":18,"az":332,"ss":0,"used":false},{"PRN":17,"el":15,"az":22,"ss":0,"used":false},{"PRN":23,"el":5,"az":259,"ss":0,"used":false},{"PRN":201,"el":0,"az":0,"ss":44,"used":false},{"PRN":202,"el":14,"az":89,"ss":35,"used":false},{"PRN":204,"el":0,"az":0,"ss":42,"used":false},{"PRN":205,"el":27,"az":91,"ss":0,"used":false},{"PRN":209,"el":7,"az":33,"ss":0,"used":false}]}

@@ -60,13 +58,12 @@ $GPGSV,6,3,21,06,00,000,26,07,00,000,24,16,00,000,22,21,00,000,24*7E
 $GPGSV,6,4,21,25,34,142,21,26,00,000,23,28,00,000,22,27,31,036,*71

 $GPGSV,6,5,21,15,21,289,,09,14,038,,30,14,180,,11,10,179,*7B

 $GPGSV,6,6,21,23,06,275,*4D

-{"class":"SKY","xdop":1.14,"ydop":1.16,"vdop":2.20,"tdop":1.59,"hdop":1.20,"gdop":3.04,"pdop":2.50,"satellites":[{"PRN":22,"el":80,"az":39,"ss":49,"used":true},{"PRN":18,"el":50,"az":119,"ss":51,"used":true},{"PRN":14,"el":51,"az":342,"ss":48,"used":true},{"PRN":12,"el":20,"az":61,"ss":50,"used":true},{"PRN":31,"el":51,"az":228,"ss":34,"used":true},{"PRN":24,"el":4,"az":41,"ss":43,"used":true},{"PRN":3,"el":0,"az":0,"ss":20,"used":false},{"PRN":5,"el":0,"az":0,"ss":26,"used":false},{"PRN":6,"el":0,"az":0,"ss":26,"used":false},{"PRN":7,"el":0,"az":0,"ss":24,"used":false},{"PRN":16,"el":0,"az":0,"ss":22,"used":false},{"PRN":21,"el":0,"az":0,"ss":24,"used":false},{"PRN":25,"el":34,"az":142,"ss":21,"used":false},{"PRN":26,"el":0,"az":0,"ss":23,"used":false},{"PRN":28,"el":0,"az":0,"ss":22,"used":false},{"PRN":27,"el":31,"az":36,"ss":0,"used":false},{"PRN":15,"el":21,"az":289,"ss":0,"used":false},{"PRN":9,"el":14,"az":38,"ss":0,"used":false},{"PRN":30,"el":14,"az":180,"ss":0,"used":false},{"PRN":11,"el":10,"az":179,"ss":0,"used":false},{"PRN":23,"el":6,"az":275,"ss":0,"used":false}]}

 $GBGSV,3,1,11,201,49,147,44,202,23,250,35,204,35,123,42,213,83,243,*6D

 $GBGSV,3,2,11,210,70,270,,207,70,267,,206,55,311,,203,49,208,*6B

 $GBGSV,3,3,11,209,36,317,,214,36,147,,205,11,257,*67

 {"class":"SKY","xdop":1.12,"ydop":0.98,"vdop":2.20,"tdop":1.57,"hdop":1.20,"gdop":2.94,"pdop":2.50,"satellites":[{"PRN":22,"el":80,"az":39,"ss":49,"used":true},{"PRN":18,"el":50,"az":119,"ss":51,"used":true},{"PRN":14,"el":51,"az":342,"ss":48,"used":true},{"PRN":12,"el":20,"az":61,"ss":50,"used":true},{"PRN":31,"el":51,"az":228,"ss":34,"used":true},{"PRN":24,"el":4,"az":41,"ss":43,"used":true},{"PRN":3,"el":0,"az":0,"ss":20,"used":false},{"PRN":5,"el":0,"az":0,"ss":26,"used":false},{"PRN":6,"el":0,"az":0,"ss":26,"used":false},{"PRN":7,"el":0,"az":0,"ss":24,"used":false},{"PRN":16,"el":0,"az":0,"ss":22,"used":false},{"PRN":21,"el":0,"az":0,"ss":24,"used":false},{"PRN":25,"el":34,"az":142,"ss":21,"used":false},{"PRN":26,"el":0,"az":0,"ss":23,"used":false},{"PRN":28,"el":0,"az":0,"ss":22,"used":false},{"PRN":27,"el":31,"az":36,"ss":0,"used":false},{"PRN":15,"el":21,"az":289,"ss":0,"used":false},{"PRN":9,"el":14,"az":38,"ss":0,"used":false},{"PRN":30,"el":14,"az":180,"ss":0,"used":false},{"PRN":11,"el":10,"az":179,"ss":0,"used":false},{"PRN":23,"el":6,"az":275,"ss":0,"used":false},{"PRN":201,"el":49,"az":147,"ss":44,"used":true},{"PRN":202,"el":23,"az":250,"ss":35,"used":false},{"PRN":204,"el":35,"az":123,"ss":42,"used":false},{"PRN":213,"el":83,"az":243,"ss":0,"used":false},{"PRN":210,"el":70,"az":270,"ss":0,"used":false},{"PRN":207,"el":70,"az":267,"ss":0,"used":false},{"PRN":206,"el":55,"az":311,"ss":0,"used":false},{"PRN":203,"el":49,"az":208,"ss":0,"used":false},{"PRN":209,"el":36,"az":317,"ss":0,"used":false},{"PRN":214,"el":36,"az":147,"ss":0,"used":false},{"PRN":205,"el":11,"az":257,"ss":0,"used":false}]}

 $GNRMC,053232.438,A,3114.8789,N,12135.2442,E,0.26,167.42,020315,,,A*70

-{"class":"TPV","mode":3,"time":"2015-03-02T05:32:32.438Z","ept":0.005,"lat":31.247981667,"lon":121.587403333,"alt":153.800,"epx":17.160,"epy":17.458,"epv":50.600,"track":167.4200,"speed":0.134}

+{"class":"TPV","mode":3,"time":"2015-03-02T05:32:32.438Z","ept":0.005,"lat":31.247981667,"lon":121.587403333,"alt":153.800,"epx":16.817,"epy":14.633,"epv":50.600,"track":167.4200,"speed":0.134}

 $PSRFEPE,053233.438,A,1.2,25.61,66.06,0.3,180.0*1E

 $GPGGA,053233.438,3114.8821,N,12135.2428,E,1,06,1.2,167.2,M,8.3,M,,0000*67

 $GNGNS,053233.438,3114.8821,N,12135.2428,E,ANNA,07,1.2,167.2,8.3,,0000*52

@@ -77,10 +74,9 @@ $GPGSV,5,2,18,31,37,248,34,24,13,042,43,03,00,000,21,06,00,000,27*7E
 $GPGSV,5,3,18,07,00,000,23,16,00,000,20,21,00,000,24,26,00,000,23*75

 $GPGSV,5,4,18,25,44,164,,27,38,028,,09,22,036,,30,14,194,*77

 $GPGSV,5,5,18,11,11,192,,15,06,294,*77

-{"class":"SKY","xdop":0.86,"ydop":1.24,"vdop":2.20,"tdop":1.60,"hdop":1.20,"gdop":3.05,"pdop":2.50,"satellites":[{"PRN":22,"el":73,"az":312,"ss":50,"used":true},{"PRN":18,"el":66,"az":145,"ss":51,"used":true},{"PRN":14,"el":41,"az":330,"ss":48,"used":true},{"PRN":12,"el":34,"az":60,"ss":49,"used":true},{"PRN":31,"el":37,"az":248,"ss":34,"used":true},{"PRN":24,"el":13,"az":42,"ss":43,"used":true},{"PRN":3,"el":0,"az":0,"ss":21,"used":false},{"PRN":6,"el":0,"az":0,"ss":27,"used":false},{"PRN":7,"el":0,"az":0,"ss":23,"used":false},{"PRN":16,"el":0,"az":0,"ss":20,"used":false},{"PRN":21,"el":0,"az":0,"ss":24,"used":false},{"PRN":26,"el":0,"az":0,"ss":23,"used":false},{"PRN":25,"el":44,"az":164,"ss":0,"used":false},{"PRN":27,"el":38,"az":28,"ss":0,"used":false},{"PRN":9,"el":22,"az":36,"ss":0,"used":false},{"PRN":30,"el":14,"az":194,"ss":0,"used":false},{"PRN":11,"el":11,"az":192,"ss":0,"used":false},{"PRN":15,"el":6,"az":294,"ss":0,"used":false}]}

 $GBGSV,3,1,11,201,49,147,44,202,23,250,35,204,35,123,42,213,83,243,*6D

 $GBGSV,3,2,11,210,70,270,,207,70,267,,206,55,311,,203,49,208,*6B

 $GBGSV,3,3,11,209,36,317,,214,36,147,,205,11,257,*67

 {"class":"SKY","xdop":0.80,"ydop":0.97,"vdop":2.20,"tdop":1.53,"hdop":1.20,"gdop":2.88,"pdop":2.50,"satellites":[{"PRN":22,"el":73,"az":312,"ss":50,"used":true},{"PRN":18,"el":66,"az":145,"ss":51,"used":true},{"PRN":14,"el":41,"az":330,"ss":48,"used":true},{"PRN":12,"el":34,"az":60,"ss":49,"used":true},{"PRN":31,"el":37,"az":248,"ss":34,"used":true},{"PRN":24,"el":13,"az":42,"ss":43,"used":true},{"PRN":3,"el":0,"az":0,"ss":21,"used":false},{"PRN":6,"el":0,"az":0,"ss":27,"used":false},{"PRN":7,"el":0,"az":0,"ss":23,"used":false},{"PRN":16,"el":0,"az":0,"ss":20,"used":false},{"PRN":21,"el":0,"az":0,"ss":24,"used":false},{"PRN":26,"el":0,"az":0,"ss":23,"used":false},{"PRN":25,"el":44,"az":164,"ss":0,"used":false},{"PRN":27,"el":38,"az":28,"ss":0,"used":false},{"PRN":9,"el":22,"az":36,"ss":0,"used":false},{"PRN":30,"el":14,"az":194,"ss":0,"used":false},{"PRN":11,"el":11,"az":192,"ss":0,"used":false},{"PRN":15,"el":6,"az":294,"ss":0,"used":false},{"PRN":201,"el":49,"az":147,"ss":44,"used":true},{"PRN":202,"el":23,"az":250,"ss":35,"used":false},{"PRN":204,"el":35,"az":123,"ss":42,"used":false},{"PRN":213,"el":83,"az":243,"ss":0,"used":false},{"PRN":210,"el":70,"az":270,"ss":0,"used":false},{"PRN":207,"el":70,"az":267,"ss":0,"used":false},{"PRN":206,"el":55,"az":311,"ss":0,"used":false},{"PRN":203,"el":49,"az":208,"ss":0,"used":false},{"PRN":209,"el":36,"az":317,"ss":0,"used":false},{"PRN":214,"el":36,"az":147,"ss":0,"used":false},{"PRN":205,"el":11,"az":257,"ss":0,"used":false}]}

 $GNRMC,053233.438,A,3114.8821,N,12135.2428,E,0.07,167.42,020315,,,A*73

-{"class":"TPV","mode":3,"time":"2015-03-02T05:32:33.438Z","ept":0.005,"lat":31.248035000,"lon":121.587380000,"alt":167.200,"epx":16.817,"epy":14.633,"epv":50.600,"track":167.4200,"speed":0.036,"climb":13.400,"eps":34.27,"epc":101.20}

+{"class":"TPV","mode":3,"time":"2015-03-02T05:32:33.438Z","ept":0.005,"lat":31.248035000,"lon":121.587380000,"alt":167.200,"epx":16.817,"epy":14.633,"epv":50.600,"track":167.4200,"speed":0.036,"climb":13.400,"eps":33.63,"epc":101.20}