From ec70edc20bdf6697ce79f5b977a6b03f0e232f14 Mon Sep 17 00:00:00 2001 From: luosheng Date: Sat, 15 Jul 2023 07:02:10 +0800 Subject: [PATCH] Fix --- Modbus.Net/Modbus.Net/Controller/BaseController.cs | 4 ++-- Modbus.Net/Modbus.Net/Controller/FifoController.cs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Modbus.Net/Modbus.Net/Controller/BaseController.cs b/Modbus.Net/Modbus.Net/Controller/BaseController.cs index 2fd0db5..9334a57 100644 --- a/Modbus.Net/Modbus.Net/Controller/BaseController.cs +++ b/Modbus.Net/Modbus.Net/Controller/BaseController.cs @@ -142,11 +142,11 @@ namespace Modbus.Net var duplicateMessage = receiveMessageCopy.Take(length.Value).ToArray(); if (CheckRightFunc != null && CheckRightFunc(duplicateMessage) == false) { - receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessage.Length - 1).ToArray(); + receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessageCopy.Length - 1).ToArray(); continue; } duplicatedMessages.Add(duplicateMessage); - receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessage.Length - length.Value).ToArray(); + receiveMessageCopy = receiveMessageCopy.TakeLast(receiveMessageCopy.Length - length.Value).ToArray(); if (receiveMessageCopy.Length == 0) break; length = LengthCalc?.Invoke(receiveMessageCopy); if (length == -1) break; diff --git a/Modbus.Net/Modbus.Net/Controller/FifoController.cs b/Modbus.Net/Modbus.Net/Controller/FifoController.cs index 1c2317d..2ca46dc 100644 --- a/Modbus.Net/Modbus.Net/Controller/FifoController.cs +++ b/Modbus.Net/Modbus.Net/Controller/FifoController.cs @@ -76,7 +76,6 @@ namespace Modbus.Net if (WaitingMessages.Count <= 0) { _currentSendingPos = null; - _taskCycleSema?.Close(); sendSuccess = true; } else if (WaitingMessages.IndexOf(_currentSendingPos) == -1)