From 32c758b03286b12751d7aa195d6fcd463b5bcba6 Mon Sep 17 00:00:00 2001 From: Alessandro Mandelli Date: Fri, 8 Feb 2019 20:01:04 +0100 Subject: [PATCH 1/4] Commit 5.5.1 for undetecting !datareceived when unitidentifier =0, porting to .net 4.7 --- EasyModbus/EasyModbus.csproj | 4 +- EasyModbus/ModbusClient.cs | 202 ++++++++++----------- EasyModbus/ModbusServer.cs | 6 +- EasyModbus/Properties/AssemblyInfo.cs | 4 +- EasyModbusServerSimulator/MainForm.cs | 2 - EasyModbusTCPCore/ModbusClient.cs | 5 - ServerApplication/App.config | 6 +- ServerApplication/ServerApplication.csproj | 3 +- 8 files changed, 113 insertions(+), 119 deletions(-) diff --git a/EasyModbus/EasyModbus.csproj b/EasyModbus/EasyModbus.csproj index 41db91d..9f17281 100644 --- a/EasyModbus/EasyModbus.csproj +++ b/EasyModbus/EasyModbus.csproj @@ -1,5 +1,5 @@  - + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B} Debug @@ -7,7 +7,7 @@ Library EasyModbus EasyModbus - v4.0 + v4.7 Properties diff --git a/EasyModbus/ModbusClient.cs b/EasyModbus/ModbusClient.cs index 7f180ef..c41de5f 100644 --- a/EasyModbus/ModbusClient.cs +++ b/EasyModbus/ModbusClient.cs @@ -712,8 +712,8 @@ public static UInt16 calculateCRC(byte[] data, UInt16 numberOfBytes, int startBy private bool receiveActive = false; private byte[] readBuffer = new byte[256]; private int bytesToRead = 0; - private int akjjjctualPositionToRead = 0; - DateTime dateTimeLastRead; + /*private int akjjjctualPositionToRead = 0; + DateTime dateTimeLastRead;*/ /* private void DataReceivedHandler(object sender, SerialDataReceivedEventArgs e) @@ -868,17 +868,17 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport==null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >2000) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000"); } bool[] response; @@ -990,22 +990,22 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) } if (data[7] == 0x82 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x82 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x82 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x82 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1013,7 +1013,7 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8] + 9] | crc[1] != data[data[8] + 10]) & dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1027,7 +1027,7 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1064,17 +1064,17 @@ public bool[] ReadCoils(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >2000) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000"); } bool[] response; @@ -1185,22 +1185,22 @@ public bool[] ReadCoils(int startingAddress, int quantity) } if (data[7] == 0x81 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x81 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x81 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x81 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1208,7 +1208,7 @@ public bool[] ReadCoils(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8]+9] | crc[1] != data[data[8]+10]) & dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1222,7 +1222,7 @@ public bool[] ReadCoils(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1259,17 +1259,17 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >125) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 125"); } int[] response; @@ -1376,22 +1376,22 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) } if (data[7] == 0x83 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x83 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x83 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x83 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1399,7 +1399,7 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8]+9] | crc[1] != data[data[8]+10])& dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1413,7 +1413,7 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1460,17 +1460,17 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddress > 65535 | quantity >125) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 125"); } int[] response; @@ -1578,22 +1578,22 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) } if (data[7] == 0x84 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x84 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x84 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x84 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) @@ -1601,7 +1601,7 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) crc = BitConverter.GetBytes(calculateCRC(data, (ushort)(data[8]+3), 6)); if ((crc[0] != data[data[8]+9] | crc[1] != data[data[8]+10]) & dataReceived) { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1615,7 +1615,7 @@ public int[] ReadInputRegisters(int startingAddress, int quantity) } else if (!dataReceived) { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1660,12 +1660,12 @@ public void WriteSingleCoil(int startingAddress, bool value) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } byte[] coilValue = new byte[2]; @@ -1723,7 +1723,7 @@ public void WriteSingleCoil(int startingAddress, bool value) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -1775,30 +1775,30 @@ public void WriteSingleCoil(int startingAddress, bool value) } if (data[7] == 0x85 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x85 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x85 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x85 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -1810,10 +1810,10 @@ public void WriteSingleCoil(int startingAddress, bool value) WriteSingleCoil(startingAddress, value); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); - if (NumberOfRetries <= countRetries) + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); + if (NumberOfRetries <= countRetries ) { countRetries = 0; throw new TimeoutException("No Response from Modbus Slave"); @@ -1841,12 +1841,12 @@ public void WriteSingleRegister(int startingAddress, int value) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } byte[] registerValue = new byte[2]; @@ -1898,7 +1898,7 @@ public void WriteSingleRegister(int startingAddress, int value) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -1952,34 +1952,34 @@ public void WriteSingleRegister(int startingAddress, int value) } if (data[7] == 0x86 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x86 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x86 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x86 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { - countRetries = 0; - throw new EasyModbus.Exceptions.CRCCheckFailedException("Response CRC check failed"); + countRetries = 0; + throw new EasyModbus.Exceptions.CRCCheckFailedException("Response CRC check failed"); } else { @@ -1987,10 +1987,10 @@ public void WriteSingleRegister(int startingAddress, int value) WriteSingleRegister(startingAddress, value); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); - if (NumberOfRetries <= countRetries) + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); + if (NumberOfRetries <= countRetries & this.unitIdentifier != 0) { countRetries = 0; throw new TimeoutException("No Response from Modbus Slave"); @@ -2023,12 +2023,12 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } this.transactionIdentifier = BitConverter.GetBytes((uint)transactionIdentifierInternal); @@ -2094,7 +2094,7 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -2148,30 +2148,30 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) } if (data[7] == 0x8F & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x8F & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x8F & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x8F & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) & dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2183,9 +2183,9 @@ public void WriteMultipleCoils(int startingAddress, bool[] values) WriteMultipleCoils(startingAddress, values); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2218,12 +2218,12 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } this.transactionIdentifier = BitConverter.GetBytes((uint)transactionIdentifierInternal); @@ -2279,7 +2279,7 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) readBuffer = new byte[256]; DateTime dateTimeSend = DateTime.Now; byte receivedUnitIdentifier = 0xFF; - while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) + while (this.unitIdentifier != 0 & receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) { while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout)) System.Threading.Thread.Sleep(1); @@ -2332,30 +2332,30 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) } if (data[7] == 0x90 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x90 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x90 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x90 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } if (serialport != null) { crc = BitConverter.GetBytes(calculateCRC(data, 6, 6)); - if ((crc[0] != data[12] | crc[1] != data[13]) &dataReceived) - { - if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Throwed", System.DateTime.Now); + if ((crc[0] != data[12] | crc[1] != data[13]) &dataReceived) + { + if (debug) StoreLogData.Instance.Store("CRCCheckFailedException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2367,9 +2367,9 @@ public void WriteMultipleRegisters(int startingAddress, int[] values) WriteMultipleRegisters(startingAddress, values); } } - else if (!dataReceived) - { - if (debug) StoreLogData.Instance.Store("TimeoutException Throwed", System.DateTime.Now); + else if (!dataReceived & this.unitIdentifier != 0) + { + if (debug) StoreLogData.Instance.Store("TimeoutException Thrown", System.DateTime.Now); if (NumberOfRetries <= countRetries) { countRetries = 0; @@ -2409,17 +2409,17 @@ public int[] ReadWriteMultipleRegisters(int startingAddressRead, int quantityRea if (serialport != null) if (!serialport.IsOpen) { - if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("SerialPortNotOpenedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.SerialPortNotOpenedException("serial port not opened"); } if (tcpClient == null & !udpFlag & serialport == null) { - if (debug) StoreLogData.Instance.Store("ConnectionException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ConnectionException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ConnectionException("connection error"); } if (startingAddressRead > 65535 | quantityRead > 125 | startingAddressWrite > 65535 | values.Length > 121) { - if (debug) StoreLogData.Instance.Store("ArgumentException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ArgumentException Thrown", System.DateTime.Now); throw new ArgumentException("Starting address must be 0 - 65535; quantity must be 0 - 2000"); } int[] response; @@ -2536,22 +2536,22 @@ public int[] ReadWriteMultipleRegisters(int startingAddressRead, int quantityRea } if (data[7] == 0x97 & data[8] == 0x01) { - if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("FunctionCodeNotSupportedException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.FunctionCodeNotSupportedException("Function code not supported by master"); } if (data[7] == 0x97 & data[8] == 0x02) { - if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("StartingAddressInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.StartingAddressInvalidException("Starting address invalid or starting address + quantity invalid"); } if (data[7] == 0x97 & data[8] == 0x03) { - if (debug) StoreLogData.Instance.Store("QuantityInvalidException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("QuantityInvalidException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.QuantityInvalidException("quantity invalid"); } if (data[7] == 0x97 & data[8] == 0x04) { - if (debug) StoreLogData.Instance.Store("ModbusException Throwed", System.DateTime.Now); + if (debug) StoreLogData.Instance.Store("ModbusException Thrown", System.DateTime.Now); throw new EasyModbus.Exceptions.ModbusException("error reading"); } response = new int[quantityRead]; diff --git a/EasyModbus/ModbusServer.cs b/EasyModbus/ModbusServer.cs index 81351e8..0404506 100644 --- a/EasyModbus/ModbusServer.cs +++ b/EasyModbus/ModbusServer.cs @@ -138,7 +138,7 @@ private int GetAndCleanNumberOfConnectedClients(Client client) { lock (this) { - int i = 0; + /*int i = 0;*/ bool objetExists = false; foreach (Client clientLoop in tcpClientLastRequestList) { @@ -266,7 +266,7 @@ public class ModbusServer { private bool debug = false; Int32 port = 502; - ModbusProtocol receiveData; + /*ModbusProtocol receiveData;*/ ModbusProtocol sendData = new ModbusProtocol(); Byte[] bytes = new Byte[2100]; //public Int16[] _holdingRegisters = new Int16[65535]; @@ -289,7 +289,7 @@ public class ModbusServer private IPEndPoint iPEndPoint; private TCPHandler tcpHandler; Thread listenerThread; - Thread clientConnectionThread; + private Thread clientConnectionThread; private ModbusProtocol[] modbusLogData = new ModbusProtocol[100]; public bool FunctionCode1Disabled {get; set;} public bool FunctionCode2Disabled { get; set; } diff --git a/EasyModbus/Properties/AssemblyInfo.cs b/EasyModbus/Properties/AssemblyInfo.cs index 6c9dff7..90907c6 100644 --- a/EasyModbus/Properties/AssemblyInfo.cs +++ b/EasyModbus/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] [assembly: AssemblyProduct("EasyModbus")] -[assembly: AssemblyCopyright("Copyright 2017")] +[assembly: AssemblyCopyright("Copyright 2017-2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -28,4 +28,4 @@ // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.5.0")] +[assembly: AssemblyVersion("5.5.1")] diff --git a/EasyModbusServerSimulator/MainForm.cs b/EasyModbusServerSimulator/MainForm.cs index 78f6dc5..fe3315d 100644 --- a/EasyModbusServerSimulator/MainForm.cs +++ b/EasyModbusServerSimulator/MainForm.cs @@ -19,9 +19,7 @@ public partial class MainForm : Form private UInt16 startingAddressHoldingRegisters = 1; private UInt16 startingAddressInputRegisters = 1; private bool showProtocolInformations = true; - private bool preventInvokeDiscreteInputs = false; private bool preventInvokeCoils = false; - private bool preventInvokeInputRegisters = false; private bool preventInvokeHoldingRegisters = false; public MainForm() diff --git a/EasyModbusTCPCore/ModbusClient.cs b/EasyModbusTCPCore/ModbusClient.cs index b71766f..2281708 100644 --- a/EasyModbusTCPCore/ModbusClient.cs +++ b/EasyModbusTCPCore/ModbusClient.cs @@ -601,12 +601,7 @@ public static UInt16 calculateCRC(byte[] data, UInt16 numberOfBytes, int startBy return (UInt16)((UInt16)uchCRCHi << 8 | uchCRCLo); } - private bool dataReceived = false; - private bool receiveActive = false; private byte[] readBuffer = new byte[256]; - private int bytesToRead = 0; - private int actualPositionToRead = 0; - DateTime dateTimeLastRead; /* private void DataReceivedHandler(object sender, SerialDataReceivedEventArgs e) diff --git a/ServerApplication/App.config b/ServerApplication/App.config index 88fa402..9d2c7ad 100644 --- a/ServerApplication/App.config +++ b/ServerApplication/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/ServerApplication/ServerApplication.csproj b/ServerApplication/ServerApplication.csproj index 0c58f0b..b86b4fc 100644 --- a/ServerApplication/ServerApplication.csproj +++ b/ServerApplication/ServerApplication.csproj @@ -9,9 +9,10 @@ Properties ServerApplication ServerApplication - v4.5.2 + v4.7 512 true + AnyCPU From 284470cf5511a67056307a1379fb5e44c79587e7 Mon Sep 17 00:00:00 2001 From: Scott W Harden Date: Tue, 16 Jul 2019 09:46:12 -0400 Subject: [PATCH 2/4] fix link in title --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7f701f..5064c45 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# EasyModbusTCP.NET - www.EasyModbusTCP.NET +# EasyModbusTCP.NET - www.EasyModbusTCP.NET Modbus TCP, Modbus UDP and Modbus RTU client/server library for .NET
Industry approved!!
From 22b40784ca54da1c80f127b170800ee7bb68b3c6 Mon Sep 17 00:00:00 2001 From: Alessandro Mandelli Date: Mon, 22 Jun 2020 16:41:53 +0200 Subject: [PATCH 3/4] Commit fixed class name --- EasyModbus/EasyModbus.csproj | 2 +- EasyModbus/ModbusServer.cs | 36 +++++++++---------- EasyModbus/Properties/AssemblyInfo.cs | 4 +-- .../EasyModbusClient_IOTCoreExample.csproj | 4 +-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/EasyModbus/EasyModbus.csproj b/EasyModbus/EasyModbus.csproj index 9f17281..82dc328 100644 --- a/EasyModbus/EasyModbus.csproj +++ b/EasyModbus/EasyModbus.csproj @@ -7,7 +7,7 @@ Library EasyModbus EasyModbus - v4.7 + v4.6.1 Properties diff --git a/EasyModbus/ModbusServer.cs b/EasyModbus/ModbusServer.cs index 0404506..981bfac 100644 --- a/EasyModbus/ModbusServer.cs +++ b/EasyModbus/ModbusServer.cs @@ -181,7 +181,7 @@ private void ReadCallback(IAsyncResult asyncResult) read = networkStream.EndRead(asyncResult); } - catch (Exception ex) + catch (Exception) { return; } @@ -270,10 +270,10 @@ public class ModbusServer ModbusProtocol sendData = new ModbusProtocol(); Byte[] bytes = new Byte[2100]; //public Int16[] _holdingRegisters = new Int16[65535]; - public HoldingRegisters holdingRegisters; - public InputRegisters inputRegisters; - public Coils coils; - public DiscreteInputs discreteInputs; + public HoldingRegistersClass holdingRegisters; + public InputRegistersClass inputRegisters; + public CoilsClass coils; + public DiscreteInputsClass discreteInputs; private int numberOfConnections = 0; private bool udpFlag; private bool serialFlag; @@ -309,10 +309,10 @@ public class ModbusServer public ModbusServer() { - holdingRegisters = new HoldingRegisters(this); - inputRegisters = new InputRegisters(this); - coils = new Coils(this); - discreteInputs = new DiscreteInputs(this); + holdingRegisters = new HoldingRegistersClass(this); + inputRegisters = new InputRegistersClass(this); + coils = new CoilsClass(this); + discreteInputs = new DiscreteInputsClass(this); } @@ -635,7 +635,7 @@ private void ProcessReceivedData(object networkConnectionParameter) } } } - catch (Exception exc) + catch (Exception) { } this.CreateAnswer(receiveDataThread, sendDataThread, stream, portIn, ipAddressIn); //this.sendAnswer(); @@ -2146,12 +2146,12 @@ public string LogFileFilename - public class HoldingRegisters + public class HoldingRegistersClass { public Int16[] localArray = new Int16[65535]; ModbusServer modbusServer; - public HoldingRegisters(EasyModbus.ModbusServer modbusServer) + public HoldingRegistersClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } @@ -2167,12 +2167,12 @@ public Int16 this[int x] } } - public class InputRegisters + public class InputRegistersClass { public Int16[] localArray = new Int16[65535]; ModbusServer modbusServer; - public InputRegisters(EasyModbus.ModbusServer modbusServer) + public InputRegistersClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } @@ -2188,12 +2188,12 @@ public Int16 this[int x] } } - public class Coils + public class CoilsClass { public bool[] localArray = new bool[65535]; ModbusServer modbusServer; - public Coils(EasyModbus.ModbusServer modbusServer) + public CoilsClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } @@ -2209,12 +2209,12 @@ public bool this[int x] } } - public class DiscreteInputs + public class DiscreteInputsClass { public bool[] localArray = new bool[65535]; ModbusServer modbusServer; - public DiscreteInputs(EasyModbus.ModbusServer modbusServer) + public DiscreteInputsClass(EasyModbus.ModbusServer modbusServer) { this.modbusServer = modbusServer; } diff --git a/EasyModbus/Properties/AssemblyInfo.cs b/EasyModbus/Properties/AssemblyInfo.cs index 90907c6..f9c9db9 100644 --- a/EasyModbus/Properties/AssemblyInfo.cs +++ b/EasyModbus/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] [assembly: AssemblyProduct("EasyModbus")] -[assembly: AssemblyCopyright("Copyright 2017-2019")] +[assembly: AssemblyCopyright("Copyright 2017-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -28,4 +28,4 @@ // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.5.1")] +[assembly: AssemblyVersion("5.5.2")] diff --git a/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj b/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj index f917ac5..03398c7 100644 --- a/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj +++ b/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj @@ -11,7 +11,7 @@ EasyModbusClient_IOTCoreExample de-DE UAP - 10.0.16299.0 + 10.0.18362.0 10.0.16299.0 14 512 @@ -134,7 +134,7 @@ - + Windows Desktop Extensions for the UWP From c3026dd0246808f09fe8a7b2628b06a4e6e63a6c Mon Sep 17 00:00:00 2001 From: Alessandro Mandelli Date: Thu, 16 Jul 2020 08:12:09 +0200 Subject: [PATCH 4/4] Porting to .NET5 --- .../ConsoleApplication1.csproj | 59 +--- ConsoleApplication1/Program.cs | 13 +- .../Properties/AssemblyInfo.cs | 25 -- ConsoleApplication1/packages.config | 5 - EasyModbus.sln | 331 +++++++----------- EasyModbus/EasyModbus.csproj | 74 +--- EasyModbus/ModbusClient.cs | 4 +- EasyModbus/Properties/AssemblyInfo.cs | 25 +- .../AddConnectionForm.Designer.cs | 4 +- EasyModbusAdvancedClient/AddConnectionForm.cs | 2 +- .../EasyModbusAdvancedClient.csproj | 122 +++---- .../Properties/AssemblyInfo.cs | 25 +- .../Properties/Resources.Designer.cs | 53 +-- .../EasyModbusClientExample.csproj | 105 ++---- .../Properties/AssemblyInfo.cs | 25 +- EasyModbusClient_IOTCoreExample/App.xaml | 8 - EasyModbusClient_IOTCoreExample/App.xaml.cs | 100 ------ .../Assets/LockScreenLogo.scale-200.png | Bin 1430 -> 0 bytes .../Assets/SplashScreen.scale-200.png | Bin 7700 -> 0 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 2937 -> 0 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 1647 -> 0 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 1255 -> 0 bytes .../Assets/StoreLogo.png | Bin 1451 -> 0 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 3204 -> 0 bytes .../EasyModbusClient_IOTCoreExample.csproj | 158 --------- EasyModbusClient_IOTCoreExample/MainPage.xaml | 19 - .../MainPage.xaml.cs | 42 --- .../Package.appxmanifest | 28 -- .../Properties/AssemblyInfo.cs | 29 -- .../Properties/Default.rd.xml | 31 -- .../EasyModbusServerSimulator.csproj | 123 +++---- EasyModbusServerSimulator/MainForm.cs | 6 +- .../Properties/AssemblyInfo.cs | 23 +- EasyModbusTCPCore/EasyModbusTCPCore.csproj | 12 +- ServerApplication/Properties/AssemblyInfo.cs | 25 -- ServerApplication/ServerApplication.csproj | 61 +--- 36 files changed, 333 insertions(+), 1204 deletions(-) delete mode 100644 ConsoleApplication1/packages.config delete mode 100644 EasyModbusClient_IOTCoreExample/App.xaml delete mode 100644 EasyModbusClient_IOTCoreExample/App.xaml.cs delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/LockScreenLogo.scale-200.png delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/SplashScreen.scale-200.png delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/Square150x150Logo.scale-200.png delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.scale-200.png delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/StoreLogo.png delete mode 100644 EasyModbusClient_IOTCoreExample/Assets/Wide310x150Logo.scale-200.png delete mode 100644 EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj delete mode 100644 EasyModbusClient_IOTCoreExample/MainPage.xaml delete mode 100644 EasyModbusClient_IOTCoreExample/MainPage.xaml.cs delete mode 100644 EasyModbusClient_IOTCoreExample/Package.appxmanifest delete mode 100644 EasyModbusClient_IOTCoreExample/Properties/AssemblyInfo.cs delete mode 100644 EasyModbusClient_IOTCoreExample/Properties/Default.rd.xml diff --git a/ConsoleApplication1/ConsoleApplication1.csproj b/ConsoleApplication1/ConsoleApplication1.csproj index 186a0e3..3afd728 100644 --- a/ConsoleApplication1/ConsoleApplication1.csproj +++ b/ConsoleApplication1/ConsoleApplication1.csproj @@ -1,64 +1,29 @@ - - - + - Debug - AnyCPU - {AA208FA1-1496-4BBC-97D1-9F628EB4197A} Exe - Properties - ConsoleApplication1 - ConsoleApplication1 - v4.5.2 - 512 + net5.0 true + ConsoleApplication1 + ConsoleApplication1 + Copyright © 2017 + bin\$(Configuration)\ - AnyCPU - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AnyCPU pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - ..\packages\EasyModbusTCP.4.5.1\lib\EasyModbus.dll - - - - - - - - - + + - - + - - + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Resources.Extensions.dll + - - \ No newline at end of file diff --git a/ConsoleApplication1/Program.cs b/ConsoleApplication1/Program.cs index be11d02..eeba1da 100644 --- a/ConsoleApplication1/Program.cs +++ b/ConsoleApplication1/Program.cs @@ -1,14 +1,9 @@ - using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + using System; -using System.Net.Sockets; -using System.Net; -using System.IO.Ports; -using System.Reflection; + namespace ConsoleApplication1 + + { class Program { diff --git a/ConsoleApplication1/Properties/AssemblyInfo.cs b/ConsoleApplication1/Properties/AssemblyInfo.cs index 97e457c..dc94290 100644 --- a/ConsoleApplication1/Properties/AssemblyInfo.cs +++ b/ConsoleApplication1/Properties/AssemblyInfo.cs @@ -2,18 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ConsoleApplication1")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConsoleApplication1")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -21,16 +9,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("aa208fa1-1496-4bbc-97d1-9f628eb4197a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ConsoleApplication1/packages.config b/ConsoleApplication1/packages.config deleted file mode 100644 index 9b07e13..0000000 --- a/ConsoleApplication1/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/EasyModbus.sln b/EasyModbus.sln index a5b3acb..d27c7bf 100644 --- a/EasyModbus.sln +++ b/EasyModbus.sln @@ -3,21 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29503.13 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbus", "EasyModbus\EasyModbus.csproj", "{7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbus", "EasyModbus\EasyModbus.csproj", "{7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusServerSimulator", "EasyModbusServerSimulator\EasyModbusServerSimulator.csproj", "{871BD4C1-69F0-45B9-8807-1620E6A896A9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusServerSimulator", "EasyModbusServerSimulator\EasyModbusServerSimulator.csproj", "{871BD4C1-69F0-45B9-8807-1620E6A896A9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusClientExample", "EasyModbusClientExample\EasyModbusClientExample.csproj", "{9412077F-7DFF-45D0-AFF9-7D5303118EA7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusClientExample", "EasyModbusClientExample\EasyModbusClientExample.csproj", "{9412077F-7DFF-45D0-AFF9-7D5303118EA7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusAdvancedClient", "EasyModbusAdvancedClient\EasyModbusAdvancedClient.csproj", "{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusAdvancedClient", "EasyModbusAdvancedClient\EasyModbusAdvancedClient.csproj", "{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerApplication", "ServerApplication\ServerApplication.csproj", "{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerApplication", "ServerApplication\ServerApplication.csproj", "{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyModbusTCPCore", "EasyModbusTCPCore\EasyModbusTCPCore.csproj", "{22675733-2164-4AE8-A8C2-F23182073913}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusClient_IOTCoreExample", "EasyModbusClient_IOTCoreExample\EasyModbusClient_IOTCoreExample.csproj", "{9AC81F46-F110-46F3-B884-6665D8A05267}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{AA208FA1-1496-4BBC-97D1-9F628EB4197A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{AA208FA1-1496-4BBC-97D1-9F628EB4197A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -55,38 +53,38 @@ Global {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Debug|x64.Build.0 = Debug|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Debug|x86.ActiveCfg = Debug|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Debug|x86.Build.0 = Debug|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.Build.0 = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.ActiveCfg = DebugCommercial|Any CPU - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.Build.0 = DebugCommercial|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial|x86.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial1|x86.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Release|Any CPU.ActiveCfg = Release|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Release|Any CPU.Build.0 = Release|Any CPU {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B}.Release|ARM.ActiveCfg = Release|Any CPU @@ -103,38 +101,38 @@ Global {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Debug|x64.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Debug|x86.ActiveCfg = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Debug|x86.Build.0 = Debug|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.Build.0 = DebugCommercial3|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial|x86.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.Build.0 = DebugCommercial3|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial1|x86.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.Build.0 = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.ActiveCfg = DebugCommercial3|Any CPU - {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.Build.0 = DebugCommercial3|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {871BD4C1-69F0-45B9-8807-1620E6A896A9}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Release|Any CPU.Build.0 = Release|Any CPU {871BD4C1-69F0-45B9-8807-1620E6A896A9}.Release|ARM.ActiveCfg = Release|Any CPU @@ -151,38 +149,38 @@ Global {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Debug|x64.Build.0 = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Debug|x86.ActiveCfg = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Debug|x86.Build.0 = Debug|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.Build.0 = DebugCommercial2|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial|x86.Build.0 = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.Build.0 = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.ActiveCfg = DebugCommercial2|Any CPU - {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.Build.0 = DebugCommercial2|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial1|x86.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Release|Any CPU.Build.0 = Release|Any CPU {9412077F-7DFF-45D0-AFF9-7D5303118EA7}.Release|ARM.ActiveCfg = Release|Any CPU @@ -199,38 +197,38 @@ Global {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Debug|x64.Build.0 = Debug|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Debug|x86.ActiveCfg = Debug|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Debug|x86.Build.0 = Debug|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.Build.0 = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.ActiveCfg = DebugCommercial1|Any CPU - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.Build.0 = DebugCommercial1|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial|x86.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial1|x86.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial2|x86.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x64.Build.0 = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU + {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.DebugCommercial3|x86.Build.0 = Debug|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|Any CPU.Build.0 = Release|Any CPU {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|ARM.ActiveCfg = Release|Any CPU @@ -335,77 +333,6 @@ Global {22675733-2164-4AE8-A8C2-F23182073913}.Release|x64.Build.0 = Release|Any CPU {22675733-2164-4AE8-A8C2-F23182073913}.Release|x86.ActiveCfg = Release|Any CPU {22675733-2164-4AE8-A8C2-F23182073913}.Release|x86.Build.0 = Release|Any CPU - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|Any CPU.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|Any CPU.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial1|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial2|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|Any CPU.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|Any CPU.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|Any CPU.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|ARM.ActiveCfg = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|ARM.Build.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|ARM.Deploy.0 = Debug|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x64.ActiveCfg = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x64.Build.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x64.Deploy.0 = Debug|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x86.ActiveCfg = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x86.Build.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.DebugCommercial3|x86.Deploy.0 = Debug|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|Any CPU.ActiveCfg = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|Any CPU.Build.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|Any CPU.Deploy.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|ARM.ActiveCfg = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|ARM.Build.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|ARM.Deploy.0 = Release|ARM - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x64.ActiveCfg = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x64.Build.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x64.Deploy.0 = Release|x64 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x86.ActiveCfg = Release|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x86.Build.0 = Release|x86 - {9AC81F46-F110-46F3-B884-6665D8A05267}.Release|x86.Deploy.0 = Release|x86 {AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -459,7 +386,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - VisualSVNWorkingCopyRoot = . SolutionGuid = {7628B1C9-8DDB-4DBD-A71D-D369A4A166DE} + VisualSVNWorkingCopyRoot = . EndGlobalSection EndGlobal diff --git a/EasyModbus/EasyModbus.csproj b/EasyModbus/EasyModbus.csproj index 82dc328..2f6c0df 100644 --- a/EasyModbus/EasyModbus.csproj +++ b/EasyModbus/EasyModbus.csproj @@ -1,81 +1,39 @@ - - + - {7657FC4A-AEDF-4F17-B3E9-0D0DFB1CE23B} - Debug - AnyCPU - Library - EasyModbus - EasyModbus - v4.6.1 - - - Properties - - - - - 3.5 - - - AnyCPU + net5.0 + + + EasyModbus + Stefan Rossmann Engineering Solutions + EasyModbus + Copyright 2017-2020 + 5.5.2 + 5.5.2 - bin\Debug\ - True + bin\$(Configuration)\ Full - False True - DEBUG;TRACE - bin\Release\ - False + bin\$(Configuration)\ None - True - False - TRACE true - bin\DebugCommercial\ + bin\$(Configuration)\ TRACE;DEBUG;COMMERCIAL true Full - AnyCPU MinimumRecommendedRules.ruleset - false TRACE;DEBUG;SSL - false 0 - bin\Debug\EasyModbus.xml - - - false + bin\$(Configuration)\EasyModbus.xml - - - - 3.5 - - - - 3.5 - - - - - - - - - - - - + + - \ No newline at end of file diff --git a/EasyModbus/ModbusClient.cs b/EasyModbus/ModbusClient.cs index be2644c..e686cdc 100644 --- a/EasyModbus/ModbusClient.cs +++ b/EasyModbus/ModbusClient.cs @@ -24,10 +24,8 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using System; using System.Net.Sockets; using System.Net; -using System.IO.Ports; using System.Reflection; -using System.Text; -using System.Collections.Generic; +using System.IO.Ports; namespace EasyModbus { diff --git a/EasyModbus/Properties/AssemblyInfo.cs b/EasyModbus/Properties/AssemblyInfo.cs index f9c9db9..428c5ab 100644 --- a/EasyModbus/Properties/AssemblyInfo.cs +++ b/EasyModbus/Properties/AssemblyInfo.cs @@ -1,31 +1,8 @@ -#region Using directives - + using System; using System.Reflection; using System.Runtime.InteropServices; -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EasyModbus")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] -[assembly: AssemblyProduct("EasyModbus")] -[assembly: AssemblyCopyright("Copyright 2017-2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.5.2")] diff --git a/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs b/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs index 1fac5c1..9666ac8 100644 --- a/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs +++ b/EasyModbusAdvancedClient/AddConnectionForm.Designer.cs @@ -6,6 +6,8 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ +using System.ComponentModel; + namespace EasyModbusAdvancedClient { partial class AddConnectionForm @@ -13,7 +15,7 @@ partial class AddConnectionForm /// /// Designer variable used to keep track of non-visual components. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Disposes resources used by the form. diff --git a/EasyModbusAdvancedClient/AddConnectionForm.cs b/EasyModbusAdvancedClient/AddConnectionForm.cs index 6b74d1e..3a6dc6a 100644 --- a/EasyModbusAdvancedClient/AddConnectionForm.cs +++ b/EasyModbusAdvancedClient/AddConnectionForm.cs @@ -22,8 +22,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ using System; -using System.Drawing; using System.ComponentModel; +using System.Drawing; using System.Windows.Forms; namespace EasyModbusAdvancedClient diff --git a/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj b/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj index 77592b0..31979c6 100644 --- a/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj +++ b/EasyModbusAdvancedClient/EasyModbusAdvancedClient.csproj @@ -1,127 +1,74 @@ - - + - {3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4} - Debug - AnyCPU WinExe - EasyModbusAdvancedClient - EasyModbusAdvancedClient - v4.5 - - - Properties + net5.0 + EasyModbusAdvancedClient + Stefan Rossmann Engineering Solutions + EasyModbusAdvancedClient + Copyright 2018 + 5.1.0 + 5.1.0 x86 - bin\Debug\ - True + bin\$(Configuration)\ Full - False True - DEBUG;TRACE - bin\Release\ - False + bin\$(Configuration)\ None - True - False - TRACE true - bin\DebugCommercial1\ + bin\$(Configuration)\ DEBUG;TRACE true Full x86 MinimumRecommendedRules.ruleset - false - false TRACE;DEBUG;SSL - - false - - - - 3.5 - - - - 3.5 - - - - - - 3.5 - - - - - Exceptions\Exceptions.cs - - - ModbusClient.cs - - - ModbusServer.cs - - - StoreLogData.cs - - - Form - - + + + + + + AddConnectionForm.cs - - Form - - + + AddFunctionCodeForm.cs - - - Form - - + + MainForm.cs - - - + True True Resources.resx - + AddConnectionForm.cs - + AddFunctionCodeForm.cs - + MainForm.Designer.cs Always - - ResXFileCodeGenerator - Resources.Designer.cs - - @@ -146,7 +93,22 @@ - + + + + + + + ..\EasyModbus\bin\Release\EasyModbus.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Drawing.Common.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.Primitives.dll + - \ No newline at end of file diff --git a/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs b/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs index 4fae2f9..428c5ab 100644 --- a/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs +++ b/EasyModbusAdvancedClient/Properties/AssemblyInfo.cs @@ -1,31 +1,8 @@ -#region Using directives - + using System; using System.Reflection; using System.Runtime.InteropServices; -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EasyModbusAdvancedClient")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] -[assembly: AssemblyProduct("EasyModbusAdvancedClient")] -[assembly: AssemblyCopyright("Copyright 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.1.0")] diff --git a/EasyModbusAdvancedClient/Properties/Resources.Designer.cs b/EasyModbusAdvancedClient/Properties/Resources.Designer.cs index 7c0f175..0f79825 100644 --- a/EasyModbusAdvancedClient/Properties/Resources.Designer.cs +++ b/EasyModbusAdvancedClient/Properties/Resources.Designer.cs @@ -10,8 +10,9 @@ namespace EasyModbusAdvancedClient.Properties { using System; - - + using System.Drawing; + + /// /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// @@ -61,82 +62,82 @@ internal Resources() { } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap network_connect { + internal static Bitmap network_connect { get { object obj = ResourceManager.GetObject("network-connect", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap network_connect_2 { + internal static Bitmap network_connect_2 { get { object obj = ResourceManager.GetObject("network-connect-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap network_disconnect_2 { + internal static Bitmap network_disconnect_2 { get { object obj = ResourceManager.GetObject("network-disconnect-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap process_stop_2 { + internal static Bitmap process_stop_2 { get { object obj = ResourceManager.GetObject("process-stop-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap tab { + internal static Bitmap tab { get { object obj = ResourceManager.GetObject("tab", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap tab_close { + internal static Bitmap tab_close { get { object obj = ResourceManager.GetObject("tab-close", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap tab_new { + internal static Bitmap tab_new { get { object obj = ResourceManager.GetObject("tab-new", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ Bitmap. /// - internal static System.Drawing.Bitmap view_refresh_2 { + internal static Bitmap view_refresh_2 { get { object obj = ResourceManager.GetObject("view-refresh-2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } } diff --git a/EasyModbusClientExample/EasyModbusClientExample.csproj b/EasyModbusClientExample/EasyModbusClientExample.csproj index 16d52ef..58f4699 100644 --- a/EasyModbusClientExample/EasyModbusClientExample.csproj +++ b/EasyModbusClientExample/EasyModbusClientExample.csproj @@ -1,110 +1,60 @@ - - + - {9412077F-7DFF-45D0-AFF9-7D5303118EA7} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Debug - AnyCPU WinExe - EasyModbusClientExample - EasyModbusClientExample - v4.5 - Properties - + net5.0 + EasyModbusClientExample + Stefan Rossmann Engineering Solutions + EasyModbusClientExample + Copyright 2018 + 5.5.0 + 5.5.0 x86 - bin\Debug\ - True + bin\$(Configuration)\ Full - False True - DEBUG;TRACE - bin\Release\ - False + bin\$(Configuration)\ None - True - False - TRACE true - bin\DebugCommercial2\ + bin\$(Configuration)\ TRACE;DEBUG;COMMERCIAL true Full x86 MinimumRecommendedRules.ruleset - false - false TRACE;DEBUG;SSL - - false - - - 4.0 - - - - 3.5 - - - - 3.5 - - - - - - 3.5 - - - - - Exceptions\Exceptions.cs - - - ModbusClient.cs - - - ModbusServer.cs - - - StoreLogData.cs - - + + + + + Form - + MainForm.cs - - - + True True Resources.resx - - - - + MainForm.cs - - ResXFileCodeGenerator - Resources.Designer.cs - @@ -127,5 +77,20 @@ - + + + + + + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Drawing.Common.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.dll + + + ..\..\..\..\..\..\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\5.0.0-preview.6.20308.1\ref\net5.0\System.Windows.Forms.Primitives.dll + + \ No newline at end of file diff --git a/EasyModbusClientExample/Properties/AssemblyInfo.cs b/EasyModbusClientExample/Properties/AssemblyInfo.cs index 7c39ca9..428c5ab 100644 --- a/EasyModbusClientExample/Properties/AssemblyInfo.cs +++ b/EasyModbusClientExample/Properties/AssemblyInfo.cs @@ -1,31 +1,8 @@ -#region Using directives - + using System; using System.Reflection; using System.Runtime.InteropServices; -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EasyModbusClientExample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")] -[assembly: AssemblyProduct("EasyModbusClientExample")] -[assembly: AssemblyCopyright("Copyright 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.5.0")] diff --git a/EasyModbusClient_IOTCoreExample/App.xaml b/EasyModbusClient_IOTCoreExample/App.xaml deleted file mode 100644 index 4ecb99a..0000000 --- a/EasyModbusClient_IOTCoreExample/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/EasyModbusClient_IOTCoreExample/App.xaml.cs b/EasyModbusClient_IOTCoreExample/App.xaml.cs deleted file mode 100644 index 506165f..0000000 --- a/EasyModbusClient_IOTCoreExample/App.xaml.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -namespace EasyModbusClient_IOTCoreExample -{ - /// - /// Stellt das anwendungsspezifische Verhalten bereit, um die Standardanwendungsklasse zu ergänzen. - /// - sealed partial class App : Application - { - /// - /// Initialisiert das Singletonanwendungsobjekt. Dies ist die erste Zeile von erstelltem Code - /// und daher das logische Äquivalent von main() bzw. WinMain(). - /// - public App() - { - this.InitializeComponent(); - this.Suspending += OnSuspending; - } - - /// - /// Wird aufgerufen, wenn die Anwendung durch den Endbenutzer normal gestartet wird. Weitere Einstiegspunkte - /// werden z. B. verwendet, wenn die Anwendung gestartet wird, um eine bestimmte Datei zu öffnen. - /// - /// Details über Startanforderung und -prozess. - protected override void OnLaunched(LaunchActivatedEventArgs e) - { - Frame rootFrame = Window.Current.Content as Frame; - - // App-Initialisierung nicht wiederholen, wenn das Fenster bereits Inhalte enthält. - // Nur sicherstellen, dass das Fenster aktiv ist. - if (rootFrame == null) - { - // Frame erstellen, der als Navigationskontext fungiert und zum Parameter der ersten Seite navigieren - rootFrame = new Frame(); - - rootFrame.NavigationFailed += OnNavigationFailed; - - if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - //TODO: Zustand von zuvor angehaltener Anwendung laden - } - - // Den Frame im aktuellen Fenster platzieren - Window.Current.Content = rootFrame; - } - - if (e.PrelaunchActivated == false) - { - if (rootFrame.Content == null) - { - // Wenn der Navigationsstapel nicht wiederhergestellt wird, zur ersten Seite navigieren - // und die neue Seite konfigurieren, indem die erforderlichen Informationen als Navigationsparameter - // übergeben werden - rootFrame.Navigate(typeof(MainPage), e.Arguments); - } - // Sicherstellen, dass das aktuelle Fenster aktiv ist - Window.Current.Activate(); - } - } - - /// - /// Wird aufgerufen, wenn die Navigation auf eine bestimmte Seite fehlschlägt - /// - /// Der Rahmen, bei dem die Navigation fehlgeschlagen ist - /// Details über den Navigationsfehler - void OnNavigationFailed(object sender, NavigationFailedEventArgs e) - { - throw new Exception("Failed to load Page " + e.SourcePageType.FullName); - } - - /// - /// Wird aufgerufen, wenn die Ausführung der Anwendung angehalten wird. Der Anwendungszustand wird gespeichert, - /// ohne zu wissen, ob die Anwendung beendet oder fortgesetzt wird und die Speicherinhalte dabei - /// unbeschädigt bleiben. - /// - /// Die Quelle der Anhalteanforderung. - /// Details zur Anhalteanforderung. - private void OnSuspending(object sender, SuspendingEventArgs e) - { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Anwendungszustand speichern und alle Hintergrundaktivitäten beenden - deferral.Complete(); - } - } -} diff --git a/EasyModbusClient_IOTCoreExample/Assets/LockScreenLogo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57adb5dfc01886d137b4e493d7e97cf13af3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m diff --git a/EasyModbusClient_IOTCoreExample/Assets/SplashScreen.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/SplashScreen.scale-200.png deleted file mode 100644 index 023e7f1feda78d5100569825acedfd213a0d84e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7700 zcmeHLYj~4Yw%(;oxoEH#Kxq-eR|+VkP17b#Vk;?4QwkI+A{L04G+#<<(x#Un1#+h5>eArRq zTw$)ZvTWW_Y?bDho0nPVTh08+s`sp!j74rJTTtXIDww0SILedFv?sZ?yb@@}GN;#8 znk_b~Q(A0YR#uV4ef!osoV1M3;vQ8N$O|fStfgf$S5;ddUNv`tWtGjM;koG#N;7M< zP*84lnx(bn_KF&9Z5Ai$)#Cs3a|$OFw>WKCT$of*L7_CqQEinflT|W{JT+aKp-E0v zsxmYg)1(T>DROm+LN1eQw8}KCTp=C!$H7`PU!t9_Hw@TsTI2`udRZv*!a5`#A9hK6Y95L(CDUX&_@QxKV z_feX{UhA#ZWlvgpL$#w^D#lq`_A4AzDqd|Zv6y9PX&DNcN|l}_D^{q@GG&H^Pg583 z8FI6N8^H7b5WjGp;urW)d7F+_lcp%KsLX0viCmE(OHH+=%ZfD_=`voUuoUxFO^L;- z;!;2{g-YiiO6m4bs89OuF9!p{FGtH-f%8<2gY!h9s)4ciN%{Kh1+`}{^}M~+TDH9N z^Z5PlgVXMC&2&k*Hw^Lb9gny#ro$MOIxIt{+r)EA10$VR3 zanN8D{TUkl+v0CQ_>ZoHP<M-x#8@8ZiT#$Kh`(uRaX1g$Bg|qy$<#7 zSSAi{Nb8Y=lvNVeio+UGLCAtoLBfL`iOv`)yoJMDJBN>4IH@(l7YRF;61@>qq1iM9 zr@b#OC~SAxSle?5Pp8Z78{VO0YFr1x7kZU64Z23eLf2T2#6J_t;-E}DkB?NufZ0Ug zi?J&byXeaB-uTNVhuiM!UVQw}bZrJ3GtAETYp->!{q#zfN7D3AS9@Q7*V^85jGx#R z(QxYV(wW#F0XF9^^s>>H8pPlVJ>)3Oz z&_X8Sf@~?cH_O*cgi$U#`v`RRfv#y3m(ZpKk^5uLup+lVs$~}FZU$r_+}#hl%?g5m z-u-}-666ssp-xWQak~>PPy$mRc|~?pVSs1_@mBEXpPVfLF6(Ktf1S* zPPh@QZ=tFMs?LM2(5P3L2;l_6XX6s&cYsP1ip#eg0`ZEP0HGYh{UmS@o`MihLLvkU zgyAG0G`b1|qjxxh1(ODKFE%AP}Dq=3vK$P7TXP4GrM1kQ72!GUVMDl`rDC&2;TA}*nF z8$nQD&6ys_nc1*E7$*1S@R8$ymy(sQV}imGSedB@{!QR5P&N_H=-^o!?LsWs+2|mH z-e=)T^SvI)=_JIm7}j4;@*Z17=(#}m=~YF~z~CLI+vdAGlJDcdF$TM?CVI1%LhUrN zaa6DJ=Yh$)$k&Oz{-~8yw^GM^8prYxSxo zvI4k#ibryMa%%*8oI-5m61Koa_A_xg=(fwp0aBX{;X4Q;NXUhtaoJDo1>TqhWtn=_ zd5~chq#&6~c%8JZK#t_&J(9EVUU&upYeIovLt1>vaHe}UUq>#RGQj!EN#5+0@T`(@ z^g~>*c`VGRiSt;!$_4+0hk^I!@O3``5=sZ8IwlxWW7km1B&_t&E*u0_9UBa#VqwY* zz>nxv?FAsVnRaD(Bui=6i==BFUw0k4n$>`umU`F2l?7CYTD^)c2X+d9X&ddS9|gj? zM?knGkGCX&W8offw8aLC2$D{PjC3nVZwd4k?eZH8*mZ)U@3Qk8RDFOz_#WUA#vnzy zyP>KrCfKwSXea7}jgJjBc}PGY+4#6%lbZyjhy`5sZd_Vy6Wz;ixa?czkN}J9It1K6 zY!eu>|AwF^fwZlLAYyQI*lM@^>O>Iu6Vf6i>Q$?v!SeUS<{>UYMwz$*%Aq?w^`j{h z!$GZbhu=^D{&ET8;))LL%ZBDZkQqRd2;u~!d9bHGmLRhLDctNgYyjsuvoSZ#iVdoB z2!f--UUA#U;<{je#?cYt^{PIyKa%hW>}uepWMyAI{{Zo7?2>?$c9;whJae%oN|I-kpTQSx_C$Z&;f zi2i)qmEn=y4U0uvk)$m;zKfjPK@oc?I`}1Jzl$Q~aoKBd3kt7L#7gyt|A_qgz6ai< z=X%D1i!d2h?rHR^R8SUj&G||dkC?DT>{o#Yau<@uqVT{Xef&XG}5*E4aPk{}~ zplx&XhaV)&1EfI3Em;Bw#O5SV^c;{twb-1Rw)+=0!e_BLbd7tYmXCH0wrlOSS+~`7He8Iqx0{CN+DVit9;*6L~JAN zD&cyT)2?h}xnYmL?^)<7YyzZ3$FHU^Eg;DLqAV{#wv#Wj7S`Jdl1pX&{3(uZ?!uh} zDc$ZTNV*7le_W6}Hju~GMTxZQ1aWCeUc%!jv3MHAzt>Y-nQK%zfT*3ebDQA5b?iGn; zBjv3B+GhLTexd_(CzZDP4|#n5^~scvB6#Pk%Ho!kQ>yYw((Dv{6=$g3jT1!u6gORW zx5#`7Wy-ZHRa~IxGHdrp(bm%lf>2%J660nj$fCqN(epv@y!l9s7@k6EvxS{AMP>WY zX4$@F8^kayphIx-RGO$+LYl9YdoI5d|4#q9##`_F5Xnx`&GPzp2fB{-{P@ATw=X@~ z_|&^UMWAKD;jjBKTK(~o?cUFRK8EX=6>cXpfzg4ZpMB>*w_^8GSiT-Jp|xBOnzM+j z*09-@-~qJ(eqWq5@R4i^u4^{McCP(!3}C|v_WsTR*bIUxN(Nx`u##3B4{sE`Z`v8w zAwIG`?1~PkID~W{uDzmqH98Pew_1(;x2%8r^vY{)_&J2K)cN{W+h5+g)ZcjP&Ci#O zgy|8K@4kyMfwilHd&6TDlhb%++Pk!>9HRld6HT7gwyZGrxS$}CsD6`>6!!2K1@Mjf z(P0WYB7V_OFZyeWrbOFb>O54BNXf~K&?}3=^v;v_wT{DKr?jN^DtN&DXwX%u?s*c6`%8>WFz z7}YW^tp0bp^NriE)AB6M2l<7rn7fzePtR*omOevpfm9n?}2V*+0iW;S)C zhg`NAjL?D=W#k*$aR{>pGf~lD-rVtD;5jW1_*Jn1j1=es@Kcx4ySM_bwcQCT=d+DV z>Sz~L=Hj@(X%31nK$mWI@7d>}ORB`K(p=+`UD)+99YUGQc7y^bHZ1F(8|tL0 zdK*DT0kSXG_{BKTpP2*2PecdKV9;dq$^ZZDP;Nyq1kp-&GI5eAyZsK!e3V zK@rPy*{(`KIfo+lc878mDKk^V#`VT05}64kBtk%DgwLrOvLMj5-;*GNKv6c6pzMuL z6EP%ob|_0IW}lLRXCP2!9wWhEw3LA7iF#1O1mIZ@Z=6&bz41F;@S_GvYAG-#CW3z{ zP3+6vHhvP&A3$##Vo9$dT^#MoGg^|MDm=Bt1d2RRwSZ<;ZHICpLBv5Xs!D?BH^(9_ z7`H=N&^v|Z-%mP}wNzG{aiFCsRgwzwq!N6obW9+7(R; z(SZ=23`|`>qil!LMGG{_Heq!BD>(Y-zV9wD)}hz25JA37YR%39;kI4y9pgtcUass6 zP24}ZY$vvYeI`zy&)A_X#nY3017ap*0&jx|mVwyGhg3;!keU53a}Uhm3BZI$N$6Se zLWlAmy1S0xKJm4G_U@sN_Tm=`$xWJSEwKU98rZ&)1R^*$$1vA3oG#&*%SMxY_~oGP zP&PFJatFLM-Ps%84IV-+Ow)T{C7cqUAvauy4C z(FRz&?6$Rypj{xO!`y=*J5o4@U8Q-(y5(*=YoKeZ+-1YdljXxkA#B)zo=FeQH#?Le zycNUmEEHWO9a=X^pb#&cOq7-`7UA87#|S22)<7RUtZo|(zibX=w;K3qur9vy#`MNV z6UUcf9ZwEnKCCp+OoBnF@OdbvH)ANXO0o~Pi9l8=x3))}L<#vO0-~O4!~--Ket?d} zJaqsj<@CD1%S2cTW%rOP{Vto%0sGW~1RMa_j^)5nil0Yw- z0EE#bP+l4#P^%PQ+N*oxu1Zq05xZ!bXfYTg>9c{(Iw*lnjR^>kz%lAN^zFce7rppy zY8zA~3GD=A6d*hze&l4D_wA~+O!56)BZTe_rEu}Ezi<4!kG|W#amBZ5{&XS2@6R~H z{9o^y*BkH4$~yX9U&@CgbOzX1bn9xqF|zh$Dh0Y5y*E0e90*$!ObrHY3Ok0`2=O~r zCuke6KrP9KOf?V(YDsM<6pX2nVoN%M$LT^q#FmtaF?1^27F*IcNX~XRB(|hCFvdcc zc)$=S-)acdk$g4?_>jRqxpI6M3vHZk?0c^3=byamYDNf;uB{3NlKW5IhnOS3DNkMV z?tK8?kJ}pmvp%&&eTVOVjHP`q34hN1@!aK}H(K!vI`~gf|Gv+FNEQD5Yd<~yX7k_l h&G-K)@HZb3BABY{)U1?^%I#E6`MGoTtustd{~yM6srvu` diff --git a/EasyModbusClient_IOTCoreExample/Assets/Square150x150Logo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/Square150x150Logo.scale-200.png deleted file mode 100644 index af49fec1a5484db1d52a7f9b5ec90a27c7030186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP diff --git a/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.scale-200.png deleted file mode 100644 index ce342a2ec8a61291ba76c54604aea7e9d20af11b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ diff --git a/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/EasyModbusClient_IOTCoreExample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index f6c02ce97e0a802b85f6021e822c89f8bf57d5cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= diff --git a/EasyModbusClient_IOTCoreExample/Assets/StoreLogo.png b/EasyModbusClient_IOTCoreExample/Assets/StoreLogo.png deleted file mode 100644 index 7385b56c0e4d3c6b0efe3324aa1194157d837826..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x diff --git a/EasyModbusClient_IOTCoreExample/Assets/Wide310x150Logo.scale-200.png b/EasyModbusClient_IOTCoreExample/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index 288995b397fdbef1fb7e85afd71445d5de1952c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA - - - - Debug - x86 - {9AC81F46-F110-46F3-B884-6665D8A05267} - AppContainerExe - Properties - EasyModbusClient_IOTCoreExample - EasyModbusClient_IOTCoreExample - de-DE - UAP - 10.0.18362.0 - 10.0.16299.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - EasyModbusClient_IOTCoreExample_TemporaryKey.pfx - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - - - PackageReference - - - - App.xaml - - - MainPage.xaml - - - - - - Designer - - - - - - - - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - 5.4.0 - - - 1.0.0 - - - - - Windows Desktop Extensions for the UWP - - - Windows IoT Extensions for the UWP - - - - - - - 14.0 - - - - \ No newline at end of file diff --git a/EasyModbusClient_IOTCoreExample/MainPage.xaml b/EasyModbusClient_IOTCoreExample/MainPage.xaml deleted file mode 100644 index a246428..0000000 --- a/EasyModbusClient_IOTCoreExample/MainPage.xaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - -