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

Fix

Browse Source
This commit is contained in:
luosheng
2023-07-15 07:02:10 +08:00
parent 89d26ba0c7
commit ec70edc20b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modbus.Net/Modbus.Net/Controller/BaseController.cs
View File

@@ -142,11 +142,11 @@ namespace Modbus.Net
var duplicateMessage = receiveMessageCopy.Take(length.Value).ToArray(); var duplicateMessage = receiveMessageCopy.Take(length.Value).ToArray();
if (CheckRightFunc != null && CheckRightFunc(duplicateMessage) == false) if (CheckRightFunc != null && CheckRightFunc(duplicateMessage) == false)
{ {
receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessage.Length - 1).ToArray(); receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessageCopy.Length - 1).ToArray();
continue; continue;
} }
duplicatedMessages.Add(duplicateMessage); duplicatedMessages.Add(duplicateMessage);
receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessage.Length - length.Value).ToArray(); receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessageCopy.Length - length.Value).ToArray();
if (receiveMessageCopy.Length == 0) break; if (receiveMessageCopy.Length == 0) break;
length = LengthCalc?.Invoke(receiveMessageCopy); length = LengthCalc?.Invoke(receiveMessageCopy);
if (length == -1) break; if (length == -1) break;

1
Modbus.Net/Modbus.Net/Controller/FifoController.cs
View File

@@ -76,7 +76,6 @@ namespace Modbus.Net
if (WaitingMessages.Count <= 0) if (WaitingMessages.Count <= 0)
{ {
_currentSendingPos = null; _currentSendingPos = null;
_taskCycleSema?.Close();
sendSuccess = true; sendSuccess = true;
} }
else if (WaitingMessages.IndexOf(_currentSendingPos) == -1) else if (WaitingMessages.IndexOf(_currentSendingPos) == -1)