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

Fixed reading of vars bigger than 2 bytes, see killnine/s7netplus#49

Browse Source
This commit is contained in:
Dirk-Jan
2016-04-22 16:03:17 +02:00
parent 6ddcc37294
commit 1f0534abc4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
S7.Net/PLC.cs
View File

@@ -313,7 +313,8 @@ namespace S7.Net
public List<DataItem> ReadMultipleVars(List<DataItem> dataItems)
{
int cntBytes = dataItems.Sum(dataItem => VarTypeToByteLength(dataItem.VarType, dataItem.Count));
if (dataItems.Count > 20) throw new Exception("Too many vars requested");
if (cntBytes > 222) throw new Exception("Too many bytes requested"); //todo, proper TDU check + split in multiple requests
try
@@ -334,11 +335,9 @@ namespace S7.Net
int numReceived = _mSocket.Receive(bReceive, 512, SocketFlags.None);
if (bReceive[21] != 0xff) throw new Exception(ErrorCode.WrongNumberReceivedBytes.ToString());
int offset = 19;
int offset = 25;
foreach (var dataItem in dataItems)
{
offset += 6;
int byteCnt = VarTypeToByteLength(dataItem.VarType, dataItem.Count);
byte[] bytes = new byte[byteCnt];
@@ -347,6 +346,8 @@ namespace S7.Net
bytes[i] = bReceive[i + offset];
}
offset += byteCnt + 4;
dataItem.Value = ParseBytes(dataItem.VarType, bytes, dataItem.Count);
}