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

Merge pull request #223 from thoj/develop

Browse Source 
Fix padding of last dataitem in WriteMulitple fixes #222
This commit is contained in:
Michael Croes
2019-07-17 21:39:19 +02:00
committed by GitHub
parent 1d1f1e76a9 0e5651b37f
commit 47cce5887d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
S7.Net/Protocol/S7WriteMultiple.cs
View File

@@ -20,8 +20,11 @@ namespace S7.Net.Protocol
var dataOffset = paramOffset + paramSize;
var data = new ByteArray();
var itemCount = 0;
foreach (var item in dataItems)
{
itemCount++;
message.Add(Parameter.Template);
var value = Serialization.SerializeDataItem(item);
var wordLen = item.Value is bool ? 1 : 2;
@@ -44,8 +47,10 @@ namespace S7.Net.Protocol
data.Add(0x03);
data.AddWord(1);
data.Add(b ? (byte) 1 : (byte) 0);
data.Add(0);
data.Add(b ? (byte)1 : (byte)0);
if (itemCount != dataItems.Length) {
data.Add(0);
}
}
else
{
@@ -56,7 +61,7 @@ namespace S7.Net.Protocol
data.AddWord((ushort) (len << 3));
data.Add(value);
if ((len & 0b1) == 1)
if ((len & 0b1) == 1 && itemCount != dataItems.Length)
{
data.Add(0);
}