12 Commits

Author SHA1 Message Date
Felix Weiß
83f17a4eae Fixed bug a bug where the writeregister method always returned false
- fixed a bug where the adress ToString of a register with a special adress was always ending with 0
- counted up version
2022-06-23 12:15:42 +02:00
Felix Weiß
4c719843f2 Fixed issues with bitwise decoding not working correctly
- refactored bitwise register assign methods
- counted up version number
2022-06-22 15:58:24 +02:00
Felix Weiß
8f9e66d5d3 Added string value to register base for viewmodel support
- counted up version number
2022-06-22 10:13:15 +02:00
Felix Weiß
5cc222abcc Merge branch 'master' of https://github.com/WOmed/MewtocolNet 2022-06-22 09:22:37 +02:00
Felix Weiß
14659ffaad Implemented INotifyPropertyChanged on MewtocolInterface
- added event for disconnect
- counted up version number
2022-06-22 09:21:50 +02:00
Sandoun
ea106416ee Fixed an issue with doc file and build directory path 2022-06-21 18:05:14 +02:00
Felix Weiß
0afa146712 Counted up version number 2022-06-21 16:45:48 +02:00
Felix Weiß
325aa56d8a Added register collection base methods 2022-06-21 16:45:22 +02:00
Felix Weiß
f4fad297fb Merge branch 'master' of https://github.com/WOmed/MewtocolNet 2022-06-21 15:54:31 +02:00
Felix Weiß
664b32b92e Fixed plc info not getting set when reading it
- added auto poll of plc info each 25 cycles
- counted up version
2022-06-21 15:54:24 +02:00
Felix Weiß
a639a8eda8 Update README.md 2022-06-21 14:31:29 +02:00
Felix Weiß
23c2b0efb4 Update README.md 2022-06-21 14:20:25 +02:00
13 changed files with 409 additions and 151 deletions

View File

@@ -2,6 +2,7 @@
using System.Threading.Tasks;
using MewtocolNet;
using MewtocolNet.Logging;
using MewtocolNet.Registers;
namespace Examples {
@@ -30,6 +31,12 @@ namespace Examples {
//reading a value from the register collection
Console.WriteLine($"BitValue is: {registers.BitValue}");
interf.GetRegister(nameof(registers.TestBool1)).PropertyChanged += (s, e) => {
Console.ForegroundColor = ConsoleColor.Green;
Console.WriteLine(interf.GetRegister(nameof(registers.TestBool1)).StringValue);
Console.ResetColor();
};
//writing a value to the registers
Task.Factory.StartNew(async () => {
@@ -38,9 +45,6 @@ namespace Examples {
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

View File

@@ -7,7 +7,7 @@ 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; }
//corresponds to a XD input of the PLC
@@ -42,11 +42,13 @@ 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 TimeSpan TestTime { get; private set; }
}
}

View File

@@ -71,6 +71,8 @@ namespace MewtocolNet {
ContinousReaderRunning = true;
int getPLCinfoCycleCount = 0;
while (ContinousReaderRunning) {
//do priority tasks first
@@ -78,6 +80,11 @@ namespace MewtocolNet {
await PriorityTasks.FirstOrDefault(x => !x.IsCompleted);
} else if (getPLCinfoCycleCount > 25) {
await GetPLCInfoAsync();
getPLCinfoCycleCount = 0;
}
foreach (var registerPair in Registers) {
@@ -88,63 +95,49 @@ namespace MewtocolNet {
var lastVal = shortReg.Value;
var readout = (await ReadNumRegister(shortReg)).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)).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)).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)).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)).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)).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)).Register.Value;
if (lastVal != readout) {
boolReg.LastValue = readout;
InvokeRegisterChanged(boolReg);
boolReg.TriggerNotifyChange();
}
}
if (reg is SRegister stringReg) {
@@ -152,13 +145,14 @@ namespace MewtocolNet {
var readout = (await ReadStringRegister(stringReg)).Register.Value;
if (lastVal != readout) {
InvokeRegisterChanged(stringReg);
stringReg.TriggerNotifyChange();
}
}
}
getPLCinfoCycleCount++;
//invoke cycle polled event
InvokePolledCycleDone();
@@ -191,30 +185,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(_address, 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(_address, toAdd);
}
@@ -239,6 +263,17 @@ namespace MewtocolNet {
}
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((int)_spAddress, reg);
}
/// <summary>
/// Adds a PLC memory register to the watchlist <para/>
/// The registers can be read back by attaching <see cref="WithPoller"/>
@@ -256,7 +291,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);
@@ -265,18 +300,16 @@ namespace MewtocolNet {
}
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.");
}
if (regType == typeof(short)) {
Registers.Add(_address, new NRegister<short>(_address, _name, _isBitwise));
Registers.Add(_address, new NRegister<short>(_address, _name));
} else if (regType == typeof(ushort)) {
Registers.Add(_address, new NRegister<ushort>(_address, _name));
} else if (regType == typeof(int)) {
Registers.Add(_address, new NRegister<int>(_address, _name, _isBitwise));
Registers.Add(_address, new NRegister<int>(_address, _name));
} else if (regType == typeof(uint)) {
Registers.Add(_address, new NRegister<uint>(_address, _name));
} else if (regType == typeof(float)) {
@@ -294,6 +327,56 @@ namespace MewtocolNet {
}
internal void AddRegister<T> (Type _colType, int _address, int _length = 1, string _name = null, bool _isBitwise = false) {
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.Key == _address) && !_isBitwise) {
throw new NotSupportedException($"Cannot add a register multiple times, " +
$"make sure that all register attributes or AddRegister assignments have different adresses.");
}
if (Registers.Any(x => x.Key == _address) && _isBitwise) {
return;
}
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);
} 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 {
reg.collectionType = _colType;
Registers.Add(_address, reg);
}
}
#endregion
#region Register accessing

View File

@@ -11,33 +11,58 @@ using MewtocolNet.RegisterAttributes;
using MewtocolNet.Logging;
using System.Collections;
using System.Diagnostics;
using System.ComponentModel;
namespace MewtocolNet {
/// <summary>
/// The PLC com interface class
/// </summary>
public partial class MewtocolInterface {
public partial class MewtocolInterface : INotifyPropertyChanged {
/// <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 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 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
@@ -46,7 +71,7 @@ namespace MewtocolNet {
private string ip;
private int port;
private int stationNumber;
private int stationNumber;
/// <summary>
/// The current IP of the PLC connection
@@ -61,7 +86,20 @@ namespace MewtocolNet {
/// </summary>
public int StationNumber => stationNumber;
internal List<Task> PriorityTasks { get; set; } = new List<Task>();
private int cycleTimeMs;
/// <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 List<Task> PriorityTasks { get; set; } = new List<Task>();
#region Initialization
@@ -72,10 +110,10 @@ namespace MewtocolNet {
/// <param name="_port">Port of the PLC</param>
/// <param name="_station">Station Number of the PLC</param>
public MewtocolInterface (string _ip, int _port = 9094, int _station = 1) {
ip = _ip;
port = _port;
stationNumber = _station;
stationNumber = _station;
Connected += MewtocolInterface_Connected;
@@ -90,7 +128,8 @@ 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}) " : "")}" +
@@ -144,6 +183,7 @@ namespace MewtocolNet {
if (OnFailed != null) {
OnFailed();
Disconnected?.Invoke();
Logger.Log("Initial connection failed", LogLevel.Info, this);
}
@@ -190,47 +230,47 @@ 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);
}
//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);
}
}
@@ -238,16 +278,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);
}
}
@@ -258,8 +300,42 @@ 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);
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) {
var foundAttributes = foundToUpdate.GetCustomAttributes(true);
@@ -309,27 +385,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) {
@@ -356,6 +412,14 @@ namespace MewtocolNet {
};
if (collection != null)
collection.OnInterfaceLinked(this);
Connected += (i) => {
if (collection != null)
collection.OnInterfaceLinkedAndOnline(this);
};
return this;
}
@@ -465,7 +529,7 @@ namespace MewtocolNet {
string response = null;
if(ContinousReaderRunning) {
if (ContinousReaderRunning) {
//if the poller is active then add all messages to a qeueue
@@ -473,7 +537,7 @@ namespace MewtocolNet {
PriorityTasks.Add(awaittask);
awaittask.Wait();
PriorityTasks.Remove(awaittask);
PriorityTasks.Remove(awaittask);
response = awaittask.Result;
} else {
@@ -484,7 +548,7 @@ namespace MewtocolNet {
}
if(response == null) {
if (response == null) {
return new CommandResult {
Success = false,
Error = "0000",
@@ -519,7 +583,7 @@ namespace MewtocolNet {
private async Task<string> SendSingleBlock (string _blockString) {
Stopwatch sw = Stopwatch.StartNew();
Stopwatch sw = Stopwatch.StartNew();
using (TcpClient client = new TcpClient() { ReceiveBufferSize = 64, NoDelay = true, ExclusiveAddressUse = true }) {
@@ -547,19 +611,28 @@ namespace MewtocolNet {
}
while (stream.DataAvailable);
sw.Stop();
var curCycle = (int)sw.ElapsedMilliseconds;
if (Math.Abs(CycleTimeMs - curCycle) > 2) {
CycleTimeMs = curCycle;
}
Logger.Log($"IN MSG ({(int)sw.Elapsed.TotalMilliseconds}ms): {_blockString}", LogLevel.Critical, this);
return response.ToString();
}
} catch(Exception) {
} catch (Exception) {
if (IsConnected) {
CycleTimeMs = 0;
IsConnected = false;
Disconnected?.Invoke();
}
IsConnected = false;
KillPoller();
Logger.Log("The PLC connection was closed", LogLevel.Error, this);
return null;
}
}
}

View File

@@ -44,6 +44,8 @@ namespace MewtocolNet {
ErrorCode = error,
StationNumber = int.Parse(station ?? "0"),
};
PlcInfo = retInfo;
return retInfo;
}
@@ -158,7 +160,7 @@ namespace MewtocolNet {
var resultBool = result.Response.ParseRCSingleBit();
if(resultBool != null) {
_toRead.LastValue = resultBool.Value;
_toRead.SetValueFromPLC(resultBool.Value);
}
var finalRes = new BRegisterResult {
@@ -181,7 +183,7 @@ namespace MewtocolNet {
var result = await SendCommandAsync(requeststring);
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}#WC");
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WC");
}
@@ -214,25 +216,25 @@ namespace MewtocolNet {
var resultBytes = result.Response.ParseDTByteString(4).ReverseByteOrder();
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();
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();
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();
var val = uint.Parse(resultBytes, NumberStyles.HexNumber);
(_toRead as NRegister<uint>).LastValue = val;
_toRead.SetValueFromPLC(val);
} else if (numType == typeof(float)) {
@@ -243,7 +245,7 @@ namespace MewtocolNet {
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)) {
@@ -254,7 +256,7 @@ namespace MewtocolNet {
var ts = TimeSpan.FromMilliseconds(valMillis);
//minmax writable / readable value is 10ms
(_toRead as NRegister<TimeSpan>).LastValue = ts;
_toRead.SetValueFromPLC(ts);
}
@@ -311,7 +313,7 @@ namespace MewtocolNet {
var result = await SendCommandAsync(requeststring);
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}#WD");
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WD");
}
@@ -367,7 +369,7 @@ namespace MewtocolNet {
var result = await SendCommandAsync(requeststring);
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}#WD");
return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WD");
}
#endregion

View File

@@ -10,17 +10,34 @@ 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));
}
public virtual void OnInterfaceLinked (MewtocolInterface plc) { }
public virtual void OnInterfaceLinkedAndOnline (MewtocolInterface plc) { }
}
}

View File

@@ -9,8 +9,8 @@ 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;
@@ -18,13 +18,7 @@ namespace MewtocolNet.Registers {
/// <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 +29,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,7 +48,7 @@ namespace MewtocolNet.Registers {
throw new NotSupportedException("Special adress cant be none");
SpecialAddress = _address;
Name = _name;
name = _name;
RegType = _type;
@@ -74,6 +68,11 @@ namespace MewtocolNet.Registers {
}
internal void SetValueFromPLC (bool val) {
LastValue = val;
TriggerChangedEvnt(this);
TriggerNotifyChange();
}
public override string ToString() {
return $"Adress: {MemoryAdress} Val: {Value}";
}

View File

@@ -13,13 +13,7 @@ namespace MewtocolNet.Registers {
/// <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
@@ -29,21 +23,21 @@ namespace MewtocolNet.Registers {
public NRegister(int _adress, string _name = null, bool isBitwise = false) {
if (_adress > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
MemoryAdress = _adress;
Name = _name;
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");
}
@@ -52,9 +46,16 @@ namespace MewtocolNet.Registers {
}
internal void SetValueFromPLC (object val) {
LastValue = (T)val;
TriggerChangedEvnt(this);
TriggerNotifyChange();
}
public override string ToString() {
return $"Adress: {MemoryAdress} Val: {Value}";
}
}

View File

@@ -1,4 +1,6 @@
namespace MewtocolNet.Registers {
using System;
namespace MewtocolNet.Registers {
/// <summary>
/// Result for a read/write operation
/// </summary>
@@ -11,6 +13,19 @@
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;
}
}

View File

@@ -17,13 +17,63 @@ 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 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 Register () {
ValueChanged += (obj) => {
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StringValue)));
};
}
public virtual string BuildMewtocolIdent() {
StringBuilder asciistring = new StringBuilder("D");
@@ -148,7 +198,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}";

View File

@@ -8,11 +8,8 @@ namespace MewtocolNet.Registers {
public class SRegister : Register {
private string lastVal = "";
public string Value {
get => lastVal;
}
public string Value => lastVal;
public short ReservedSize { get; set; }
@@ -22,8 +19,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,7 +29,7 @@ namespace MewtocolNet.Registers {
wordsize++;
}
MemoryLength = (int)Math.Round(wordsize + 1);
memoryLength = (int)Math.Round(wordsize + 1);
}
public override string ToString() {
@@ -62,7 +59,7 @@ namespace MewtocolNet.Registers {
return asciistring.ToString();
}
public void SetValueFromPLC (string val) {
internal void SetValueFromPLC (string val) {
lastVal = val;
TriggerChangedEvnt(this);
TriggerNotifyChange();

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>MewtocolNet</PackageId>
<Version>0.3.0</Version>
<Version>0.3.6</Version>
<Authors>Felix Weiss</Authors>
<Company>Womed</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -15,7 +15,7 @@
<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>

View File

@@ -18,11 +18,10 @@ 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
@@ -54,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.3.0" />
```
in your dependencies.
Alternatively use the dotnet CLI and run