You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/08/30 11:12:39 UTC

[plc4x] branch develop updated: - Made the transaction-id reset to 1 when reaching the 0xFFFF

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new d83b8ff  - Made the transaction-id reset to 1 when reaching the 0xFFFF
d83b8ff is described below

commit d83b8ff658ed69c9318894741782107ec8333c0b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Aug 30 13:12:29 2020 +0200

    - Made the transaction-id reset to 1 when reaching the 0xFFFF
---
 .../apache/plc4x/java/modbus/protocol/ModbusProtocolLogic.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/protocol/ModbusProtocolLogic.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/protocol/ModbusProtocolLogic.java
index 6bf8184..7bc2bb6 100644
--- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/protocol/ModbusProtocolLogic.java
+++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/protocol/ModbusProtocolLogic.java
@@ -97,6 +97,10 @@ public class ModbusProtocolLogic extends Plc4xProtocolBase<ModbusTcpADU> impleme
             PlcField field = request.getField(fieldName);
             final ModbusPDU requestPdu = getReadRequestPdu(field);
             int transactionIdentifier = transactionIdentifierGenerator.getAndIncrement();
+            // If we've reached the max value for a 16 bit transaction identifier, reset back to 1
+            if(transactionIdentifierGenerator.get() == 0xFFFF) {
+                transactionIdentifierGenerator.set(1);
+            }
             ModbusTcpADU modbusTcpADU = new ModbusTcpADU(transactionIdentifier, unitIdentifier, requestPdu);
             RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
             transaction.submit(() -> context.sendRequest(modbusTcpADU)
@@ -178,6 +182,10 @@ public class ModbusProtocolLogic extends Plc4xProtocolBase<ModbusTcpADU> impleme
             PlcField field = request.getField(fieldName);
             final ModbusPDU requestPdu = getWriteRequestPdu(field, ((DefaultPlcWriteRequest) writeRequest).getPlcValue(fieldName));
             int transactionIdentifier = transactionIdentifierGenerator.getAndIncrement();
+            // If we've reached the max value for a 16 bit transaction identifier, reset back to 1
+            if(transactionIdentifierGenerator.get() == 0xFFFF) {
+                transactionIdentifierGenerator.set(1);
+            }
             ModbusTcpADU modbusTcpADU = new ModbusTcpADU(transactionIdentifier, unitIdentifier, requestPdu);
             RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
             transaction.submit(() -> context.sendRequest(modbusTcpADU)