mirror of
https://github.com/OpenLogics/MewtocolNet.git
synced 2025-12-06 11:11:23 +00:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45a9fa0520 | ||
|
|
772f8b89a4 | ||
|
|
6c7c368b55 | ||
|
|
38f0f9f523 | ||
|
|
c2aecb387a | ||
|
|
0e1f5cd12b | ||
|
|
f15d565029 | ||
|
|
0ac0198223 | ||
|
|
3c450eea97 | ||
|
|
fe2d2b9fb9 | ||
|
|
6c411d7318 | ||
|
|
cdae9a60fb | ||
|
|
b1c2cdb70e | ||
|
|
95bfcf94de | ||
|
|
0a93df287d | ||
|
|
18384ff964 | ||
|
|
e4ddad685a |
@@ -4,12 +4,31 @@ 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) {
|
||||||
|
|
||||||
|
Console.WriteLine("Enter your scenario number:\n" +
|
||||||
|
"1 = Permanent connection\n" +
|
||||||
|
"2 = Dispose connection");
|
||||||
|
|
||||||
|
var line = Console.ReadLine();
|
||||||
|
|
||||||
|
if(line == "1") {
|
||||||
|
Scenario1();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (line == "2") {
|
||||||
|
Scenario2();
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.ReadLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Scenario1 () {
|
||||||
|
|
||||||
Task.Factory.StartNew(async () => {
|
Task.Factory.StartNew(async () => {
|
||||||
|
|
||||||
//attaching the logger
|
//attaching the logger
|
||||||
@@ -38,9 +57,16 @@ namespace Examples {
|
|||||||
//set plc to run mode if not already
|
//set plc to run mode if not already
|
||||||
await interf.SetOperationMode(OPMode.Run);
|
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 Task.Delay(2000);
|
||||||
|
|
||||||
Console.WriteLine("Testregister was toggled");
|
await interf.SetRegisterAsync(nameof(registers.TestInt32), 100);
|
||||||
|
|
||||||
//adds 10 each time the plc connects to the PLCs INT regíster
|
//adds 10 each time the plc connects to the PLCs INT regíster
|
||||||
interf.SetRegister(nameof(registers.TestInt16), (short)(registers.TestInt16 + 10));
|
interf.SetRegister(nameof(registers.TestInt16), (short)(registers.TestInt16 + 10));
|
||||||
@@ -60,7 +86,52 @@ namespace Examples {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Console.ReadLine();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,16 +10,19 @@ namespace Examples {
|
|||||||
[Register(1000, RegisterType.R)]
|
[Register(1000, RegisterType.R)]
|
||||||
public bool TestBool1 { get; private set; }
|
public bool TestBool1 { get; private set; }
|
||||||
|
|
||||||
|
[Register(1000)]
|
||||||
|
public int TestDuplicate { get; private set; }
|
||||||
|
|
||||||
//corresponds to a XD input of the PLC
|
//corresponds to a XD input of the PLC
|
||||||
[Register(RegisterType.X, SpecialAddress.D)]
|
[Register(RegisterType.X, SpecialAddress.D)]
|
||||||
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
|
||||||
@@ -65,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; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -15,7 +15,6 @@ namespace MewtocolNet {
|
|||||||
public partial class MewtocolInterface {
|
public partial class MewtocolInterface {
|
||||||
|
|
||||||
internal event Action PolledCycle;
|
internal event Action PolledCycle;
|
||||||
internal CancellationTokenSource cTokenAutoUpdater;
|
|
||||||
internal bool ContinousReaderRunning;
|
internal bool ContinousReaderRunning;
|
||||||
internal bool usePoller = false;
|
internal bool usePoller = false;
|
||||||
|
|
||||||
@@ -24,7 +23,6 @@ namespace MewtocolNet {
|
|||||||
internal void KillPoller () {
|
internal void KillPoller () {
|
||||||
|
|
||||||
ContinousReaderRunning = false;
|
ContinousReaderRunning = false;
|
||||||
cTokenAutoUpdater?.Cancel();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,63 +31,32 @@ namespace MewtocolNet {
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal void AttachPoller () {
|
internal void AttachPoller () {
|
||||||
|
|
||||||
if (ContinousReaderRunning) return;
|
if (ContinousReaderRunning)
|
||||||
|
return;
|
||||||
cTokenAutoUpdater = new CancellationTokenSource();
|
|
||||||
|
|
||||||
Logger.Log("Poller is attaching", LogLevel.Info, this);
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
Task.Factory.StartNew(async () => {
|
Task.Factory.StartNew(async () => {
|
||||||
|
|
||||||
var plcinf = await GetPLCInfoAsync();
|
Logger.Log("Poller is attaching", LogLevel.Info, this);
|
||||||
if (plcinf == null) {
|
|
||||||
Logger.Log("PLC not reachable, stopping logger", LogLevel.Info, this);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
PolledCycle += MewtocolInterface_PolledCycle;
|
|
||||||
void MewtocolInterface_PolledCycle () {
|
|
||||||
|
|
||||||
StringBuilder stringBuilder = new StringBuilder();
|
|
||||||
foreach (var reg in GetAllRegisters()) {
|
|
||||||
string address = $"{reg.GetRegisterString()}{reg.GetStartingMemoryArea()}".PadRight(8, (char)32);
|
|
||||||
stringBuilder.AppendLine($"{address}{(reg.Name != null ? $" ({reg.Name})" : "")}: {reg.GetValueString()}");
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger.Log($"Registers loaded are: \n" +
|
|
||||||
$"--------------------\n" +
|
|
||||||
$"{stringBuilder.ToString()}" +
|
|
||||||
$"--------------------",
|
|
||||||
LogLevel.Verbose, this);
|
|
||||||
|
|
||||||
Logger.Log("Logger did its first cycle successfully", LogLevel.Info, this);
|
|
||||||
|
|
||||||
PolledCycle -= MewtocolInterface_PolledCycle;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
int it = 0;
|
||||||
ContinousReaderRunning = true;
|
ContinousReaderRunning = true;
|
||||||
|
|
||||||
int getPLCinfoCycleCount = 0;
|
|
||||||
|
|
||||||
while (ContinousReaderRunning) {
|
while (ContinousReaderRunning) {
|
||||||
|
|
||||||
//do priority tasks first
|
if (it >= Registers.Count + 1) {
|
||||||
if (PriorityTasks.Count > 0) {
|
it = 0;
|
||||||
|
//invoke cycle polled event
|
||||||
await PriorityTasks.FirstOrDefault(x => !x.IsCompleted);
|
InvokePolledCycleDone();
|
||||||
|
continue;
|
||||||
} else if (getPLCinfoCycleCount > 25) {
|
|
||||||
|
|
||||||
await GetPLCInfoAsync();
|
|
||||||
getPLCinfoCycleCount = 0;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var registerPair in Registers) {
|
if (it >= Registers.Count) {
|
||||||
|
await GetPLCInfoAsync();
|
||||||
|
it++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
var reg = registerPair.Value;
|
var reg = Registers[it];
|
||||||
|
|
||||||
if (reg is NRegister<short> shortReg) {
|
if (reg is NRegister<short> shortReg) {
|
||||||
var lastVal = shortReg.Value;
|
var lastVal = shortReg.Value;
|
||||||
@@ -146,21 +113,13 @@ namespace MewtocolNet {
|
|||||||
if (lastVal != readout) {
|
if (lastVal != readout) {
|
||||||
InvokeRegisterChanged(stringReg);
|
InvokeRegisterChanged(stringReg);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it++;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
});
|
||||||
|
|
||||||
getPLCinfoCycleCount++;
|
|
||||||
|
|
||||||
//invoke cycle polled event
|
|
||||||
InvokePolledCycleDone();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}, cTokenAutoUpdater.Token);
|
|
||||||
|
|
||||||
} catch (TaskCanceledException) { }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,7 +167,7 @@ namespace MewtocolNet {
|
|||||||
toAdd = new BRegister(_address, _type, _name);
|
toAdd = new BRegister(_address, _type, _name);
|
||||||
}
|
}
|
||||||
|
|
||||||
Registers.Add(_address, toAdd);
|
Registers.Add(toAdd);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,7 +197,7 @@ namespace MewtocolNet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
toAdd.collectionType = _colType;
|
toAdd.collectionType = _colType;
|
||||||
Registers.Add(_address, toAdd);
|
Registers.Add(toAdd);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,7 +218,7 @@ namespace MewtocolNet {
|
|||||||
public void AddRegister (SpecialAddress _spAddress, RegisterType _type, string _name = null) {
|
public void AddRegister (SpecialAddress _spAddress, RegisterType _type, string _name = null) {
|
||||||
|
|
||||||
//as bool registers
|
//as bool registers
|
||||||
Registers.Add((int)_spAddress, new BRegister(_spAddress, _type, _name));
|
Registers.Add(new BRegister(_spAddress, _type, _name));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,7 +229,7 @@ namespace MewtocolNet {
|
|||||||
reg.collectionType = _colType;
|
reg.collectionType = _colType;
|
||||||
|
|
||||||
//as bool registers
|
//as bool registers
|
||||||
Registers.Add((int)_spAddress, reg);
|
Registers.Add(reg);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -299,32 +258,35 @@ namespace MewtocolNet {
|
|||||||
throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
|
throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Registers.Any(x => x.Key == _address)) {
|
Register toAdd;
|
||||||
throw new NotSupportedException($"Cannot add a register multiple times, " +
|
|
||||||
$"make sure that all register attributes or AddRegister assignments have different adresses.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (regType == typeof(short)) {
|
if (regType == typeof(short)) {
|
||||||
Registers.Add(_address, new NRegister<short>(_address, _name));
|
toAdd = new NRegister<short>(_address, _name);
|
||||||
} else if (regType == typeof(ushort)) {
|
} else if (regType == typeof(ushort)) {
|
||||||
Registers.Add(_address, new NRegister<ushort>(_address, _name));
|
toAdd = new NRegister<ushort>(_address, _name);
|
||||||
} else if (regType == typeof(int)) {
|
} else if (regType == typeof(int)) {
|
||||||
Registers.Add(_address, new NRegister<int>(_address, _name));
|
toAdd = new NRegister<int>(_address, _name);
|
||||||
} else if (regType == typeof(uint)) {
|
} else if (regType == typeof(uint)) {
|
||||||
Registers.Add(_address, new NRegister<uint>(_address, _name));
|
toAdd = new NRegister<uint>(_address, _name);
|
||||||
} else if (regType == typeof(float)) {
|
} else if (regType == typeof(float)) {
|
||||||
Registers.Add(_address, new NRegister<float>(_address, _name));
|
toAdd = new NRegister<float>(_address, _name);
|
||||||
} else if (regType == typeof(string)) {
|
} else if (regType == typeof(string)) {
|
||||||
Registers.Add(_address, new SRegister(_address, _length, _name));
|
toAdd = new SRegister(_address, _length, _name);
|
||||||
} else if (regType == typeof(TimeSpan)) {
|
} else if (regType == typeof(TimeSpan)) {
|
||||||
Registers.Add(_address, new NRegister<TimeSpan>(_address, _name));
|
toAdd = new NRegister<TimeSpan>(_address, _name);
|
||||||
} else if (regType == typeof(bool)) {
|
} else if (regType == typeof(bool)) {
|
||||||
Registers.Add(_address, new BRegister(_address, RegisterType.R, _name));
|
toAdd = new BRegister(_address, RegisterType.R, _name);
|
||||||
} else {
|
} else {
|
||||||
throw new NotSupportedException($"The type {regType} is not allowed for Registers \n" +
|
throw new NotSupportedException($"The type {regType} is not allowed for Registers \n" +
|
||||||
$"Allowed are: short, ushort, int, uint, float and string");
|
$"Allowed are: short, ushort, int, uint, float and string");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (Registers.Any(x => x.GetRegisterPLCName() == toAdd.GetRegisterPLCName())) {
|
||||||
|
throw new NotSupportedException($"Cannot add a register multiple times, " +
|
||||||
|
$"make sure that all register attributes or AddRegister assignments have different adresses.");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void AddRegister<T> (Type _colType, int _address, int _length = 1, string _name = null, bool _isBitwise = false, Type _enumType = null) {
|
internal void AddRegister<T> (Type _colType, int _address, int _length = 1, string _name = null, bool _isBitwise = false, Type _enumType = null) {
|
||||||
@@ -335,12 +297,7 @@ namespace MewtocolNet {
|
|||||||
throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
|
throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Registers.Any(x => x.Key == _address) && !_isBitwise) {
|
if (Registers.Any(x => x.MemoryAdress == _address) && _isBitwise) {
|
||||||
throw new NotSupportedException($"Cannot add a register multiple times, " +
|
|
||||||
$"make sure that all register attributes or AddRegister assignments have different adresses.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Registers.Any(x => x.Key == _address) && _isBitwise) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -364,15 +321,19 @@ namespace MewtocolNet {
|
|||||||
reg = new BRegister(_address, RegisterType.R, _name);
|
reg = new BRegister(_address, RegisterType.R, _name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (reg == null) {
|
if (reg == null) {
|
||||||
throw new NotSupportedException($"The type {regType} is not allowed for Registers \n" +
|
throw new NotSupportedException($"The type {regType} is not allowed for Registers \n" +
|
||||||
$"Allowed are: short, ushort, int, uint, float and string");
|
$"Allowed are: short, ushort, int, uint, float and string");
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
reg.collectionType = _colType;
|
|
||||||
|
|
||||||
Registers.Add(_address, reg);
|
if (Registers.Any(x => x.GetRegisterPLCName() == reg.GetRegisterPLCName()) && !_isBitwise) {
|
||||||
|
throw new NotSupportedException($"Cannot add a register multiple times, " +
|
||||||
|
$"make sure that all register attributes or AddRegister assignments have different adresses.");
|
||||||
|
}
|
||||||
|
|
||||||
|
reg.collectionType = _colType;
|
||||||
|
Registers.Add(reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -387,7 +348,7 @@ namespace MewtocolNet {
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public Register GetRegister (string name) {
|
public Register GetRegister (string name) {
|
||||||
|
|
||||||
return Registers.FirstOrDefault(x => x.Value.Name == name).Value;
|
return Registers.FirstOrDefault(x => x.Name == name);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -398,8 +359,8 @@ namespace MewtocolNet {
|
|||||||
/// <returns>A casted register or the <code>default</code> value</returns>
|
/// <returns>A casted register or the <code>default</code> value</returns>
|
||||||
public T GetRegister<T> (string name) where T : Register {
|
public T GetRegister<T> (string name) where T : Register {
|
||||||
try {
|
try {
|
||||||
var reg = Registers.FirstOrDefault(x => x.Value.Name == name);
|
var reg = Registers.FirstOrDefault(x => x.Name == name);
|
||||||
return reg.Value as T;
|
return reg as T;
|
||||||
} catch (InvalidCastException) {
|
} catch (InvalidCastException) {
|
||||||
return default(T);
|
return default(T);
|
||||||
}
|
}
|
||||||
@@ -414,7 +375,7 @@ namespace MewtocolNet {
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public List<Register> GetAllRegisters () {
|
public List<Register> GetAllRegisters () {
|
||||||
|
|
||||||
return Registers.Values.ToList();
|
return Registers;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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))
|
||||||
|
|||||||
@@ -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,20 @@ 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; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <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 +69,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
|
||||||
@@ -67,11 +94,12 @@ namespace MewtocolNet {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The registered data registers of the PLC
|
/// The registered data registers of the PLC
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Dictionary<int, Register> Registers { get; set; } = new Dictionary<int, Register>();
|
public List<Register> Registers { get; set; } = new List<Register>();
|
||||||
|
|
||||||
private string ip;
|
private string ip;
|
||||||
private int port;
|
private int port;
|
||||||
private int stationNumber;
|
private int stationNumber;
|
||||||
|
private int cycleTimeMs = 25;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The current IP of the PLC connection
|
/// The current IP of the PLC connection
|
||||||
@@ -86,7 +114,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,8 +125,12 @@ namespace MewtocolNet {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal NetworkStream stream;
|
||||||
internal List<Task> PriorityTasks { get; set; } = new List<Task>();
|
internal TcpClient client;
|
||||||
|
internal readonly SerialQueue queue = new SerialQueue();
|
||||||
|
private int RecBufferSize = 128;
|
||||||
|
internal int SendExceptionsInRow = 0;
|
||||||
|
internal bool ImportantTaskRunning = false;
|
||||||
|
|
||||||
#region Initialization
|
#region Initialization
|
||||||
|
|
||||||
@@ -129,7 +160,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}) " : "")}" +
|
||||||
@@ -193,6 +223,35 @@ namespace MewtocolNet {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 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>
|
||||||
|
public void Disconnect () {
|
||||||
|
|
||||||
|
if (!IsConnected)
|
||||||
|
return;
|
||||||
|
|
||||||
|
OnMajorSocketExceptionWhileConnected();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Attaches a poller to the interface that continously
|
/// Attaches a poller to the interface that continously
|
||||||
/// polls the registered data registers and writes the values to them
|
/// polls the registered data registers and writes the values to them
|
||||||
@@ -207,6 +266,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>
|
||||||
@@ -319,8 +459,11 @@ namespace MewtocolNet {
|
|||||||
|
|
||||||
var bytes = BitConverter.GetBytes(reg16.Value);
|
var bytes = BitConverter.GetBytes(reg16.Value);
|
||||||
BitArray bitAr = new BitArray(bytes);
|
BitArray bitAr = new BitArray(bytes);
|
||||||
|
|
||||||
|
if (bitIndex < bitAr.Length && bitIndex >= 0) {
|
||||||
prop.SetValue(collection, bitAr[bitIndex]);
|
prop.SetValue(collection, bitAr[bitIndex]);
|
||||||
collection.TriggerPropertyChanged(prop.Name);
|
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;
|
||||||
@@ -384,6 +527,10 @@ namespace MewtocolNet {
|
|||||||
foundToUpdate.SetValue(collection, ((NRegister<int>)reg).Value);
|
foundToUpdate.SetValue(collection, ((NRegister<int>)reg).Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (foundToUpdate.PropertyType == typeof(TimeSpan)) {
|
||||||
|
foundToUpdate.SetValue(collection, ((NRegister<TimeSpan>)reg).Value);
|
||||||
|
}
|
||||||
|
|
||||||
//setting back strings
|
//setting back strings
|
||||||
|
|
||||||
if (foundToUpdate.PropertyType == typeof(string)) {
|
if (foundToUpdate.PropertyType == typeof(string)) {
|
||||||
@@ -526,7 +673,6 @@ namespace MewtocolNet {
|
|||||||
/// Calculates checksum and sends a command to the PLC then awaits results
|
/// Calculates checksum and sends a command to the PLC then awaits results
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="_msg">MEWTOCOL Formatted request string ex: %01#RT</param>
|
/// <param name="_msg">MEWTOCOL Formatted request string ex: %01#RT</param>
|
||||||
/// <param name="_close">Auto close of frame [true]%01#RT01\r [false]%01#RT</param>
|
|
||||||
/// <returns>Returns the result</returns>
|
/// <returns>Returns the result</returns>
|
||||||
public async Task<CommandResult> SendCommandAsync (string _msg) {
|
public async Task<CommandResult> SendCommandAsync (string _msg) {
|
||||||
|
|
||||||
@@ -534,27 +680,9 @@ namespace MewtocolNet {
|
|||||||
_msg += "\r";
|
_msg += "\r";
|
||||||
|
|
||||||
//send request
|
//send request
|
||||||
|
try {
|
||||||
|
|
||||||
string response = null;
|
var response = await queue.Enqueue(() => SendSingleBlock(_msg));
|
||||||
|
|
||||||
if (ContinousReaderRunning) {
|
|
||||||
|
|
||||||
//if the poller is active then add all messages to a qeueue
|
|
||||||
|
|
||||||
var awaittask = SendSingleBlock(_msg);
|
|
||||||
PriorityTasks.Add(awaittask);
|
|
||||||
awaittask.Wait();
|
|
||||||
|
|
||||||
PriorityTasks.Remove(awaittask);
|
|
||||||
response = awaittask.Result;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
//poller not active let the user manage message timing
|
|
||||||
|
|
||||||
response = await SendSingleBlock(_msg);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response == null) {
|
if (response == null) {
|
||||||
return new CommandResult {
|
return new CommandResult {
|
||||||
@@ -572,7 +700,7 @@ namespace MewtocolNet {
|
|||||||
string eDes = Links.LinkedData.ErrorCodes[Convert.ToInt32(eCode)];
|
string eDes = Links.LinkedData.ErrorCodes[Convert.ToInt32(eCode)];
|
||||||
Console.ForegroundColor = ConsoleColor.Red;
|
Console.ForegroundColor = ConsoleColor.Red;
|
||||||
Console.WriteLine($"Response is: {response}");
|
Console.WriteLine($"Response is: {response}");
|
||||||
Console.WriteLine($"Error on command {_msg.Replace("\r", "")} the PLC returned error code: {eCode}, {eDes}");
|
Logger.Log($"Error on command {_msg.Replace("\r", "")} the PLC returned error code: {eCode}, {eDes}", LogLevel.Error);
|
||||||
Console.ResetColor();
|
Console.ResetColor();
|
||||||
return new CommandResult {
|
return new CommandResult {
|
||||||
Success = false,
|
Success = false,
|
||||||
@@ -587,64 +715,94 @@ namespace MewtocolNet {
|
|||||||
Response = response.ToString()
|
Response = response.ToString()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} catch {
|
||||||
|
return new CommandResult {
|
||||||
|
Success = false,
|
||||||
|
Error = "0000",
|
||||||
|
ErrorDescription = "null result"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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 {
|
|
||||||
|
|
||||||
await client.ConnectAsync(ip, port);
|
|
||||||
|
|
||||||
using (NetworkStream stream = client.GetStream()) {
|
|
||||||
var message = _blockString.ToHexASCIIBytes();
|
var message = _blockString.ToHexASCIIBytes();
|
||||||
var messageAscii = BitConverter.ToString(message).Replace("-", " ");
|
|
||||||
//send request
|
//send request
|
||||||
using (var sendStream = new MemoryStream(message)) {
|
using (var sendStream = new MemoryStream(message)) {
|
||||||
await sendStream.CopyToAsync(stream);
|
await sendStream.CopyToAsync(stream);
|
||||||
Logger.Log($"OUT MSG: {_blockString}", LogLevel.Critical, this);
|
Logger.Log($"[--------------------------------]", LogLevel.Critical, this);
|
||||||
//log message sent
|
Logger.Log($"--> OUT MSG: {_blockString}", LogLevel.Critical, this);
|
||||||
ASCIIEncoding enc = new ASCIIEncoding();
|
|
||||||
string characters = enc.GetString(message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//await result
|
//await result
|
||||||
StringBuilder response = new StringBuilder();
|
StringBuilder response = new StringBuilder();
|
||||||
byte[] responseBuffer = new byte[256];
|
try {
|
||||||
|
|
||||||
|
byte[] responseBuffer = new byte[128 * 16];
|
||||||
|
|
||||||
|
bool endLineCode = false;
|
||||||
|
bool startMsgCode = false;
|
||||||
|
|
||||||
|
while (!endLineCode && !startMsgCode) {
|
||||||
|
|
||||||
do {
|
do {
|
||||||
int bytes = stream.Read(responseBuffer, 0, responseBuffer.Length);
|
int bytes = await stream.ReadAsync(responseBuffer, 0, responseBuffer.Length);
|
||||||
|
|
||||||
|
endLineCode = responseBuffer.Any(x => x == 0x0D);
|
||||||
|
startMsgCode = responseBuffer.Count(x => x == 0x25) > 1;
|
||||||
|
|
||||||
|
if (!endLineCode && !startMsgCode) break;
|
||||||
|
|
||||||
response.Append(Encoding.UTF8.GetString(responseBuffer, 0, bytes));
|
response.Append(Encoding.UTF8.GetString(responseBuffer, 0, bytes));
|
||||||
}
|
}
|
||||||
while (stream.DataAvailable);
|
while (stream.DataAvailable);
|
||||||
sw.Stop();
|
|
||||||
var curCycle = (int)sw.ElapsedMilliseconds;
|
|
||||||
if (Math.Abs(CycleTimeMs - curCycle) > 2) {
|
|
||||||
CycleTimeMs = curCycle;
|
|
||||||
}
|
|
||||||
Logger.Log($"IN MSG ({(int)sw.Elapsed.TotalMilliseconds}ms): {_blockString}", LogLevel.Critical, this);
|
|
||||||
return response.ToString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception) {
|
} catch (IOException) {
|
||||||
|
OnMajorSocketExceptionWhileConnected();
|
||||||
if (IsConnected) {
|
|
||||||
CycleTimeMs = 0;
|
|
||||||
IsConnected = false;
|
|
||||||
Disconnected?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
KillPoller();
|
|
||||||
Logger.Log("The PLC connection was closed", LogLevel.Error, this);
|
|
||||||
return null;
|
return null;
|
||||||
|
} catch (SocketException) {
|
||||||
|
OnMajorSocketExceptionWhileConnected();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!string.IsNullOrEmpty(response.ToString())) {
|
||||||
|
Logger.Log($"<-- IN MSG: {response}", LogLevel.Critical, this);
|
||||||
|
return response.ToString();
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
#endregion
|
||||||
|
|
||||||
|
#region Disposing
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Disposes the current interface and clears all its members
|
||||||
|
/// </summary>
|
||||||
|
public void Dispose () {
|
||||||
|
|
||||||
|
if (Disposed) return;
|
||||||
|
|
||||||
|
Disconnect();
|
||||||
|
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
|
||||||
|
Disposed = true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -663,4 +821,5 @@ namespace MewtocolNet {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -115,26 +115,40 @@ namespace MewtocolNet {
|
|||||||
/// <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) {
|
||||||
|
|
||||||
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');
|
|
||||||
|
//read blocks of max 4 words per msg
|
||||||
|
for (int i = 0; i < wordLength; i+=8) {
|
||||||
|
|
||||||
|
int curWordStart = start + i;
|
||||||
|
int curWordEnd = curWordStart + 7;
|
||||||
|
|
||||||
|
string startStr = curWordStart.ToString().PadLeft(5, '0');
|
||||||
|
string endStr = (curWordEnd).ToString().PadLeft(5, '0');
|
||||||
|
|
||||||
string requeststring = $"%{GetStationNumber()}#RDD{startStr}{endStr}";
|
string requeststring = $"%{GetStationNumber()}#RDD{startStr}{endStr}";
|
||||||
var result = await SendCommandAsync(requeststring);
|
var result = await SendCommandAsync(requeststring);
|
||||||
|
|
||||||
if(result.Success && !string.IsNullOrEmpty(result.Response)) {
|
if (result.Success && !string.IsNullOrEmpty(result.Response)) {
|
||||||
|
|
||||||
var bytes = result.Response.ParseDTByteString(wordLength * 4).HexStringToByteArray();
|
var bytes = result.Response.ParseDTByteString(8 * 4).HexStringToByteArray();
|
||||||
|
|
||||||
return bytes.BigToMixedEndian().Take(count).ToArray();
|
if (bytes == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
byteList.AddRange(bytes.BigToMixedEndian().Take(count).ToArray());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
}
|
||||||
|
|
||||||
|
return byteList.ToArray();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,6 +190,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 +211,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 +219,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 +271,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 +295,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) {
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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) { }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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}";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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}";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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}";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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}";
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.0</TargetFramework>
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
<PackageId>MewtocolNet</PackageId>
|
<PackageId>MewtocolNet</PackageId>
|
||||||
<Version>0.4.0</Version>
|
<Version>0.5.2</Version>
|
||||||
<Authors>Felix Weiss</Authors>
|
<Authors>Felix Weiss</Authors>
|
||||||
<Company>Womed</Company>
|
<Company>Womed</Company>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
|
|||||||
71
MewtocolNet/Queue/SerialQueue.cs
Normal file
71
MewtocolNet/Queue/SerialQueue.cs
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
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 Enqueue (Action action) {
|
||||||
|
return Enqueue<bool>(() => {
|
||||||
|
action();
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
internal Task<T> Enqueue<T> (Func<T> function) {
|
||||||
|
lock (_locker) {
|
||||||
|
Task lastTask;
|
||||||
|
Task<T> resultTask;
|
||||||
|
|
||||||
|
if (_lastTask.TryGetTarget(out lastTask)) {
|
||||||
|
resultTask = lastTask.ContinueWith(_ => function(), TaskContinuationOptions.ExecuteSynchronously);
|
||||||
|
} else {
|
||||||
|
resultTask = Task.Run(function);
|
||||||
|
}
|
||||||
|
|
||||||
|
_lastTask.SetTarget(resultTask);
|
||||||
|
|
||||||
|
return resultTask;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal Task Enqueue (Func<Task> asyncAction) {
|
||||||
|
lock (_locker) {
|
||||||
|
Task lastTask;
|
||||||
|
Task resultTask;
|
||||||
|
|
||||||
|
if (_lastTask.TryGetTarget(out lastTask)) {
|
||||||
|
resultTask = lastTask.ContinueWith(_ => asyncAction(), TaskContinuationOptions.ExecuteSynchronously).Unwrap();
|
||||||
|
} else {
|
||||||
|
resultTask = Task.Run(asyncAction);
|
||||||
|
}
|
||||||
|
|
||||||
|
_lastTask.SetTarget(resultTask);
|
||||||
|
|
||||||
|
return resultTask;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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.3.0" />
|
<PackageReference Include="MewtocolNet" Version="0.5.0" />
|
||||||
```
|
```
|
||||||
in your dependencies.
|
in your dependencies.
|
||||||
Alternatively use the dotnet CLI and run
|
Alternatively use the dotnet CLI and run
|
||||||
|
|||||||
Reference in New Issue
Block a user