17 Commits

Author SHA1 Message Date
Felix Weiß
19159ed183 Upcount version 2022-09-27 09:53:02 +02:00
Felix Weiß
635823a66f Made poller delay thread safe
- added property for currentlly queued messages
- added (optional) progress to ReadByteRange
2022-09-27 09:52:35 +02:00
Felix Weiß
c7a6559f97 Added methods to pause/resume the auto polling 2022-09-23 16:38:14 +02:00
Felix Weiß
88a453355c Merge branch 'master' of https://github.com/WOmed/MewtocolNet 2022-09-21 16:24:08 +02:00
Felix Weiß
6f8f891760 Added poller delay
- added downstream and upstream speeds
- refactored SerialQueue
- counted version up to 0.5.5
2022-09-21 16:24:00 +02:00
Felix Weiß
8fb8d4989d Update version in package ref 2022-08-04 11:53:20 +02:00
Felix Weiß
45a9fa0520 Version upcount 2022-08-04 11:48:04 +02:00
Felix Weiß
772f8b89a4 Fixed auto value string enum conversion 2022-08-04 11:47:37 +02:00
Felix Weiß
6c7c368b55 Bugfixes in host connection params setup 2022-07-19 17:37:10 +02:00
Felix Weiß
38f0f9f523 Counted up version number 2022-07-19 09:31:06 +02:00
Felix Weiß
c2aecb387a Merge branch 'master' of https://github.com/WOmed/MewtocolNet 2022-07-19 09:28:27 +02:00
Felix Weiß
0e1f5cd12b Added possiblity to connect over a certain host endpoint
- fixed missing docs and
- fixed accessing modifiers
2022-07-19 09:28:18 +02:00
Felix Weiß
f15d565029 Typos 2022-07-18 16:50:48 +02:00
Felix Weiß
0ac0198223 Update README.md 2022-07-18 16:49:53 +02:00
Felix Weiß
3c450eea97 Added method to change connection params 2022-07-18 16:47:43 +02:00
Felix Weiß
fe2d2b9fb9 Made the interface disposable and refactoring 2022-07-18 09:55:36 +02:00
Felix Weiß
6c411d7318 Heavily improved the overall performance and async handling
- added a queuing manager for all messages
- tcp now keeps the connection after the first handshake
- async tasks are now run by the time order they were added
- minor bugfixes
2022-07-15 15:53:26 +02:00
20 changed files with 865 additions and 337 deletions

View File

@@ -4,63 +4,204 @@ using MewtocolNet;
using MewtocolNet.Logging; using MewtocolNet.Logging;
using MewtocolNet.Registers; using MewtocolNet.Registers;
namespace Examples { namespace Examples;
class Program { class Program {
static void Main(string[] args) { static void Main(string[] args) {
Task.Factory.StartNew(async () => { Console.WriteLine("Enter your scenario number:\n" +
"1 = Permanent connection\n" +
"2 = Dispose connection");
//attaching the logger var line = Console.ReadLine();
Logger.LogLevel = LogLevel.Verbose;
Logger.OnNewLogMessage((date, msg) => {
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
});
//setting up a new PLC interface and register collection
MewtocolInterface interf = new MewtocolInterface("10.237.191.3");
TestRegisters registers = new TestRegisters();
//attaching the register collection and an automatic poller if(line == "1") {
interf.WithRegisterCollection(registers).WithPoller(); Scenario1();
await interf.ConnectAsync(
(plcinf) => {
//reading a value from the register collection
Console.WriteLine($"BitValue is: {registers.BitValue}");
Console.WriteLine($"TestEnum is: {registers.TestEnum}");
//writing a value to the registers
Task.Factory.StartNew(async () => {
//set plc to run mode if not already
await interf.SetOperationMode(OPMode.Run);
await Task.Delay(2000);
Console.WriteLine("Testregister was toggled");
//adds 10 each time the plc connects to the PLCs INT regíster
interf.SetRegister(nameof(registers.TestInt16), (short)(registers.TestInt16 + 10));
//adds 1 each time the plc connects to the PLCs DINT regíster
interf.SetRegister(nameof(registers.TestInt32), (registers.TestInt32 + 1));
//adds 11.11 each time the plc connects to the PLCs REAL regíster
interf.SetRegister(nameof(registers.TestFloat32), (float)(registers.TestFloat32 + 11.11));
//writes 'Hello' to the PLCs string register
interf.SetRegister(nameof(registers.TestString2), "Hello");
//set the current second to the PLCs TIME register
interf.SetRegister(nameof(registers.TestTime), TimeSpan.FromSeconds(DateTime.Now.Second));
});
}
);
});
Console.ReadLine();
} }
if (line == "2") {
Scenario2();
}
Console.ReadLine();
} }
private static bool isProgressReadout = false;
static void Scenario1 () {
Task.Factory.StartNew(async () => {
//attaching the logger
Logger.LogLevel = LogLevel.Critical;
Logger.OnNewLogMessage((date, msg) => {
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
});
//setting up a new PLC interface and register collection
MewtocolInterface interf = new MewtocolInterface("10.237.191.3");
TestRegisters registers = new TestRegisters();
//attaching the register collection and an automatic poller
interf.WithRegisterCollection(registers).WithPoller();
_ = Task.Factory.StartNew(async () => {
while (true) {
if (isProgressReadout) continue;
Console.Title = $"Polling Paused: {interf.PollingPaused}, " +
$"Speed UP: {interf.BytesPerSecondUpstream} B/s, " +
$"Speed DOWN: {interf.BytesPerSecondDownstream} B/s, " +
$"Poll delay: {interf.PollerDelayMs} ms, " +
$"Queued MSGs: {interf.QueuedMessages}";
await Task.Delay(1000);
}
});
await interf.ConnectAsync((plcinf) => AfterConnect(interf, registers));
});
}
static void AfterConnect (MewtocolInterface interf, TestRegisters registers) {
//reading a value from the register collection
Console.WriteLine($"BitValue is: {registers.BitValue}");
Console.WriteLine($"TestEnum is: {registers.TestEnum}");
_ = Task.Factory.StartNew(async () => {
while(true) {
isProgressReadout = true;
await interf.ReadByteRange(1000, 2000, (p) => {
var totSteps = 10;
var cSteps = totSteps * p;
string progBar = "";
for (int i = 0; i < totSteps; i++) {
if(i < (int)cSteps) {
progBar += "⬛";
} else {
progBar += "⬜";
}
}
Console.Title = $"Prog read range: {(p * 100).ToString("N1")}% {progBar} Queued MSGs: {interf.QueuedMessages}";
});
isProgressReadout = false;
await Task.Delay(3000);
}
});
//writing a value to the registers
_ = Task.Factory.StartNew(async () => {
//set plc to run mode if not already
await interf.SetOperationMode(OPMode.Run);
int startAdress = 10000;
int entryByteSize = 20 * 20;
var bytes = await interf.ReadByteRange(startAdress, entryByteSize);
Console.WriteLine($"Bytes: {string.Join('-', bytes)}");
await Task.Delay(2000);
await interf.SetRegisterAsync(nameof(registers.TestInt32), 100);
//adds 10 each time the plc connects to the PLCs INT regíster
interf.SetRegister(nameof(registers.TestInt16), (short)(registers.TestInt16 + 10));
//adds 1 each time the plc connects to the PLCs DINT regíster
interf.SetRegister(nameof(registers.TestInt32), (registers.TestInt32 + 1));
//adds 11.11 each time the plc connects to the PLCs REAL regíster
interf.SetRegister(nameof(registers.TestFloat32), (float)(registers.TestFloat32 + 11.11));
//writes 'Hello' to the PLCs string register
interf.SetRegister(nameof(registers.TestString2), "Hello");
//set the current second to the PLCs TIME register
interf.SetRegister(nameof(registers.TestTime), TimeSpan.FromSeconds(DateTime.Now.Second));
//test pausing poller
bool pollerPaused = false;
while (true) {
await Task.Delay(5000);
pollerPaused = !pollerPaused;
if (pollerPaused) {
Console.WriteLine("Pausing poller");
await interf.PausePollingAsync();
//interf.PollerDelayMs += 10;
Console.WriteLine("Paused poller");
} else {
interf.ResumePolling();
Console.WriteLine("Resumed poller");
}
}
});
}
static void Scenario2 () {
Logger.LogLevel = LogLevel.Critical;
Logger.OnNewLogMessage((date, msg) => {
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
});
Task.Factory.StartNew(async () => {
//automatic endpoint
using (var interf = new MewtocolInterface("10.237.191.3")) {
await interf.ConnectAsync();
if (interf.IsConnected) {
await Task.Delay(5000);
}
interf.Disconnect();
}
//manual endpoint
using (var interf = new MewtocolInterface("10.237.191.3")) {
interf.HostEndpoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("10.237.191.77"), 0);
await interf.ConnectAsync();
if(interf.IsConnected) {
await Task.Delay(5000);
}
interf.Disconnect();
}
});
}
} }

View File

@@ -18,11 +18,11 @@ namespace Examples {
public bool TestBoolInputXD { get; private set; } public bool TestBoolInputXD { get; private set; }
//corresponds to a DT1101 - DT1104 string register in the PLC with (STRING[4]) //corresponds to a DT1101 - DT1104 string register in the PLC with (STRING[4])
[Register(1101, 4)] //[Register(1101, 4)]
public string TestString1 { get; private set; } //public string TestString1 { get; private set; }
//corresponds to a DT7000 16 bit int register in the PLC //corresponds to a DT7000 16 bit int register in the PLC
[Register(7000)] [Register(899)]
public short TestInt16 { get; private set; } public short TestInt16 { get; private set; }
//corresponds to a DTD7001 - DTD7002 32 bit int register in the PLC //corresponds to a DTD7001 - DTD7002 32 bit int register in the PLC
@@ -68,6 +68,8 @@ namespace Examples {
[Register(50)] [Register(50)]
public CurrentState TestEnum { get; private set; } public CurrentState TestEnum { get; private set; }
[Register(100)]
public TimeSpan TsTest2 { get; private set; }
} }
} }

View File

@@ -1,14 +1,28 @@
using System; using System;
namespace MewtocolNet.Registers { namespace MewtocolNet.Registers {
/// <summary>
/// Contains information about the plc and its cpu
/// </summary>
public partial class CpuInfo { public partial class CpuInfo {
/// <summary>
/// The cpu type of the plc
/// </summary>
public CpuType Cputype { get; set; } public CpuType Cputype { get; set; }
/// <summary>
/// Program capacity in 1K steps
/// </summary>
public int ProgramCapacity { get; set; } public int ProgramCapacity { get; set; }
/// <summary>
/// Version of the cpu
/// </summary>
public string CpuVersion { get; set; } public string CpuVersion { get; set; }
internal static CpuInfo BuildFromHexString (string _cpuType, string _cpuVersion, string _progCapacity) {
public static CpuInfo BuildFromHexString (string _cpuType, string _cpuVersion, string _progCapacity) {
CpuInfo retInf = new CpuInfo(); CpuInfo retInf = new CpuInfo();
@@ -47,8 +61,7 @@ namespace MewtocolNet.Registers {
return retInf; return retInf;
} }
} }
} }

View File

@@ -14,17 +14,61 @@ namespace MewtocolNet {
/// </summary> /// </summary>
public partial class MewtocolInterface { public partial class MewtocolInterface {
/// <summary>
/// True if the auto poller is currently paused
/// </summary>
public bool PollingPaused => pollerIsPaused;
internal event Action PolledCycle; internal event Action PolledCycle;
internal CancellationTokenSource cTokenAutoUpdater;
internal bool ContinousReaderRunning; internal volatile bool pollerTaskRunning;
internal volatile bool pollerTaskStopped;
internal volatile bool pollerIsPaused;
internal bool usePoller = false; internal bool usePoller = false;
#region Register Polling #region Register Polling
/// <summary>
/// Kills the poller completely
/// </summary>
internal void KillPoller () { internal void KillPoller () {
ContinousReaderRunning = false; pollerTaskRunning = false;
cTokenAutoUpdater?.Cancel(); pollerTaskStopped = true;
}
/// <summary>
/// Pauses the polling and waits for the last message to be sent
/// </summary>
/// <returns></returns>
public async Task PausePollingAsync () {
if (!pollerTaskRunning)
return;
pollerTaskRunning = false;
while (!pollerIsPaused) {
if (pollerIsPaused)
break;
await Task.Delay(10);
}
pollerTaskRunning = false;
}
/// <summary>
/// Resumes the polling
/// </summary>
public void ResumePolling () {
pollerTaskRunning = true;
} }
@@ -33,134 +77,108 @@ namespace MewtocolNet {
/// </summary> /// </summary>
internal void AttachPoller () { internal void AttachPoller () {
if (ContinousReaderRunning) return; if (pollerTaskRunning)
return;
cTokenAutoUpdater = new CancellationTokenSource(); Task.Factory.StartNew(async () => {
Logger.Log("Poller is attaching", LogLevel.Info, this); Logger.Log("Poller is attaching", LogLevel.Info, this);
try { int iteration = 0;
Task.Factory.StartNew(async () => { pollerTaskStopped = false;
pollerTaskRunning = true;
pollerIsPaused = false;
var plcinf = await GetPLCInfoAsync(); while (!pollerTaskStopped) {
if (plcinf == null) {
Logger.Log("PLC not reachable, stopping logger", LogLevel.Info, this);
return;
}
PolledCycle += MewtocolInterface_PolledCycle; while (pollerTaskRunning) {
void MewtocolInterface_PolledCycle () {
StringBuilder stringBuilder = new StringBuilder(); if (iteration >= Registers.Count + 1) {
foreach (var reg in GetAllRegisters()) { iteration = 0;
string address = $"{reg.GetRegisterString()}{reg.GetStartingMemoryArea()}".PadRight(8, (char)32); //invoke cycle polled event
stringBuilder.AppendLine($"{address}{(reg.Name != null ? $" ({reg.Name})" : "")}: {reg.GetValueString()}"); InvokePolledCycleDone();
continue;
} }
Logger.Log($"Registers loaded are: \n" + if (iteration >= Registers.Count) {
$"--------------------\n" +
$"{stringBuilder.ToString()}" +
$"--------------------",
LogLevel.Verbose, this);
Logger.Log("Logger did its first cycle successfully", LogLevel.Info, this);
PolledCycle -= MewtocolInterface_PolledCycle;
}
ContinousReaderRunning = true;
int getPLCinfoCycleCount = 0;
while (ContinousReaderRunning) {
//do priority tasks first
if (PriorityTasks != null && PriorityTasks.Count > 0) {
try {
await PriorityTasks?.FirstOrDefault(x => !x.IsCompleted);
} catch (NullReferenceException) { }
} else if (getPLCinfoCycleCount > 25) {
await GetPLCInfoAsync(); await GetPLCInfoAsync();
getPLCinfoCycleCount = 0; iteration++;
continue;
} }
foreach (var reg in Registers) { var reg = Registers[iteration];
if (reg is NRegister<short> shortReg) { if (reg is NRegister<short> shortReg) {
var lastVal = shortReg.Value; var lastVal = shortReg.Value;
var readout = (await ReadNumRegister(shortReg)).Register.Value; var readout = (await ReadNumRegister(shortReg)).Register.Value;
if (lastVal != readout) { if (lastVal != readout) {
InvokeRegisterChanged(shortReg); InvokeRegisterChanged(shortReg);
}
} }
if (reg is NRegister<ushort> ushortReg) { }
var lastVal = ushortReg.Value; if (reg is NRegister<ushort> ushortReg) {
var readout = (await ReadNumRegister(ushortReg)).Register.Value; var lastVal = ushortReg.Value;
if (lastVal != readout) { var readout = (await ReadNumRegister(ushortReg)).Register.Value;
InvokeRegisterChanged(ushortReg); if (lastVal != readout) {
} InvokeRegisterChanged(ushortReg);
} }
if (reg is NRegister<int> intReg) { }
var lastVal = intReg.Value; if (reg is NRegister<int> intReg) {
var readout = (await ReadNumRegister(intReg)).Register.Value; var lastVal = intReg.Value;
if (lastVal != readout) { var readout = (await ReadNumRegister(intReg)).Register.Value;
InvokeRegisterChanged(intReg); if (lastVal != readout) {
} InvokeRegisterChanged(intReg);
} }
if (reg is NRegister<uint> uintReg) { }
var lastVal = uintReg.Value; if (reg is NRegister<uint> uintReg) {
var readout = (await ReadNumRegister(uintReg)).Register.Value; var lastVal = uintReg.Value;
if (lastVal != readout) { var readout = (await ReadNumRegister(uintReg)).Register.Value;
InvokeRegisterChanged(uintReg); if (lastVal != readout) {
} InvokeRegisterChanged(uintReg);
} }
if (reg is NRegister<float> floatReg) { }
var lastVal = floatReg.Value; if (reg is NRegister<float> floatReg) {
var readout = (await ReadNumRegister(floatReg)).Register.Value; var lastVal = floatReg.Value;
if (lastVal != readout) { var readout = (await ReadNumRegister(floatReg)).Register.Value;
InvokeRegisterChanged(floatReg); if (lastVal != readout) {
} InvokeRegisterChanged(floatReg);
} }
if (reg is NRegister<TimeSpan> tsReg) { }
var lastVal = tsReg.Value; if (reg is NRegister<TimeSpan> tsReg) {
var readout = (await ReadNumRegister(tsReg)).Register.Value; var lastVal = tsReg.Value;
if (lastVal != readout) { var readout = (await ReadNumRegister(tsReg)).Register.Value;
InvokeRegisterChanged(tsReg); if (lastVal != readout) {
} InvokeRegisterChanged(tsReg);
} }
if (reg is BRegister boolReg) { }
var lastVal = boolReg.Value; if (reg is BRegister boolReg) {
var readout = (await ReadBoolRegister(boolReg)).Register.Value; var lastVal = boolReg.Value;
if (lastVal != readout) { var readout = (await ReadBoolRegister(boolReg)).Register.Value;
InvokeRegisterChanged(boolReg); if (lastVal != readout) {
} InvokeRegisterChanged(boolReg);
} }
if (reg is SRegister stringReg) { }
var lastVal = stringReg.Value; if (reg is SRegister stringReg) {
var readout = (await ReadStringRegister(stringReg)).Register.Value; var lastVal = stringReg.Value;
if (lastVal != readout) { var readout = (await ReadStringRegister(stringReg)).Register.Value;
InvokeRegisterChanged(stringReg); if (lastVal != readout) {
} InvokeRegisterChanged(stringReg);
} }
} }
getPLCinfoCycleCount++; iteration++;
//invoke cycle polled event await Task.Delay(pollerDelayMs);
InvokePolledCycleDone();
} }
}, cTokenAutoUpdater.Token); pollerIsPaused = !pollerTaskRunning;
} catch (TaskCanceledException) { } }
pollerIsPaused = false;
});
} }

View File

@@ -75,7 +75,7 @@ namespace MewtocolNet {
var res = new Regex(@"\%([0-9]{2})\$RD.{8}(.*)...").Match(_onString); var res = new Regex(@"\%([0-9]{2})\$RD.{8}(.*)...").Match(_onString);
if(res.Success) { if(res.Success) {
string val = res.Groups[2].Value; string val = res.Groups[2].Value;
return val.GetStringFromAsciiHex().Trim(); return val.GetStringFromAsciiHex()?.Trim();
} }
return null; return null;
} }
@@ -143,7 +143,7 @@ namespace MewtocolNet {
internal static string GetStringFromAsciiHex (this string input) { internal static string GetStringFromAsciiHex (this string input) {
if (input.Length % 2 != 0) if (input.Length % 2 != 0)
throw new ArgumentException("input not a hex string"); return null;
byte[] bytes = new byte[input.Length / 2]; byte[] bytes = new byte[input.Length / 2];
for (int i = 0; i < input.Length; i += 2) { for (int i = 0; i < input.Length; i += 2) {
String hex = input.Substring(i, 2); String hex = input.Substring(i, 2);
@@ -158,6 +158,8 @@ namespace MewtocolNet {
} }
internal static byte[] HexStringToByteArray(this string hex) { internal static byte[] HexStringToByteArray(this string hex) {
if (hex == null)
return null;
return Enumerable.Range(0, hex.Length) return Enumerable.Range(0, hex.Length)
.Where(x => x % 2 == 0) .Where(x => x % 2 == 0)
.Select(x => Convert.ToByte(hex.Substring(x, 2), 16)) .Select(x => Convert.ToByte(hex.Substring(x, 2), 16))

View File

@@ -12,13 +12,16 @@ using MewtocolNet.Logging;
using System.Collections; using System.Collections;
using System.Diagnostics; using System.Diagnostics;
using System.ComponentModel; using System.ComponentModel;
using System.Net;
using System.Threading;
using MewtocolNet.Queue;
namespace MewtocolNet { namespace MewtocolNet {
/// <summary> /// <summary>
/// The PLC com interface class /// The PLC com interface class
/// </summary> /// </summary>
public partial class MewtocolInterface : INotifyPropertyChanged { public partial class MewtocolInterface : INotifyPropertyChanged, IDisposable {
/// <summary> /// <summary>
/// Gets triggered when the PLC connection was established /// Gets triggered when the PLC connection was established
@@ -40,6 +43,40 @@ namespace MewtocolNet {
/// </summary> /// </summary>
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
private int connectTimeout = 3000;
/// <summary>
/// The initial connection timeout in milliseconds
/// </summary>
public int ConnectTimeout {
get { return connectTimeout; }
set { connectTimeout = value; }
}
private volatile int pollerDelayMs = 0;
/// <summary>
/// Delay for each poller cycle in milliseconds, default = 0
/// </summary>
public int PollerDelayMs {
get => pollerDelayMs;
set {
pollerDelayMs = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PollerDelayMs)));
}
}
private volatile int queuedMessages;
/// <summary>
/// Currently queued Messages
/// </summary>
public int QueuedMessages {
get => queuedMessages;
}
/// <summary>
/// The host ip endpoint, leave it null to use an automatic interface
/// </summary>
public IPEndPoint HostEndpoint { get; set; }
private bool isConnected; private bool isConnected;
/// <summary> /// <summary>
/// The current connection state of the interface /// The current connection state of the interface
@@ -52,6 +89,16 @@ namespace MewtocolNet {
} }
} }
private bool disposed;
/// <summary>
/// True if the current interface was disposed
/// </summary>
public bool Disposed {
get { return disposed; }
private set { disposed = value; }
}
private PLCInfo plcInfo; private PLCInfo plcInfo;
/// <summary> /// <summary>
/// Generic information about the connected PLC /// Generic information about the connected PLC
@@ -72,6 +119,10 @@ namespace MewtocolNet {
private string ip; private string ip;
private int port; private int port;
private int stationNumber; private int stationNumber;
private int cycleTimeMs = 25;
private int bytesTotalCountedUpstream = 0;
private int bytesTotalCountedDownstream = 0;
/// <summary> /// <summary>
/// The current IP of the PLC connection /// The current IP of the PLC connection
@@ -86,7 +137,6 @@ namespace MewtocolNet {
/// </summary> /// </summary>
public int StationNumber => stationNumber; public int StationNumber => stationNumber;
private int cycleTimeMs;
/// <summary> /// <summary>
/// The duration of the last message cycle /// The duration of the last message cycle
/// </summary> /// </summary>
@@ -98,10 +148,39 @@ namespace MewtocolNet {
} }
} }
private int bytesPerSecondUpstream = 0;
/// <summary>
/// The current transmission speed in bytes per second
/// </summary>
public int BytesPerSecondUpstream {
get { return bytesPerSecondUpstream; }
private set {
bytesPerSecondUpstream = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BytesPerSecondUpstream)));
}
}
internal List<Task> PriorityTasks { get; set; } = new List<Task>(); private int bytesPerSecondDownstream = 0;
/// <summary>
/// The current transmission speed in bytes per second
/// </summary>
public int BytesPerSecondDownstream {
get { return bytesPerSecondDownstream; }
private set {
bytesPerSecondDownstream = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BytesPerSecondDownstream)));
}
}
internal NetworkStream stream;
internal TcpClient client;
internal readonly SerialQueue queue = new SerialQueue();
private int RecBufferSize = 128;
internal int SendExceptionsInRow = 0; internal int SendExceptionsInRow = 0;
internal bool ImportantTaskRunning = false;
private Stopwatch speedStopwatchUpstr;
private Stopwatch speedStopwatchDownstr;
#region Initialization #region Initialization
@@ -131,7 +210,6 @@ namespace MewtocolNet {
RegisterChanged += (o) => { RegisterChanged += (o) => {
string address = $"{o.GetRegisterString()}{o.MemoryAdress}".PadRight(5, (char)32); string address = $"{o.GetRegisterString()}{o.MemoryAdress}".PadRight(5, (char)32);
;
Logger.Log($"{address} " + Logger.Log($"{address} " +
$"{(o.Name != null ? $"({o.Name}) " : "")}" + $"{(o.Name != null ? $"({o.Name}) " : "")}" +
@@ -196,16 +274,31 @@ namespace MewtocolNet {
} }
/// <summary> /// <summary>
/// Closes all permanent polling /// Changes the connections parameters of the PLC, only applyable when the connection is offline
/// </summary>
/// <param name="_ip">Ip adress</param>
/// <param name="_port">Port number</param>
/// <param name="_station">Station number</param>
public void ChangeConnectionSettings (string _ip, int _port, int _station = 1) {
if (IsConnected)
throw new Exception("Cannot change the connection settings while the PLC is connected");
ip = _ip;
port = _port;
stationNumber = _station;
}
/// <summary>
/// Closes the connection all cyclic polling
/// </summary> /// </summary>
public void Disconnect () { public void Disconnect () {
if (!IsConnected) if (!IsConnected)
return; return;
OnMajorSocketException(); OnMajorSocketExceptionWhileConnected();
PriorityTasks.Clear();
} }
@@ -223,6 +316,87 @@ namespace MewtocolNet {
#endregion #endregion
#region TCP connection state handling
private async Task ConnectTCP () {
if (!IPAddress.TryParse(ip, out var targetIP)) {
throw new ArgumentException("The IP adress of the PLC was no valid format");
}
try {
if(HostEndpoint != null) {
client = new TcpClient(HostEndpoint) {
ReceiveBufferSize = RecBufferSize,
NoDelay = false,
};
var ep = (IPEndPoint)client.Client.LocalEndPoint;
Logger.Log($"Connecting [MAN] endpoint: {ep.Address}:{ep.Port}", LogLevel.Verbose, this);
} else {
client = new TcpClient() {
ReceiveBufferSize = RecBufferSize,
NoDelay = false,
ExclusiveAddressUse = true,
};
}
var result = client.BeginConnect(targetIP, port, null, null);
var success = result.AsyncWaitHandle.WaitOne(TimeSpan.FromMilliseconds(ConnectTimeout));
if(!success || !client.Connected) {
OnMajorSocketExceptionWhileConnecting();
return;
}
if(HostEndpoint == null) {
var ep = (IPEndPoint)client.Client.LocalEndPoint;
Logger.Log($"Connecting [AUTO] endpoint: {ep.Address.MapToIPv4()}:{ep.Port}", LogLevel.Verbose, this);
}
stream = client.GetStream();
stream.ReadTimeout = 1000;
await Task.CompletedTask;
} catch (SocketException) {
OnMajorSocketExceptionWhileConnecting();
}
}
private void OnMajorSocketExceptionWhileConnecting () {
Logger.Log("The PLC connection timed out", LogLevel.Error, this);
CycleTimeMs = 0;
IsConnected = false;
KillPoller();
}
private void OnMajorSocketExceptionWhileConnected () {
if (IsConnected) {
Logger.Log("The PLC connection was closed", LogLevel.Error, this);
CycleTimeMs = 0;
IsConnected = false;
Disconnected?.Invoke();
KillPoller();
client.Close();
}
}
#endregion
#region Register Collection #region Register Collection
/// <summary> /// <summary>
@@ -335,9 +509,12 @@ namespace MewtocolNet {
var bytes = BitConverter.GetBytes(reg16.Value); var bytes = BitConverter.GetBytes(reg16.Value);
BitArray bitAr = new BitArray(bytes); BitArray bitAr = new BitArray(bytes);
prop.SetValue(collection, bitAr[bitIndex]);
collection.TriggerPropertyChanged(prop.Name);
if (bitIndex < bitAr.Length && bitIndex >= 0) {
prop.SetValue(collection, bitAr[bitIndex]);
collection.TriggerPropertyChanged(prop.Name);
}
} else if (bitWiseFound != null && reg is NRegister<int> reg32) { } else if (bitWiseFound != null && reg is NRegister<int> reg32) {
var casted = (RegisterAttribute)bitWiseFound; var casted = (RegisterAttribute)bitWiseFound;
var bitIndex = casted.AssignedBitIndex; var bitIndex = casted.AssignedBitIndex;
@@ -553,29 +730,44 @@ namespace MewtocolNet {
_msg += "\r"; _msg += "\r";
//send request //send request
try {
string response = null; queuedMessages++;
var response = await queue.Enqueue(() => SendSingleBlock(_msg));
queuedMessages--;
if (ContinousReaderRunning) { if (response == null) {
return new CommandResult {
Success = false,
Error = "0000",
ErrorDescription = "null result"
};
}
//if the poller is active then add all messages to a qeueue //error catching
Regex errorcheck = new Regex(@"\%[0-9]{2}\!([0-9]{2})", RegexOptions.IgnoreCase);
Match m = errorcheck.Match(response.ToString());
if (m.Success) {
string eCode = m.Groups[1].Value;
string eDes = Links.LinkedData.ErrorCodes[Convert.ToInt32(eCode)];
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine($"Response is: {response}");
Logger.Log($"Error on command {_msg.Replace("\r", "")} the PLC returned error code: {eCode}, {eDes}", LogLevel.Error);
Console.ResetColor();
return new CommandResult {
Success = false,
Error = eCode,
ErrorDescription = eDes
};
}
var awaittask = SendSingleBlock(_msg); return new CommandResult {
PriorityTasks.Add(awaittask); Success = true,
await awaittask; Error = "0000",
Response = response.ToString()
};
PriorityTasks.Remove(awaittask); } catch {
response = awaittask.Result;
} else {
//poller not active let the user manage message timing
response = await SendSingleBlock(_msg);
}
if (response == null) {
return new CommandResult { return new CommandResult {
Success = false, Success = false,
Error = "0000", Error = "0000",
@@ -583,112 +775,122 @@ namespace MewtocolNet {
}; };
} }
//error catching
Regex errorcheck = new Regex(@"\%[0-9]{2}\!([0-9]{2})", RegexOptions.IgnoreCase);
Match m = errorcheck.Match(response.ToString());
if (m.Success) {
string eCode = m.Groups[1].Value;
string eDes = Links.LinkedData.ErrorCodes[Convert.ToInt32(eCode)];
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine($"Response is: {response}");
Console.WriteLine($"Error on command {_msg.Replace("\r", "")} the PLC returned error code: {eCode}, {eDes}");
Console.ResetColor();
return new CommandResult {
Success = false,
Error = eCode,
ErrorDescription = eDes
};
}
return new CommandResult {
Success = true,
Error = "0000",
Response = response.ToString()
};
} }
private async Task<string> SendSingleBlock (string _blockString) { private async Task<string> SendSingleBlock (string _blockString) {
Stopwatch sw = Stopwatch.StartNew(); if (client == null || !client.Connected ) {
await ConnectTCP();
}
using (TcpClient client = new TcpClient() { ReceiveBufferSize = 64, NoDelay = true, ExclusiveAddressUse = true }) { if (client == null || !client.Connected)
return null;
try { var message = _blockString.ToHexASCIIBytes();
await client.ConnectAsync(ip, port); //time measuring
if(speedStopwatchUpstr == null) {
speedStopwatchUpstr = Stopwatch.StartNew();
}
using (NetworkStream stream = client.GetStream()) { if(speedStopwatchUpstr.Elapsed.TotalSeconds >= 1) {
speedStopwatchUpstr.Restart();
bytesTotalCountedUpstream = 0;
}
var message = _blockString.ToHexASCIIBytes(); //send request
var messageAscii = BitConverter.ToString(message).Replace("-", " "); using (var sendStream = new MemoryStream(message)) {
await sendStream.CopyToAsync(stream);
Logger.Log($"[--------------------------------]", LogLevel.Critical, this);
Logger.Log($"--> OUT MSG: {_blockString}", LogLevel.Critical, this);
}
//send request //calc upstream speed
try { bytesTotalCountedUpstream += message.Length;
using (var sendStream = new MemoryStream(message)) {
await sendStream.CopyToAsync(stream); var perSecUpstream = (double)((bytesTotalCountedUpstream / speedStopwatchUpstr.Elapsed.TotalMilliseconds) * 1000);
Logger.Log($"OUT MSG: {_blockString}", LogLevel.Critical, this); if (perSecUpstream <= 10000)
//log message sent BytesPerSecondUpstream = (int)Math.Round(perSecUpstream, MidpointRounding.AwayFromZero);
ASCIIEncoding enc = new ASCIIEncoding();
string characters = enc.GetString(message); //await result
} StringBuilder response = new StringBuilder();
} catch (IOException) { try {
Logger.Log($"Critical IO exception on send", LogLevel.Critical, this);
return null; byte[] responseBuffer = new byte[128 * 16];
} catch (SocketException) {
OnMajorSocketException(); bool endLineCode = false;
return null; bool startMsgCode = false;
while (!endLineCode && !startMsgCode) {
do {
//time measuring
if (speedStopwatchDownstr == null) {
speedStopwatchDownstr = Stopwatch.StartNew();
} }
//await result if (speedStopwatchDownstr.Elapsed.TotalSeconds >= 1) {
StringBuilder response = new StringBuilder(); speedStopwatchDownstr.Restart();
try { bytesTotalCountedDownstream = 0;
byte[] responseBuffer = new byte[256];
do {
int bytes = stream.Read(responseBuffer, 0, responseBuffer.Length);
response.Append(Encoding.UTF8.GetString(responseBuffer, 0, bytes));
}
while (stream.DataAvailable);
} catch (IOException) {
Logger.Log($"Critical IO exception on receive", LogLevel.Critical, this);
return null;
} catch (SocketException) {
OnMajorSocketException();
return null;
} }
sw.Stop(); int bytes = await stream.ReadAsync(responseBuffer, 0, responseBuffer.Length);
var curCycle = (int)sw.ElapsedMilliseconds;
if (Math.Abs(CycleTimeMs - curCycle) > 2) {
CycleTimeMs = curCycle;
}
Logger.Log($"IN MSG ({(int)sw.Elapsed.TotalMilliseconds}ms): {response}", LogLevel.Critical, this); endLineCode = responseBuffer.Any(x => x == 0x0D);
return response.ToString(); startMsgCode = responseBuffer.Count(x => x == 0x25) > 1;
if (!endLineCode && !startMsgCode) break;
response.Append(Encoding.UTF8.GetString(responseBuffer, 0, bytes));
} }
while (stream.DataAvailable);
} catch (SocketException) {
OnMajorSocketException();
return null;
} }
} catch (IOException) {
OnMajorSocketExceptionWhileConnected();
return null;
} catch (SocketException) {
OnMajorSocketExceptionWhileConnected();
return null;
}
if(!string.IsNullOrEmpty(response.ToString())) {
Logger.Log($"<-- IN MSG: {response}", LogLevel.Critical, this);
bytesTotalCountedDownstream += Encoding.ASCII.GetByteCount(response.ToString());
var perSecDownstream = (double)((bytesTotalCountedDownstream / speedStopwatchDownstr.Elapsed.TotalMilliseconds) * 1000);
if(perSecUpstream <= 10000)
BytesPerSecondDownstream = (int)Math.Round(perSecUpstream, MidpointRounding.AwayFromZero);
return response.ToString();
} else {
return null;
} }
} }
private void OnMajorSocketException () { #endregion
if (IsConnected) { #region Disposing
Logger.Log("The PLC connection was closed", LogLevel.Error, this); /// <summary>
CycleTimeMs = 0; /// Disposes the current interface and clears all its members
IsConnected = false; /// </summary>
Disconnected?.Invoke(); public void Dispose () {
KillPoller();
} if (Disposed) return;
Disconnect();
GC.SuppressFinalize(this);
Disposed = true;
} }
@@ -709,4 +911,5 @@ namespace MewtocolNet {
} }
} }

View File

@@ -112,29 +112,47 @@ namespace MewtocolNet {
/// </summary> /// </summary>
/// <param name="start">Start adress</param> /// <param name="start">Start adress</param>
/// <param name="count">Number of bytes to get</param> /// <param name="count">Number of bytes to get</param>
/// <param name="onProgress">Gets invoked when the progress changes, contains the progress as a double</param>
/// <returns>A byte array or null of there was an error</returns> /// <returns>A byte array or null of there was an error</returns>
public async Task<byte[]> ReadByteRange (int start, int count) { public async Task<byte[]> ReadByteRange (int start, int count, Action<double> onProgress = null) {
string startStr = start.ToString().PadLeft(5, '0'); var byteList = new List<byte>();
var wordLength = count / 2; var wordLength = count / 2;
bool wasOdd = false;
if (count % 2 != 0) if (count % 2 != 0)
wordLength++; wordLength++;
string endStr = (start + wordLength - 1).ToString().PadLeft(5, '0');
string requeststring = $"%{GetStationNumber()}#RDD{startStr}{endStr}"; //read blocks of max 4 words per msg
var result = await SendCommandAsync(requeststring); for (int i = 0; i < wordLength; i+=8) {
if(result.Success && !string.IsNullOrEmpty(result.Response)) { int curWordStart = start + i;
int curWordEnd = curWordStart + 7;
var bytes = result.Response.ParseDTByteString(wordLength * 4).HexStringToByteArray(); string startStr = curWordStart.ToString().PadLeft(5, '0');
string endStr = (curWordEnd).ToString().PadLeft(5, '0');
return bytes.BigToMixedEndian().Take(count).ToArray(); string requeststring = $"%{GetStationNumber()}#RDD{startStr}{endStr}";
var result = await SendCommandAsync(requeststring);
if (result.Success && !string.IsNullOrEmpty(result.Response)) {
var bytes = result.Response.ParseDTByteString(8 * 4).HexStringToByteArray();
if (bytes == null) {
return null;
}
byteList.AddRange(bytes.BigToMixedEndian().Take(count).ToArray());
}
if(onProgress != null)
onProgress((double)i / wordLength);
} }
return null; return byteList.ToArray();
} }
@@ -176,6 +194,7 @@ namespace MewtocolNet {
/// Writes to the given bool register on the PLC /// Writes to the given bool register on the PLC
/// </summary> /// </summary>
/// <param name="_toWrite">The register to write to</param> /// <param name="_toWrite">The register to write to</param>
/// <param name="value">The value to write</param>
/// <returns>The success state of the write operation</returns> /// <returns>The success state of the write operation</returns>
public async Task<bool> WriteBoolRegister (BRegister _toWrite, bool value) { public async Task<bool> WriteBoolRegister (BRegister _toWrite, bool value) {
@@ -196,7 +215,6 @@ namespace MewtocolNet {
/// </summary> /// </summary>
/// <typeparam name="T">Type of number (short, ushort, int, uint, float)</typeparam> /// <typeparam name="T">Type of number (short, ushort, int, uint, float)</typeparam>
/// <param name="_toRead">The register to read</param> /// <param name="_toRead">The register to read</param>
/// <param name="_stationNumber">Station number to access</param>
/// <returns>A result with the given NumberRegister containing the readback value and a result struct</returns> /// <returns>A result with the given NumberRegister containing the readback value and a result struct</returns>
public async Task<NRegisterResult<T>> ReadNumRegister<T> (NRegister<T> _toRead) { public async Task<NRegisterResult<T>> ReadNumRegister<T> (NRegister<T> _toRead) {
@@ -205,40 +223,47 @@ namespace MewtocolNet {
string requeststring = $"%{GetStationNumber()}#RD{_toRead.BuildMewtocolIdent()}"; string requeststring = $"%{GetStationNumber()}#RD{_toRead.BuildMewtocolIdent()}";
var result = await SendCommandAsync(requeststring); var result = await SendCommandAsync(requeststring);
if(!result.Success || string.IsNullOrEmpty(result.Response)) { var failedResult = new NRegisterResult<T> {
return new NRegisterResult<T> { Result = result,
Result = result, Register = _toRead
Register = _toRead };
};
if (!result.Success || string.IsNullOrEmpty(result.Response)) {
return failedResult;
} }
if (numType == typeof(short)) { if (numType == typeof(short)) {
var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder(); var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder();
if (resultBytes == null) return failedResult;
var val = short.Parse(resultBytes, NumberStyles.HexNumber); var val = short.Parse(resultBytes, NumberStyles.HexNumber);
_toRead.SetValueFromPLC(val); _toRead.SetValueFromPLC(val);
} else if (numType == typeof(ushort)) { } else if (numType == typeof(ushort)) {
var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder(); var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder();
if (resultBytes == null) return failedResult;
var val = ushort.Parse(resultBytes, NumberStyles.HexNumber); var val = ushort.Parse(resultBytes, NumberStyles.HexNumber);
_toRead.SetValueFromPLC(val); _toRead.SetValueFromPLC(val);
} else if (numType == typeof(int)) { } else if (numType == typeof(int)) {
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder(); var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
if (resultBytes == null) return failedResult;
var val = int.Parse(resultBytes, NumberStyles.HexNumber); var val = int.Parse(resultBytes, NumberStyles.HexNumber);
_toRead.SetValueFromPLC(val); _toRead.SetValueFromPLC(val);
} else if (numType == typeof(uint)) { } else if (numType == typeof(uint)) {
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder(); var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
if (resultBytes == null) return failedResult;
var val = uint.Parse(resultBytes, NumberStyles.HexNumber); var val = uint.Parse(resultBytes, NumberStyles.HexNumber);
_toRead.SetValueFromPLC(val); _toRead.SetValueFromPLC(val);
} else if (numType == typeof(float)) { } else if (numType == typeof(float)) {
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder(); var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
if (resultBytes == null) return failedResult;
//convert to unsigned int first //convert to unsigned int first
var val = uint.Parse(resultBytes, NumberStyles.HexNumber); var val = uint.Parse(resultBytes, NumberStyles.HexNumber);
@@ -250,6 +275,7 @@ namespace MewtocolNet {
} else if (numType == typeof(TimeSpan)) { } else if (numType == typeof(TimeSpan)) {
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder(); var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
if (resultBytes == null) return failedResult;
//convert to unsigned int first //convert to unsigned int first
var vallong = long.Parse(resultBytes, NumberStyles.HexNumber); var vallong = long.Parse(resultBytes, NumberStyles.HexNumber);
var valMillis = vallong * 10; var valMillis = vallong * 10;
@@ -273,7 +299,7 @@ namespace MewtocolNet {
/// </summary> /// </summary>
/// <typeparam name="T">Type of number (short, ushort, int, uint, float)</typeparam> /// <typeparam name="T">Type of number (short, ushort, int, uint, float)</typeparam>
/// <param name="_toWrite">The register to write</param> /// <param name="_toWrite">The register to write</param>
/// <param name="_stationNumber">Station number to access</param> /// <param name="_value">The value to write</param>
/// <returns>The success state of the write operation</returns> /// <returns>The success state of the write operation</returns>
public async Task<bool> WriteNumRegister<T> (NRegister<T> _toWrite, T _value) { public async Task<bool> WriteNumRegister<T> (NRegister<T> _toWrite, T _value) {

View File

@@ -6,13 +6,38 @@ namespace MewtocolNet.Registers {
/// All modes /// All modes
/// </summary> /// </summary>
public class PLCMode { public class PLCMode {
/// <summary>
/// PLC is running
/// </summary>
public bool RunMode { get; set; } public bool RunMode { get; set; }
/// <summary>
/// PLC is in test
/// </summary>
public bool TestRunMode { get; set; } public bool TestRunMode { get; set; }
/// <summary>
/// BreakExcecuting
/// </summary>
public bool BreakExcecuting { get; set; } public bool BreakExcecuting { get; set; }
/// <summary>
/// BreakValid
/// </summary>
public bool BreakValid { get; set; } public bool BreakValid { get; set; }
/// <summary>
/// PLC output is enabled
/// </summary>
public bool OutputEnabled { get; set; } public bool OutputEnabled { get; set; }
/// <summary>
/// PLC runs step per step
/// </summary>
public bool StepRunMode { get; set; } public bool StepRunMode { get; set; }
/// <summary>
/// Message executing
/// </summary>
public bool MessageExecuting { get; set; } public bool MessageExecuting { get; set; }
/// <summary>
/// PLC is in remote mode
/// </summary>
public bool RemoteMode { get; set; } public bool RemoteMode { get; set; }
/// <summary> /// <summary>

View File

@@ -6,22 +6,39 @@ using System.Threading.Tasks;
namespace MewtocolNet.RegisterAttributes { namespace MewtocolNet.RegisterAttributes {
/// <summary>
/// The size of the bitwise register
/// </summary>
public enum BitCount { public enum BitCount {
/// <summary>
/// 16 bit
/// </summary>
B16, B16,
/// <summary>
/// 32 bit
/// </summary>
B32 B32
} }
/// <summary>
/// Defines the behavior of a register property
/// </summary>
[AttributeUsage(AttributeTargets.Property)] [AttributeUsage(AttributeTargets.Property)]
public class RegisterAttribute : Attribute { public class RegisterAttribute : Attribute {
public int MemoryArea; internal int MemoryArea;
public int StringLength; internal int StringLength;
public RegisterType RegisterType; internal RegisterType RegisterType;
public SpecialAddress SpecialAddress = SpecialAddress.None; internal SpecialAddress SpecialAddress = SpecialAddress.None;
public BitCount BitCount; internal BitCount BitCount;
public int AssignedBitIndex = -1; internal int AssignedBitIndex = -1;
/// <summary>
/// Attribute for string type or numeric registers
/// </summary>
/// <param name="memoryArea">The area in the plcs memory</param>
/// <param name="stringLength">The max string length in the plc</param>
public RegisterAttribute (int memoryArea, int stringLength = 1) { public RegisterAttribute (int memoryArea, int stringLength = 1) {
MemoryArea = memoryArea; MemoryArea = memoryArea;
@@ -29,6 +46,11 @@ namespace MewtocolNet.RegisterAttributes {
} }
/// <summary>
/// Attribute for boolean registers
/// </summary>
/// <param name="memoryArea">The area in the plcs memory</param>
/// <param name="type">The type of boolean register</param>
public RegisterAttribute (int memoryArea, RegisterType type) { public RegisterAttribute (int memoryArea, RegisterType type) {
if (type.ToString().StartsWith("DT")) if (type.ToString().StartsWith("DT"))
@@ -40,6 +62,11 @@ namespace MewtocolNet.RegisterAttributes {
} }
/// <summary>
/// Attribute for boolean registers
/// </summary>
/// <param name="spAdress">The special area in the plcs memory</param>
/// <param name="type">The type of boolean register</param>
public RegisterAttribute (RegisterType type, SpecialAddress spAdress) { public RegisterAttribute (RegisterType type, SpecialAddress spAdress) {
if (type.ToString().StartsWith("DT")) if (type.ToString().StartsWith("DT"))
@@ -50,7 +77,11 @@ namespace MewtocolNet.RegisterAttributes {
} }
/// <summary>
/// Attribute to read numeric registers as bitwise
/// </summary>
/// <param name="memoryArea">The area in the plcs memory</param>
/// <param name="bitcount">The number of bits to parse</param>
public RegisterAttribute (int memoryArea, BitCount bitcount) { public RegisterAttribute (int memoryArea, BitCount bitcount) {
MemoryArea = memoryArea; MemoryArea = memoryArea;
@@ -59,6 +90,12 @@ namespace MewtocolNet.RegisterAttributes {
} }
/// <summary>
/// Attribute to read numeric registers as bitwise
/// </summary>
/// <param name="memoryArea">The area in the plcs memory</param>
/// <param name="bitcount">The number of bits to parse</param>
/// <param name="assignBit">The index of the bit that gets linked to the bool</param>
public RegisterAttribute (int memoryArea, uint assignBit, BitCount bitcount) { public RegisterAttribute (int memoryArea, uint assignBit, BitCount bitcount) {
if(assignBit > 15 && bitcount == BitCount.B16) { if(assignBit > 15 && bitcount == BitCount.B16) {

View File

@@ -34,8 +34,17 @@ namespace MewtocolNet.RegisterAttributes {
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
} }
/// <summary>
/// Gets called when the register collection base was linked to its parent mewtocol interface
/// </summary>
/// <param name="plc">The parent interface</param>
public virtual void OnInterfaceLinked (MewtocolInterface plc) { } public virtual void OnInterfaceLinked (MewtocolInterface plc) { }
/// <summary>
/// Gets called when the register collection base was linked to its parent mewtocol interface
/// and the plc connection is established
/// </summary>
/// <param name="plc">The parent interface</param>
public virtual void OnInterfaceLinkedAndOnline (MewtocolInterface plc) { } public virtual void OnInterfaceLinkedAndOnline (MewtocolInterface plc) { }
} }

View File

@@ -12,8 +12,7 @@ namespace MewtocolNet.Registers {
internal RegisterType RegType { get; private set; } internal RegisterType RegType { get; private set; }
internal SpecialAddress SpecialAddress { get; private set; } internal SpecialAddress SpecialAddress { get; private set; }
public bool NeedValue; internal bool LastValue;
public bool LastValue;
/// <summary> /// <summary>
/// The value of the register /// The value of the register
@@ -54,6 +53,9 @@ namespace MewtocolNet.Registers {
} }
/// <summary>
/// Builds the register area name
/// </summary>
public override string BuildMewtocolIdent () { public override string BuildMewtocolIdent () {
//build area code from register type //build area code from register type
@@ -73,9 +75,7 @@ namespace MewtocolNet.Registers {
TriggerChangedEvnt(this); TriggerChangedEvnt(this);
TriggerNotifyChange(); TriggerNotifyChange();
} }
public override string ToString() {
return $"Adress: {MemoryAdress} Val: {Value}";
}
} }
} }

View File

@@ -1,13 +1,20 @@
namespace MewtocolNet.Registers { namespace MewtocolNet.Registers {
/// <summary>
/// Result for a boolean register
/// </summary>
public class BRegisterResult { public class BRegisterResult {
/// <summary>
/// The command result
/// </summary>
public CommandResult Result { get; set; } public CommandResult Result { get; set; }
/// <summary>
/// The used register
/// </summary>
public BRegister Register { get; set; } public BRegister Register { get; set; }
public override string ToString() {
string errmsg = Result.Success ? "" : $", Error [{Result.ErrorDescription}]";
return $"Result [{Result.Success}], Register [{Register.ToString()}]{errmsg}";
}
} }
} }

View File

@@ -7,8 +7,7 @@ namespace MewtocolNet.Registers {
/// <typeparam name="T">The type of the numeric value</typeparam> /// <typeparam name="T">The type of the numeric value</typeparam>
public class NRegister<T> : Register { public class NRegister<T> : Register {
public T NeedValue; internal T LastValue;
public T LastValue;
/// <summary> /// <summary>
/// The value of the register /// The value of the register
@@ -78,10 +77,6 @@ namespace MewtocolNet.Registers {
TriggerNotifyChange(); TriggerNotifyChange();
} }
public override string ToString() {
return $"Adress: {MemoryAdress} Val: {Value}";
}
} }

View File

@@ -6,13 +6,16 @@ namespace MewtocolNet.Registers {
/// </summary> /// </summary>
/// <typeparam name="T">The type of the numeric value</typeparam> /// <typeparam name="T">The type of the numeric value</typeparam>
public class NRegisterResult<T> { public class NRegisterResult<T> {
public CommandResult Result { get; set; }
public NRegister<T> Register { get; set; }
public override string ToString() { /// <summary>
string errmsg = Result.Success ? "" : $", Error [{Result.ErrorDescription}]"; /// Command result
return $"Result [{Result.Success}], Register [{Register.ToString()}]{errmsg}"; /// </summary>
} public CommandResult Result { get; set; }
/// <summary>
/// The used register
/// </summary>
public NRegister<T> Register { get; set; }
/// <summary> /// <summary>
/// Trys to get the value of there is one /// Trys to get the value of there is one

View File

@@ -75,6 +75,9 @@ namespace MewtocolNet.Registers {
}; };
} }
/// <summary>
/// Builds the register area name
/// </summary>
public virtual string BuildMewtocolIdent() { public virtual string BuildMewtocolIdent() {
StringBuilder asciistring = new StringBuilder("D"); StringBuilder asciistring = new StringBuilder("D");
@@ -112,9 +115,14 @@ namespace MewtocolNet.Registers {
public string GetValueString () { public string GetValueString () {
if (enumType != null && this is NRegister<int> intEnumReg) { if (enumType != null && this is NRegister<int> intEnumReg) {
var dict = new Dictionary<int, string>(); var dict = new Dictionary<int, string>();
foreach (var name in Enum.GetNames(enumType)) { foreach (var name in Enum.GetNames(enumType)) {
dict.Add((int)Enum.Parse(enumType, name), name); int enumKey = (int)Enum.Parse(enumType, name);
if(!dict.ContainsKey(enumKey)) {
dict.Add(enumKey, name);
}
} }
if(dict.ContainsKey(intEnumReg.Value)) { if(dict.ContainsKey(intEnumReg.Value)) {
@@ -122,6 +130,7 @@ namespace MewtocolNet.Registers {
} else { } else {
return $"{intEnumReg.Value} (Missing Enum)"; return $"{intEnumReg.Value} (Missing Enum)";
} }
} }
if (this is NRegister<short> shortReg) { if (this is NRegister<short> shortReg) {
return $"{shortReg.Value}{(isUsedBitwise ? $" [{shortReg.GetBitwise().ToBitString()}]" : "")}"; return $"{shortReg.Value}{(isUsedBitwise ? $" [{shortReg.GetBitwise().ToBitString()}]" : "")}";
@@ -145,7 +154,7 @@ namespace MewtocolNet.Registers {
return boolReg.Value.ToString(); return boolReg.Value.ToString();
} }
if (this is SRegister stringReg) { if (this is SRegister stringReg) {
return stringReg.Value.ToString(); return stringReg.Value ?? "";
} }
return "Type of the register is not supported."; return "Type of the register is not supported.";
@@ -178,6 +187,9 @@ namespace MewtocolNet.Registers {
} }
/// <summary>
/// Gets the register dataarea string DT for 16bit and DDT for 32 bit types
/// </summary>
public string GetRegisterString () { public string GetRegisterString () {
if (this is NRegister<short> shortReg) { if (this is NRegister<short> shortReg) {

View File

@@ -9,9 +9,12 @@ namespace MewtocolNet.Registers {
private string lastVal = ""; private string lastVal = "";
/// <summary>
/// The current value of the register
/// </summary>
public string Value => lastVal; public string Value => lastVal;
public short ReservedSize { get; set; } internal short ReservedSize { get; set; }
/// <summary> /// <summary>
/// Defines a register containing a string /// Defines a register containing a string
@@ -32,10 +35,9 @@ namespace MewtocolNet.Registers {
memoryLength = (int)Math.Round(wordsize + 1); memoryLength = (int)Math.Round(wordsize + 1);
} }
public override string ToString() { /// <summary>
return $"Adress: {MemoryAdress} Val: {Value}"; /// Builds the register identifier for the mewotocol protocol
} /// </summary>
public override string BuildMewtocolIdent() { public override string BuildMewtocolIdent() {
StringBuilder asciistring = new StringBuilder("D"); StringBuilder asciistring = new StringBuilder("D");
@@ -65,7 +67,6 @@ namespace MewtocolNet.Registers {
TriggerNotifyChange(); TriggerNotifyChange();
} }
} }
} }

View File

@@ -1,15 +1,19 @@
namespace MewtocolNet.Registers { namespace MewtocolNet.Registers {
/// <summary>
/// The results of a string register operation
/// </summary>
public class SRegisterResult { public class SRegisterResult {
/// <summary>
/// The command result
/// </summary>
public CommandResult Result { get; set; } public CommandResult Result { get; set; }
/// <summary>
/// The register definition used
/// </summary>
public SRegister Register { get; set; } public SRegister Register { get; set; }
public override string ToString() {
string errmsg = Result.Success ? "" : $", Error [{Result.ErrorDescription}]";
return $"Result [{Result.Success}], Register [{Register.ToString()}]{errmsg}";
}
} }
} }

View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<PackageId>MewtocolNet</PackageId> <PackageId>MewtocolNet</PackageId>
<Version>0.4.3</Version> <Version>0.5.8</Version>
<Authors>Felix Weiss</Authors> <Authors>Felix Weiss</Authors>
<Company>Womed</Company> <Company>Womed</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

View File

@@ -0,0 +1,30 @@
using System;
using System.Threading.Tasks;
namespace MewtocolNet.Queue {
internal class SerialQueue {
readonly object _locker = new object();
readonly WeakReference<Task> _lastTask = new WeakReference<Task>(null);
internal Task<T> Enqueue<T> (Func<Task<T>> asyncFunction) {
lock (_locker) {
Task lastTask;
Task<T> resultTask;
if (_lastTask.TryGetTarget(out lastTask)) {
resultTask = lastTask.ContinueWith(_ => asyncFunction(), TaskContinuationOptions.ExecuteSynchronously).Unwrap();
} else {
resultTask = Task.Run(asyncFunction);
}
_lastTask.SetTarget(resultTask);
return resultTask;
}
}
}
}

View File

@@ -28,7 +28,7 @@ This software was written by WOLF Medizintechnik GmbH (@WOmed/dev).
## .NET Support ## .NET Support
This library was written in **netstandard2.0** and should by compatible with a lot of .NET environments. This library was written in **netstandard2.0** and should be compatible with a lot of .NET environments.
For a full list of supported .NET clrs see [this page](https://docs.microsoft.com/de-de/dotnet/standard/net-standard?tabs=net-standard-2-0#select-net-standard-version) For a full list of supported .NET clrs see [this page](https://docs.microsoft.com/de-de/dotnet/standard/net-standard?tabs=net-standard-2-0#select-net-standard-version)
@@ -53,7 +53,7 @@ Where is the RS232/Serial support?
Install this package by using [Nuget](https://www.nuget.org/packages/MewtocolNet/) or reference Install this package by using [Nuget](https://www.nuget.org/packages/MewtocolNet/) or reference
```XML ```XML
<PackageReference Include="MewtocolNet" Version="0.4.2" /> <PackageReference Include="MewtocolNet" Version="0.5.2" />
``` ```
in your dependencies. in your dependencies.
Alternatively use the dotnet CLI and run Alternatively use the dotnet CLI and run