From 21b0540e81f4897fe52c375a91f284bc5b509a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 2 Apr 2024 17:40:29 +0200 Subject: [PATCH] Updated Protocol Constants --- AMWD.Protocols.Modbus.Common/Protocols/AsciiProtocol.cs | 2 +- AMWD.Protocols.Modbus.Common/Protocols/RtuOverTcpProtocol.cs | 2 +- AMWD.Protocols.Modbus.Common/Protocols/RtuProtocol.cs | 2 +- .../Common/Contracts/ModbusClientBaseTest.cs | 1 - .../Common/Extensions/ModbusDecimalExtensionsTest.cs | 4 +--- AMWD.Protocols.Modbus.Tests/GlobalUsings.cs | 1 + 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/AMWD.Protocols.Modbus.Common/Protocols/AsciiProtocol.cs b/AMWD.Protocols.Modbus.Common/Protocols/AsciiProtocol.cs index 5fbcba4..b6d5566 100644 --- a/AMWD.Protocols.Modbus.Common/Protocols/AsciiProtocol.cs +++ b/AMWD.Protocols.Modbus.Common/Protocols/AsciiProtocol.cs @@ -31,7 +31,7 @@ namespace AMWD.Protocols.Modbus.Common.Protocols /// /// Reading the specification, the max allowed unit id would be 247! /// - public const byte MAX_UNIT_ID = 0xFF; + public const byte MAX_UNIT_ID = 0xF7; /// /// The minimum allowed read count specified by the Modbus SerialLine protocol. diff --git a/AMWD.Protocols.Modbus.Common/Protocols/RtuOverTcpProtocol.cs b/AMWD.Protocols.Modbus.Common/Protocols/RtuOverTcpProtocol.cs index 00dd00b..67fcb6a 100644 --- a/AMWD.Protocols.Modbus.Common/Protocols/RtuOverTcpProtocol.cs +++ b/AMWD.Protocols.Modbus.Common/Protocols/RtuOverTcpProtocol.cs @@ -41,7 +41,7 @@ namespace AMWD.Protocols.Modbus.Common.Protocols /// /// Reading the specification, the max allowed unit id would be 247! /// - public const byte MAX_UNIT_ID = 0xFF; + public const byte MAX_UNIT_ID = 0xF7; /// /// The minimum allowed read count specified by the Modbus SerialLine protocol. diff --git a/AMWD.Protocols.Modbus.Common/Protocols/RtuProtocol.cs b/AMWD.Protocols.Modbus.Common/Protocols/RtuProtocol.cs index 26bf868..40a2a8b 100644 --- a/AMWD.Protocols.Modbus.Common/Protocols/RtuProtocol.cs +++ b/AMWD.Protocols.Modbus.Common/Protocols/RtuProtocol.cs @@ -30,7 +30,7 @@ namespace AMWD.Protocols.Modbus.Common.Protocols /// /// Reading the specification, the max allowed unit id would be 247! /// - public const byte MAX_UNIT_ID = 0xFF; + public const byte MAX_UNIT_ID = 0xF7; /// /// The minimum allowed read count specified by the Modbus SerialLine protocol. diff --git a/AMWD.Protocols.Modbus.Tests/Common/Contracts/ModbusClientBaseTest.cs b/AMWD.Protocols.Modbus.Tests/Common/Contracts/ModbusClientBaseTest.cs index 963089f..0fa7999 100644 --- a/AMWD.Protocols.Modbus.Tests/Common/Contracts/ModbusClientBaseTest.cs +++ b/AMWD.Protocols.Modbus.Tests/Common/Contracts/ModbusClientBaseTest.cs @@ -2,7 +2,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using AMWD.Protocols.Modbus.Common.Contracts; using Moq; namespace AMWD.Protocols.Modbus.Tests.Common.Contracts diff --git a/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusDecimalExtensionsTest.cs b/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusDecimalExtensionsTest.cs index db088cc..0598e82 100644 --- a/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusDecimalExtensionsTest.cs +++ b/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusDecimalExtensionsTest.cs @@ -1,6 +1,4 @@ -using AMWD.Protocols.Modbus.Common; - -namespace AMWD.Protocols.Modbus.Tests.Common.Extensions +namespace AMWD.Protocols.Modbus.Tests.Common.Extensions { [TestClass] public class ModbusDecimalExtensionsTest diff --git a/AMWD.Protocols.Modbus.Tests/GlobalUsings.cs b/AMWD.Protocols.Modbus.Tests/GlobalUsings.cs index c0bf97d..606f9a6 100644 --- a/AMWD.Protocols.Modbus.Tests/GlobalUsings.cs +++ b/AMWD.Protocols.Modbus.Tests/GlobalUsings.cs @@ -1,4 +1,5 @@ global using System; global using System.Linq; global using AMWD.Protocols.Modbus.Common; +global using AMWD.Protocols.Modbus.Common.Contracts; global using Microsoft.VisualStudio.TestTools.UnitTesting;