DarthAffe/OBD.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/OBD.NET.git synced 2025-12-12 16:58:30 +00:00
Code Issues Releases Wiki Activity

fix https://github.com/DarthAffe/OBD.NET/issues/3

Browse Source
This commit is contained in:
Roman Lumetsberger 2017-08-18 16:04:51 +02:00
parent d2c2b8456f
commit 6728f6413d
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
View File

@ -222,22 +222,27 @@ namespace OBD.NET.Devices
while (!commandCancellationToken.IsCancellationRequested) while (!commandCancellationToken.IsCancellationRequested)
{ {
currentCommand = null; currentCommand = null;
if(commandQueue.TryTake(out currentCommand, Timeout.Infinite, commandCancellationToken.Token)) try
{ {
Logger?.WriteLine("Writing Command: '" + currentCommand.CommandText.Replace('\r', '\'') + "'", OBDLogLevel.Verbose); if (commandQueue.TryTake(out currentCommand, Timeout.Infinite, commandCancellationToken.Token))
if (Connection.IsAsync)
{ {
await Connection.WriteAsync(Encoding.ASCII.GetBytes(currentCommand.CommandText)); Logger?.WriteLine("Writing Command: '" + currentCommand.CommandText.Replace('\r', '\'') + "'", OBDLogLevel.Verbose);
}
else
{
Connection.Write(Encoding.ASCII.GetBytes(currentCommand.CommandText));
if (Connection.IsAsync)
{
await Connection.WriteAsync(Encoding.ASCII.GetBytes(currentCommand.CommandText));
}
else
{
Connection.Write(Encoding.ASCII.GetBytes(currentCommand.CommandText));
}
//wait for command to finish
commandFinishedEvent.WaitOne();
} }
//wait for command to finish
commandFinishedEvent.WaitOne();
} }
catch (OperationCanceledException)
{/*ignore, because it is thrown when the cancellation token is canceled*/}
} }
} }
@ -246,6 +251,7 @@ namespace OBD.NET.Devices
/// </summary> /// </summary>
public virtual void Dispose() public virtual void Dispose()
{ {
commandQueue.CompleteAdding();
commandCancellationToken?.Cancel(); commandCancellationToken?.Cancel();
commandWorkerTask?.Wait(); commandWorkerTask?.Wait();
Connection?.Dispose(); Connection?.Dispose();