Typos

- added a queuing manager for all messages
- tcp now keeps the connection after the first handshake
- async tasks are now run by the time order they were added
- minor bugfixes

Examples/Program.cs

@@ -2,66 +2,135 @@
 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
+        var line = Console.ReadLine();
-                Logger.LogLevel = LogLevel.Verbose;
-                Logger.OnNewLogMessage((date, msg) => {
-                    Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
-                });
-                   
-                //setting up a new PLC interface and register collection
-                MewtocolInterface interf = new MewtocolInterface("10.237.191.3");
-                TestRegisters registers = new TestRegisters();
 
-                //attaching the register collection and an automatic poller
+        if(line == "1") {
-                interf.WithRegisterCollection(registers).WithPoller();
+            Scenario1();
-
-                await interf.ConnectAsync(
-                    (plcinf) => {
-
-                        //reading a value from the register collection
-                        Console.WriteLine($"BitValue is: {registers.BitValue}");
-
-                        //writing a value to the registers
-                        Task.Factory.StartNew(async () => {
-
-                            //set plc to run mode if not already
-                            await interf.SetOperationMode(OPMode.Run);
-
-                            await Task.Delay(2000);
-
-                            //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));
-
-                        });
-
-                    }
-                );
-
-            });
-            
-            Console.ReadLine();
         }
+
+        if (line == "2") {
+            Scenario2();
+        }
+
+        Console.ReadLine();
     }
+
+    static void Scenario1 () {
+
+        Task.Factory.StartNew(async () => {
+
+            //attaching the logger
+            Logger.LogLevel = LogLevel.Critical;
+            Logger.OnNewLogMessage((date, msg) => {
+                Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
+            });
+
+            //setting up a new PLC interface and register collection
+            MewtocolInterface interf = new MewtocolInterface("10.237.191.3");
+            TestRegisters registers = new TestRegisters();
+
+            //attaching the register collection and an automatic poller
+            interf.WithRegisterCollection(registers).WithPoller();
+
+            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 () => {
+
+            using(var interf = new MewtocolInterface("10.237.191.3")) {
+
+                await interf.ConnectAsync();
+
+                if(interf.IsConnected) {
+
+                    var plcInf = await interf.GetPLCInfoAsync();
+                    Console.WriteLine(plcInf);
+
+                }
+
+                interf.Disconnect();
+
+            }
+
+
+            using (var interf = new MewtocolInterface("10.237.191.3")) {
+
+                await interf.ConnectAsync();
+
+                if (interf.IsConnected) {
+
+                    var plcInf = await interf.GetPLCInfoAsync();
+                    Console.WriteLine(plcInf);
+
+                }
+
+                interf.Disconnect();
+
+            }
+
+
+        });
+
+    }
+
 }

Examples/TestRegisters.cs

@@ -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)]
+        //[Register(1101, 4)]
-        public string TestString1 { get; private set; }
+        //public string TestString1 { get; private set; }
 
         //corresponds to a DT7000 16 bit int register in the PLC
-        [Register(7000)]
+        [Register(899)]
         public short TestInt16 { get; private set; }
 
         //corresponds to a DTD7001 - DTD7002 32 bit int register in the PLC
@@ -42,10 +45,29 @@ 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; }
+
+
     }
 }

MewtocolNet/Mewtocol/DynamicInterface.cs

@@ -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,149 +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 () => {
+                while (ContinousReaderRunning) {
-
-                    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;
-
-                    int getPLCinfoCycleCount = 0;
-
-                    while (ContinousReaderRunning) {
-
-                        //do priority tasks first
-                        if (PriorityTasks.Count > 0) {
-
-                            await PriorityTasks.FirstOrDefault(x => !x.IsCompleted);
-
-                        } else if (getPLCinfoCycleCount > 25) {
-
-                            await GetPLCInfoAsync();
-                            getPLCinfoCycleCount = 0;
-
-                        }
-
-                        foreach (var registerPair in Registers) {
-
-                            var reg = registerPair.Value;
-
-                            if (reg is NRegister<short> shortReg) {
-                                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) {
-                                var lastVal = stringReg.Value;
-                                var readout = (await ReadStringRegister(stringReg)).Register.Value;
-                                if (lastVal != readout) {
-                                    InvokeRegisterChanged(stringReg);
-                                    stringReg.TriggerNotifyChange();
-                                }
-
-                            }
-
-                        }
-
-                        getPLCinfoCycleCount++;
 
+                    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++;
+
+                }
+
+            });
 
         }
 
@@ -200,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));
+                toAdd = new NRegister<short>(_address, _name);
-                return;
             }
             if (_type == RegisterType.DT_ushort) {
-                Registers.Add(_address, new NRegister<ushort>(_address, _name));
+                toAdd = new NRegister<ushort>(_address, _name);
-                return;
             }
             if (_type == RegisterType.DDT_int) {
-                Registers.Add(_address, new NRegister<int>(_address, _name));
+                toAdd = new NRegister<int>(_address, _name);
-                return;
             }
             if (_type == RegisterType.DDT_uint) {
-                Registers.Add(_address, new NRegister<uint>(_address, _name));
+                toAdd = new NRegister<uint>(_address, _name);
-                return;
             }
             if (_type == RegisterType.DDT_float) {
-                Registers.Add(_address, new NRegister<float>(_address, _name));
+                toAdd = new NRegister<float>(_address, _name);
-                return;
             }
 
-            //as bool registers
+            if(toAdd == null) {
-            Registers.Add(_address, new BRegister(_address, _type, _name));
+                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);
 
         }
 
@@ -244,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);
 
         }
 
@@ -265,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);
 
@@ -273,34 +258,84 @@ namespace MewtocolNet {
                 throw new NotSupportedException($"_lenght parameter only allowed for register of type string");
             }
 
-            if (Registers.Any(x => x.Key == _address)) {
+            Register toAdd;
-
-                throw new NotSupportedException($"Cannot add a register multiple times, " +
-                    $"make sure that all register attributes or AddRegister assignments have different adresses.");
-
-            }
 
             if (regType == typeof(short)) {
-                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
@@ -313,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);
 
         }
 
@@ -324,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);
+                var reg = Registers.FirstOrDefault(x => x.Name == name);
-                return reg.Value as T;
+                return reg as T;
             } catch (InvalidCastException) {
                 return default(T);
             }
@@ -340,7 +375,7 @@ namespace MewtocolNet {
         /// </summary>
         public List<Register> GetAllRegisters () {
 
-            return Registers.Values.ToList();
+            return Registers;
 
         }
 

MewtocolNet/Mewtocol/MewtocolHelpers.cs

@@ -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,6 +158,8 @@ 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))

MewtocolNet/Mewtocol/MewtocolInterface.cs

@@ -11,42 +11,90 @@ 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 = 1000;
+        /// <summary>
+        /// The initial connection timeout in milliseconds
+        /// </summary>
+        public int ConnectTimeout {
+            get { return connectTimeout; }
+            set { connectTimeout = value; }
+        }
+
+        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 stationNumber;
+        private int cycleTimeMs = 25;
 
         /// <summary>
         /// The current IP of the PLC connection
@@ -61,7 +109,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
 
@@ -72,10 +136,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 +154,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}) " : "")}" +
@@ -144,6 +208,7 @@ namespace MewtocolNet {
 
                 if (OnFailed != null) {
                     OnFailed();
+                    Disconnected?.Invoke();
                     Logger.Log("Initial connection failed", LogLevel.Info, this);
                 }
 
@@ -153,6 +218,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
@@ -167,6 +261,70 @@ 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 {
+
+                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) {
+                    OnMajorSocketExceptionWhileConnecting();
+                    return;
+                }
+
+                stream = client.GetStream();
+                stream.ReadTimeout = 1000;
+
+                Console.WriteLine($"Connected {client.Connected}");
+                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>
@@ -190,47 +348,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) {
+                            if (cAttribute.BitCount == BitCount.B16) {
-                                AddRegister<short>(cAttribute.MemoryArea, _name: propName, _isBitwise: true);
+                                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 +400,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 +422,45 @@ 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) {
 
                     var foundAttributes = foundToUpdate.GetCustomAttributes(true);
@@ -300,6 +501,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)) {
@@ -309,27 +518,7 @@ namespace MewtocolNet {
                     }
 
 
-                    if (foundToUpdate.PropertyType == typeof(bool) && registerAttr.AssignedBitIndex >= 0) {
+                    if (foundToUpdate.PropertyType == typeof(BitArray)) {
-
-                        //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)) {
 
                         //setting back bit registers
                         if (reg is NRegister<short> shortReg) {
@@ -360,7 +549,7 @@ namespace MewtocolNet {
                 collection.OnInterfaceLinked(this);
 
             Connected += (i) => {
-                if(collection != null) 
+                if (collection != null)
                     collection.OnInterfaceLinkedAndOnline(this);
             };
 
@@ -462,7 +651,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) {
 
@@ -470,29 +658,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);
+                return new CommandResult {
-                PriorityTasks.Add(awaittask);
+                    Success = true,
-                awaittask.Wait();
+                    Error = "0000",
+                    Response = response.ToString()
+                };
 
-                PriorityTasks.Remove(awaittask);    
+            } catch {
-                response = awaittask.Result;
-
-            } else {
-
-                //poller not active let the user manage message timing
-
-                response = await SendSingleBlock(_msg);
-
-            }
-
-            if(response == null) {
                 return new CommandResult {
                     Success = false,
                     Error = "0000",
@@ -500,78 +701,85 @@ 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.Connected)
-
-                try {
-
-                    await client.ConnectAsync(ip, port);
-
-                    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();
-                    }
-
-                } catch(Exception) {
-
-                    IsConnected = false;
-                    KillPoller();
-                    Logger.Log("The PLC connection was closed", LogLevel.Error, this);
                     return null;
+            }
+
+            var message = _blockString.ToHexASCIIBytes();
+
+            //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);
+            }
+
+            //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));
+                    }
+                    while (stream.DataAvailable);
 
                 }
-                
+
+            } catch (IOException) {
+                Logger.Log($"Critical IO exception on receive", LogLevel.Critical, this);
+                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
 
@@ -590,4 +798,5 @@ namespace MewtocolNet {
 
     }
 
+
 }

MewtocolNet/Mewtocol/MewtocolInterfaceRequests.cs

@@ -115,26 +115,40 @@ namespace MewtocolNet {
         /// <returns>A byte array or null of there was an error</returns>
         public async Task<byte[]> ReadByteRange (int start, int count) {
 
-            string startStr = start.ToString().PadLeft(5, '0');
+            var byteList = new List<byte>();
+            
             var wordLength = count / 2;
-            bool wasOdd = false;
             if (count % 2 != 0) 
                 wordLength++;
 
-            string endStr = (start + wordLength - 1).ToString().PadLeft(5, '0');
 
-            string requeststring = $"%{GetStationNumber()}#RDD{startStr}{endStr}";
+            //read blocks of max 4 words per msg
-            var result = await SendCommandAsync(requeststring);
+            for (int i = 0; i < wordLength; i+=8) {
 
-            if(result.Success && !string.IsNullOrEmpty(result.Response)) {
+                int curWordStart = start + i;
+                int curWordEnd = curWordStart + 7;
 
-                var bytes = result.Response.ParseDTByteString(wordLength * 4).HexStringToByteArray();
+                string startStr = curWordStart.ToString().PadLeft(5, '0');
+                string endStr = (curWordEnd).ToString().PadLeft(5, '0');
 
-                return bytes.BigToMixedEndian().Take(count).ToArray();
+                string requeststring = $"%{GetStationNumber()}#RDD{startStr}{endStr}";
+                var result = await SendCommandAsync(requeststring);
+
+                if (result.Success && !string.IsNullOrEmpty(result.Response)) {
+
+                    var bytes = result.Response.ParseDTByteString(8 * 4).HexStringToByteArray();
+
+                    if (bytes == null) {
+                        return null;
+                    }
+
+                    byteList.AddRange(bytes.BigToMixedEndian().Take(count).ToArray());
+
+                }
 
             }
 
-            return null;
+            return byteList.ToArray();  
 
         }
 
@@ -160,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 {
@@ -183,7 +197,7 @@ namespace MewtocolNet {
 
             var result = await SendCommandAsync(requeststring);
 
-            return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}#WC");
+            return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WC");
 
         }
 
@@ -196,7 +210,6 @@ 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) {
 
@@ -205,58 +218,66 @@ namespace MewtocolNet {
             string requeststring = $"%{GetStationNumber()}#RD{_toRead.BuildMewtocolIdent()}";
             var result = await SendCommandAsync(requeststring);
 
-            if(!result.Success || string.IsNullOrEmpty(result.Response)) {
+            var failedResult = new NRegisterResult<T> {
-                return new NRegisterResult<T> {
+                Result = result,
-                    Result = result,
+                Register = _toRead
-                    Register = _toRead
+            };
-                };
+
+            if (!result.Success || string.IsNullOrEmpty(result.Response)) {
+                return failedResult;
             }
                 
             if (numType == typeof(short)) {
 
                 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);
 
             }
 
@@ -313,7 +334,7 @@ namespace MewtocolNet {
 
             var result = await SendCommandAsync(requeststring);
 
-            return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}#WD");
+            return result.Success && result.Response.StartsWith($"%{ GetStationNumber()}$WD");
 
         }
 
@@ -369,7 +390,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

MewtocolNet/Mewtocol/Subregisters/BRegister.cs

@@ -9,8 +9,8 @@ namespace MewtocolNet.Registers {
     /// </summary>
     public class BRegister : Register {
 
-        internal RegisterType RegType { get; set; }     
+        internal RegisterType RegType { get; private set; }     
-        internal SpecialAddress SpecialAddress { get; 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 {
+        public bool Value => LastValue;
-            get => LastValue;
-            set {
-                NeedValue = value;
-                TriggerChangedEvnt(this);
-            }
-        }
 
         /// <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;
+            memoryAdress = _address;
-            Name = _name;
+            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}";
         }

MewtocolNet/Mewtocol/Subregisters/NRegister.cs

@@ -13,48 +13,75 @@ namespace MewtocolNet.Registers {
         /// <summary>
         /// The value of the register
         /// </summary>
-        public T Value {
+        public T Value => LastValue;
-            get => LastValue;
-            set {
-                NeedValue = value;
-                TriggerChangedEvnt(this);
-            }
-        }
 
         /// <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>
+        /// <param name="_name">Name of the register</param>
-        public NRegister(int _adress, string _name = null, bool isBitwise = false) {
+        public NRegister (int _adress, string _name = null) {
 
-            if (_adress > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
+            if (_adress > 99999)
-            MemoryAdress = _adress;
+                throw new NotSupportedException("Memory adresses cant be greater than 99999");
-            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");
+            }
+
+        }
+
+        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;    
 
         }
 
+        internal void SetValueFromPLC (object val) {
+            LastValue = (T)val;
+            TriggerChangedEvnt(this);
+            TriggerNotifyChange();
+        }
+
         public override string ToString() {
             return $"Adress: {MemoryAdress} Val: {Value}";
         }
+
     }
 
 

MewtocolNet/Mewtocol/Subregisters/NRegisterResult.cs

@@ -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;
+        }
+
     }
 
 

MewtocolNet/Mewtocol/Subregisters/Register.cs

@@ -17,12 +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; }
+        internal Type collectionType;
-        public int MemoryAdress { get; set; }
+        /// <summary>
-        public int MemoryLength { get; set; }
+        /// 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)));
+            };
+        }
 
         public virtual string BuildMewtocolIdent() {
 
@@ -60,6 +111,18 @@ 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)) {
+                    dict.Add((int)Enum.Parse(enumType, name), 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 +145,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.";
@@ -148,7 +210,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}";
 

MewtocolNet/Mewtocol/Subregisters/SRegister.cs

@@ -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;
+            name = _name;
-            MemoryAdress = _adress;
+            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();

MewtocolNet/MewtocolNet.csproj

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

MewtocolNet/Queue/SerialQueue.cs

@@ -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;
+            }
+        }
+
+    }
+
+}

README.md

@@ -28,7 +28,7 @@ This software was written by WOLF Medizintechnik GmbH (@WOmed/dev).
 
 ## .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.3.0" />
+<PackageReference Include="MewtocolNet" Version="0.5.0" />
 ```
 in your dependencies.
 Alternatively use the dotnet CLI and run