am-wd/AMWD.Protocols.Modbus
1
0
Fork 0
Code Issues Actions Activity

Fixed wrong ADU calculation on RTU proxy

Browse Source
This commit is contained in:
Andreas Müller
2025-01-28 14:00:58 +01:00
parent 56664cdac5
commit 38dd94471d
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AMWD.Protocols.Modbus.Serial/ModbusRtuProxy.cs
View File

@@ -738,8 +738,9 @@ namespace AMWD.Protocols.Modbus.Serial
byte[] objBytes = GetDeviceObject((byte)i, deviceInfo);
// We need to split the response if it would exceed the max ADU size
if (responseBytes.Count + bodyBytes.Count + objBytes.Length > RtuProtocol.MAX_ADU_LENGTH)
// We need to split the response if it would exceed the max ADU size.
// 2 bytes of CRC have to be added.
if (responseBytes.Count + bodyBytes.Count + objBytes.Length + 2 > RtuProtocol.MAX_ADU_LENGTH)
{
bodyBytes[3] = 0xFF;
bodyBytes[4] = (byte)i;
@@ -831,9 +832,8 @@ namespace AMWD.Protocols.Modbus.Serial
default:
{
if (deviceIdentification.ExtendedObjects.ContainsKey(objectId))
if (deviceIdentification.ExtendedObjects.TryGetValue(objectId, out byte[] bytes))
{
byte[] bytes = deviceIdentification.ExtendedObjects[objectId];
result.Add((byte)bytes.Length);
result.AddRange(bytes);
}