[incubator-plc4x] branch master updated: added TODOs and outputs to serial protocol

[sr...@apache.org]

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

sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/master by this push:
     new 2cc2c35  added TODOs and outputs to serial protocol
2cc2c35 is described below

commit 2cc2c3509c258cee1e670333db9e2b4b7cb97154
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Mar 8 17:35:52 2018 +0100

    added TODOs and outputs to serial protocol
---
 .../java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java | 6 ++++++
 .../java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java
index 2f32027..256b4ad 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2SerialProtocol.java
@@ -67,6 +67,8 @@ public class Ads2SerialProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket
         }
         byte asLong = (byte) (invokeId.getAsLong() % 255);
         out.add(amsPacket.toAmsSerialFrame(asLong).getByteBuf());
+        // TODO: we need to remember the fragment and maybe even need to spilt up the package
+        // TODO: if we exceed 255 byte
     }
 
     @Override
@@ -93,6 +95,10 @@ public class Ads2SerialProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket
                 ByteBuf fakeTcpHeader = AmsTcpHeader.of(0).getByteBuf();
                 ads2TcpProtocol.decode(channelHandlerContext, Unpooled.wrappedBuffer(fakeTcpHeader, userData.getByteBuf()), out);
                 AmsPacket amsPacket = (AmsPacket) out.get(0);
+                AmsPacket correlatedAmsPacket = requests.remove(amsPacket.getAmsHeader().getInvokeId());
+                if (correlatedAmsPacket != null) {
+                    LOGGER.debug("Correlated packet received {}", correlatedAmsPacket);
+                }
                 AmsSerialFrame amsSerialFrame = amsPacket.toAmsSerialFrame(fragmentNumber.getBytes()[0]);
                 LOGGER.debug("Ams Serial Frame received {}", amsSerialFrame);
                 break;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java
index 5668b00..6e6ecf4 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Ads2TcpProtocol.java
@@ -90,9 +90,9 @@ public class Ads2TcpProtocol extends MessageToMessageCodec<ByteBuf, AmsPacket> {
         DataLength dataLength = DataLength.of(byteBuf);
         AmsError errorCode = AmsError.of(byteBuf);
         Invoke invoke = Invoke.of(byteBuf);
-        AmsPacket correlatedamsPacket = requests.remove(invoke);
-        if (correlatedamsPacket != null) {
-            LOGGER.debug("Correlated packet received {}", correlatedamsPacket);
+        AmsPacket correlatedAmsPacket = requests.remove(invoke);
+        if (correlatedAmsPacket != null) {
+            LOGGER.debug("Correlated packet received {}", correlatedAmsPacket);
         }
         if (dataLength.getAsLong() > Integer.MAX_VALUE) {
             byteBuf.release();

-- 
To stop receiving notification emails like this one, please contact
sruehl@apache.org.