Remove function restriction from slave, fixed slave logs

Author: graham22

CommonControls/BaseForm.cs

@@ -597,13 +597,15 @@ private void buttonPauseLog_Click(object sender, EventArgs e)
             buttonPauseLog.Text = _logPaused ? "Resume" : "Pause";
         }
 
-        protected void DriverIncommingData(byte[] data)
+        protected void DriverIncommingData(byte[] data, int len)
         {
             if (_logPaused)
                 return;
-            var hex = new StringBuilder(data.Length * 2);
-            foreach (byte b in data)
-                hex.AppendFormat("{0:x2} ", b);
+            var hex = new StringBuilder(len);
+            for(int i = 0; i < len; i++)
+            {
+                hex.AppendFormat("{0:x2} ", data[i]);
+            }
             AppendLog(String.Format("RX: {0}", hex));
         }
 

ModbusLib/Net/TcpServer.cs

@@ -64,7 +64,7 @@ protected override void Worker()
                             length = CacheSize;
                         //read the data from the physical port
                         Port.Receive(buffer, length, SocketFlags.None);
-                        Protocol.OnIncommingData(buffer);
+                        Protocol.OnIncommingData(buffer, length);
                         //append the data to the writer
                         if (writer == null)
                             writer = new ByteArrayWriter();

ModbusLib/Net/UdpServer.cs

@@ -55,7 +55,7 @@ protected override void Worker()
                     Port.ReceiveFrom(
                         buffer,
                         ref remote);
-                    Protocol.OnIncommingData(buffer);
+                    Protocol.OnIncommingData(buffer, length);
                     //try to decode the incoming data
                     var data = new ServerCommData(Protocol) {IncomingData = new ByteArrayReader(buffer)};
 

ModbusLib/Ports/SerialPortServer.cs

@@ -76,7 +76,7 @@ private void Worker()
                         buffer,
                         0,
                         length);
-                    Protocol.OnIncommingData(buffer);
+                    Protocol.OnIncommingData(buffer, length);
                     //append the data to the writer
                     if (writer == null)
                         writer = new ByteArrayWriter();

ModbusLib/Protocols/Modbus/ModbusClient.cs

@@ -39,9 +39,9 @@ public void OnOutgoingData(byte[] data)
             if (OutgoingData != null) OutgoingData(data);
         }
 
-        public void OnIncommingData(byte[] data)
+        public void OnIncommingData(byte[] data, int len)
         {
-            if (IncommingData != null) IncommingData(data);
+            if (IncommingData != null) IncommingData(data, len);
         }
 
         /// <summary>
@@ -69,7 +69,7 @@ public CommResponse ExecuteGeneric(
             if (data.OutgoingData != null)
                 OnOutgoingData(data.OutgoingData.ToArray());
             if (data.IncomingData != null)
-                OnIncommingData(data.IncomingData.ToArray());
+                OnIncommingData(data.IncomingData.ToArray(), data.IncomingData.Length);
             return rVal;
         }
 

ModbusLib/Protocols/Modbus/ModbusCommand.cs

@@ -70,7 +70,7 @@ public class ModbusCommand
         public const byte ErrorMemoryParity = 8;
 
         public delegate void OutgoingData(byte[] data);
-        public delegate void IncommingData(byte[] data);
+        public delegate void IncommingData(byte[] data, int len);
 
         public ModbusCommand(byte fc)
         {

ModbusLib/Protocols/Modbus/ModbusServer.cs

@@ -41,9 +41,9 @@ public void OnOutgoingData(byte[] data)
             if (OutgoingData != null) OutgoingData(data);
         }
 
-        public void OnIncommingData(byte[] data)
+        public void OnIncommingData(byte[] data, int len)
         {
-            if (IncommingData != null) IncommingData(data);
+            if (IncommingData != null) IncommingData(data, len);
         }
 
         /// <summary>

ModbusLib/Protocols/Shared/IProtocol.cs

@@ -29,7 +29,7 @@ public interface IProtocol
         event ModbusCommand.IncommingData IncommingData;
 
         void OnOutgoingData(byte[] data);
-        void OnIncommingData(byte[] data);
+        void OnIncommingData(byte[] data, int len);
 
 
     }