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 #169 from mycroes/dataitem-from-string-write-fix

Browse Source 
Dataitem from string write fix
This commit is contained in:
Derek Heiser
2018-07-18 18:39:21 -05:00
committed by GitHub
parent 8dad14955e e44cb1571c
commit fba3ffd5db
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,13 +30,17 @@ namespace S7.Net.Protocol
Serialization.SetWordAt(message, paramOffset + Parameter.Offsets.Amount, (ushort) value.Length);
Serialization.SetWordAt(message, paramOffset + Parameter.Offsets.DbNumber, (ushort) item.DB);
message[paramOffset + Parameter.Offsets.Area] = (byte) item.DataType;
Serialization.SetAddressAt(message, paramOffset + Parameter.Offsets.Address, item.StartByteAdr, item.BitAdr);
paramOffset += Parameter.Template.Length;
data.Add(0x00);
if (item.Value is bool b)
{
if (item.BitAdr > 7)
throw new ArgumentException(
$"Cannot read bit with invalid {nameof(item.BitAdr)} '{item.BitAdr}'.", nameof(dataItems));
Serialization.SetAddressAt(message, paramOffset + Parameter.Offsets.Address, item.StartByteAdr,
item.BitAdr);
data.Add(0x03);
data.AddWord(1);
@@ -45,6 +49,8 @@ namespace S7.Net.Protocol
}
else
{
Serialization.SetAddressAt(message, paramOffset + Parameter.Offsets.Address, item.StartByteAdr, 0);
var len = value.Length;
data.Add(0x04);
data.AddWord((ushort) (len << 3));
@@ -55,8 +61,9 @@ namespace S7.Net.Protocol
data.Add(0);
}
}
}
paramOffset += Parameter.Template.Length;
}
message.Add(data.Array);

2
S7.Net/Types/DataItem.cs
View File

@@ -68,7 +68,7 @@ namespace S7.Net.Types
DB = dbNumber,
VarType = varType,
StartByteAdr = startByte,
BitAdr = (byte) bitNumber
BitAdr = (byte) (bitNumber == -1 ? 0 : bitNumber)
};
}