nefarius/Nefarius.Peripherals.SerialPort
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed SetCommState

Browse Source
This commit is contained in:
Benjamin Höglinger-Stelzer
2022-10-03 17:58:42 +02:00
parent d04267250c
commit 91159c3643
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Nefarius.Peripherals.SerialPort/SerialPort.cs
View File

@@ -3,9 +3,15 @@ using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using Windows.Win32;
using Windows.Win32.Devices.Communication;
using Windows.Win32.Foundation;
using Windows.Win32.Storage.FileSystem;
using Microsoft.Win32.SafeHandles;
using Nefarius.Peripherals.SerialPort.Win32PInvoke;
using COMMPROP = Nefarius.Peripherals.SerialPort.Win32PInvoke.COMMPROP;
using COMMTIMEOUTS = Nefarius.Peripherals.SerialPort.Win32PInvoke.COMMTIMEOUTS;
using COMSTAT = Nefarius.Peripherals.SerialPort.Win32PInvoke.COMSTAT;
using DCB = Windows.Win32.Devices.Communication.DCB;
namespace Nefarius.Peripherals.SerialPort
{
@@ -366,21 +372,21 @@ namespace Nefarius.Peripherals.SerialPort
commTimeouts.WriteTotalTimeoutConstant = SendTimeoutConstant;
commTimeouts.WriteTotalTimeoutMultiplier = SendTimeoutMultiplier;
portDcb.Init(Parity is Parity.Odd or Parity.Even, TxFlowCts, TxFlowDsr,
(int) UseDtr, RxGateDsr, !TxWhenRxXoff, TxFlowX, RxFlowX, (int) UseRts);
portDcb.BaudRate = BaudRate;
portDcb.ByteSize = (byte) DataBits;
portDcb.Parity = (byte) Parity;
portDcb.StopBits = (byte) StopBits;
portDcb.XoffChar = (byte) XoffChar;
portDcb.XonChar = (byte) XonChar;
portDcb.XoffLim = (short) RxHighWater;
portDcb.XonLim = (short) RxLowWater;
(int)UseDtr, RxGateDsr, !TxWhenRxXoff, TxFlowX, RxFlowX, (int)UseRts);
portDcb.BaudRate = (uint)BaudRate;
portDcb.ByteSize = (byte)DataBits;
portDcb.Parity = (DCB_PARITY)Parity;
portDcb.StopBits = (DCB_STOP_BITS)StopBits;
portDcb.XoffChar = (CHAR)(byte)XoffChar;
portDcb.XonChar = (CHAR)(byte)XonChar;
portDcb.XoffLim = (ushort)RxHighWater;
portDcb.XonLim = (ushort)RxLowWater;
if (RxQueue != 0 || TxQueue != 0)
if (!Win32Com.SetupComm(_hPort.DangerousGetHandle(), (uint) RxQueue, (uint) TxQueue))
if (!Win32Com.SetupComm(_hPort.DangerousGetHandle(), (uint)RxQueue, (uint)TxQueue))
ThrowException("Bad queue settings");
if (!Win32Com.SetCommState(_hPort.DangerousGetHandle(), ref portDcb))
if (!PInvoke.SetCommState(_hPort, portDcb))
ThrowException("Bad com settings");
if (!Win32Com.SetCommTimeouts(_hPort.DangerousGetHandle(), ref commTimeouts))
@@ -421,7 +427,9 @@ namespace Nefarius.Peripherals.SerialPort
// TODO: utilize Task Parallel Library here
_rxThread = new Thread(ReceiveThread)
{
Name = "CommBaseRx", Priority = ThreadPriority.AboveNormal, IsBackground = true
Name = "CommBaseRx",
Priority = ThreadPriority.AboveNormal,
IsBackground = true
};
_rxThread.Start();
@@ -514,9 +522,9 @@ namespace Nefarius.Peripherals.SerialPort
CheckOnline();
CheckResult();
_writeCount = toSend.GetLength(0);
if (Win32Com.WriteFile(_hPort.DangerousGetHandle(), toSend, (uint) _writeCount, out sent, _ptrUwo))
if (Win32Com.WriteFile(_hPort.DangerousGetHandle(), toSend, (uint)_writeCount, out sent, _ptrUwo))
{
_writeCount -= (int) sent;
_writeCount -= (int)sent;
}
else
{
@@ -568,7 +576,7 @@ namespace Nefarius.Peripherals.SerialPort
uint sent;
if (Win32Com.GetOverlappedResult(_hPort.DangerousGetHandle(), _ptrUwo, out sent, _checkSends))
{
_writeCount -= (int) sent;
_writeCount -= (int)sent;
if (_writeCount != 0) ThrowException("Send Timeout");
}
else
@@ -718,7 +726,7 @@ namespace Nefarius.Peripherals.SerialPort
throw new CommPortException("IO Error [002]");
}
eventMask = (uint) Marshal.ReadInt32(uMask);
eventMask = (uint)Marshal.ReadInt32(uMask);
if ((eventMask & Win32Com.EV_ERR) != 0)
{
uint errs;

2
Nefarius.Peripherals.SerialPort/Util.cs
View File

@@ -4,7 +4,7 @@ namespace Nefarius.Peripherals.SerialPort;
internal static class DCBExtensions
{
public static void Init(this DCB dcb, bool parity, bool outCts, bool outDsr, int dtr, bool inDsr, bool txc,
public static void Init(this ref DCB dcb, bool parity, bool outCts, bool outDsr, int dtr, bool inDsr, bool txc,
bool xOut,
bool xIn, int rts)
{