Added to Nuget, included bug fixes found along the way
This commit is contained in:
@@ -3,8 +3,9 @@ using GpsClient2.Exceptions;
|
|||||||
using GpsClient2.Model;
|
using GpsClient2.Model;
|
||||||
using GpsClient2.NmeaMessages;
|
using GpsClient2.NmeaMessages;
|
||||||
using System;
|
using System;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.IO.Ports;
|
using System.IO.Ports;
|
||||||
using System.Threading;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace GpsClient2 {
|
namespace GpsClient2 {
|
||||||
public class ComPortGpsClient : BaseGpsClient {
|
public class ComPortGpsClient : BaseGpsClient {
|
||||||
@@ -14,7 +15,8 @@ namespace GpsClient2 {
|
|||||||
private SerialPort _serialPort;
|
private SerialPort _serialPort;
|
||||||
|
|
||||||
private DateTime? _previousReadTime;
|
private DateTime? _previousReadTime;
|
||||||
|
private readonly BackgroundWorker worker = new BackgroundWorker();
|
||||||
|
private ComPortInfo data = null;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Constructors
|
#region Constructors
|
||||||
@@ -30,30 +32,36 @@ namespace GpsClient2 {
|
|||||||
#region Connect and Disconnect
|
#region Connect and Disconnect
|
||||||
|
|
||||||
public override bool Connect() {
|
public override bool Connect() {
|
||||||
var data = (ComPortInfo)GpsInfo;
|
data = (ComPortInfo)GpsInfo;
|
||||||
|
|
||||||
IsRunning = true;
|
IsRunning = true;
|
||||||
OnGpsStatusChanged(GpsStatus.Connecting);
|
OnGpsStatusChanged(GpsStatus.Connecting);
|
||||||
_serialPort = new SerialPort(data.ComPort, 9600, Parity.None, 8, StopBits.One);
|
_serialPort = new SerialPort(data.ComPort, data.BaudRate, Parity.None, 8, StopBits.One);
|
||||||
|
|
||||||
// Attach a method to be called when there
|
// Attach a method to be called when there
|
||||||
// is data waiting in the port's buffer
|
// is data waiting in the port's buffer
|
||||||
_serialPort.DataReceived += port_DataReceived;
|
//_serialPort.DataReceived += port_DataReceived;
|
||||||
try {
|
try {
|
||||||
// Begin communications
|
// Begin communications
|
||||||
_serialPort.Open();
|
_serialPort.Open();
|
||||||
|
|
||||||
OnGpsStatusChanged(GpsStatus.Connected);
|
OnGpsStatusChanged(GpsStatus.Connected);
|
||||||
// Enter an application loop to keep this thread alive
|
// Enter an application loop to keep this thread alive
|
||||||
while (_serialPort.IsOpen) {
|
worker.DoWork += Worker_DoWork;
|
||||||
Thread.Sleep(data.ReadFrequenty);
|
worker.RunWorkerAsync();
|
||||||
}
|
return true;
|
||||||
} catch {
|
} catch {
|
||||||
Disconnect();
|
Disconnect();
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
private async void Worker_DoWork(object sender, DoWorkEventArgs e) {
|
||||||
|
while (_serialPort.IsOpen) {
|
||||||
|
await Task.Delay(data.ReadFrequency);
|
||||||
|
//Thread.Sleep(data.ReadFrequenty);
|
||||||
|
processData();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool Disconnect() {
|
public override bool Disconnect() {
|
||||||
@@ -62,24 +70,103 @@ namespace GpsClient2 {
|
|||||||
OnGpsStatusChanged(GpsStatus.Disabled);
|
OnGpsStatusChanged(GpsStatus.Disabled);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Location Callbacks
|
#region Location Callbacks
|
||||||
|
|
||||||
private void port_DataReceived(object sender, SerialDataReceivedEventArgs e) {
|
private void port_DataReceived(object sender, SerialDataReceivedEventArgs e) {
|
||||||
|
processData();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void processData() {
|
||||||
try {
|
try {
|
||||||
var readString = _serialPort.ReadExisting();
|
var readString = _serialPort.ReadExisting().Trim();
|
||||||
OnRawGpsDataReceived(readString);
|
|
||||||
var result = _parser.Parse(readString);
|
foreach (string sentence in readString.Split(new string[] { Environment.NewLine }, StringSplitOptions.None)) {
|
||||||
if (typeof(GprmcMessage) != result.GetType()) return;
|
if (sentence.Length > 0 && sentence.StartsWith("$") && sentence.Contains("*")) {
|
||||||
if (_previousReadTime != null && GpsInfo.ReadFrequenty != 0 && ((GprmcMessage)result).UpdateDate.Subtract(new TimeSpan(0, 0, 0, 0, GpsInfo.ReadFrequenty)) <= _previousReadTime) return;
|
parseSentence(sentence.Trim());
|
||||||
OnGpsDataReceived(new GpsDataEventArgs((GprmcMessage)result));
|
}
|
||||||
} catch (UnknownTypeException ex) {
|
}
|
||||||
Console.WriteLine(ex.Message);
|
} catch (Exception ex) {
|
||||||
|
Console.WriteLine(" ==> " + ex.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void parseSentence(string sentence) {
|
||||||
|
if (sentence.StartsWith("$GPGSV")) { return; } // Ignore all $GPGSV messages
|
||||||
|
//Console.WriteLine(sentence);
|
||||||
|
try {
|
||||||
|
OnRawGpsDataReceived(sentence);
|
||||||
|
var result = _parser.Parse(sentence);
|
||||||
|
if (result == null) { return; }
|
||||||
|
|
||||||
|
if (typeof(GprmcMessage) != result.GetType()) return;
|
||||||
|
if (_previousReadTime != null && GpsInfo.ReadFrequency != 0 && ((GprmcMessage)result).UpdateDate.Subtract(new TimeSpan(0, 0, 0, 0, GpsInfo.ReadFrequency)) <= _previousReadTime) return;
|
||||||
|
OnGpsDataReceived(new GpsDataEventArgs((GprmcMessage)result));
|
||||||
|
} catch (UnknownTypeException ex) {
|
||||||
|
Console.WriteLine(" ==> " + ex.Message + " : " + sentence);
|
||||||
|
} catch (ArgumentException ex) {
|
||||||
|
Console.WriteLine(" ==> " + ex.Message + " : " + sentence);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region "Find My GPS Device Methods"
|
||||||
|
public async Task<bool> FindGps() {
|
||||||
|
int[] bauds = { 9600, 4800 };
|
||||||
|
|
||||||
|
foreach (string comPort in SerialPort.GetPortNames()) {
|
||||||
|
foreach (int baud in bauds) {
|
||||||
|
if (await IsGpsPort(comPort, baud)) {
|
||||||
|
GpsInfo = new ComPortInfo(comPort, baud);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<bool> IsGpsPort(string comPort, int baudRate) {
|
||||||
|
bool result = await Task.Run(() => {
|
||||||
|
Console.Write("Attempting to locate GPS on " + comPort + ":" + baudRate + "...");
|
||||||
|
SerialPort serial = new SerialPort(comPort, baudRate, Parity.None, 8, StopBits.One);
|
||||||
|
serial.ReadTimeout = 3000;
|
||||||
|
try {
|
||||||
|
serial.Open();
|
||||||
|
Console.Write(" Connected. Listening for NMEA Sentences...");
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Console.WriteLine(" Error: " + ex.Message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string sData = "";
|
||||||
|
while (true) {
|
||||||
|
string s;
|
||||||
|
try {
|
||||||
|
s = serial.ReadLine();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
serial.Close();
|
||||||
|
Console.WriteLine(" Error: " + ex.Message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(s)) { return false; }
|
||||||
|
sData += s + Environment.NewLine;
|
||||||
|
|
||||||
|
if (sData.Length > 1500) {
|
||||||
|
|
||||||
|
if (sData.Contains("$GPRMC") || sData.Contains("$GPGGA") || sData.Contains("$GPGSA")) {
|
||||||
|
Console.WriteLine(" This is a GPS device!");
|
||||||
|
serial.Close();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
14
GpsClient2.nuspec
Normal file
14
GpsClient2.nuspec
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>GpsClient2</id>
|
||||||
|
<version>1.0.7</version>
|
||||||
|
<title>GpsClient2</title>
|
||||||
|
<authors>Russ Kollmansberger</authors>
|
||||||
|
<owners>Russ Kollmansberger</owners>
|
||||||
|
<description>Package that allows users to receive and process GPS NMEA sentences or utilize Windows Location Services to report the device's current location.</description>
|
||||||
|
<releaseNotes>Updated to include various bug fixes in COM GPS Client and spelling corrections.</releaseNotes>
|
||||||
|
<tags>NuGet,Package,Helper</tags>
|
||||||
|
<license type="expression">MIT</license>
|
||||||
|
</metadata>
|
||||||
|
</package>
|
||||||
@@ -2,6 +2,6 @@
|
|||||||
public abstract class BaseGpsInfo {
|
public abstract class BaseGpsInfo {
|
||||||
public GpsCoordinateSystem CoordinateSystem { get; set; } = GpsCoordinateSystem.GeoEtrs89;
|
public GpsCoordinateSystem CoordinateSystem { get; set; } = GpsCoordinateSystem.GeoEtrs89;
|
||||||
|
|
||||||
public int ReadFrequenty { get; set; }
|
public int ReadFrequency { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
namespace GpsClient2.Model {
|
namespace GpsClient2.Model {
|
||||||
public class ComPortInfo : BaseGpsInfo {
|
public class ComPortInfo : BaseGpsInfo {
|
||||||
public string ComPort { get; set; } = "ComPort1";
|
public string ComPort { get; set; } = "ComPort1";
|
||||||
|
public int BaudRate { get; set; } = 9600;
|
||||||
|
|
||||||
public ComPortInfo() {
|
public ComPortInfo() {
|
||||||
ReadFrequenty = 1000;
|
ReadFrequency = 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ComPortInfo(string comPort, int readFrequenty = 1000) {
|
public ComPortInfo(string comPort, int baudRate = 9600, int readFrequency = 1000) {
|
||||||
ComPort = comPort;
|
ComPort = comPort;
|
||||||
ReadFrequenty = readFrequenty;
|
BaudRate = baudRate;
|
||||||
|
ReadFrequency = readFrequency;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
public int Timeout { get; set; } = 1000;
|
public int Timeout { get; set; } = 1000;
|
||||||
|
|
||||||
public WindowsLocationApiInfo() {
|
public WindowsLocationApiInfo() {
|
||||||
ReadFrequenty = 0;
|
ReadFrequency = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ namespace GpsClient2 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void WatcherOnPositionChanged(object sender, GeoPositionChangedEventArgs<GeoCoordinate> e) {
|
private void WatcherOnPositionChanged(object sender, GeoPositionChangedEventArgs<GeoCoordinate> e) {
|
||||||
if (_previousReadTime != null && GpsInfo.ReadFrequenty != 0 && e.Position.Timestamp.Subtract(new TimeSpan(0, 0, 0, 0, GpsInfo.ReadFrequenty)) <= _previousReadTime) return;
|
if (_previousReadTime != null && GpsInfo.ReadFrequency != 0 && e.Position.Timestamp.Subtract(new TimeSpan(0, 0, 0, 0, GpsInfo.ReadFrequency)) <= _previousReadTime) return;
|
||||||
OnGpsDataReceived(new GpsDataEventArgs(e.Position.Location));
|
OnGpsDataReceived(new GpsDataEventArgs(e.Position.Location));
|
||||||
_previousReadTime = e.Position.Timestamp;
|
_previousReadTime = e.Position.Timestamp;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user