Learning/s7netplus
0
0
Fork 0
mirror of https://github.com/S7NetPlus/s7netplus.git synced 2026-02-17 22:38:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move BuildReadRequestPackage to PlcHelpers, cleanup.

Browse Source
This commit is contained in:
Serge Camille
2020-09-16 22:01:33 +02:00
parent e2a0ed548d
commit 4d37679c75
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
S7.Net/PLCHelpers.cs
View File

@@ -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();
}
}
}

13
S7.Net/PlcAsynchronous.cs
View File

@@ -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.