From 4d37679c753b79e22900b408bf1697c8a2b6ee74 Mon Sep 17 00:00:00 2001
From: Serge Camille <sergecamille@gmail.com>
Date: Wed, 16 Sep 2020 22:01:33 +0200
Subject: [PATCH] Move BuildReadRequestPackage to PlcHelpers, cleanup.

---
 S7.Net/PLCHelpers.cs      | 15 +++++++++++++++
 S7.Net/PlcAsynchronous.cs | 13 -------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/S7.Net/PLCHelpers.cs b/S7.Net/PLCHelpers.cs
index 949fcd3..b701863 100644
--- a/S7.Net/PLCHelpers.cs
+++ b/S7.Net/PLCHelpers.cs
@@ -242,5 +242,20 @@ namespace S7.Net
                     offset++;
             }
         }
+
+        private static byte[] BuildReadRequestPackage(IList<DataRequestItem> dataItems)
+        {
+            int packageSize = 19 + (dataItems.Count * 12);
+            var package = new System.IO.MemoryStream(packageSize);
+
+            BuildHeaderPackage(package, dataItems.Count);
+
+            foreach (var dataItem in dataItems)
+            {
+                BuildReadDataRequestPackage(package, dataItem.DataType, dataItem.DB, dataItem.StartByteAddress, dataItem.ByteLength);
+            }
+
+            return package.ToArray();
+        }
     }
 }
diff --git a/S7.Net/PlcAsynchronous.cs b/S7.Net/PlcAsynchronous.cs
index 8f33940..9bd57de 100644
--- a/S7.Net/PlcAsynchronous.cs
+++ b/S7.Net/PlcAsynchronous.cs
@@ -285,19 +285,6 @@ namespace S7.Net
             return dataItems;
         }
 
-        private static byte[] BuildReadRequestPackage(IList<DataRequestItem> dataItems)
-        {                
-            // first create the header
-            int packageSize = 19 + (dataItems.Count * 12);
-            var package = new System.IO.MemoryStream(packageSize);
-            BuildHeaderPackage(package, dataItems.Count);
-            // package.Add(0x02);  // datenart
-            foreach (var dataItem in dataItems)
-            {
-                BuildReadDataRequestPackage(package, dataItem.DataType, dataItem.DB, dataItem.StartByteAddress, dataItem.ByteLength);
-            }
-            return package.ToArray();
-        }
 
         /// <summary>
         /// Write a number of bytes from a DB starting from a specified index. This handles more than 200 bytes with multiple requests.