Code to accommodate alternat Beidou talker ID of $GB. Also, add a test for it.

All regression tests pass.

1 files changed, 86 insertions, 0 deletions

diff --git a/test/daemon/beidou-bd.log b/test/daemon/beidou-bd.log
new file mode 100644
index 00000000..6138a9dc
--- /dev/null
+++ b/test/daemon/beidou-bd.log
@@ -0,0 +1,86 @@
+# Name: AtlasVI/PrimaII SOC 
+# Chipset = SiRF-IV
+# Date = 2015-02-25
+# Submitter = Eli Huang <eli.huang.cn@gmail.com>
+# Notes: Contains Beidou and GLONASS sentences. Use this to test that Beidou
+#	NMEA IDs are being mapped properly and that Beidou GSV sentences are
+#	properly integrated into a combined skyview.
+$PSRFEPE,074150.799,V,,,,,*23

+$GNGGA,074150.799,,,,,0,00,,,M,0.0,M,,0000,*64

+$GNGNS,074150.799,,,,,NNNN,00,,,0.0,,0000*63

+$GPGSA,A,1,,,,,,,,,,,,,,,,*32

+$BDGSA,A,1,,,,,,,,,,,,,,,,*23

+$GPGSV,7,1,25,01,30,046,22,05,00,000,27,07,00,000,24,08,00,000,27*74

+$GPGSV,7,2,25,09,27,171,25,11,00,000,29,12,00,000,42,14,31,261,49*76

+$GPGSV,7,3,25,18,00,000,25,21,00,000,24,25,52,244,51,26,00,000,21*70

+$GPGSV,7,4,25,28,00,000,27,29,49,174,42,32,14,319,46,31,55,220,*7F

+$GPGSV,7,5,25,27,43,190,,15,30,319,,17,27,064,,10,24,021,*7F

+$GPGSV,7,6,25,23,21,343,,02,19,139,,20,15,059,,24,14,014,*74

+$GPGSV,7,7,25,04,08,012,*41

+$BDGSV,2,1,07,01,00,000,45,02,01,090,35,03,00,000,38,04,00,000,42*6A

+$BDGSV,2,2,07,05,27,090,,13,19,016,,11,07,147,*5E

+$GNRMC,074150.799,V,,,,,,,250215,,,N*52

+$PSRFEPE,074151.799,V,,,,,*22

+$GNGGA,074151.799,,,,,0,00,,,M,0.0,M,,0000,*65

+$GNGNS,074151.799,,,,,NNNN,00,,,0.0,,0000*62

+$GPGSA,A,1,,,,,,,,,,,,,,,,*32

+$BDGSA,A,1,,,,,,,,,,,,,,,,*23

+$GNRMC,074151.799,V,,,,,,,250215,,,N*53

+$PSRFEPE,074152.799,V,,,,,*21

+$GNGGA,074152.799,,,,,0,00,,,M,0.0,M,,0000,*66

+$GNGNS,074152.799,,,,,NNNN,00,,,0.0,,0000*61

+$GPGSA,A,1,,,,,,,,,,,,,,,,*32

+$BDGSA,A,1,,,,,,,,,,,,,,,,*23

+$GNRMC,074152.799,V,,,,,,,250215,,,N*50

+$PSRF151,3,1833,28692,0x7EFFFFFF*15

+$PSRFEPE,074153.799,V,,,,,*20

+$GNGGA,074153.799,,,,,0,00,,,M,0.0,M,,0000,*67

+$GNGNS,074153.799,,,,,NNNN,00,,,0.0,,0000*60

+$GPGSA,A,1,,,,,,,,,,,,,,,,*32

+$BDGSA,A,1,,,,,,,,,,,,,,,,*23

+$GNRMC,074153.799,V,,,,,,,250215,,,N*51

+$PSRFEPE,074154.799,V,,,,,*27

+$GNGGA,074154.799,,,,,0,00,,,M,0.0,M,,0000,*60

+$GNGNS,074154.799,,,,,NNNN,00,,,0.0,,0000*67

+$GPGSA,A,1,,,,,,,,,,,,,,,,*32

+$BDGSA,A,1,,,,,,,,,,,,,,,,*23

+$GNRMC,074154.799,V,,,,,,,250215,,,N*56

+$PSRFEPE,074155.799,A,1.3,10.59,52.97,0.6,180.0*16

+$GNGGA,074155.799,3114.8770,N,12135.2463,E,1,05,1.3,156.9,M,8.3,M,,0000,4.9*77

+$GNGNS,074155.799,3114.8770,N,12135.2463,E,ANNA,05,1.3,156.9,8.3,,0000*52

+$GPGSA,A,3,25,32,,,,,,,,,,,5.1,1.3,4.9,3.3*3D

+$BDGSA,A,3,02,03,04,,,,,,,,,,5.1,1.3,4.9,3.3*2F

+$GPGSV,5,1,20,25,76,102,50,32,29,284,47,01,02,001,24,07,00,000,23*7A

+$GPGSV,5,2,20,08,00,000,46,09,19,094,,12,00,000,44,14,68,202,49*7F

+$GPGSV,5,3,20,18,13,225,27,20,00,000,29,22,16,229,37,26,00,000,24*77

+$GPGSV,5,4,20,28,00,000,24,29,35,080,43,31,62,089,,15,42,298,*72

+$GPGSV,5,5,20,27,40,094,,30,24,225,,23,22,310,,10,05,340,*77

+$BDGSV,3,1,12,02,33,240,35,03,51,201,37,04,35,123,42,01,42,130,45*6B

+$BDGSV,3,2,12,10,64,323,,07,64,320,,06,55,274,,14,50,284,*66

+$BDGSV,3,3,12,09,44,299,,08,14,156,,05,11,258,,13,08,322,*6C

+$GNRMC,074155.799,A,3114.8770,N,12135.2463,E,0.30,4.94,250215,,,A*76

+$PSRFEPE,074156.799,A,1.1,64.94,58.97,0.2,180.0*1B

+$GNGGA,074156.799,3114.8950,N,12135.2442,E,1,07,1.1,190.7,M,8.3,M,,0000,1.8*7B

+$GNGNS,074156.799,3114.8950,N,12135.2442,E,ANNA,07,1.1,190.7,8.3,,0000*5A

+$GPGSA,A,3,25,32,14,12,,,,,,,,,2.1,1.1,1.8,1.2*39

+$BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

+$GNRMC,074156.799,A,3114.8950,N,12135.2442,E,0.26,4.94,250215,,,A*7D

+$PSRFEPE,074157.799,A,1.1,24.65,25.14,0.1,61.5*29

+$GNGGA,074157.799,3114.8902,N,12135.2443,E,1,07,1.1,192.9,M,8.3,M,,0000,1.8*70

+$GNGNS,074157.799,3114.8902,N,12135.2443,E,ANNA,07,1.1,192.9,8.3,,0000*51

+$GPGSA,A,3,25,32,12,14,,,,,,,,,2.1,1.1,1.8,1.2*39

+$BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

+ $GNRMC,074157.799,A,3114.8902,N,12135.2443,E,0.32,4.94,250215,,,A*7F

+$PSRFEPE,074158.799,A,1.1,19.32,19.35,0.1,180.0*1D

+$GNGGA,074158.799,3114.8953,N,12135.2439,E,1,07,1.1,198.5,M,8.3,M,,0000,1.8*70

+$GNGNS,074158.799,3114.8953,N,12135.2439,E,ANNA,07,1.1,198.5,8.3,,0000*51

+$GPGSA,A,3,25,32,12,14,,,,,,,,,2.1,1.1,1.8,1.2*39

+$BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

+$GNRMC,074158.799,A,3114.8953,N,12135.2439,E,0.25,4.94,250215,,,A*7F

+$PSRFEPE,074159.799,A,1.1,14.86,15.59,0.2,180.0*1B

+$GNGGA,074159.799,3114.8943,N,12135.2444,E,1,07,1.1,196.4,M,8.3,M,,0000,1.8*75

+$GNGNS,074159.799,3114.8943,N,12135.2444,E,ANNA,07,1.1,196.4,8.3,,0000*54

+$GPGSA,A,3,25,32,12,14,,,,,,,,,2.1,1.1,1.8,1.2*39

+$BDGSA,A,3,02,03,04,,,,,,,,,,2.1,1.1,1.8,1.2*2D

+$GNRMC,074159.799,A,3114.8943,N,12135.2444,E,0.23,4.94,250215,,,A*73

+$PSRF151,3,1833,28693,0x7EFFD7FF*67