luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/parallelbgls/Modbus.Net into dev

Browse Source
This commit is contained in:
parallelbgls
2017-12-27 11:52:21 +08:00
parent 517cbb82e9 3b61296b4a
commit 10361b5eb3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
View File

@@ -67,6 +67,7 @@ namespace Modbus.Net.Siemens
private readonly ushort _tsapDst; private readonly ushort _tsapDst;
private ushort _sendCount; private ushort _sendCount;
private object _counterLock = new object();
private SiemensType _siemensType; private SiemensType _siemensType;
@@ -236,7 +237,10 @@ namespace Modbus.Net.Siemens
{ {
try try
{ {
_sendCount = (ushort)(_sendCount % 65535 + 1); lock (_counterLock)
{
_sendCount = (ushort)(_sendCount % ushort.MaxValue + 1);
}
var readRequestSiemensInputStruct = new ReadRequestSiemensInputStruct(SlaveAddress, MasterAddress, var readRequestSiemensInputStruct = new ReadRequestSiemensInputStruct(SlaveAddress, MasterAddress,
_sendCount, SiemensTypeCode.Byte, startAddress, (ushort) getByteCount, AddressTranslator); _sendCount, SiemensTypeCode.Byte, startAddress, (ushort) getByteCount, AddressTranslator);
var readRequestSiemensOutputStruct = var readRequestSiemensOutputStruct =
@@ -263,7 +267,10 @@ namespace Modbus.Net.Siemens
{ {
try try
{ {
_sendCount = (ushort)(_sendCount % 65535 + 1); lock (_counterLock)
{
_sendCount = (ushort)(_sendCount % ushort.MaxValue + 1);
}
var writeRequestSiemensInputStruct = new WriteRequestSiemensInputStruct(SlaveAddress, MasterAddress, var writeRequestSiemensInputStruct = new WriteRequestSiemensInputStruct(SlaveAddress, MasterAddress,
_sendCount, startAddress, setContents, AddressTranslator); _sendCount, startAddress, setContents, AddressTranslator);
var writeRequestSiemensOutputStruct = var writeRequestSiemensOutputStruct =