dotMorten/NmeaParser
1
0
Fork 0
mirror of https://github.com/dotMorten/NmeaParser.git synced 2026-01-20 15:40:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/dotMorten/NmeaParser into main

Browse source 
# Conflicts:
#	src/NmeaParser/Gnss/GnssMonitor.cs
This commit is contained in:
Morten Nielsen 2020-09-07 19:59:34 -07:00
parent 804ff218a9 11cb0d72be
commit 81ff060070
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/NmeaParser/Gnss/GnssMonitor.cs
View file

@ -80,7 +80,7 @@ namespace NmeaParser.Gnss
m_allMessages[message.MessageType] = message;
}
properties.Add(nameof(AllMessages));
if(message.TalkerId != NmeaParser.Talker.GlobalNavigationSatelliteSystem && !(message is Gsv))
if(message.TalkerId != NmeaParser.Talker.GlobalNavigationSatelliteSystem && !(message is Gsv) && message.MessageType.Length > 2)
{
// If device supports combined GN*** messages, ignore non-GN messages, except for Gsv
if (m_allMessages.ContainsKey("GN" + message.MessageType.Substring(2)))

4
src/NmeaParser/NmeaParser.csproj
View file

@ -11,7 +11,7 @@
<Description>An NMEA stream parser for serial port, bluetooth and file-based nmea simulation.</Description>
<PackageTags>NMEA GPS GNSS Serialport Bluetooth Navigation NTRIP RTCM Galileo GLONASS BeiDou Garmin Trimble</PackageTags>
<PackageId>SharpGIS.NmeaParser</PackageId>
<Version>2.1</Version>
<Version>2.2</Version>
<Product>NMEA Parser</Product>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://dotmorten.github.io/NmeaParser/</PackageProjectUrl>
@ -35,7 +35,7 @@ All messages now have a unique timestamp useful to expire older messages.</Packa
<Nullable>enable</Nullable>
<PackageIcon>logo.png</PackageIcon>
<PackageIconUrl />
<AssemblyVersion>2.1.0.0</AssemblyVersion>
<AssemblyVersion>2.2.0.0</AssemblyVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">