mirror of
https://github.com/OpenLogics/MewtocolNet.git
synced 2025-12-06 11:11:23 +00:00
Compare commits
38 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45a9fa0520 | ||
|
|
772f8b89a4 | ||
|
|
6c7c368b55 | ||
|
|
38f0f9f523 | ||
|
|
c2aecb387a | ||
|
|
0e1f5cd12b | ||
|
|
f15d565029 | ||
|
|
0ac0198223 | ||
|
|
3c450eea97 | ||
|
|
fe2d2b9fb9 | ||
|
|
6c411d7318 | ||
|
|
cdae9a60fb | ||
|
|
b1c2cdb70e | ||
|
|
95bfcf94de | ||
|
|
0a93df287d | ||
|
|
18384ff964 | ||
|
|
e4ddad685a | ||
|
|
e953938a65 | ||
|
|
83f17a4eae | ||
|
|
4c719843f2 | ||
|
|
8f9e66d5d3 | ||
|
|
5cc222abcc | ||
|
|
14659ffaad | ||
|
|
ea106416ee | ||
|
|
0afa146712 | ||
|
|
325aa56d8a | ||
|
|
f4fad297fb | ||
|
|
664b32b92e | ||
|
|
a639a8eda8 | ||
|
|
23c2b0efb4 | ||
|
|
eed19f84d7 | ||
|
|
da90a45e15 | ||
|
|
614426207c | ||
|
|
3aa8aa227c | ||
|
|
26c0e9add0 | ||
|
|
4a63fb10bd | ||
|
|
881253130b | ||
|
|
3a5cdb11c2 |
23
.github/workflows/dotnet-windows.yml
vendored
Normal file
23
.github/workflows/dotnet-windows.yml
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
name: .NET Windows
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "master" ]
|
||||
pull_request:
|
||||
branches: [ "master" ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: windows-latest
|
||||
strategy:
|
||||
matrix:
|
||||
dotnet-version: [ '3.0', '3.1.x', '5.0.x' ]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Setup dotnet ${{ matrix.dotnet-version }}
|
||||
uses: actions/setup-dotnet@v2
|
||||
with:
|
||||
dotnet-version: ${{ matrix.dotnet-version }}
|
||||
# You can test your matrix by printing the current dotnet version
|
||||
- name: Display dotnet version
|
||||
run: dotnet --version
|
||||
@@ -2,63 +2,136 @@
|
||||
using System.Threading.Tasks;
|
||||
using MewtocolNet;
|
||||
using MewtocolNet.Logging;
|
||||
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
|
||||
Logger.LogLevel = LogLevel.Verbose;
|
||||
Logger.OnNewLogMessage((date, msg) => {
|
||||
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
|
||||
});
|
||||
var line = Console.ReadLine();
|
||||
|
||||
//setting up a new PLC interface and register collection
|
||||
MewtocolInterface interf = new MewtocolInterface("10.237.191.3");
|
||||
TestRegisters registers = new TestRegisters();
|
||||
if(line == "1") {
|
||||
Scenario1();
|
||||
}
|
||||
|
||||
//attaching the register collection and an automatic poller
|
||||
interf.WithRegisterCollection(registers).WithPoller();
|
||||
if (line == "2") {
|
||||
Scenario2();
|
||||
}
|
||||
|
||||
await interf.ConnectAsync(
|
||||
(plcinf) => {
|
||||
Console.ReadLine();
|
||||
}
|
||||
|
||||
//reading a value from the register collection
|
||||
Console.WriteLine($"BitValue is: {registers.BitValue}");
|
||||
static void Scenario1 () {
|
||||
|
||||
//writing a value to the registers
|
||||
Task.Factory.StartNew(async () => {
|
||||
|
||||
await Task.Delay(2000);
|
||||
|
||||
//inverts the boolean register
|
||||
await interf.SetRegisterAsync(nameof(registers.TestBool1), !registers.TestBool1);
|
||||
|
||||
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));
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
);
|
||||
Task.Factory.StartNew(async () => {
|
||||
|
||||
//attaching the logger
|
||||
Logger.LogLevel = LogLevel.Verbose;
|
||||
Logger.OnNewLogMessage((date, msg) => {
|
||||
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
|
||||
});
|
||||
|
||||
Console.ReadLine();
|
||||
}
|
||||
//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();
|
||||
|
||||
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);
|
||||
|
||||
|
||||
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));
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,19 +7,22 @@ namespace Examples {
|
||||
public class TestRegisters : RegisterCollectionBase {
|
||||
|
||||
//corresponds to a R100 boolean register in the PLC
|
||||
[Register(100, RegisterType.R)]
|
||||
[Register(1000, RegisterType.R)]
|
||||
public bool TestBool1 { get; private set; }
|
||||
|
||||
[Register(1000)]
|
||||
public int TestDuplicate { get; private set; }
|
||||
|
||||
//corresponds to a XD input of the PLC
|
||||
[Register(RegisterType.X, SpecialAddress.D)]
|
||||
public bool TestBoolInputXD { get; private set; }
|
||||
|
||||
//corresponds to a DT1101 - DT1104 string register in the PLC with (STRING[4])
|
||||
[Register(1101, 4)]
|
||||
public string TestString1 { get; private set; }
|
||||
//[Register(1101, 4)]
|
||||
//public string TestString1 { get; private set; }
|
||||
|
||||
//corresponds to a DT7000 16 bit int register in the PLC
|
||||
[Register(7000)]
|
||||
[Register(899)]
|
||||
public short TestInt16 { get; private set; }
|
||||
|
||||
//corresponds to a DTD7001 - DTD7002 32 bit int register in the PLC
|
||||
@@ -42,11 +45,31 @@ namespace Examples {
|
||||
[Register(1204, 9, BitCount.B16)]
|
||||
public bool BitValue { get; private set; }
|
||||
|
||||
[Register(1204, 5, BitCount.B16)]
|
||||
public bool FillTest { get; private set; }
|
||||
|
||||
//corresponds to a DT7012 - DT7013 as a 32bit time value that gets parsed as a timespan (TIME)
|
||||
//the smallest value to communicate to the PLC is 10ms
|
||||
[Register(7012)]
|
||||
public TimeSpan TestTime { get; private set; }
|
||||
|
||||
public enum CurrentState {
|
||||
Undefined = 0,
|
||||
State1 = 1,
|
||||
State2 = 2,
|
||||
//State3 = 3,
|
||||
State4 = 4,
|
||||
State5 = 5,
|
||||
StateBetween = 100,
|
||||
State6 = 6,
|
||||
State7 = 7,
|
||||
}
|
||||
|
||||
[Register(50)]
|
||||
public CurrentState TestEnum { get; private set; }
|
||||
|
||||
[Register(100)]
|
||||
public TimeSpan TsTest2 { get; private set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,56 +1,28 @@
|
||||
using System;
|
||||
|
||||
namespace MewtocolNet.Registers {
|
||||
public class CpuInfo {
|
||||
|
||||
/// <summary>
|
||||
/// Contains information about the plc and its cpu
|
||||
/// </summary>
|
||||
public partial class CpuInfo {
|
||||
|
||||
/// <summary>
|
||||
/// CPU type of the PLC
|
||||
/// The cpu type of the plc
|
||||
/// </summary>
|
||||
public enum CpuType {
|
||||
/// <summary>
|
||||
/// FP 0 / FP 2.7K
|
||||
/// </summary>
|
||||
FP0_FP1_2_7K,
|
||||
/// <summary>
|
||||
/// FP0 / FP1, 5K / 10K
|
||||
/// </summary>
|
||||
FP0_FP1_5K_10K,
|
||||
/// <summary>
|
||||
/// FP1 M 0.9K
|
||||
/// </summary>
|
||||
FP1_M_0_9K,
|
||||
/// <summary>
|
||||
/// FP2 16k / 32k
|
||||
/// </summary>
|
||||
FP2_16K_32K,
|
||||
/// <summary>
|
||||
/// FP3 C 10K
|
||||
/// </summary>
|
||||
FP3_C_10K,
|
||||
/// <summary>
|
||||
/// FP3 C 16K
|
||||
/// </summary>
|
||||
FP3_C_16K,
|
||||
/// <summary>
|
||||
/// FP5 16K
|
||||
/// </summary>
|
||||
FP5_16K,
|
||||
/// <summary>
|
||||
/// FP 5 24K
|
||||
/// </summary>
|
||||
FP5_24K,
|
||||
/// <summary>
|
||||
/// Includes panasonic FPX, FPX-H, Sigma
|
||||
/// </summary>
|
||||
FP_Sigma_X_H_30K_60K_120K
|
||||
|
||||
}
|
||||
|
||||
public CpuType Cputype { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Program capacity in 1K steps
|
||||
/// </summary>
|
||||
public int ProgramCapacity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Version of the cpu
|
||||
/// </summary>
|
||||
public string CpuVersion { get; set; }
|
||||
|
||||
|
||||
public static CpuInfo BuildFromHexString (string _cpuType, string _cpuVersion, string _progCapacity) {
|
||||
internal static CpuInfo BuildFromHexString (string _cpuType, string _cpuVersion, string _progCapacity) {
|
||||
|
||||
CpuInfo retInf = new CpuInfo();
|
||||
|
||||
@@ -89,8 +61,7 @@ namespace MewtocolNet.Registers {
|
||||
return retInf;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -15,7 +15,6 @@ namespace MewtocolNet {
|
||||
public partial class MewtocolInterface {
|
||||
|
||||
internal event Action PolledCycle;
|
||||
internal CancellationTokenSource cTokenAutoUpdater;
|
||||
internal bool ContinousReaderRunning;
|
||||
internal bool usePoller = false;
|
||||
|
||||
@@ -24,7 +23,6 @@ namespace MewtocolNet {
|
||||
internal void KillPoller () {
|
||||
|
||||
ContinousReaderRunning = false;
|
||||
cTokenAutoUpdater.Cancel();
|
||||
|
||||
}
|
||||
|
||||
@@ -33,140 +31,95 @@ namespace MewtocolNet {
|
||||
/// </summary>
|
||||
internal void AttachPoller () {
|
||||
|
||||
if (ContinousReaderRunning) return;
|
||||
if (ContinousReaderRunning)
|
||||
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 it = 0;
|
||||
ContinousReaderRunning = true;
|
||||
|
||||
Task.Factory.StartNew(async () => {
|
||||
|
||||
var plcinf = await GetPLCInfoAsync();
|
||||
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;
|
||||
}
|
||||
|
||||
ContinousReaderRunning = true;
|
||||
|
||||
while (ContinousReaderRunning) {
|
||||
|
||||
//do priority tasks first
|
||||
if (PriorityTasks.Count > 0) {
|
||||
|
||||
await PriorityTasks.FirstOrDefault(x => !x.IsCompleted);
|
||||
|
||||
}
|
||||
|
||||
foreach (var registerPair in Registers) {
|
||||
|
||||
var reg = registerPair.Value;
|
||||
|
||||
if (reg is NRegister<short> shortReg) {
|
||||
var lastVal = shortReg.Value;
|
||||
var readout = (await ReadNumRegister(shortReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
shortReg.LastValue = readout;
|
||||
InvokeRegisterChanged(shortReg);
|
||||
shortReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<ushort> ushortReg) {
|
||||
var lastVal = ushortReg.Value;
|
||||
var readout = (await ReadNumRegister(ushortReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
ushortReg.LastValue = readout;
|
||||
InvokeRegisterChanged(ushortReg);
|
||||
ushortReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<int> intReg) {
|
||||
var lastVal = intReg.Value;
|
||||
var readout = (await ReadNumRegister(intReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
intReg.LastValue = readout;
|
||||
InvokeRegisterChanged(intReg);
|
||||
intReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<uint> uintReg) {
|
||||
var lastVal = uintReg.Value;
|
||||
var readout = (await ReadNumRegister(uintReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
uintReg.LastValue = readout;
|
||||
InvokeRegisterChanged(uintReg);
|
||||
uintReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<float> floatReg) {
|
||||
var lastVal = floatReg.Value;
|
||||
var readout = (await ReadNumRegister(floatReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
floatReg.LastValue = readout;
|
||||
InvokeRegisterChanged(floatReg);
|
||||
floatReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<TimeSpan> tsReg) {
|
||||
var lastVal = tsReg.Value;
|
||||
var readout = (await ReadNumRegister(tsReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
tsReg.LastValue = readout;
|
||||
InvokeRegisterChanged(tsReg);
|
||||
tsReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is BRegister boolReg) {
|
||||
var lastVal = boolReg.Value;
|
||||
var readout = (await ReadBoolRegister(boolReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
boolReg.LastValue = readout;
|
||||
InvokeRegisterChanged(boolReg);
|
||||
boolReg.TriggerNotifyChange();
|
||||
}
|
||||
}
|
||||
if (reg is SRegister stringReg) {
|
||||
var lastVal = stringReg.Value;
|
||||
var readout = (await ReadStringRegister(stringReg, stationNumber)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(stringReg);
|
||||
stringReg.TriggerNotifyChange();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
while (ContinousReaderRunning) {
|
||||
|
||||
if (it >= Registers.Count + 1) {
|
||||
it = 0;
|
||||
//invoke cycle polled event
|
||||
InvokePolledCycleDone();
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
}, cTokenAutoUpdater.Token);
|
||||
if (it >= Registers.Count) {
|
||||
await GetPLCInfoAsync();
|
||||
it++;
|
||||
continue;
|
||||
}
|
||||
|
||||
} catch (TaskCanceledException) { }
|
||||
var reg = Registers[it];
|
||||
|
||||
if (reg is NRegister<short> shortReg) {
|
||||
var lastVal = shortReg.Value;
|
||||
var readout = (await ReadNumRegister(shortReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(shortReg);
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<ushort> ushortReg) {
|
||||
var lastVal = ushortReg.Value;
|
||||
var readout = (await ReadNumRegister(ushortReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(ushortReg);
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<int> intReg) {
|
||||
var lastVal = intReg.Value;
|
||||
var readout = (await ReadNumRegister(intReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(intReg);
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<uint> uintReg) {
|
||||
var lastVal = uintReg.Value;
|
||||
var readout = (await ReadNumRegister(uintReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(uintReg);
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<float> floatReg) {
|
||||
var lastVal = floatReg.Value;
|
||||
var readout = (await ReadNumRegister(floatReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(floatReg);
|
||||
}
|
||||
}
|
||||
if (reg is NRegister<TimeSpan> tsReg) {
|
||||
var lastVal = tsReg.Value;
|
||||
var readout = (await ReadNumRegister(tsReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(tsReg);
|
||||
}
|
||||
}
|
||||
if (reg is BRegister boolReg) {
|
||||
var lastVal = boolReg.Value;
|
||||
var readout = (await ReadBoolRegister(boolReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(boolReg);
|
||||
}
|
||||
}
|
||||
if (reg is SRegister stringReg) {
|
||||
var lastVal = stringReg.Value;
|
||||
var readout = (await ReadStringRegister(stringReg)).Register.Value;
|
||||
if (lastVal != readout) {
|
||||
InvokeRegisterChanged(stringReg);
|
||||
}
|
||||
}
|
||||
|
||||
it++;
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@@ -191,30 +144,60 @@ namespace MewtocolNet {
|
||||
/// <param name="_name">A naming definition for QOL, doesn't effect PLC and is optional</param>
|
||||
public void AddRegister (int _address, RegisterType _type, string _name = null) {
|
||||
|
||||
Register toAdd = null;
|
||||
|
||||
//as number registers
|
||||
if (_type == RegisterType.DT_short) {
|
||||
Registers.Add(_address, new NRegister<short>(_address, _name));
|
||||
return;
|
||||
toAdd = new NRegister<short>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DT_ushort) {
|
||||
Registers.Add(_address, new NRegister<ushort>(_address, _name));
|
||||
return;
|
||||
toAdd = new NRegister<ushort>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DDT_int) {
|
||||
Registers.Add(_address, new NRegister<int>(_address, _name));
|
||||
return;
|
||||
toAdd = new NRegister<int>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DDT_uint) {
|
||||
Registers.Add(_address, new NRegister<uint>(_address, _name));
|
||||
return;
|
||||
toAdd = new NRegister<uint>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DDT_float) {
|
||||
Registers.Add(_address, new NRegister<float>(_address, _name));
|
||||
return;
|
||||
toAdd = new NRegister<float>(_address, _name);
|
||||
}
|
||||
|
||||
//as bool registers
|
||||
Registers.Add(_address, new BRegister(_address, _type, _name));
|
||||
if(toAdd == null) {
|
||||
toAdd = new BRegister(_address, _type, _name);
|
||||
}
|
||||
|
||||
Registers.Add(toAdd);
|
||||
|
||||
}
|
||||
|
||||
internal void AddRegister (Type _colType, int _address, RegisterType _type, string _name = null) {
|
||||
|
||||
Register toAdd = null;
|
||||
|
||||
//as number registers
|
||||
if (_type == RegisterType.DT_short) {
|
||||
toAdd = new NRegister<short>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DT_ushort) {
|
||||
toAdd = new NRegister<ushort>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DDT_int) {
|
||||
toAdd = new NRegister<int>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DDT_uint) {
|
||||
toAdd = new NRegister<uint>(_address, _name);
|
||||
}
|
||||
if (_type == RegisterType.DDT_float) {
|
||||
toAdd = new NRegister<float>(_address, _name);
|
||||
}
|
||||
|
||||
if (toAdd == null) {
|
||||
toAdd = new BRegister(_address, _type, _name);
|
||||
}
|
||||
|
||||
toAdd.collectionType = _colType;
|
||||
Registers.Add(toAdd);
|
||||
|
||||
}
|
||||
|
||||
@@ -235,7 +218,18 @@ namespace MewtocolNet {
|
||||
public void AddRegister (SpecialAddress _spAddress, RegisterType _type, string _name = null) {
|
||||
|
||||
//as bool registers
|
||||
Registers.Add((int)_spAddress, new BRegister(_spAddress, _type, _name));
|
||||
Registers.Add(new BRegister(_spAddress, _type, _name));
|
||||
|
||||
}
|
||||
|
||||
internal void AddRegister (Type _colType, SpecialAddress _spAddress, RegisterType _type, string _name = null) {
|
||||
|
||||
var reg = new BRegister(_spAddress, _type, _name);
|
||||
|
||||
reg.collectionType = _colType;
|
||||
|
||||
//as bool registers
|
||||
Registers.Add(reg);
|
||||
|
||||
}
|
||||
|
||||
@@ -256,7 +250,7 @@ namespace MewtocolNet {
|
||||
/// <param name="_name">A naming definition for QOL, doesn't effect PLC and is optional</param>
|
||||
/// <param name="_address">The address of the register in the PLCs memory</param>
|
||||
/// <param name="_length">The length of the string (Can be ignored for other types)</param>
|
||||
public void AddRegister<T>(int _address, int _length = 1, string _name = null, bool _isBitwise = false) {
|
||||
public void AddRegister<T>(int _address, int _length = 1, string _name = null) {
|
||||
|
||||
Type regType = typeof(T);
|
||||
|
||||
@@ -264,34 +258,84 @@ namespace MewtocolNet {
|
||||
throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
|
||||
}
|
||||
|
||||
if (Registers.Any(x => x.Key == _address)) {
|
||||
|
||||
throw new NotSupportedException($"Cannot add a register multiple times, " +
|
||||
$"make sure that all register attributes or AddRegister assignments have different adresses.");
|
||||
|
||||
}
|
||||
Register toAdd;
|
||||
|
||||
if (regType == typeof(short)) {
|
||||
Registers.Add(_address, new NRegister<short>(_address, _name, _isBitwise));
|
||||
toAdd = new NRegister<short>(_address, _name);
|
||||
} else if (regType == typeof(ushort)) {
|
||||
Registers.Add(_address, new NRegister<ushort>(_address, _name));
|
||||
toAdd = new NRegister<ushort>(_address, _name);
|
||||
} else if (regType == typeof(int)) {
|
||||
Registers.Add(_address, new NRegister<int>(_address, _name, _isBitwise));
|
||||
toAdd = new NRegister<int>(_address, _name);
|
||||
} else if (regType == typeof(uint)) {
|
||||
Registers.Add(_address, new NRegister<uint>(_address, _name));
|
||||
toAdd = new NRegister<uint>(_address, _name);
|
||||
} else if (regType == typeof(float)) {
|
||||
Registers.Add(_address, new NRegister<float>(_address, _name));
|
||||
toAdd = new NRegister<float>(_address, _name);
|
||||
} else if (regType == typeof(string)) {
|
||||
Registers.Add(_address, new SRegister(_address, _length, _name));
|
||||
toAdd = new SRegister(_address, _length, _name);
|
||||
} else if (regType == typeof(TimeSpan)) {
|
||||
Registers.Add(_address, new NRegister<TimeSpan>(_address, _name));
|
||||
toAdd = new NRegister<TimeSpan>(_address, _name);
|
||||
} else if (regType == typeof(bool)) {
|
||||
Registers.Add(_address, new BRegister(_address, RegisterType.R, _name));
|
||||
toAdd = new BRegister(_address, RegisterType.R, _name);
|
||||
} else {
|
||||
throw new NotSupportedException($"The type {regType} is not allowed for Registers \n" +
|
||||
$"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) {
|
||||
|
||||
Type regType = typeof(T);
|
||||
|
||||
if (regType != typeof(string) && _length != 1) {
|
||||
throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
|
||||
}
|
||||
|
||||
if (Registers.Any(x => x.MemoryAdress == _address) && _isBitwise) {
|
||||
return;
|
||||
}
|
||||
|
||||
Register reg = null;
|
||||
|
||||
if (regType == typeof(short)) {
|
||||
reg = new NRegister<short>(_address, _name, _isBitwise);
|
||||
} else if (regType == typeof(ushort)) {
|
||||
reg = new NRegister<ushort>(_address, _name);
|
||||
} else if (regType == typeof(int)) {
|
||||
reg = new NRegister<int>(_address, _name, _isBitwise, _enumType);
|
||||
} else if (regType == typeof(uint)) {
|
||||
reg = new NRegister<uint>(_address, _name);
|
||||
} else if (regType == typeof(float)) {
|
||||
reg = new NRegister<float>(_address, _name);
|
||||
} else if (regType == typeof(string)) {
|
||||
reg = new SRegister(_address, _length, _name);
|
||||
} else if (regType == typeof(TimeSpan)) {
|
||||
reg = new NRegister<TimeSpan>(_address, _name);
|
||||
} else if (regType == typeof(bool)) {
|
||||
reg = new BRegister(_address, RegisterType.R, _name);
|
||||
}
|
||||
|
||||
if (reg == null) {
|
||||
throw new NotSupportedException($"The type {regType} is not allowed for Registers \n" +
|
||||
$"Allowed are: short, ushort, int, uint, float and string");
|
||||
} else {
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -304,7 +348,7 @@ namespace MewtocolNet {
|
||||
/// <returns></returns>
|
||||
public Register GetRegister (string name) {
|
||||
|
||||
return Registers.FirstOrDefault(x => x.Value.Name == name).Value;
|
||||
return Registers.FirstOrDefault(x => x.Name == name);
|
||||
|
||||
}
|
||||
|
||||
@@ -315,8 +359,8 @@ namespace MewtocolNet {
|
||||
/// <returns>A casted register or the <code>default</code> value</returns>
|
||||
public T GetRegister<T> (string name) where T : Register {
|
||||
try {
|
||||
var reg = Registers.FirstOrDefault(x => x.Value.Name == name);
|
||||
return reg.Value as T;
|
||||
var reg = Registers.FirstOrDefault(x => x.Name == name);
|
||||
return reg as T;
|
||||
} catch (InvalidCastException) {
|
||||
return default(T);
|
||||
}
|
||||
@@ -331,7 +375,7 @@ namespace MewtocolNet {
|
||||
/// </summary>
|
||||
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);
|
||||
if(res.Success) {
|
||||
string val = res.Groups[2].Value;
|
||||
return val.GetStringFromAsciiHex().Trim();
|
||||
return val.GetStringFromAsciiHex()?.Trim();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -143,7 +143,7 @@ namespace MewtocolNet {
|
||||
|
||||
internal static string GetStringFromAsciiHex (this string input) {
|
||||
if (input.Length % 2 != 0)
|
||||
throw new ArgumentException("input not a hex string");
|
||||
return null;
|
||||
byte[] bytes = new byte[input.Length / 2];
|
||||
for (int i = 0; i < input.Length; i += 2) {
|
||||
String hex = input.Substring(i, 2);
|
||||
@@ -158,20 +158,45 @@ namespace MewtocolNet {
|
||||
}
|
||||
|
||||
internal static byte[] HexStringToByteArray(this string hex) {
|
||||
if (hex == null)
|
||||
return null;
|
||||
return Enumerable.Range(0, hex.Length)
|
||||
.Where(x => x % 2 == 0)
|
||||
.Select(x => Convert.ToByte(hex.Substring(x, 2), 16))
|
||||
.ToArray();
|
||||
.Where(x => x % 2 == 0)
|
||||
.Select(x => Convert.ToByte(hex.Substring(x, 2), 16))
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
internal static string ToHexString (this byte[] arr) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
foreach (var b in arr) {
|
||||
for (int i = 0; i < arr.Length; i++) {
|
||||
byte b = arr[i];
|
||||
sb.Append(b.ToString("X2"));
|
||||
}
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
internal static byte[] BigToMixedEndian (this byte[] arr) {
|
||||
|
||||
List<byte> oldBL = new List<byte>(arr);
|
||||
|
||||
List<byte> tempL = new List<byte>();
|
||||
|
||||
//make the input list even
|
||||
if(arr.Length % 2 != 0)
|
||||
oldBL.Add((byte)0);
|
||||
|
||||
for (int i = 0; i < oldBL.Count; i+=2) {
|
||||
byte firstByte = oldBL[i];
|
||||
byte lastByte = oldBL[i + 1];
|
||||
tempL.Add(lastByte);
|
||||
tempL.Add(firstByte);
|
||||
|
||||
}
|
||||
|
||||
return tempL.ToArray();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,42 +11,95 @@ using MewtocolNet.RegisterAttributes;
|
||||
using MewtocolNet.Logging;
|
||||
using System.Collections;
|
||||
using System.Diagnostics;
|
||||
using System.ComponentModel;
|
||||
using System.Net;
|
||||
using System.Threading;
|
||||
using MewtocolNet.Queue;
|
||||
|
||||
namespace MewtocolNet {
|
||||
|
||||
/// <summary>
|
||||
/// The PLC com interface class
|
||||
/// </summary>
|
||||
public partial class MewtocolInterface {
|
||||
public partial class MewtocolInterface : INotifyPropertyChanged, IDisposable {
|
||||
|
||||
/// <summary>
|
||||
/// Gets triggered when the PLC connection was established
|
||||
/// </summary>
|
||||
public event Action<PLCInfo> Connected;
|
||||
|
||||
/// <summary>
|
||||
/// Gets triggered when the PLC connection was closed or lost
|
||||
/// </summary>
|
||||
public event Action Disconnected;
|
||||
|
||||
/// <summary>
|
||||
/// Gets triggered when a registered data register changes its value
|
||||
/// </summary>
|
||||
public event Action<Register> RegisterChanged;
|
||||
|
||||
/// <summary>
|
||||
/// Gets triggered when a property of the interface changes
|
||||
/// </summary>
|
||||
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;
|
||||
/// <summary>
|
||||
/// The current connection state of the interface
|
||||
/// </summary>
|
||||
public bool IsConnected { get; private set; }
|
||||
public bool IsConnected {
|
||||
get => isConnected;
|
||||
private set {
|
||||
isConnected = value;
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsConnected)));
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
/// <summary>
|
||||
/// Generic information about the connected PLC
|
||||
/// </summary>
|
||||
public PLCInfo PlcInfo { get; private set; }
|
||||
public PLCInfo PlcInfo {
|
||||
get => plcInfo;
|
||||
private set {
|
||||
plcInfo = value;
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PlcInfo)));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The registered data registers of the PLC
|
||||
/// </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 int port;
|
||||
private int stationNumber;
|
||||
private int cycleTimeMs = 25;
|
||||
|
||||
/// <summary>
|
||||
/// The current IP of the PLC connection
|
||||
@@ -61,7 +114,23 @@ namespace MewtocolNet {
|
||||
/// </summary>
|
||||
public int StationNumber => stationNumber;
|
||||
|
||||
internal List<Task> PriorityTasks { get; set; } = new List<Task>();
|
||||
/// <summary>
|
||||
/// The duration of the last message cycle
|
||||
/// </summary>
|
||||
public int CycleTimeMs {
|
||||
get { return cycleTimeMs; }
|
||||
private set {
|
||||
cycleTimeMs = value;
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CycleTimeMs)));
|
||||
}
|
||||
}
|
||||
|
||||
internal NetworkStream stream;
|
||||
internal TcpClient client;
|
||||
internal readonly SerialQueue queue = new SerialQueue();
|
||||
private int RecBufferSize = 128;
|
||||
internal int SendExceptionsInRow = 0;
|
||||
internal bool ImportantTaskRunning = false;
|
||||
|
||||
#region Initialization
|
||||
|
||||
@@ -90,7 +159,7 @@ namespace MewtocolNet {
|
||||
|
||||
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} " +
|
||||
$"{(o.Name != null ? $"({o.Name}) " : "")}" +
|
||||
@@ -115,6 +184,8 @@ namespace MewtocolNet {
|
||||
/// <returns></returns>
|
||||
public async Task<MewtocolInterface> ConnectAsync (Action<PLCInfo> OnConnected = null, Action OnFailed = null) {
|
||||
|
||||
Logger.Log("Connecting to PLC...", LogLevel.Info, this);
|
||||
|
||||
var plcinf = await GetPLCInfoAsync();
|
||||
|
||||
if (plcinf != null) {
|
||||
@@ -142,6 +213,7 @@ namespace MewtocolNet {
|
||||
|
||||
if (OnFailed != null) {
|
||||
OnFailed();
|
||||
Disconnected?.Invoke();
|
||||
Logger.Log("Initial connection failed", LogLevel.Info, this);
|
||||
}
|
||||
|
||||
@@ -151,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>
|
||||
/// Attaches a poller to the interface that continously
|
||||
/// polls the registered data registers and writes the values to them
|
||||
@@ -165,6 +266,87 @@ namespace MewtocolNet {
|
||||
|
||||
#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
|
||||
|
||||
/// <summary>
|
||||
@@ -188,47 +370,51 @@ namespace MewtocolNet {
|
||||
string propName = prop.Name;
|
||||
foreach (var attr in attributes) {
|
||||
|
||||
if(attr is RegisterAttribute cAttribute) {
|
||||
if (attr is RegisterAttribute cAttribute) {
|
||||
|
||||
if (prop.PropertyType == typeof(bool) && cAttribute.AssignedBitIndex == -1) {
|
||||
if (cAttribute.SpecialAddress == SpecialAddress.None) {
|
||||
AddRegister(cAttribute.MemoryArea, cAttribute.RegisterType, _name: propName);
|
||||
AddRegister(collection.GetType(), cAttribute.MemoryArea, cAttribute.RegisterType, _name: propName);
|
||||
} else {
|
||||
AddRegister(cAttribute.SpecialAddress, cAttribute.RegisterType, _name: propName);
|
||||
AddRegister(collection.GetType(), cAttribute.SpecialAddress, cAttribute.RegisterType, _name: propName);
|
||||
}
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(short)) {
|
||||
AddRegister<short>(cAttribute.MemoryArea, _name: propName);
|
||||
AddRegister<short>(collection.GetType(), cAttribute.MemoryArea, _name: propName);
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(ushort)) {
|
||||
AddRegister<ushort>(cAttribute.MemoryArea, _name: propName);
|
||||
AddRegister<ushort>(collection.GetType(), cAttribute.MemoryArea, _name: propName);
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(int)) {
|
||||
AddRegister<int>(cAttribute.MemoryArea, _name: propName);
|
||||
AddRegister<int>(collection.GetType(), cAttribute.MemoryArea, _name: propName);
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(uint)) {
|
||||
AddRegister<uint>(cAttribute.MemoryArea, _name: propName);
|
||||
AddRegister<uint>(collection.GetType(), cAttribute.MemoryArea, _name: propName);
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(float)) {
|
||||
AddRegister<float>(cAttribute.MemoryArea, _name: propName);
|
||||
AddRegister<float>(collection.GetType(), cAttribute.MemoryArea, _name: propName);
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(string)) {
|
||||
AddRegister<string>(cAttribute.MemoryArea, cAttribute.StringLength, _name: propName);
|
||||
AddRegister<string>(collection.GetType(), cAttribute.MemoryArea, cAttribute.StringLength, _name: propName);
|
||||
}
|
||||
|
||||
if (prop.PropertyType.IsEnum) {
|
||||
AddRegister<int>(collection.GetType(), cAttribute.MemoryArea, _name: propName, _enumType: prop.PropertyType);
|
||||
}
|
||||
|
||||
//read number as bit array
|
||||
if (prop.PropertyType == typeof(BitArray)) {
|
||||
|
||||
if(cAttribute.BitCount == BitCount.B16) {
|
||||
AddRegister<short>(cAttribute.MemoryArea, _name: propName, _isBitwise: true);
|
||||
if (cAttribute.BitCount == BitCount.B16) {
|
||||
AddRegister<short>(collection.GetType(), cAttribute.MemoryArea, _name: propName, _isBitwise: true);
|
||||
} else {
|
||||
AddRegister<int>(cAttribute.MemoryArea, _name: propName, _isBitwise: true);
|
||||
AddRegister<int>(collection.GetType(), cAttribute.MemoryArea, _name: propName, _isBitwise: true);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -236,16 +422,18 @@ namespace MewtocolNet {
|
||||
//read number as bit array by invdividual properties
|
||||
if (prop.PropertyType == typeof(bool) && cAttribute.AssignedBitIndex != -1) {
|
||||
|
||||
//var bitwiseCount = Registers.Count(x => x.Value.isUsedBitwise);
|
||||
|
||||
if (cAttribute.BitCount == BitCount.B16) {
|
||||
AddRegister<short>(cAttribute.MemoryArea, _name: propName, _isBitwise: true);
|
||||
AddRegister<short>(collection.GetType(), cAttribute.MemoryArea, _name: $"Auto_Bitwise_DT{cAttribute.MemoryArea}", _isBitwise: true);
|
||||
} else {
|
||||
AddRegister<int>(cAttribute.MemoryArea, _name: propName, _isBitwise: true);
|
||||
AddRegister<int>(collection.GetType(), cAttribute.MemoryArea, _name: $"Auto_Bitwise_DDT{cAttribute.MemoryArea}", _isBitwise: true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (prop.PropertyType == typeof(TimeSpan)) {
|
||||
AddRegister<TimeSpan>(cAttribute.MemoryArea, _name: propName);
|
||||
AddRegister<TimeSpan>(collection.GetType(), cAttribute.MemoryArea, _name: propName);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -256,6 +444,43 @@ namespace MewtocolNet {
|
||||
|
||||
RegisterChanged += (reg) => {
|
||||
|
||||
//if the register is also used bitwise assign the boolean bit value to the according prop
|
||||
if(reg.isUsedBitwise) {
|
||||
|
||||
for (int i = 0; i < props.Length; i++) {
|
||||
|
||||
var prop = props[i];
|
||||
var bitWiseFound = prop.GetCustomAttributes(true)
|
||||
.FirstOrDefault(y => y.GetType() == typeof(RegisterAttribute) && ((RegisterAttribute)y).MemoryArea == reg.MemoryAdress);
|
||||
|
||||
if(bitWiseFound != null && reg is NRegister<short> reg16) {
|
||||
var casted = (RegisterAttribute)bitWiseFound;
|
||||
var bitIndex = casted.AssignedBitIndex;
|
||||
|
||||
var bytes = BitConverter.GetBytes(reg16.Value);
|
||||
BitArray bitAr = new BitArray(bytes);
|
||||
|
||||
if (bitIndex < bitAr.Length && bitIndex >= 0) {
|
||||
prop.SetValue(collection, bitAr[bitIndex]);
|
||||
collection.TriggerPropertyChanged(prop.Name);
|
||||
}
|
||||
|
||||
} else if (bitWiseFound != null && reg is NRegister<int> reg32) {
|
||||
var casted = (RegisterAttribute)bitWiseFound;
|
||||
var bitIndex = casted.AssignedBitIndex;
|
||||
|
||||
var bytes = BitConverter.GetBytes(reg32.Value);
|
||||
BitArray bitAr = new BitArray(bytes);
|
||||
prop.SetValue(collection, bitAr[bitIndex]);
|
||||
collection.TriggerPropertyChanged(prop.Name);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
var foundToUpdate = props.FirstOrDefault(x => x.Name == reg.Name);
|
||||
|
||||
if (foundToUpdate != null) {
|
||||
@@ -298,6 +523,14 @@ namespace MewtocolNet {
|
||||
foundToUpdate.SetValue(collection, ((NRegister<float>)reg).Value);
|
||||
}
|
||||
|
||||
if (foundToUpdate.PropertyType.IsEnum) {
|
||||
foundToUpdate.SetValue(collection, ((NRegister<int>)reg).Value);
|
||||
}
|
||||
|
||||
if (foundToUpdate.PropertyType == typeof(TimeSpan)) {
|
||||
foundToUpdate.SetValue(collection, ((NRegister<TimeSpan>)reg).Value);
|
||||
}
|
||||
|
||||
//setting back strings
|
||||
|
||||
if (foundToUpdate.PropertyType == typeof(string)) {
|
||||
@@ -307,27 +540,7 @@ namespace MewtocolNet {
|
||||
}
|
||||
|
||||
|
||||
if (foundToUpdate.PropertyType == typeof(bool) && registerAttr.AssignedBitIndex >= 0) {
|
||||
|
||||
//setting back bit registers to individual properties
|
||||
if (reg is NRegister<short> shortReg) {
|
||||
|
||||
var bytes = BitConverter.GetBytes(shortReg.Value);
|
||||
BitArray bitAr = new BitArray(bytes);
|
||||
foundToUpdate.SetValue(collection, bitAr[registerAttr.AssignedBitIndex]);
|
||||
|
||||
}
|
||||
|
||||
if (reg is NRegister<int> intReg) {
|
||||
|
||||
var bytes = BitConverter.GetBytes(intReg.Value);
|
||||
BitArray bitAr = new BitArray(bytes);
|
||||
foundToUpdate.SetValue(collection, bitAr[registerAttr.AssignedBitIndex]);
|
||||
|
||||
}
|
||||
|
||||
|
||||
} else if(foundToUpdate.PropertyType == typeof(BitArray)) {
|
||||
if (foundToUpdate.PropertyType == typeof(BitArray)) {
|
||||
|
||||
//setting back bit registers
|
||||
if (reg is NRegister<short> shortReg) {
|
||||
@@ -354,6 +567,14 @@ namespace MewtocolNet {
|
||||
|
||||
};
|
||||
|
||||
if (collection != null)
|
||||
collection.OnInterfaceLinked(this);
|
||||
|
||||
Connected += (i) => {
|
||||
if (collection != null)
|
||||
collection.OnInterfaceLinkedAndOnline(this);
|
||||
};
|
||||
|
||||
return this;
|
||||
|
||||
}
|
||||
@@ -394,49 +615,49 @@ namespace MewtocolNet {
|
||||
|
||||
if (foundRegister.GetType() == typeof(BRegister)) {
|
||||
|
||||
return await WriteBoolRegister((BRegister)foundRegister, (bool)value, StationNumber);
|
||||
return await WriteBoolRegister((BRegister)foundRegister, (bool)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(NRegister<short>)) {
|
||||
|
||||
return await WriteNumRegister((NRegister<short>)foundRegister, (short)value, StationNumber);
|
||||
return await WriteNumRegister((NRegister<short>)foundRegister, (short)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(NRegister<ushort>)) {
|
||||
|
||||
return await WriteNumRegister((NRegister<ushort>)foundRegister, (ushort)value, StationNumber);
|
||||
return await WriteNumRegister((NRegister<ushort>)foundRegister, (ushort)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(NRegister<int>)) {
|
||||
|
||||
return await WriteNumRegister((NRegister<int>)foundRegister, (int)value, StationNumber);
|
||||
return await WriteNumRegister((NRegister<int>)foundRegister, (int)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(NRegister<uint>)) {
|
||||
|
||||
return await WriteNumRegister((NRegister<uint>)foundRegister, (uint)value, StationNumber);
|
||||
return await WriteNumRegister((NRegister<uint>)foundRegister, (uint)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(NRegister<float>)) {
|
||||
|
||||
return await WriteNumRegister((NRegister<float>)foundRegister, (float)value, StationNumber);
|
||||
return await WriteNumRegister((NRegister<float>)foundRegister, (float)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(NRegister<TimeSpan>)) {
|
||||
|
||||
return await WriteNumRegister((NRegister<TimeSpan>)foundRegister, (TimeSpan)value, StationNumber);
|
||||
return await WriteNumRegister((NRegister<TimeSpan>)foundRegister, (TimeSpan)value);
|
||||
|
||||
}
|
||||
|
||||
if (foundRegister.GetType() == typeof(SRegister)) {
|
||||
|
||||
return await WriteStringRegister((SRegister)foundRegister, (string)value, StationNumber);
|
||||
return await WriteStringRegister((SRegister)foundRegister, (string)value);
|
||||
|
||||
}
|
||||
|
||||
@@ -452,7 +673,6 @@ namespace MewtocolNet {
|
||||
/// Calculates checksum and sends a command to the PLC then awaits results
|
||||
/// </summary>
|
||||
/// <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>
|
||||
public async Task<CommandResult> SendCommandAsync (string _msg) {
|
||||
|
||||
@@ -460,29 +680,42 @@ namespace MewtocolNet {
|
||||
_msg += "\r";
|
||||
|
||||
//send request
|
||||
try {
|
||||
|
||||
string response = null;
|
||||
var response = await queue.Enqueue(() => SendSingleBlock(_msg));
|
||||
|
||||
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);
|
||||
PriorityTasks.Add(awaittask);
|
||||
awaittask.Wait();
|
||||
return new CommandResult {
|
||||
Success = true,
|
||||
Error = "0000",
|
||||
Response = response.ToString()
|
||||
};
|
||||
|
||||
PriorityTasks.Remove(awaittask);
|
||||
response = awaittask.Result;
|
||||
|
||||
} else {
|
||||
|
||||
//poller not active let the user manage message timing
|
||||
|
||||
response = await SendSingleBlock(_msg);
|
||||
|
||||
}
|
||||
|
||||
if(response == null) {
|
||||
} catch {
|
||||
return new CommandResult {
|
||||
Success = false,
|
||||
Error = "0000",
|
||||
@@ -490,78 +723,86 @@ 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) {
|
||||
|
||||
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);
|
||||
//send request
|
||||
using (var sendStream = new MemoryStream(message)) {
|
||||
await sendStream.CopyToAsync(stream);
|
||||
Logger.Log($"[--------------------------------]", LogLevel.Critical, this);
|
||||
Logger.Log($"--> OUT MSG: {_blockString}", LogLevel.Critical, this);
|
||||
}
|
||||
|
||||
using (NetworkStream stream = client.GetStream()) {
|
||||
var message = _blockString.ToHexASCIIBytes();
|
||||
var messageAscii = BitConverter.ToString(message).Replace("-", " ");
|
||||
//send request
|
||||
using (var sendStream = new MemoryStream(message)) {
|
||||
await sendStream.CopyToAsync(stream);
|
||||
Logger.Log($"OUT MSG: {_blockString}", LogLevel.Critical, this);
|
||||
//log message sent
|
||||
ASCIIEncoding enc = new ASCIIEncoding();
|
||||
string characters = enc.GetString(message);
|
||||
}
|
||||
//await result
|
||||
StringBuilder response = new StringBuilder();
|
||||
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);
|
||||
sw.Stop();
|
||||
Logger.Log($"IN MSG ({(int)sw.Elapsed.TotalMilliseconds}ms): {_blockString}", LogLevel.Critical, this);
|
||||
return response.ToString();
|
||||
//await result
|
||||
StringBuilder response = new StringBuilder();
|
||||
try {
|
||||
|
||||
byte[] responseBuffer = new byte[128 * 16];
|
||||
|
||||
bool endLineCode = false;
|
||||
bool startMsgCode = false;
|
||||
|
||||
while (!endLineCode && !startMsgCode) {
|
||||
|
||||
do {
|
||||
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));
|
||||
}
|
||||
|
||||
} catch(Exception) {
|
||||
|
||||
IsConnected = false;
|
||||
KillPoller();
|
||||
Logger.Log("The PLC connection was closed", LogLevel.Error, this);
|
||||
return null;
|
||||
while (stream.DataAvailable);
|
||||
|
||||
}
|
||||
|
||||
} catch (IOException) {
|
||||
OnMajorSocketExceptionWhileConnected();
|
||||
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
|
||||
|
||||
@@ -580,4 +821,5 @@ namespace MewtocolNet {
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
|
||||
using MewtocolNet.Registers;
|
||||
using System.Linq;
|
||||
using System.Globalization;
|
||||
using MewtocolNet.Logging;
|
||||
|
||||
namespace MewtocolNet {
|
||||
|
||||
@@ -43,6 +44,8 @@ namespace MewtocolNet {
|
||||
ErrorCode = error,
|
||||
StationNumber = int.Parse(station ?? "0"),
|
||||
};
|
||||
|
||||
PlcInfo = retInfo;
|
||||
return retInfo;
|
||||
|
||||
}
|
||||
@@ -51,16 +54,115 @@ namespace MewtocolNet {
|
||||
|
||||
#endregion
|
||||
|
||||
#region Operation mode changing
|
||||
|
||||
/// <summary>
|
||||
/// Changes the PLCs operation mode to the given one
|
||||
/// </summary>
|
||||
/// <param name="mode">The mode to change to</param>
|
||||
/// <returns>The success state of the write operation</returns>
|
||||
public async Task<bool> SetOperationMode (OPMode mode) {
|
||||
|
||||
string modeChar = mode == OPMode.Prog ? "P" : "R";
|
||||
|
||||
string requeststring = $"%{GetStationNumber()}#RM{modeChar}";
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
if (result.Success) {
|
||||
Logger.Log($"operation mode was changed to {mode}", LogLevel.Info, this);
|
||||
} else {
|
||||
Logger.Log("Operation mode change failed", LogLevel.Error, this);
|
||||
}
|
||||
|
||||
return result.Success;
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Byte range writingv / reading to registers
|
||||
|
||||
/// <summary>
|
||||
/// Writes a byte array to a span over multiple registers at once,
|
||||
/// Rembember the plc can only store word so in order to write to a word array
|
||||
/// your byte array should be double the size
|
||||
/// </summary>
|
||||
/// /// <param name="start">start address of the array</param>
|
||||
/// <param name="byteArr"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<bool> WriteByteRange (int start, byte[] byteArr) {
|
||||
|
||||
string byteString = byteArr.BigToMixedEndian().ToHexString();
|
||||
var wordLength = byteArr.Length / 2;
|
||||
if (byteArr.Length % 2 != 0)
|
||||
wordLength++;
|
||||
|
||||
string startStr = start.ToString().PadLeft(5, '0');
|
||||
string endStr = (start + wordLength - 1).ToString().PadLeft(5, '0');
|
||||
|
||||
string requeststring = $"%{GetStationNumber()}#WDD{startStr}{endStr}{byteString}";
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
return result.Success;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Reads the bytes from the start adress for counts byte length
|
||||
/// </summary>
|
||||
/// <param name="start">Start adress</param>
|
||||
/// <param name="count">Number of bytes to get</param>
|
||||
/// <returns>A byte array or null of there was an error</returns>
|
||||
public async Task<byte[]> ReadByteRange (int start, int count) {
|
||||
|
||||
var byteList = new List<byte>();
|
||||
|
||||
var wordLength = count / 2;
|
||||
if (count % 2 != 0)
|
||||
wordLength++;
|
||||
|
||||
|
||||
//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}";
|
||||
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());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return byteList.ToArray();
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Bool register reading / writing
|
||||
|
||||
/// <summary>
|
||||
/// Reads the given boolean register from the PLC
|
||||
/// </summary>
|
||||
/// <param name="_toRead">The register to read</param>
|
||||
/// <param name="_stationNumber">Station number to access</param>
|
||||
public async Task<BRegisterResult> ReadBoolRegister (BRegister _toRead, int _stationNumber = 1) {
|
||||
public async Task<BRegisterResult> ReadBoolRegister (BRegister _toRead) {
|
||||
|
||||
string requeststring = $"%{_stationNumber.ToString().PadLeft(2, '0')}#RCS{_toRead.BuildMewtocolIdent()}";
|
||||
string requeststring = $"%{GetStationNumber()}#RCS{_toRead.BuildMewtocolIdent()}";
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
if(!result.Success) {
|
||||
@@ -72,7 +174,7 @@ namespace MewtocolNet {
|
||||
|
||||
var resultBool = result.Response.ParseRCSingleBit();
|
||||
if(resultBool != null) {
|
||||
_toRead.LastValue = resultBool.Value;
|
||||
_toRead.SetValueFromPLC(resultBool.Value);
|
||||
}
|
||||
|
||||
var finalRes = new BRegisterResult {
|
||||
@@ -88,15 +190,15 @@ namespace MewtocolNet {
|
||||
/// Writes to the given bool register on the PLC
|
||||
/// </summary>
|
||||
/// <param name="_toWrite">The register to write to</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>
|
||||
public async Task<bool> WriteBoolRegister (BRegister _toWrite, bool value, int _stationNumber = 1) {
|
||||
public async Task<bool> WriteBoolRegister (BRegister _toWrite, bool value) {
|
||||
|
||||
string requeststring = $"%{_stationNumber.ToString().PadLeft(2, '0')}#WCS{_toWrite.BuildMewtocolIdent()}{(value ? "1" : "0")}";
|
||||
string requeststring = $"%{GetStationNumber()}#WCS{_toWrite.BuildMewtocolIdent()}{(value ? "1" : "0")}";
|
||||
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
return result.Success && result.Response.StartsWith($"%{ _stationNumber.ToString().PadLeft(2, '0')}#WC");
|
||||
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WC");
|
||||
|
||||
}
|
||||
|
||||
@@ -109,67 +211,74 @@ namespace MewtocolNet {
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type of number (short, ushort, int, uint, float)</typeparam>
|
||||
/// <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>
|
||||
public async Task<NRegisterResult<T>> ReadNumRegister<T> (NRegister<T> _toRead, int _stationNumber = 1) {
|
||||
public async Task<NRegisterResult<T>> ReadNumRegister<T> (NRegister<T> _toRead) {
|
||||
|
||||
Type numType = typeof(T);
|
||||
|
||||
string requeststring = $"%{_stationNumber.ToString().PadLeft(2, '0')}#RD{_toRead.BuildMewtocolIdent()}";
|
||||
string requeststring = $"%{GetStationNumber()}#RD{_toRead.BuildMewtocolIdent()}";
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
if(!result.Success || string.IsNullOrEmpty(result.Response)) {
|
||||
return new NRegisterResult<T> {
|
||||
Result = result,
|
||||
Register = _toRead
|
||||
};
|
||||
var failedResult = new NRegisterResult<T> {
|
||||
Result = result,
|
||||
Register = _toRead
|
||||
};
|
||||
|
||||
if (!result.Success || string.IsNullOrEmpty(result.Response)) {
|
||||
return failedResult;
|
||||
}
|
||||
|
||||
if (numType == typeof(short)) {
|
||||
|
||||
var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder();
|
||||
if (resultBytes == null) return failedResult;
|
||||
var val = short.Parse(resultBytes, NumberStyles.HexNumber);
|
||||
(_toRead as NRegister<short>).LastValue = val;
|
||||
_toRead.SetValueFromPLC(val);
|
||||
|
||||
} else if (numType == typeof(ushort)) {
|
||||
|
||||
var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder();
|
||||
if (resultBytes == null) return failedResult;
|
||||
var val = ushort.Parse(resultBytes, NumberStyles.HexNumber);
|
||||
(_toRead as NRegister<ushort>).LastValue = val;
|
||||
_toRead.SetValueFromPLC(val);
|
||||
|
||||
} else if (numType == typeof(int)) {
|
||||
|
||||
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
|
||||
if (resultBytes == null) return failedResult;
|
||||
var val = int.Parse(resultBytes, NumberStyles.HexNumber);
|
||||
(_toRead as NRegister<int>).LastValue = val;
|
||||
_toRead.SetValueFromPLC(val);
|
||||
|
||||
} else if (numType == typeof(uint)) {
|
||||
|
||||
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
|
||||
if (resultBytes == null) return failedResult;
|
||||
var val = uint.Parse(resultBytes, NumberStyles.HexNumber);
|
||||
(_toRead as NRegister<uint>).LastValue = val;
|
||||
_toRead.SetValueFromPLC(val);
|
||||
|
||||
} else if (numType == typeof(float)) {
|
||||
|
||||
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
|
||||
if (resultBytes == null) return failedResult;
|
||||
//convert to unsigned int first
|
||||
var val = uint.Parse(resultBytes, NumberStyles.HexNumber);
|
||||
|
||||
byte[] floatVals = BitConverter.GetBytes(val);
|
||||
float finalFloat = BitConverter.ToSingle(floatVals, 0);
|
||||
|
||||
(_toRead as NRegister<float>).LastValue = finalFloat;
|
||||
_toRead.SetValueFromPLC(finalFloat);
|
||||
|
||||
} else if (numType == typeof(TimeSpan)) {
|
||||
|
||||
var resultBytes = result.Response.ParseDTByteString(8).ReverseByteOrder();
|
||||
if (resultBytes == null) return failedResult;
|
||||
//convert to unsigned int first
|
||||
var vallong = long.Parse(resultBytes, NumberStyles.HexNumber);
|
||||
var valMillis = vallong * 10;
|
||||
var ts = TimeSpan.FromMilliseconds(valMillis);
|
||||
|
||||
//minmax writable / readable value is 10ms
|
||||
(_toRead as NRegister<TimeSpan>).LastValue = ts;
|
||||
_toRead.SetValueFromPLC(ts);
|
||||
|
||||
}
|
||||
|
||||
@@ -186,9 +295,9 @@ namespace MewtocolNet {
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type of number (short, ushort, int, uint, float)</typeparam>
|
||||
/// <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>
|
||||
public async Task<bool> WriteNumRegister<T> (NRegister<T> _toWrite, T _value, int _stationNumber = 1) {
|
||||
public async Task<bool> WriteNumRegister<T> (NRegister<T> _toWrite, T _value) {
|
||||
|
||||
byte[] toWriteVal;
|
||||
Type numType = typeof(T);
|
||||
@@ -222,11 +331,11 @@ namespace MewtocolNet {
|
||||
toWriteVal = null;
|
||||
}
|
||||
|
||||
string requeststring = $"%{_stationNumber.ToString().PadLeft(2, '0')}#WD{_toWrite.BuildMewtocolIdent()}{toWriteVal.ToHexString()}";
|
||||
string requeststring = $"%{GetStationNumber()}#WD{_toWrite.BuildMewtocolIdent()}{toWriteVal.ToHexString()}";
|
||||
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
return result.Success && result.Response.StartsWith($"%{ _stationNumber.ToString().PadLeft(2, '0')}#WD");
|
||||
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WD");
|
||||
|
||||
}
|
||||
|
||||
@@ -249,7 +358,7 @@ namespace MewtocolNet {
|
||||
/// <returns></returns>
|
||||
public async Task<SRegisterResult> ReadStringRegister (SRegister _toRead, int _stationNumber = 1) {
|
||||
|
||||
string requeststring = $"%{_stationNumber.ToString().PadLeft(2, '0')}#RD{_toRead.BuildMewtocolIdent()}";
|
||||
string requeststring = $"%{GetStationNumber()}#RD{_toRead.BuildMewtocolIdent()}";
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
if (result.Success)
|
||||
_toRead.SetValueFromPLC(result.Response.ParseDTString());
|
||||
@@ -273,7 +382,7 @@ namespace MewtocolNet {
|
||||
throw new ArgumentException("Write string size cannot be longer than reserved string size");
|
||||
}
|
||||
|
||||
string stationNum = _stationNumber.ToString().PadLeft(2, '0');
|
||||
string stationNum = GetStationNumber();
|
||||
string dataString = _value.BuildDTString(_toWrite.ReservedSize);
|
||||
string dataArea = _toWrite.BuildCustomIdent(dataString.Length / 4);
|
||||
|
||||
@@ -282,7 +391,18 @@ namespace MewtocolNet {
|
||||
var result = await SendCommandAsync(requeststring);
|
||||
|
||||
|
||||
return result.Success && result.Response.StartsWith($"%{ _stationNumber.ToString().PadLeft(2, '0')}#WD");
|
||||
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WD");
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Helpers
|
||||
|
||||
internal string GetStationNumber () {
|
||||
|
||||
return StationNumber.ToString().PadLeft(2, '0');
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
46
MewtocolNet/Mewtocol/PLCEnums/CpuType.cs
Normal file
46
MewtocolNet/Mewtocol/PLCEnums/CpuType.cs
Normal file
@@ -0,0 +1,46 @@
|
||||
namespace MewtocolNet {
|
||||
|
||||
/// <summary>
|
||||
/// CPU type of the PLC
|
||||
/// </summary>
|
||||
public enum CpuType {
|
||||
/// <summary>
|
||||
/// FP 0 / FP 2.7K
|
||||
/// </summary>
|
||||
FP0_FP1_2_7K,
|
||||
/// <summary>
|
||||
/// FP0 / FP1, 5K / 10K
|
||||
/// </summary>
|
||||
FP0_FP1_5K_10K,
|
||||
/// <summary>
|
||||
/// FP1 M 0.9K
|
||||
/// </summary>
|
||||
FP1_M_0_9K,
|
||||
/// <summary>
|
||||
/// FP2 16k / 32k
|
||||
/// </summary>
|
||||
FP2_16K_32K,
|
||||
/// <summary>
|
||||
/// FP3 C 10K
|
||||
/// </summary>
|
||||
FP3_C_10K,
|
||||
/// <summary>
|
||||
/// FP3 C 16K
|
||||
/// </summary>
|
||||
FP3_C_16K,
|
||||
/// <summary>
|
||||
/// FP5 16K
|
||||
/// </summary>
|
||||
FP5_16K,
|
||||
/// <summary>
|
||||
/// FP 5 24K
|
||||
/// </summary>
|
||||
FP5_24K,
|
||||
/// <summary>
|
||||
/// Includes panasonic FPX, FPX-H, Sigma
|
||||
/// </summary>
|
||||
FP_Sigma_X_H_30K_60K_120K
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
21
MewtocolNet/Mewtocol/PLCEnums/OPMode.cs
Normal file
21
MewtocolNet/Mewtocol/PLCEnums/OPMode.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace MewtocolNet {
|
||||
|
||||
/// <summary>
|
||||
/// CPU type of the PLC
|
||||
/// </summary>
|
||||
public enum OPMode {
|
||||
/// <summary>
|
||||
/// PLC run mode
|
||||
/// </summary>
|
||||
Run,
|
||||
/// <summary>
|
||||
/// PLC programming mode
|
||||
/// </summary>
|
||||
Prog,
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,13 +6,38 @@ namespace MewtocolNet.Registers {
|
||||
/// All modes
|
||||
/// </summary>
|
||||
public class PLCMode {
|
||||
|
||||
/// <summary>
|
||||
/// PLC is running
|
||||
/// </summary>
|
||||
public bool RunMode { get; set; }
|
||||
/// <summary>
|
||||
/// PLC is in test
|
||||
/// </summary>
|
||||
public bool TestRunMode { get; set; }
|
||||
/// <summary>
|
||||
/// BreakExcecuting
|
||||
/// </summary>
|
||||
public bool BreakExcecuting { get; set; }
|
||||
/// <summary>
|
||||
/// BreakValid
|
||||
/// </summary>
|
||||
public bool BreakValid { get; set; }
|
||||
/// <summary>
|
||||
/// PLC output is enabled
|
||||
/// </summary>
|
||||
public bool OutputEnabled { get; set; }
|
||||
/// <summary>
|
||||
/// PLC runs step per step
|
||||
/// </summary>
|
||||
public bool StepRunMode { get; set; }
|
||||
/// <summary>
|
||||
/// Message executing
|
||||
/// </summary>
|
||||
public bool MessageExecuting { get; set; }
|
||||
/// <summary>
|
||||
/// PLC is in remote mode
|
||||
/// </summary>
|
||||
public bool RemoteMode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -6,22 +6,39 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace MewtocolNet.RegisterAttributes {
|
||||
|
||||
/// <summary>
|
||||
/// The size of the bitwise register
|
||||
/// </summary>
|
||||
public enum BitCount {
|
||||
/// <summary>
|
||||
/// 16 bit
|
||||
/// </summary>
|
||||
B16,
|
||||
/// <summary>
|
||||
/// 32 bit
|
||||
/// </summary>
|
||||
B32
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Defines the behavior of a register property
|
||||
/// </summary>
|
||||
[AttributeUsage(AttributeTargets.Property)]
|
||||
public class RegisterAttribute : Attribute {
|
||||
|
||||
public int MemoryArea;
|
||||
public int StringLength;
|
||||
public RegisterType RegisterType;
|
||||
public SpecialAddress SpecialAddress = SpecialAddress.None;
|
||||
public BitCount BitCount;
|
||||
public int AssignedBitIndex = -1;
|
||||
internal int MemoryArea;
|
||||
internal int StringLength;
|
||||
internal RegisterType RegisterType;
|
||||
internal SpecialAddress SpecialAddress = SpecialAddress.None;
|
||||
internal BitCount BitCount;
|
||||
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) {
|
||||
|
||||
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) {
|
||||
|
||||
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) {
|
||||
|
||||
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) {
|
||||
|
||||
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) {
|
||||
|
||||
if(assignBit > 15 && bitcount == BitCount.B16) {
|
||||
|
||||
@@ -10,17 +10,43 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace MewtocolNet.RegisterAttributes {
|
||||
|
||||
/// <summary>
|
||||
/// A register collection base with full auto read and notification support built in
|
||||
/// </summary>
|
||||
public class RegisterCollectionBase : INotifyPropertyChanged {
|
||||
|
||||
/// <summary>
|
||||
/// Reference to its bound interface
|
||||
/// </summary>
|
||||
public MewtocolInterface PLCInterface { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Whenever one of its props changes
|
||||
/// </summary>
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
internal void TriggerPropertyChanged (string propertyName = null) {
|
||||
/// <summary>
|
||||
/// Triggers a property changed event
|
||||
/// </summary>
|
||||
/// <param name="propertyName">Name of the property to trigger for</param>
|
||||
public void TriggerPropertyChanged (string propertyName = null) {
|
||||
var handler = PropertyChanged;
|
||||
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) { }
|
||||
|
||||
/// <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) { }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -9,22 +9,15 @@ namespace MewtocolNet.Registers {
|
||||
/// </summary>
|
||||
public class BRegister : Register {
|
||||
|
||||
internal RegisterType RegType { get; set; }
|
||||
internal SpecialAddress SpecialAddress { get; set; }
|
||||
internal RegisterType RegType { get; private set; }
|
||||
internal SpecialAddress SpecialAddress { get; private set; }
|
||||
|
||||
public bool NeedValue;
|
||||
public bool LastValue;
|
||||
internal bool LastValue;
|
||||
|
||||
/// <summary>
|
||||
/// The value of the register
|
||||
/// </summary>
|
||||
public bool Value {
|
||||
get => LastValue;
|
||||
set {
|
||||
NeedValue = value;
|
||||
TriggerChangedEvnt(this);
|
||||
}
|
||||
}
|
||||
public bool Value => LastValue;
|
||||
|
||||
/// <summary>
|
||||
/// Defines a register containing a number
|
||||
@@ -35,8 +28,8 @@ namespace MewtocolNet.Registers {
|
||||
public BRegister (int _address, RegisterType _type = RegisterType.R, string _name = null) {
|
||||
|
||||
if (_address > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
|
||||
MemoryAdress = _address;
|
||||
Name = _name;
|
||||
memoryAdress = _address;
|
||||
name = _name;
|
||||
|
||||
RegType = _type;
|
||||
|
||||
@@ -54,12 +47,15 @@ namespace MewtocolNet.Registers {
|
||||
throw new NotSupportedException("Special adress cant be none");
|
||||
|
||||
SpecialAddress = _address;
|
||||
Name = _name;
|
||||
name = _name;
|
||||
|
||||
RegType = _type;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Builds the register area name
|
||||
/// </summary>
|
||||
public override string BuildMewtocolIdent () {
|
||||
|
||||
//build area code from register type
|
||||
@@ -74,9 +70,12 @@ namespace MewtocolNet.Registers {
|
||||
|
||||
}
|
||||
|
||||
public override string ToString() {
|
||||
return $"Adress: {MemoryAdress} Val: {Value}";
|
||||
internal void SetValueFromPLC (bool val) {
|
||||
LastValue = val;
|
||||
TriggerChangedEvnt(this);
|
||||
TriggerNotifyChange();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
namespace MewtocolNet.Registers {
|
||||
|
||||
/// <summary>
|
||||
/// Result for a boolean register
|
||||
/// </summary>
|
||||
public class BRegisterResult {
|
||||
|
||||
/// <summary>
|
||||
/// The command result
|
||||
/// </summary>
|
||||
public CommandResult Result { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The used register
|
||||
/// </summary>
|
||||
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,54 +7,76 @@ namespace MewtocolNet.Registers {
|
||||
/// <typeparam name="T">The type of the numeric value</typeparam>
|
||||
public class NRegister<T> : Register {
|
||||
|
||||
public T NeedValue;
|
||||
public T LastValue;
|
||||
internal T LastValue;
|
||||
|
||||
/// <summary>
|
||||
/// The value of the register
|
||||
/// </summary>
|
||||
public T Value {
|
||||
get => LastValue;
|
||||
set {
|
||||
NeedValue = value;
|
||||
TriggerChangedEvnt(this);
|
||||
}
|
||||
}
|
||||
public T Value => LastValue;
|
||||
|
||||
/// <summary>
|
||||
/// Defines a register containing a number
|
||||
/// </summary>
|
||||
/// <param name="_adress">Memory start adress max 99999</param>
|
||||
/// <param name="_format">The format in which the variable is stored</param>
|
||||
public NRegister(int _adress, string _name = null, bool isBitwise = false) {
|
||||
/// <param name="_name">Name of the register</param>
|
||||
public NRegister (int _adress, string _name = null) {
|
||||
|
||||
if (_adress > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
|
||||
MemoryAdress = _adress;
|
||||
Name = _name;
|
||||
if (_adress > 99999)
|
||||
throw new NotSupportedException("Memory adresses cant be greater than 99999");
|
||||
memoryAdress = _adress;
|
||||
name = _name;
|
||||
Type numType = typeof(T);
|
||||
if (numType == typeof(short)) {
|
||||
MemoryLength = 0;
|
||||
memoryLength = 0;
|
||||
} else if (numType == typeof(ushort)) {
|
||||
MemoryLength = 0;
|
||||
memoryLength = 0;
|
||||
} else if (numType == typeof(int)) {
|
||||
MemoryLength = 1;
|
||||
memoryLength = 1;
|
||||
} else if (numType == typeof(uint)) {
|
||||
MemoryLength = 1;
|
||||
memoryLength = 1;
|
||||
} else if (numType == typeof(float)) {
|
||||
MemoryLength = 1;
|
||||
memoryLength = 1;
|
||||
} else if (numType == typeof(TimeSpan)) {
|
||||
MemoryLength = 1;
|
||||
memoryLength = 1;
|
||||
} else {
|
||||
throw new NotSupportedException($"The type {numType} is not allowed for Number Registers");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
internal NRegister(int _adress, string _name = null, bool isBitwise = false, Type _enumType = null) {
|
||||
|
||||
if (_adress > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
|
||||
memoryAdress = _adress;
|
||||
name = _name;
|
||||
Type numType = typeof(T);
|
||||
if (numType == typeof(short)) {
|
||||
memoryLength = 0;
|
||||
} else if (numType == typeof(ushort)) {
|
||||
memoryLength = 0;
|
||||
} else if (numType == typeof(int)) {
|
||||
memoryLength = 1;
|
||||
} else if (numType == typeof(uint)) {
|
||||
memoryLength = 1;
|
||||
} else if (numType == typeof(float)) {
|
||||
memoryLength = 1;
|
||||
} else if (numType == typeof(TimeSpan)) {
|
||||
memoryLength = 1;
|
||||
} else {
|
||||
throw new NotSupportedException($"The type {numType} is not allowed for Number Registers");
|
||||
}
|
||||
|
||||
isUsedBitwise = isBitwise;
|
||||
enumType = _enumType;
|
||||
|
||||
}
|
||||
|
||||
public override string ToString() {
|
||||
return $"Adress: {MemoryAdress} Val: {Value}";
|
||||
internal void SetValueFromPLC (object val) {
|
||||
LastValue = (T)val;
|
||||
TriggerChangedEvnt(this);
|
||||
TriggerNotifyChange();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,16 +1,34 @@
|
||||
namespace MewtocolNet.Registers {
|
||||
using System;
|
||||
|
||||
namespace MewtocolNet.Registers {
|
||||
/// <summary>
|
||||
/// Result for a read/write operation
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of the numeric value</typeparam>
|
||||
public class NRegisterResult<T> {
|
||||
|
||||
/// <summary>
|
||||
/// Command result
|
||||
/// </summary>
|
||||
public CommandResult Result { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The used register
|
||||
/// </summary>
|
||||
public NRegister<T> Register { get; set; }
|
||||
|
||||
public override string ToString() {
|
||||
string errmsg = Result.Success ? "" : $", Error [{Result.ErrorDescription}]";
|
||||
return $"Result [{Result.Success}], Register [{Register.ToString()}]{errmsg}";
|
||||
/// <summary>
|
||||
/// Trys to get the value of there is one
|
||||
/// </summary>
|
||||
public bool TryGetValue (out T value) {
|
||||
if(Result.Success) {
|
||||
value = Register.Value;
|
||||
return true;
|
||||
}
|
||||
value = default(T);
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -17,13 +17,67 @@ namespace MewtocolNet.Registers {
|
||||
/// Gets called whenever the value was changed
|
||||
/// </summary>
|
||||
public event Action<object> ValueChanged;
|
||||
/// <summary>
|
||||
/// Triggers when a property on the register changes
|
||||
/// </summary>
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
public string Name { get; set; }
|
||||
public int MemoryAdress { get; set; }
|
||||
public int MemoryLength { get; set; }
|
||||
internal bool isUsedBitwise { get; set; }
|
||||
internal Type collectionType;
|
||||
/// <summary>
|
||||
/// The type of collection the register is in or null of added manually
|
||||
/// </summary>
|
||||
public Type CollectionType => collectionType;
|
||||
|
||||
internal string name;
|
||||
/// <summary>
|
||||
/// The register name or null of not defined
|
||||
/// </summary>
|
||||
public string Name => name;
|
||||
|
||||
internal int memoryAdress;
|
||||
/// <summary>
|
||||
/// The registers memory adress if not a special register
|
||||
/// </summary>
|
||||
public int MemoryAdress => memoryAdress;
|
||||
|
||||
internal int memoryLength;
|
||||
/// <summary>
|
||||
/// The rgisters memory length
|
||||
/// </summary>
|
||||
public int MemoryLength => memoryLength;
|
||||
|
||||
/// <summary>
|
||||
/// The value of the register auto converted to a string
|
||||
/// </summary>
|
||||
public string StringValue => GetValueString();
|
||||
|
||||
/// <summary>
|
||||
/// The name the register would have in the PLC
|
||||
/// </summary>
|
||||
public string RegisterPLCName => GetRegisterPLCName();
|
||||
|
||||
/// <summary>
|
||||
/// The combined name with the holding register class type infront
|
||||
/// </summary>
|
||||
public string CombinedName => GetCombinedName();
|
||||
|
||||
/// <summary>
|
||||
/// The name of the class that contains this register or empty if it was added manually
|
||||
/// </summary>
|
||||
public string ContainerName => GetContainerName();
|
||||
|
||||
internal bool isUsedBitwise { get; set; }
|
||||
internal Type enumType { get; set; }
|
||||
|
||||
internal Register () {
|
||||
ValueChanged += (obj) => {
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StringValue)));
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Builds the register area name
|
||||
/// </summary>
|
||||
public virtual string BuildMewtocolIdent() {
|
||||
|
||||
StringBuilder asciistring = new StringBuilder("D");
|
||||
@@ -60,6 +114,24 @@ namespace MewtocolNet.Registers {
|
||||
/// <returns></returns>
|
||||
public string GetValueString () {
|
||||
|
||||
if (enumType != null && this is NRegister<int> intEnumReg) {
|
||||
|
||||
var dict = new Dictionary<int, string>();
|
||||
|
||||
foreach (var name in Enum.GetNames(enumType)) {
|
||||
int enumKey = (int)Enum.Parse(enumType, name);
|
||||
if(!dict.ContainsKey(enumKey)) {
|
||||
dict.Add(enumKey, name);
|
||||
}
|
||||
}
|
||||
|
||||
if(dict.ContainsKey(intEnumReg.Value)) {
|
||||
return $"{intEnumReg.Value} ({dict[intEnumReg.Value]})";
|
||||
} else {
|
||||
return $"{intEnumReg.Value} (Missing Enum)";
|
||||
}
|
||||
|
||||
}
|
||||
if (this is NRegister<short> shortReg) {
|
||||
return $"{shortReg.Value}{(isUsedBitwise ? $" [{shortReg.GetBitwise().ToBitString()}]" : "")}";
|
||||
}
|
||||
@@ -82,8 +154,7 @@ namespace MewtocolNet.Registers {
|
||||
return boolReg.Value.ToString();
|
||||
}
|
||||
if (this is SRegister stringReg) {
|
||||
return stringReg.Value.ToString();
|
||||
|
||||
return stringReg.Value ?? "";
|
||||
}
|
||||
|
||||
return "Type of the register is not supported.";
|
||||
@@ -116,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 () {
|
||||
|
||||
if (this is NRegister<short> shortReg) {
|
||||
@@ -148,7 +222,23 @@ namespace MewtocolNet.Registers {
|
||||
|
||||
}
|
||||
|
||||
public string GetRegisterPLCName () {
|
||||
internal string GetCombinedName () {
|
||||
|
||||
return $"{(CollectionType != null ? $"{CollectionType.Name}." : "")}{Name ?? "Unnamed"}";
|
||||
|
||||
}
|
||||
|
||||
internal string GetContainerName () {
|
||||
|
||||
return $"{(CollectionType != null ? $"{CollectionType.Name}" : "")}";
|
||||
|
||||
}
|
||||
|
||||
internal string GetRegisterPLCName () {
|
||||
|
||||
if (this is BRegister bReg && bReg.SpecialAddress != SpecialAddress.None) {
|
||||
return $"{GetRegisterString()}{bReg.SpecialAddress}";
|
||||
}
|
||||
|
||||
return $"{GetRegisterString()}{MemoryAdress}";
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@ namespace MewtocolNet.Registers {
|
||||
public class SRegister : Register {
|
||||
|
||||
private string lastVal = "";
|
||||
public string Value {
|
||||
|
||||
get => lastVal;
|
||||
/// <summary>
|
||||
/// The current value of the register
|
||||
/// </summary>
|
||||
public string Value => lastVal;
|
||||
|
||||
}
|
||||
|
||||
public short ReservedSize { get; set; }
|
||||
internal short ReservedSize { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Defines a register containing a string
|
||||
@@ -22,8 +22,8 @@ namespace MewtocolNet.Registers {
|
||||
public SRegister(int _adress, int _reservedStringSize, string _name = null) {
|
||||
|
||||
if (_adress > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
|
||||
Name = _name;
|
||||
MemoryAdress = _adress;
|
||||
name = _name;
|
||||
memoryAdress = _adress;
|
||||
ReservedSize = (short)_reservedStringSize;
|
||||
|
||||
//calc mem length
|
||||
@@ -32,13 +32,12 @@ namespace MewtocolNet.Registers {
|
||||
wordsize++;
|
||||
}
|
||||
|
||||
MemoryLength = (int)Math.Round(wordsize + 1);
|
||||
}
|
||||
|
||||
public override string ToString() {
|
||||
return $"Adress: {MemoryAdress} Val: {Value}";
|
||||
memoryLength = (int)Math.Round(wordsize + 1);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Builds the register identifier for the mewotocol protocol
|
||||
/// </summary>
|
||||
public override string BuildMewtocolIdent() {
|
||||
|
||||
StringBuilder asciistring = new StringBuilder("D");
|
||||
@@ -62,13 +61,12 @@ namespace MewtocolNet.Registers {
|
||||
return asciistring.ToString();
|
||||
}
|
||||
|
||||
public void SetValueFromPLC (string val) {
|
||||
internal void SetValueFromPLC (string val) {
|
||||
lastVal = val;
|
||||
TriggerChangedEvnt(this);
|
||||
TriggerNotifyChange();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
namespace MewtocolNet.Registers {
|
||||
|
||||
/// <summary>
|
||||
/// The results of a string register operation
|
||||
/// </summary>
|
||||
public class SRegisterResult {
|
||||
|
||||
/// <summary>
|
||||
/// The command result
|
||||
/// </summary>
|
||||
public CommandResult Result { get; set; }
|
||||
/// <summary>
|
||||
/// The register definition used
|
||||
/// </summary>
|
||||
public SRegister Register { get; set; }
|
||||
|
||||
public override string ToString() {
|
||||
string errmsg = Result.Success ? "" : $", Error [{Result.ErrorDescription}]";
|
||||
return $"Result [{Result.Success}], Register [{Register.ToString()}]{errmsg}";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<PackageId>AppLogger</PackageId>
|
||||
<Version>0.2.5</Version>
|
||||
<PackageId>MewtocolNet</PackageId>
|
||||
<Version>0.5.2</Version>
|
||||
<Authors>Felix Weiss</Authors>
|
||||
<Company>Womed</Company>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<Description>A Mewtocol protocol library to interface with Panasonic PLCs over TCP/Serial.</Description>
|
||||
<Copyright>Copyright (c) 2022 WOLF Medizintechnik GmbH</Copyright>
|
||||
<PackageProjectUrl>https://github.com/WOmed/MewtocolNet</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/WOmed/MewtocolNet</RepositoryUrl>
|
||||
<PackageTags>plc;panasonic;mewtocol;automation;</PackageTags>
|
||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||
<UserSecretsId>2ccdcc9b-94a3-4e76-8827-453ab889ea33</UserSecretsId>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<DocumentationFile>C:\Users\Felix Weiß\source\repos\WOmed\MewtocolNet\Builds\MewtocolNet.xml</DocumentationFile>
|
||||
<OutputPath>C:\Users\Felix Weiß\source\repos\WOmed\MewtocolNet\Builds</OutputPath>
|
||||
<DocumentationFile>..\Builds\MewtocolNet.xml</DocumentationFile>
|
||||
<OutputPath>..\Builds</OutputPath>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
70
README.md
70
README.md
@@ -1,3 +1,4 @@
|
||||
[](https://github.com/WOmed/MewtocolNet/actions/workflows/dotnet-windows.yml)
|
||||

|
||||

|
||||

|
||||
@@ -17,18 +18,17 @@ This software was written by WOLF Medizintechnik GmbH (@WOmed/dev).
|
||||
|
||||
- [x] Read out stats from your PLC
|
||||
- [x] Read and write registers in real time
|
||||
- [X] Dynamic register type casting from properties
|
||||
- [ ] Change run / prog modes
|
||||
- [ ] Write byte blocks in a whole chain
|
||||
- [ ] Upload programs to the PLC
|
||||
- [ ] Download programs from the PLC
|
||||
- [x] Dynamic register type casting from properties
|
||||
- [x] Change run / prog modes
|
||||
- [x] Write / read byte blocks in a whole chain
|
||||
- [ ] Upload / Download programs to the PLC
|
||||
- [ ] Reading / writing PLC system registers
|
||||
|
||||
# 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)
|
||||
|
||||
@@ -53,7 +53,7 @@ Where is the RS232/Serial support?
|
||||
|
||||
Install this package by using [Nuget](https://www.nuget.org/packages/MewtocolNet/) or reference
|
||||
```XML
|
||||
<PackageReference Include="MewtocolNet" Version="0.2.5" />
|
||||
<PackageReference Include="MewtocolNet" Version="0.5.0" />
|
||||
```
|
||||
in your dependencies.
|
||||
Alternatively use the dotnet CLI and run
|
||||
@@ -84,28 +84,15 @@ Logger.OnNewLogMessage((date, msg) => {
|
||||
});
|
||||
|
||||
//setting up a new PLC interface
|
||||
MewtocolInterface interf = new MewtocolInterface("192.168.115.5");
|
||||
MewtocolInterface plc = new MewtocolInterface("192.168.115.5");
|
||||
|
||||
await interf.ConnectAsync();
|
||||
await plc.ConnectAsync();
|
||||
```
|
||||
|
||||
You can also use the callbacks of the `ConnectAsync()` method to do something after the initial connection establishment.
|
||||
|
||||
```C#
|
||||
await interf.ConnectAsync(
|
||||
//PLC connected
|
||||
(plc) => {
|
||||
if(plcinf.OperationMode.RunMode)
|
||||
Console.WriteLine("PLC is in RUN");
|
||||
},
|
||||
//Connection failed
|
||||
() => {
|
||||
Console.WriteLine("PLC failed to connect");
|
||||
}
|
||||
);
|
||||
```
|
||||
## Reading data registers / contacts
|
||||
|
||||
[Detailed instructions](https://github.com/WOmed/MewtocolNet/wiki/Attribute-handled-reading)
|
||||
|
||||
- Create a new class that inherits from `RegisterCollectionBase`
|
||||
|
||||
```C#
|
||||
@@ -135,20 +122,14 @@ public class TestRegisters : RegisterCollectionBase {
|
||||
- attach an automatic poller by chaining `.WithPoller()` after the register attachment
|
||||
|
||||
```C#
|
||||
//attaching a logger
|
||||
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("192.168.115.5");
|
||||
MewtocolInterface plc = new MewtocolInterface("192.168.115.5");
|
||||
TestRegisters registers = new TestRegisters();
|
||||
|
||||
//attaching the register collection and an automatic poller
|
||||
interf.WithRegisterCollection(registers).WithPoller();
|
||||
plc.WithRegisterCollection(registers).WithPoller();
|
||||
|
||||
await interf.ConnectAsync(
|
||||
await plc.ConnectAsync(
|
||||
(plcinf) => {
|
||||
//reading a value from the register collection
|
||||
Console.WriteLine($"Time Value is: {registers.TestTime}");
|
||||
@@ -169,37 +150,28 @@ Sets the register without feedback if it was set
|
||||
|
||||
```C#
|
||||
//inverts the boolean register
|
||||
interf.SetRegister(nameof(registers.TestBool1), !registers.TestBool1);
|
||||
plc.SetRegister(nameof(registers.TestBool1), !registers.TestBool1);
|
||||
|
||||
//set the current second to the PLCs TIME register
|
||||
interf.SetRegister(nameof(registers.TestTime), TimeSpan.FromSeconds(DateTime.Now.Second));
|
||||
plc.SetRegister(nameof(registers.TestTime), TimeSpan.FromSeconds(DateTime.Now.Second));
|
||||
|
||||
//writes 'Test' to the PLCs string register
|
||||
interf.SetRegister(nameof(registers.TestString1), "Test");
|
||||
plc.SetRegister(nameof(registers.TestString1), "Test");
|
||||
```
|
||||
|
||||
You can also set a register by calling its name directly (Must be either in an attached register collection or added to the list manually)
|
||||
|
||||
Adding registers to a manual list
|
||||
```C#
|
||||
interf.AddRegister<bool>(105, _name: "ManualBoolRegister");
|
||||
plc.AddRegister<bool>(105, _name: "ManualBoolRegister");
|
||||
```
|
||||
|
||||
Reading the value of the manually added register
|
||||
```C#
|
||||
//get the value as a string
|
||||
string value = interf.GetRegister("ManualBoolRegister").GetValueString();
|
||||
string value = plc.GetRegister("ManualBoolRegister").GetValueString();
|
||||
//get the value by casting
|
||||
bool value2 = interf.GetRegister<BRegister>("ManualBoolRegister").Value;
|
||||
bool value2 = plc.GetRegister<BRegister>("ManualBoolRegister").Value;
|
||||
//for double casted ones like numbers
|
||||
var value2 = interf.GetRegister<NRegister<short>>("NumberRegister").Value;
|
||||
```
|
||||
|
||||
### Asynchronous
|
||||
|
||||
Sets the register waiting for the PLC to confirm it was set
|
||||
|
||||
```C#
|
||||
//inverts the boolean register
|
||||
await interf.SetRegisterAsync(nameof(registers.TestBool1), !registers.TestBool1);
|
||||
var value2 = plc.GetRegister<NRegister<short>>("NumberRegister").Value;
|
||||
```
|
||||
|
||||
Reference in New Issue
Block a user