From de6105431a4cc56f5c6bb38096c1f2dab37d55b4 Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Tue, 19 Mar 2019 12:57:47 -0700 Subject: driver_nmea0183: Have xxGNS report No FIX from FAA mode. Also, ignore missing "nav status" --- test/daemon/beidou-bd.log.chk | 19 ++++++++++--------- test/daemon/beidou-gb.log.chk | 9 +++++---- test/daemon/polarx2.log.chk | 1 + 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'test/daemon') diff --git a/test/daemon/beidou-bd.log.chk b/test/daemon/beidou-bd.log.chk index 064b3524..4e6e3e65 100644 --- a/test/daemon/beidou-bd.log.chk +++ b/test/daemon/beidou-bd.log.chk @@ -2,6 +2,7 @@ $PSRFEPE,074150.799,V,,,,,*23 $GNGGA,074150.799,,,,,0,00,,,M,0.0,M,,0000,*64 {"class":"TPV","mode":1} $GNGNS,074150.799,,,,,NNNN,00,,,0.0,,0000*63 +{"class":"TPV","mode":1} $GPGSA,A,1,,,,,,,,,,,,,,,,*32 {"class":"TPV","mode":1} $BDGSA,A,1,,,,,,,,,,,,,,,,*23 @@ -21,37 +22,37 @@ $GNRMC,074150.799,V,,,,,,,250215,,,N*52 {"class":"TPV","mode":1} $PSRFEPE,074151.799,V,,,,,*22 $GNGGA,074151.799,,,,,0,00,,,M,0.0,M,,0000,*65 -{"class":"TPV","mode":1} $GNGNS,074151.799,,,,,NNNN,00,,,0.0,,0000*62 +{"class":"TPV","mode":1} $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 -{"class":"TPV","mode":1} $GNGNS,074152.799,,,,,NNNN,00,,,0.0,,0000*61 +{"class":"TPV","mode":1} $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 -{"class":"TPV","mode":1} $GNGNS,074153.799,,,,,NNNN,00,,,0.0,,0000*60 +{"class":"TPV","mode":1} $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 -{"class":"TPV","mode":1} $GNGNS,074154.799,,,,,NNNN,00,,,0.0,,0000*67 +{"class":"TPV","mode":1} $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 -{"class":"TPV","mode":3,"lat":31.247950000,"lon":121.587438333,"alt":156.900,"epd":180.0000,"eps":0.60} $GNGNS,074155.799,3114.8770,N,12135.2463,E,ANNA,05,1.3,156.9,8.3,,0000*52 +{"class":"TPV","mode":3,"lat":31.247950000,"lon":121.587438333,"alt":156.900,"epd":180.0000,"eps":0.60} $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 @@ -66,32 +67,32 @@ $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 -{"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epe":96.900,"epv":112.700,"speed":33.429,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":225.40} $GNGNS,074156.799,3114.8950,N,12135.2442,E,ANNA,07,1.1,190.7,8.3,,0000*5A +{"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epe":96.900,"epv":112.700,"speed":33.429,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":225.40} $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 {"class":"TPV","mode":3,"time":"2015-02-25T07:41:56.799Z","ept":0.005,"lat":31.248250000,"lon":121.587403333,"alt":190.700,"epx":13.701,"epy":24.264,"epe":96.900,"epv":112.700,"track":4.9400,"speed":0.134,"climb":33.800,"epd":180.0000,"eps":0.20,"epc":225.40} $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 -{"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"speed":8.871,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":154.10} $GNGNS,074157.799,3114.8902,N,12135.2443,E,ANNA,07,1.1,192.9,8.3,,0000*51 +{"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"speed":8.871,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":154.10} $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 {"class":"TPV","mode":3,"time":"2015-02-25T07:41:57.799Z","ept":0.005,"lat":31.248170000,"lon":121.587405000,"alt":192.900,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"track":4.9400,"speed":0.165,"climb":2.200,"epd":61.5000,"eps":0.10,"epc":154.10} $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 -{"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"speed":9.446,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":82.80} $GNGNS,074158.799,3114.8953,N,12135.2439,E,ANNA,07,1.1,198.5,8.3,,0000*51 +{"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"speed":9.446,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":82.80} $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 {"class":"TPV","mode":3,"time":"2015-02-25T07:41:58.799Z","ept":0.005,"lat":31.248255000,"lon":121.587398333,"alt":198.500,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"track":4.9400,"speed":0.129,"climb":5.600,"epd":180.0000,"eps":0.10,"epc":82.80} $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 -{"class":"TPV","mode":3,"time":"2015-02-25T07:41:59.799Z","ept":0.005,"lat":31.248238333,"lon":121.587406667,"alt":196.400,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"speed":2.011,"climb":-2.100,"epd":180.0000,"eps":0.20,"epc":82.80} $GNGNS,074159.799,3114.8943,N,12135.2444,E,ANNA,07,1.1,196.4,8.3,,0000*54 +{"class":"TPV","mode":3,"time":"2015-02-25T07:41:59.799Z","ept":0.005,"lat":31.248238333,"lon":121.587406667,"alt":196.400,"epx":13.701,"epy":24.264,"epe":39.900,"epv":41.400,"speed":2.011,"climb":-2.100,"epd":180.0000,"eps":0.20,"epc":82.80} $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 diff --git a/test/daemon/beidou-gb.log.chk b/test/daemon/beidou-gb.log.chk index 7ce4f7a8..8f3b2500 100644 --- a/test/daemon/beidou-gb.log.chk +++ b/test/daemon/beidou-gb.log.chk @@ -2,6 +2,7 @@ $PSRFEPE,053229.438,V,,,,,*23 $GPGGA,053229.438,,,,,0,00,,,M,0.0,M,,0000*56 {"class":"TPV","mode":1} $GNGNS,053229.438,,,,,NNNN,00,,,0.0,,0000*63 +{"class":"TPV","mode":1} $GNGSA,A,1,,,,,,,,,,,,,,,*00 {"class":"TPV","mode":1} $GPGSV,6,1,21,05,00,000,27,06,00,000,24,07,00,000,24,11,00,000,22*7C @@ -18,8 +19,8 @@ $GNRMC,053229.438,V,,,,,,,020315,,,N*56 {"class":"TPV","mode":1} $PSRFEPE,053230.438,V,,,,,*2B $GPGGA,053230.438,,,,,0,00,,,M,0.0,M,,0000*5E -{"class":"TPV","mode":1} $GNGNS,053230.438,,,,,NNNN,00,,,0.0,,0000*6B +{"class":"TPV","mode":1} $GNGSA,A,1,,,,,,,,,,,,,,,*00 $GPGSV,6,1,21,05,00,000,21,06,00,000,24,07,00,000,23,11,00,000,22*7D $GPGSV,6,2,21,12,00,000,49,14,57,107,47,16,00,000,21,18,55,190,50*72 @@ -33,8 +34,8 @@ $GBGSV,2,2,05,209,07,033,*62 $GNRMC,053230.438,V,,,,,,,020315,,,N*5E $PSRFEPE,053231.438,V,,,,,*2A $GPGGA,053231.438,,,,,0,00,,,M,0.0,M,,0000*5F -{"class":"TPV","mode":1} $GNGNS,053231.438,,,,,NNNN,00,,,0.0,,0000*6A +{"class":"TPV","mode":1} $GNGSA,A,1,,,,,,,,,,,,,,,*00 $GPGSV,6,1,21,03,00,000,,05,00,000,25,07,00,000,24,11,00,000,22*7D $GPGSV,6,2,21,12,00,000,49,14,57,107,48,16,00,000,22,18,55,190,51*7F @@ -48,8 +49,8 @@ $GBGSV,2,2,05,209,07,033,*62 $GNRMC,053231.438,V,,,,,,,020315,,,N*5F $PSRFEPE,053232.438,A,1.2,5.77,12.97,1.2,180.0*21 $GPGGA,053232.438,3114.8789,N,12135.2442,E,1,06,1.2,153.8,M,8.3,M,,0000*6A -{"class":"TPV","mode":3,"lat":31.247981667,"lon":121.587403333,"alt":153.800,"epd":180.0000,"eps":1.20} $GNGNS,053232.438,3114.8789,N,12135.2442,E,ANNA,07,1.2,153.8,8.3,,0000*5F +{"class":"TPV","mode":3,"lat":31.247981667,"lon":121.587403333,"alt":153.800,"epd":180.0000,"eps":1.20} $GNGSA,A,3,22,18,14,12,31,24,,,,,,,2.5,1.2,2.2*23 $GNGSA,A,3,201,,,,,,,,,,,,2.5,1.2,2.2*1B $GPGSV,6,1,21,22,80,039,49,18,50,119,51,14,51,342,48,12,20,061,50*78 @@ -65,8 +66,8 @@ $GBGSV,3,3,11,209,36,317,,214,36,147,,205,11,257,*67 $GNRMC,053232.438,A,3114.8789,N,12135.2442,E,0.26,167.42,020315,,,A*70 $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 -{"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,"epe":47.500,"epv":50.600,"speed":6.317,"climb":13.400,"epd":180.0000,"eps":0.30,"epc":101.20} $GNGNS,053233.438,3114.8821,N,12135.2428,E,ANNA,07,1.2,167.2,8.3,,0000*52 +{"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,"epe":47.500,"epv":50.600,"speed":6.317,"climb":13.400,"epd":180.0000,"eps":0.30,"epc":101.20} $GNGSA,A,3,22,18,14,12,31,24,,,,,,,2.5,1.2,2.2*23 $GNGSA,A,3,201,,,,,,,,,,,,2.5,1.2,2.2*1B $GPGSV,5,1,18,22,73,312,50,18,66,145,51,14,41,330,48,12,34,060,49*7B diff --git a/test/daemon/polarx2.log.chk b/test/daemon/polarx2.log.chk index 7c119c9f..e8d7444c 100644 --- a/test/daemon/polarx2.log.chk +++ b/test/daemon/polarx2.log.chk @@ -6,6 +6,7 @@ $GPGGA,112257.00,3844.24011,N,00908.43828,W,1,03,10.5,,,,,,*72 $GPGLL,3844.24011,N,00908.43828,W,112257.00,A,A*70 {"class":"TPV","mode":2,"lat":38.737335167,"lon":-9.140638000} $GPGNS,112257.00,3844.24011,N,00908.43828,W,AN,03,10.5,,,,*57 +{"class":"TPV","mode":2,"lat":38.737335167,"lon":-9.140638000} $GPRMC,112257.00,A,3844.24011,N,00908.43828,W,0.1,339.1,220312,5.6,E,A*26 {"class":"TPV","mode":2,"time":"2012-03-22T11:22:57.000Z","ept":0.005,"lat":38.737335167,"lon":-9.140638000,"track":339.1000,"speed":0.051} $GPVTG,339.1,T,333.5,M,0.1,N,0.1,K,A*2D -- cgit v1.2.1