Push to Nuget

Author: rossmann-engineering

EasyModbusClientExample/Properties/Resources.Designer.cs

@@ -79,6 +79,9 @@
     <DefineConstants>TRACE;DEBUG;SSL</DefineConstants>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>oie_ITkzMZD7tnyn.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -158,5 +161,11 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\small.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="oie_ITkzMZD7tnyn.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

EasyModbusServerSimulator/EasyModbusServerSimulator.csproj

@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
+    <AssemblyName>EasyModbus</AssemblyName>
+    <RootNamespace>EasyModbus</RootNamespace>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
 
 

EasyModbusServerSimulator/Properties/Resources.Designer.cs

@@ -180,16 +180,18 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity)
             request.TransactionIdentifier = (ushort)transactionIdentifierInternal;
 
 
-            byte[] data = new byte[2100];
-            bool[] response;
+            ApplicationDataUnit response = new ApplicationDataUnit(2);
+            response.QuantityRead = (ushort)quantity;
+
+            byte[] data = new byte[255];
             if (serialport != null)
             {
                 dataReceived = false;
                 if (quantity % 8 == 0)
                     bytesToRead = 5 + quantity / 8;
                 else
                     bytesToRead = 6 + quantity / 8;
-                //               serialport.ReceivedBytesThreshold = bytesToRead;
+
                 serialport.Write(request.Payload, 6, 8);
                 if (debug)
                 {
@@ -204,22 +206,24 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity)
                     SendDataChanged(this);
 
                 }
-                data = new byte[2100];
+
+                
+
                 readBuffer = new byte[256];
                 DateTime dateTimeSend = DateTime.UtcNow;
-                byte receivedUnitIdentifier = 0xFF;
 
+                response.UnitIdentifier = 0xFF;
 
-                while (receivedUnitIdentifier != unitIdentifier & !((DateTime.UtcNow.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * connectTimeout))
+                while (response.UnitIdentifier != unitIdentifier & !((DateTime.UtcNow.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * connectTimeout))
                 {
                     while (dataReceived == false & !((DateTime.UtcNow.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * connectTimeout))
                         System.Threading.Thread.Sleep(1);
-                    data = new byte[2100];
+                    data = new byte[255];
                     Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
-                    receivedUnitIdentifier = data[6];
+                 
                 }
-                if (receivedUnitIdentifier != unitIdentifier)
-                    data = new byte[2100];
+                if (response.UnitIdentifier != unitIdentifier)
+                    data = new byte[255];
                 else
                     countRetries = 0;
             }
@@ -250,8 +254,8 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity)
                         Array.Copy(data, 0, sendData, 0, data.Length - 2);
                         SendDataChanged(this);
                     }
-                    data = new Byte[2100];
-                    int NumberOfBytes = stream.Read(data, 0, data.Length);
+                    data = new Byte[255];
+                    int NumberOfBytes = stream.Read(response.Payload, 0, response.Payload.Length);
                     if (ReceiveDataChanged != null)
                     {
                         receiveData = new byte[NumberOfBytes];
@@ -313,14 +317,8 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity)
                     }
                 }
             }
-            response = new bool[quantity];
-            for (int i = 0; i < quantity; i++)
-            {
-                int intData = data[9 + i / 8];
-                int mask = Convert.ToInt32(Math.Pow(2, (i % 8)));
-                response[i] = Convert.ToBoolean((intData & mask) / mask);
-            }
-            return (response);
+
+            return response.RegisterDataBool;
         }
 
 

EasyModbus_NET5/EasyModbus_V5.0.csproj

@@ -27,10 +27,15 @@ class ProtocolDataUnit
         public byte ByteCount { get; }
         public byte ErroCode { get; }
         public byte ExceptionCode { get; }
-        public object[] RegisterData { get; set; }
+        public int[] RegisterDataInt { get; set; }
+
+        public bool[] RegisterDataBool { get; set; }
+
+
 
         public byte[] Data
         {
+            //return the data in case of a request
             get
             {
                 Byte[] returnvalue = null;
@@ -62,6 +67,27 @@ public byte[] Data
                 }
                 return returnvalue;
             }
+            //set the data in case of a response
+            set
+            {
+                switch (FunctionCode)
+                {
+                    // FC 01: Read Coils and 02 Read Discrete Inputs provide the same response
+                    case 1: case 2:
+                        byte byteCount = value[1];
+                        RegisterDataBool = new bool[QuantityRead];
+                        for (int i = 0; i < QuantityRead; i++)
+                        {
+                            int intData = data[i / 8];
+                            int mask = Convert.ToInt32(Math.Pow(2, (i % 8)));
+                            RegisterDataBool[i] = (Convert.ToBoolean((intData & mask) / mask));
+                        }
+                        break;
+
+                }
+            }
+
+
         }
 
     }
@@ -103,13 +129,13 @@ public byte[] Mbap_Header
                 ushort length = 0x0006;
                 if (FunctionCode == 15)
                 {
-                    byte byteCount = (byte)((RegisterData.Length % 8 != 0 ? RegisterData.Length / 8 + 1 : (RegisterData.Length / 8)));
+                    byte byteCount = (byte)((RegisterDataBool.Length % 8 != 0 ? RegisterDataBool.Length / 8 + 1 : (RegisterDataBool.Length / 8)));
                     length = (ushort)(7 + byteCount);
                 }
                 if (FunctionCode == 16)
-                    length = (ushort)(7 + RegisterData.Length * 2);
+                    length = (ushort)(7 + RegisterDataInt.Length * 2);
                 if (FunctionCode == 23)
-                    length = (ushort)(11 + RegisterData.Length * 2);
+                    length = (ushort)(11 + RegisterDataInt.Length * 2);
 
                 Byte[] returnvalue = new byte[]
                 {
@@ -123,13 +149,13 @@ public byte[] Mbap_Header
                 };
 
                 return returnvalue;
-
             }
         }
 
 
 
        public byte[] Payload {
+            // Return the Payload in case of a request
             get
             {
                 List<byte> returnvalue = new List<byte>();
@@ -141,7 +167,13 @@ public byte[] Payload {
                 byte [] crc = BitConverter.GetBytes(ModbusClient.calculateCRC(returnvalue.ToArray(), (ushort)(returnvalue.Count - 8), 6));
                 returnvalue.AddRange(crc);
                 return returnvalue.ToArray();
-
+            }
+            // Set the Payload in case of a resonse
+            set 
+            {
+                
+                TransactionIdentifier = BitConverter.ToUInt16(value, 0);
+                UnitIdentifier = value[6];
 
             }