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/12 15:28:20 UTC
[plc4x] branch develop updated: - Continued working on the new
AMS/ADS driver
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 f80dfac - Continued working on the new AMS/ADS driver
f80dfac is described below
commit f80dfacb8987e1019532e479aad4a49f8e9ccac5
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Aug 12 17:28:12 2020 +0200
- Continued working on the new AMS/ADS driver
---
.../resources/templates/java/pojo-template.ftlh | 6 +-
plc4j/examples/pom.xml | 6 +
.../spi/GeneratedDriverByteToMessageCodec.java | 6 +-
.../apache/plc4x/java/spi/transport/Transport.java | 1 -
.../main/resources/protocols/amsads/amsads.mspec | 100 ++-
.../apache/plc4x/java/amsads/AMSADSPlcDriver.java | 79 +-
.../amsads/attic/protocol/Plc4x2AdsProtocol.java | 2 +-
.../java/amsads/protocol/AdsProtocolLogic.java | 111 +--
.../plc4x/protocol/amsads/ManualAdsDriverTest.java | 48 ++
.../src/test/resources/testsuite/AdsDriverIT.xml | 826 +++++++++++----------
10 files changed, 622 insertions(+), 563 deletions(-)
diff --git a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
index 4325dae..bf469eb 100644
--- a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
@@ -175,16 +175,16 @@ public<#if helper.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${
<#assign arrayField = field>
// Array field
+ if(${arrayField.name} != null) {
<#if helper.isSimpleTypeReference(arrayField.type)>
<#assign simpleTypeReference = arrayField.type>
- lengthInBits += ${simpleTypeReference.sizeInBits} * ${arrayField.name}.length;
+ lengthInBits += ${simpleTypeReference.sizeInBits} * ${arrayField.name}.length;
<#else>
- if(${arrayField.name} != null) {
for(Message element : ${arrayField.name}) {
lengthInBits += element.getLengthInBits();
}
- }
</#if>
+ }
<#break>
<#case "checksum">
<#assign checksumField = field>
diff --git a/plc4j/examples/pom.xml b/plc4j/examples/pom.xml
index a5954f3..5def2c0 100644
--- a/plc4j/examples/pom.xml
+++ b/plc4j/examples/pom.xml
@@ -200,6 +200,12 @@
<version>0.8.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+ <!--dependency>
+ <groupId>org.apache.plc4x.sandbox</groupId>
+ <artifactId>test-java-amsads-driver</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency-->
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/GeneratedDriverByteToMessageCodec.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/GeneratedDriverByteToMessageCodec.java
index 27e48c0..f5fc6f1 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/GeneratedDriverByteToMessageCodec.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/GeneratedDriverByteToMessageCodec.java
@@ -48,14 +48,14 @@ public abstract class GeneratedDriverByteToMessageCodec<T extends Message> exten
@Override
protected void encode(ChannelHandlerContext ctx, T packet, ByteBuf byteBuf) {
- WriteBuffer buffer = new WriteBuffer(packet.getLengthInBytes(), !bigEndian);
try {
+ WriteBuffer buffer = new WriteBuffer(packet.getLengthInBytes(), !bigEndian);
io.serialize(buffer, packet);
+ byteBuf.writeBytes(buffer.getData());
+ LOGGER.debug("Sending bytes to PLC for message {} as data {}", packet, Hex.encodeHexString(buffer.getData()));
} catch (Exception e) {
LOGGER.warn("Error encoding package [{}]: {}", packet, e.getMessage(), e);
}
- byteBuf.writeBytes(buffer.getData());
- LOGGER.debug("Sending bytes to PLC for message {} as data {}", packet, Hex.encodeHexString(buffer.getData()));
}
@Override
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/transport/Transport.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/transport/Transport.java
index 31e23cc..994219c 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/transport/Transport.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/transport/Transport.java
@@ -18,7 +18,6 @@ under the License.
*/
package org.apache.plc4x.java.spi.transport;
-import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
public interface Transport {
diff --git a/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec b/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec
index 69d7283..3385799 100644
--- a/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec
+++ b/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec
@@ -317,9 +317,9 @@
// 4 bytes Length of data in bytes, which should be read.
[simple uint 32 'readLength']
// 4 bytes Length of the data (in bytes) which should be written.
- [implicit uint 32 'writeLength' '(COUNT(items) * 12) + COUNT(data)']
+ [implicit uint 32 'writeLength' '(COUNT(items) * ((indexGroup == ReservedIndexGroups.ADSIGRP_MULTIPLE_READ_WRITE.value) ? 16 : 12)) + COUNT(data)']
// Only if the indexGroup implies a sum-read response, will the indexOffset indicate the number of elements.
- [array AdsReadWriteRequest 'items' COUNT '(indexGroup == ReservedIndexGroups.ADSIGRP_MULTIPLE_READ.value) ? indexOffset : 0']
+ [array AdsMultiRequestItem 'items' COUNT '((indexGroup == ReservedIndexGroups.ADSIGRP_MULTIPLE_READ.value) || (indexGroup == ReservedIndexGroups.ADSIGRP_MULTIPLE_WRITE.value) || (indexGroup == ReservedIndexGroups.ADSIGRP_MULTIPLE_READ_WRITE.value)) ? indexOffset : 0' ['indexGroup']]
// n bytes Data which are written in the ADS device.
[array int 8 'data' count 'writeLength - (COUNT(items) * 12)']
]
@@ -334,6 +334,40 @@
]
]
+[discriminatedType 'AdsMultiRequestItem' [uint 32 'indexGroup']
+ [typeSwitch 'indexGroup'
+ // ReservedIndexGroups.ADSIGRP_MULTIPLE_READ
+ ['61568L' AdsMultiRequestItemRead
+ // 4 bytes Index Group of the data which should be written.
+ [simple uint 32 'itemIndexGroup']
+ // 4 bytes Index Offset of the data which should be written.
+ [simple uint 32 'itemIndexOffset']
+ // 4 bytes Length of data in bytes, which should be read.
+ [simple uint 32 'itemReadLength']
+ ]
+ // ReservedIndexGroups.ADSIGRP_MULTIPLE_WRITE
+ ['61569L' AdsMultiRequestItemWrite
+ // 4 bytes Index Group of the data which should be written.
+ [simple uint 32 'itemIndexGroup']
+ // 4 bytes Index Offset of the data which should be written.
+ [simple uint 32 'itemIndexOffset']
+ // 4 bytes Length of the data (in bytes) which should be written.
+ [simple uint 32 'itemWriteLength']
+ ]
+ // ReservedIndexGroups.ADSIGRP_MULTIPLE_READ_WRITE
+ ['61570L' AdsMultiRequestItemReadWrite
+ // 4 bytes Index Group of the data which should be written.
+ [simple uint 32 'itemIndexGroup']
+ // 4 bytes Index Offset of the data which should be written.
+ [simple uint 32 'itemIndexOffset']
+ // 4 bytes Length of data in bytes, which should be read.
+ [simple uint 32 'itemReadLength']
+ // 4 bytes Length of the data (in bytes) which should be written.
+ [simple uint 32 'itemWriteLength']
+ ]
+ ]
+]
+
[type 'AdsStampHeader'
// 8 bytes The timestamp is coded after the Windows FILETIME format. I.e. the value contains the number of the nano seconds, which passed since 1.1.1601. In addition, the local time change is not considered. Thus the time stamp is present as universal Coordinated time (UTC).
[simple uint 64 'timestamp']
@@ -528,35 +562,35 @@
[STRING ['9']]
]
-[enum uint 16 'ReservedIndexGroups'
- ['0xF000' ADSIGRP_SYMTAB]
- ['0xF001' ADSIGRP_SYMNAME]
- ['0xF002' ADSIGRP_SYMVAL]
- ['0xF003' ADSIGRP_SYM_HNDBYNAME]
- ['0xF004' ADSIGRP_SYM_VALBYNAME]
- ['0xF005' ADSIGRP_SYM_VALBYHND]
- ['0xF006' ADSIGRP_SYM_RELEASEHND]
- ['0xF007' ADSIGRP_SYM_INFOBYNAME]
- ['0xF008' ADSIGRP_SYM_VERSION]
- ['0xF009' ADSIGRP_SYM_INFOBYNAMEEX]
- ['0xF00A' ADSIGRP_SYM_DOWNLOAD]
- ['0xF00B' ADSIGRP_SYM_UPLOAD]
- ['0xF00C' ADSIGRP_SYM_UPLOADINFO]
- ['0xF010' ADSIGRP_SYMNOTE]
- ['0xF020' ADSIGRP_IOIMAGE_RWIB]
- ['0xF021' ADSIGRP_IOIMAGE_RWIX]
- ['0xF025' ADSIGRP_IOIMAGE_RISIZE]
- ['0xF030' ADSIGRP_IOIMAGE_RWOB]
- ['0xF031' ADSIGRP_IOIMAGE_RWOX]
- ['0xF035' ADSIGRP_IOIMAGE_RWOSIZE]
- ['0xF040' ADSIGRP_IOIMAGE_CLEARI]
- ['0xF050' ADSIGRP_IOIMAGE_CLEARO]
- ['0xF060' ADSIGRP_IOIMAGE_RWIOB]
- ['0xF080' ADSIGRP_MULTIPLE_READ]
- ['0xF081' ADSIGRP_MULTIPLE_WRITE]
- ['0xF082' ADSIGRP_MULTIPLE_GET_HANDLE]
- ['0xF083' ADSIGRP_MULTIPLE_RELEASE_HANDLE]
- ['0xF100' ADSIGRP_DEVICE_DATA]
- ['0x0000' ADSIOFFS_DEVDATA_ADSSTATE]
- ['0x0002' ADSIOFFS_DEVDATA_DEVSTATE]
+[enum uint 32 'ReservedIndexGroups'
+ ['0x0000F000' ADSIGRP_SYMTAB]
+ ['0x0000F001' ADSIGRP_SYMNAME]
+ ['0x0000F002' ADSIGRP_SYMVAL]
+ ['0x0000F003' ADSIGRP_SYM_HNDBYNAME]
+ ['0x0000F004' ADSIGRP_SYM_VALBYNAME]
+ ['0x0000F005' ADSIGRP_SYM_VALBYHND]
+ ['0x0000F006' ADSIGRP_SYM_RELEASEHND]
+ ['0x0000F007' ADSIGRP_SYM_INFOBYNAME]
+ ['0x0000F008' ADSIGRP_SYM_VERSION]
+ ['0x0000F009' ADSIGRP_SYM_INFOBYNAMEEX]
+ ['0x0000F00A' ADSIGRP_SYM_DOWNLOAD]
+ ['0x0000F00B' ADSIGRP_SYM_UPLOAD]
+ ['0x0000F00C' ADSIGRP_SYM_UPLOADINFO]
+ ['0x0000F010' ADSIGRP_SYMNOTE]
+ ['0x0000F020' ADSIGRP_IOIMAGE_RWIB]
+ ['0x0000F021' ADSIGRP_IOIMAGE_RWIX]
+ ['0x0000F025' ADSIGRP_IOIMAGE_RISIZE]
+ ['0x0000F030' ADSIGRP_IOIMAGE_RWOB]
+ ['0x0000F031' ADSIGRP_IOIMAGE_RWOX]
+ ['0x0000F035' ADSIGRP_IOIMAGE_RWOSIZE]
+ ['0x0000F040' ADSIGRP_IOIMAGE_CLEARI]
+ ['0x0000F050' ADSIGRP_IOIMAGE_CLEARO]
+ ['0x0000F060' ADSIGRP_IOIMAGE_RWIOB]
+ ['0x0000F080' ADSIGRP_MULTIPLE_READ]
+ ['0x0000F081' ADSIGRP_MULTIPLE_WRITE]
+ ['0x0000F082' ADSIGRP_MULTIPLE_READ_WRITE]
+ ['0x0000F083' ADSIGRP_MULTIPLE_RELEASE_HANDLE]
+ ['0x0000F100' ADSIGRP_DEVICE_DATA]
+ ['0x00000000' ADSIOFFS_DEVDATA_ADSSTATE]
+ ['0x00000002' ADSIOFFS_DEVDATA_DEVSTATE]
]
\ No newline at end of file
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/AMSADSPlcDriver.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/AMSADSPlcDriver.java
index 7cda7d0..913d1f2 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/AMSADSPlcDriver.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/AMSADSPlcDriver.java
@@ -18,34 +18,23 @@
*/
package org.apache.plc4x.java.amsads;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.MessageToMessageCodec;
import org.apache.plc4x.java.amsads.configuration.AdsConfiguration;
import org.apache.plc4x.java.amsads.field.AdsFieldHandler;
import org.apache.plc4x.java.amsads.protocol.AdsProtocolLogic;
-import org.apache.plc4x.java.amsads.readwrite.AmsPacket;
-import org.apache.plc4x.java.amsads.readwrite.io.AmsPacketIO;
-import org.apache.plc4x.java.spi.GeneratedDriverByteToMessageCodec;
-import org.apache.plc4x.java.spi.Plc4xNettyWrapper;
-import org.apache.plc4x.java.spi.Plc4xProtocolBase;
+import org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket;
+import org.apache.plc4x.java.amsads.readwrite.io.AmsTCPPacketIO;
import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer;
import org.apache.plc4x.java.spi.connection.SingleProtocolStackConfigurer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* Implementation of the ADS protocol, based on:
* - ADS Protocol
* - TCP
* - Serial
*/
-public class AMSADSPlcDriver extends GeneratedDriverBase<AmsPacket> {
+public class AMSADSPlcDriver extends GeneratedDriverBase<AmsTCPPacket> {
public static final int TCP_PORT = 48898;
@@ -85,63 +74,11 @@ public class AMSADSPlcDriver extends GeneratedDriverBase<AmsPacket> {
}
@Override
- protected ProtocolStackConfigurer<AmsPacket> getStackConfigurer() {
- return new AdsSwitchingStackConfigurer(
- SingleProtocolStackConfigurer.builder(AmsPacket.class, AmsPacketIO.class)
- .withProtocol(AdsProtocolLogic.class)
- .littleEndian()
- .build());
- }
-
- /**
- * Custom Configurer for Switch TCP / Serial.
- */
- static class AdsSwitchingStackConfigurer implements ProtocolStackConfigurer<AmsPacket> {
-
- private final ProtocolStackConfigurer<AmsPacket> delegate;
-
- public AdsSwitchingStackConfigurer(ProtocolStackConfigurer<AmsPacket> delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public Plc4xProtocolBase<AmsPacket> configurePipeline(Configuration configuration, ChannelPipeline pipeline, boolean passive) {
- final Plc4xProtocolBase<AmsPacket> protocolBase = delegate.configurePipeline(configuration, pipeline, passive);
- Iterator<Map.Entry<String, ChannelHandler>> iterator = pipeline.iterator();
- while (iterator.hasNext()) {
- final Map.Entry<String, ChannelHandler> entry = iterator.next();
- final Class<? extends ChannelHandler> aClass = entry.getValue().getClass();
-
- System.out.println(aClass);
-
- if (entry.getValue() instanceof Plc4xNettyWrapper) {
- // Found handler
- pipeline.addBefore(entry.getKey(), "idempotent-layer", new MessageToMessageCodec() {
- @Override
- protected void decode(ChannelHandlerContext channelHandlerContext, Object o, List list) throws Exception {
- list.add(o);
- }
-
- @Override
- protected void encode(ChannelHandlerContext channelHandlerContext, Object o, List list) throws Exception {
- list.add(o);
- }
- });
- }
-
- }
-
- // After
- System.out.println("After");
- iterator = pipeline.iterator();
- while (iterator.hasNext()) {
- final Map.Entry<String, ChannelHandler> entry = iterator.next();
- final Class<? extends ChannelHandler> aClass = entry.getValue().getClass();
-
- System.out.println(aClass);
- }
- return protocolBase;
- }
+ protected ProtocolStackConfigurer<AmsTCPPacket> getStackConfigurer() {
+ return SingleProtocolStackConfigurer.builder(AmsTCPPacket.class, AmsTCPPacketIO.class)
+ .withProtocol(AdsProtocolLogic.class)
+ .littleEndian()
+ .build();
}
}
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/attic/protocol/Plc4x2AdsProtocol.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/attic/protocol/Plc4x2AdsProtocol.java
index 8f9946e..c6860e1 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/attic/protocol/Plc4x2AdsProtocol.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/attic/protocol/Plc4x2AdsProtocol.java
@@ -198,7 +198,7 @@ public class Plc4x2AdsProtocol extends MessageToMessageCodec<AmsPacket, PlcReque
AdsDataType adsDataType = directAdsField.getAdsDataType();
int numberOfElements = directAdsField.getNumberOfElements();
int readLength = adsDataType.getNumBytes() * numberOfElements;
- AdsReadWriteRequest data = new AdsReadWriteRequest(indexGroup, indexOffset, readLength, new AdsReadWriteRequest[0], new byte[0]);
+ AdsReadWriteRequest data = new AdsReadWriteRequest(indexGroup, indexOffset, readLength, null, null);
AmsPacket amsPacket = new AmsPacket(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, CommandId.ADS_READ, new State(false, false, false, false, false, false, true, false, false), 0, invokeId, data);
LOGGER.debug("encoded read request {}", amsPacket);
out.add(amsPacket);
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AdsProtocolLogic.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AdsProtocolLogic.java
index 2998533..075a74a 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AdsProtocolLogic.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AdsProtocolLogic.java
@@ -39,6 +39,7 @@ import org.apache.plc4x.java.spi.Plc4xProtocolBase;
import org.apache.plc4x.java.spi.configuration.HasConfiguration;
import org.apache.plc4x.java.spi.generation.ParseException;
import org.apache.plc4x.java.spi.generation.ReadBuffer;
+import org.apache.plc4x.java.spi.generation.WriteBuffer;
import org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse;
import org.apache.plc4x.java.spi.messages.InternalPlcReadRequest;
import org.apache.plc4x.java.spi.messages.utils.ResponseItem;
@@ -53,7 +54,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements HasConfiguration<AdsConfiguration> {
+public class AdsProtocolLogic extends Plc4xProtocolBase<AmsTCPPacket> implements HasConfiguration<AdsConfiguration> {
private static final Logger LOGGER = LoggerFactory.getLogger(AdsProtocolLogic.class);
@@ -61,7 +62,7 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
public static final State DEFAULT_COMMAND_STATE = new State(
false, false, false, false, false, true, false, false, false);
- private ConversationContext<AmsPacket> adsDriverContext;
+ private ConversationContext<AmsTCPPacket> adsDriverContext;
private final AtomicLong invokeIdGenerator = new AtomicLong(1);
private RequestTransactionManager tm;
@@ -86,24 +87,24 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
}
@Override
- public void setContext(ConversationContext<AmsPacket> context) {
+ public void setContext(ConversationContext<AmsTCPPacket> context) {
super.setContext(context);
adsDriverContext = context;
}
@Override
- public void close(ConversationContext<AmsPacket> context) {
+ public void close(ConversationContext<AmsTCPPacket> context) {
}
@Override
- public void onConnect(ConversationContext<AmsPacket> context) {
+ public void onConnect(ConversationContext<AmsTCPPacket> context) {
// AMS/ADS doesn't know a concept of a connect.
context.fireConnected();
}
@Override
- public void onDisconnect(ConversationContext<AmsPacket> context) {
+ public void onDisconnect(ConversationContext<AmsTCPPacket> context) {
super.onDisconnect(context);
// TODO: Here we have to clean up all of the handles this connection acquired.
}
@@ -175,19 +176,25 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
AmsPacket amsPacket = new AmsPacket(configuration.getTargetAmsNetId(), configuration.getTargetAmsPort(),
configuration.getSourceAmsNetId(), configuration.getSourceAmsPort(),
CommandId.ADS_READ, DEFAULT_COMMAND_STATE, 0, invokeIdGenerator.getAndIncrement(), adsData);
+ AmsTCPPacket amsTCPPacket = new AmsTCPPacket(amsPacket);
// Start a new request-transaction (Is ended in the response-handler)
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
- transaction.submit(() -> context.sendRequest(amsPacket)
- .expectResponse(AmsPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
+ transaction.submit(() -> context.sendRequest(amsTCPPacket)
+ .expectResponse(AmsTCPPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
.onTimeout(future::completeExceptionally)
.onError((p, e) -> future.completeExceptionally(e))
- .check(responseAmsPacket -> responseAmsPacket.getInvokeId() == amsPacket.getInvokeId())
- .unwrap(AmsPacket::getData)
+ .check(responseAmsPacket -> responseAmsPacket.getUserdata().getInvokeId() == amsPacket.getInvokeId())
+ .unwrap(response -> (AdsReadResponse) response.getUserdata().getData())
.handle(responseAdsData -> {
- final PlcReadResponse plcReadResponse = convertToPlc4xReadResponse(readRequest, responseAdsData);
- // Convert the response from the PLC into a PLC4X Response ...
- future.complete(plcReadResponse);
+ if(responseAdsData.getResult() == 0) {
+ final PlcReadResponse plcReadResponse = convertToPlc4xReadResponse(readRequest, responseAdsData);
+ // Convert the response from the PLC into a PLC4X Response ...
+ future.complete(plcReadResponse);
+ } else {
+ // TODO: Implement this correctly.
+ future.completeExceptionally(new PlcException("Error"));
+ }
// Finish the request-transaction.
transaction.endRequest();
}));
@@ -198,31 +205,40 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
CompletableFuture<PlcReadResponse> future = new CompletableFuture<>();
// Calculate the size of all fields together.
- int size = 0;
+ // Calculate the expected size of the response data.
+ long expectedResponseDataSize = directAdsFields.stream().mapToLong(
+ field -> (field.getAdsDataType().getNumBytes() * field.getNumberOfElements()) + 4).sum();
// With multi-requests, the index-group is fixed and the index offset indicates the number of elements.
AdsData adsData = new AdsReadWriteRequest(
- ReservedIndexGroups.ADSIGRP_MULTIPLE_READ.getValue(), directAdsFields.size(), size,
- directAdsFields.stream().map(directAdsField -> new AdsReadWriteRequest(
- directAdsField.getIndexGroup(), directAdsField.getIndexOffset(), directAdsField.getNumberOfElements(),
- new AdsReadWriteRequest[0], new byte[0])).toArray(AdsReadWriteRequest[]::new), new byte[0]);
+ ReservedIndexGroups.ADSIGRP_MULTIPLE_READ.getValue(), directAdsFields.size(), expectedResponseDataSize,
+ directAdsFields.stream().map(directAdsField -> new AdsMultiRequestItemRead(
+ directAdsField.getIndexGroup(), directAdsField.getIndexOffset(),
+ (directAdsField.getAdsDataType().getNumBytes() * directAdsField.getNumberOfElements())))
+ .toArray(AdsMultiRequestItem[]::new), null);
AmsPacket amsPacket = new AmsPacket(configuration.getTargetAmsNetId(), configuration.getTargetAmsPort(),
configuration.getSourceAmsNetId(), configuration.getSourceAmsPort(),
CommandId.ADS_READ_WRITE, DEFAULT_COMMAND_STATE, 0, invokeIdGenerator.getAndIncrement(), adsData);
+ AmsTCPPacket amsTCPPacket = new AmsTCPPacket(amsPacket);
// Start a new request-transaction (Is ended in the response-handler)
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
- transaction.submit(() -> context.sendRequest(amsPacket)
- .expectResponse(AmsPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
+ transaction.submit(() -> context.sendRequest(amsTCPPacket)
+ .expectResponse(AmsTCPPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
.onTimeout(future::completeExceptionally)
.onError((p, e) -> future.completeExceptionally(e))
- .check(responseAmsPacket -> responseAmsPacket.getInvokeId() == amsPacket.getInvokeId())
- .unwrap(AmsPacket::getData)
+ .check(responseAmsPacket -> responseAmsPacket.getUserdata().getInvokeId() == amsPacket.getInvokeId())
+ .unwrap(response -> (AdsReadWriteResponse) response.getUserdata().getData())
.handle(responseAdsData -> {
- final PlcReadResponse plcReadResponse = convertToPlc4xReadResponse(readRequest, responseAdsData);
- // Convert the response from the PLC into a PLC4X Response ...
- future.complete(plcReadResponse);
+ if(responseAdsData.getResult() == 0) {
+ final PlcReadResponse plcReadResponse = convertToPlc4xReadResponse(readRequest, responseAdsData);
+ // Convert the response from the PLC into a PLC4X Response ...
+ future.complete(plcReadResponse);
+ } else {
+ // TODO: Implement this correctly.
+ future.completeExceptionally(new PlcException("Error"));
+ }
// Finish the request-transaction.
transaction.endRequest();
}));
@@ -308,7 +324,7 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
}
@Override
- protected void decode(ConversationContext<AmsPacket> context, AmsPacket msg) throws Exception {
+ protected void decode(ConversationContext<AmsTCPPacket> context, AmsTCPPacket msg) throws Exception {
super.decode(context, msg);
}
@@ -384,21 +400,22 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
protected CompletableFuture<Void> resolveSingleSymbolicAddress(SymbolicAdsField symbolicAdsField) {
CompletableFuture<Void> future = new CompletableFuture<>();
- // TODO: Instead of using 4 we need the size of the expected response
- AdsData adsData = new AdsReadWriteRequest(ReservedIndexGroups.ADSIGRP_SYM_HNDBYNAME.getValue(), 0, 4, null,
+ AdsData adsData = new AdsReadWriteRequest(ReservedIndexGroups.ADSIGRP_SYM_HNDBYNAME.getValue(), 0,
+ symbolicAdsField.getAdsDataType().getNumBytes() * symbolicAdsField.getNumberOfElements(), null,
getNullByteTerminatedArray(symbolicAdsField.getSymbolicField()));
AmsPacket amsPacket = new AmsPacket(configuration.getTargetAmsNetId(), configuration.getTargetAmsPort(),
configuration.getSourceAmsNetId(), configuration.getSourceAmsPort(),
CommandId.ADS_READ_WRITE, DEFAULT_COMMAND_STATE, 0, invokeIdGenerator.getAndIncrement(), adsData);
+ AmsTCPPacket amsTCPPacket = new AmsTCPPacket(amsPacket);
// Start a new request-transaction (Is ended in the response-handler)
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
- transaction.submit(() -> context.sendRequest(amsPacket)
- .expectResponse(AmsPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
+ transaction.submit(() -> context.sendRequest(amsTCPPacket)
+ .expectResponse(AmsTCPPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
.onTimeout(future::completeExceptionally)
.onError((p, e) -> future.completeExceptionally(e))
- .check(responseAmsPacket -> responseAmsPacket.getInvokeId() == amsPacket.getInvokeId())
- .unwrap(AmsPacket::getData)
+ .check(responseAmsPacket -> responseAmsPacket.getUserdata().getInvokeId() == amsPacket.getInvokeId())
+ .unwrap(response -> response.getUserdata().getData())
.check(adsDataResponse -> adsDataResponse instanceof AdsReadWriteResponse)
.unwrap(adsDataResponse -> (AdsReadWriteResponse) adsDataResponse)
.handle(responseAdsData -> {
@@ -423,23 +440,29 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
protected CompletableFuture<Void> resolveMultipleSymbolicAddresses(List<SymbolicAdsField> symbolicAdsFields) {
CompletableFuture<Void> future = new CompletableFuture<>();
- // TODO: Instead of using 4 we need the size of the expected response
- AdsData adsData = new AdsReadWriteRequest(ReservedIndexGroups.ADSIGRP_MULTIPLE_GET_HANDLE.getValue(),
- symbolicAdsFields.size(), 4, symbolicAdsFields.stream().map(symbolicAdsField ->
- new AdsReadWriteRequest(ReservedIndexGroups.ADSIGRP_SYM_HNDBYNAME.getValue(), 0, 4, null,
- getNullByteTerminatedArray(symbolicAdsField.getSymbolicField()))).toArray(AdsReadWriteRequest[]::new), null);
+ // The expected response for every symbolic address is 12 bytes (8 bytes header and 4 bytes for the handle)
+ long expectedResponseDataSize = symbolicAdsFields.size() * 12;
+ // Concatenate the string part of each symbolic address into one concattenated string and get the bytes.
+ byte[] addressData = symbolicAdsFields.stream().map(
+ SymbolicAdsField::getSymbolicField).collect(Collectors.joining("")).getBytes();
+ AdsData adsData = new AdsReadWriteRequest(ReservedIndexGroups.ADSIGRP_MULTIPLE_READ_WRITE.getValue(),
+ symbolicAdsFields.size(), expectedResponseDataSize, symbolicAdsFields.stream().map(symbolicAdsField ->
+ new AdsMultiRequestItemReadWrite(ReservedIndexGroups.ADSIGRP_SYM_HNDBYNAME.getValue(), 0,
+ 4, symbolicAdsField.getSymbolicField().length())
+ ).toArray(AdsMultiRequestItem[]::new), addressData);
AmsPacket amsPacket = new AmsPacket(configuration.getTargetAmsNetId(), configuration.getTargetAmsPort(),
configuration.getSourceAmsNetId(), configuration.getSourceAmsPort(),
CommandId.ADS_READ_WRITE, DEFAULT_COMMAND_STATE, 0, invokeIdGenerator.getAndIncrement(), adsData);
+ AmsTCPPacket amsTCPPacket = new AmsTCPPacket(amsPacket);
// Start a new request-transaction (Is ended in the response-handler)
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
- transaction.submit(() -> context.sendRequest(amsPacket)
- .expectResponse(AmsPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
+ transaction.submit(() -> context.sendRequest(amsTCPPacket)
+ .expectResponse(AmsTCPPacket.class, Duration.ofMillis(configuration.getTimeoutRequest()))
.onTimeout(future::completeExceptionally)
.onError((p, e) -> future.completeExceptionally(e))
- .check(responseAmsPacket -> responseAmsPacket.getInvokeId() == amsPacket.getInvokeId())
- .unwrap(AmsPacket::getData)
+ .check(responseAmsPacket -> responseAmsPacket.getUserdata().getInvokeId() == amsPacket.getInvokeId())
+ .unwrap(response -> response.getUserdata().getData())
.check(adsDataResponse -> adsDataResponse instanceof AdsReadWriteResponse)
.unwrap(adsDataResponse -> (AdsReadWriteResponse) adsDataResponse)
.handle(responseAdsData -> {
@@ -449,9 +472,9 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
symbolicAdsFields.forEach(symbolicAdsField -> {
try {
// This should be 0 in the success case.
- long returnCode = readBuffer.readLong(32);
+ long returnCode = readBuffer.readUnsignedLong(32);
// This is always 4
- long itemLength = readBuffer.readLong(32);
+ long itemLength = readBuffer.readUnsignedLong(32);
returnCodes.put(symbolicAdsField, returnCode);
} catch (ParseException e) {
@@ -463,7 +486,7 @@ public class AdsProtocolLogic extends Plc4xProtocolBase<AmsPacket> implements Ha
try {
if (returnCodes.get(symbolicAdsField) == 0) {
// Read the handle.
- long handle = readBuffer.readLong(32);
+ long handle = readBuffer.readUnsignedLong(32);
DirectAdsField directAdsField = new DirectAdsField(
ReservedIndexGroups.ADSIGRP_SYM_VALBYHND.getValue(), handle,
diff --git a/sandbox/test-java-amsads-driver/src/test/java/org/apache/plc4x/protocol/amsads/ManualAdsDriverTest.java b/sandbox/test-java-amsads-driver/src/test/java/org/apache/plc4x/protocol/amsads/ManualAdsDriverTest.java
new file mode 100644
index 0000000..df2b621
--- /dev/null
+++ b/sandbox/test-java-amsads-driver/src/test/java/org/apache/plc4x/protocol/amsads/ManualAdsDriverTest.java
@@ -0,0 +1,48 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.protocol.amsads;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket;
+import org.apache.plc4x.java.amsads.readwrite.io.AmsTCPPacketIO;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.spi.generation.ReadBuffer;
+
+public class ManualAdsDriverTest {
+
+ public static void main(String[] args) throws Exception {
+ // Working request:
+ // 000050000000c0a8171401015303c0a817c80101feff09000400300000000000000002000000 81f0000002000000080000002000000006f00000000000000400000006f0000000000000040000000300801b3702001b
+ // Working response:
+ // 000030000000c0a817cd0101feffc0a81714010153030900050010000000000000000100000000000000080000000000000000000000
+
+ // PLC4X request:
+ // 000050000000c0a8171401015303c0a817c80101feff09000400300000000000000002000000 80f0000002000000020000002000000005f000000000801d010000000000000005f000003702001d0100000000000000
+ // PLC4X response:
+ // 000028000000c0a817c80101feffc0a8171401015303090005000800000000000000020000000507000000000000
+
+
+
+ byte[] data = Hex.decodeHex("000028000000c0a817c80101feffc0a8171401015303090005000800000000000000010000000507000000000000");
+ ReadBuffer readBuffer = new ReadBuffer(data, true);
+ final AmsTCPPacket amsTCPPacket = AmsTCPPacketIO.staticParse(readBuffer);
+ System.out.println(amsTCPPacket);
+ }
+
+}
diff --git a/sandbox/test-java-amsads-driver/src/test/resources/testsuite/AdsDriverIT.xml b/sandbox/test-java-amsads-driver/src/test/resources/testsuite/AdsDriverIT.xml
index 83a2486..b3c7494 100644
--- a/sandbox/test-java-amsads-driver/src/test/resources/testsuite/AdsDriverIT.xml
+++ b/sandbox/test-java-amsads-driver/src/test/resources/testsuite/AdsDriverIT.xml
@@ -60,86 +60,89 @@
</TestReadRequest>
</api-request>
<outgoing-plc-message name="Send Ads Read Request">
- <!-- TODO: Should be AmsTCPPacket -->
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>false</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>1</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadRequest">
- <indexGroup>4040</indexGroup>
- <indexOffset>8</indexOffset>
- <length>1</length>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>false</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>1</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadRequest">
+ <indexGroup>4040</indexGroup>
+ <indexOffset>8</indexOffset>
+ <length>1</length>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</outgoing-plc-message>
<incoming-plc-message name="Receive Ads Read Response">
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>true</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>1</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadResponse">
- <result>0</result>
- <data>AQ==</data>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>true</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>1</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadResponse">
+ <result>0</result>
+ <data>AQ==</data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</incoming-plc-message>
<api-response name="Report Read Response to application">
<DefaultPlcReadResponse className="org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse">
@@ -185,103 +188,102 @@
</TestReadRequest>
</api-request>
<outgoing-plc-message name="Send Ads Read Request">
- <!-- TODO: Should be AmsTCPPacket -->
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ_WRITE</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>false</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>2</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteRequest">
- <indexGroup>61568</indexGroup>
- <indexOffset>2</indexOffset>
- <readLength>0</readLength>
- <items>
- <items className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteRequest">
- <indexGroup>4040</indexGroup>
- <indexOffset>8</indexOffset>
- <readLength>1</readLength>
- <items/>
- <data></data>
- </items>
- <items className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteRequest">
- <indexGroup>4040</indexGroup>
- <indexOffset>12</indexOffset>
- <readLength>1</readLength>
- <items/>
- <data></data>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ_WRITE</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>false</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>2</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteRequest">
+ <indexGroup>61568</indexGroup>
+ <indexOffset>2</indexOffset>
+ <readLength>10</readLength>
+ <items>
+ <items className="org.apache.plc4x.java.amsads.readwrite.AdsMultiRequestItemRead">
+ <itemIndexGroup>4040</itemIndexGroup>
+ <itemIndexOffset>8</itemIndexOffset>
+ <itemReadLength>1</itemReadLength>
+ </items>
+ <items className="org.apache.plc4x.java.amsads.readwrite.AdsMultiRequestItemRead">
+ <itemIndexGroup>4040</itemIndexGroup>
+ <itemIndexOffset>12</itemIndexOffset>
+ <itemReadLength>1</itemReadLength>
+ </items>
</items>
- </items>
- <data></data>
- </data>
- </AmsPacket>
+ <data></data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</outgoing-plc-message>
<incoming-plc-message name="Receive Ads Read Response">
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ_WRITE</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>true</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>2</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteResponse">
- <result>0</result>
- <data>AAAAAAAAAAABAQ==</data>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ_WRITE</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>true</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>2</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteResponse">
+ <result>0</result>
+ <data>AAAAAAAAAAABAQ==</data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</incoming-plc-message>
<api-response name="Report Read Response to application">
<DefaultPlcReadResponse className="org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse">
@@ -336,169 +338,176 @@
</TestReadRequest>
</api-request>
<outgoing-plc-message name="Send Resolve Symbolic Address Request">
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ_WRITE</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>false</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>3</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteRequest">
- <indexGroup>61443</indexGroup>
- <indexOffset>0</indexOffset>
- <readLength>4</readLength>
- <items/>
- <data>bWFpbi5mX3RyaWdEYXRlaUdlbGVzZW4uTQA=</data>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ_WRITE</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>false</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>3</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteRequest">
+ <indexGroup>61443</indexGroup>
+ <indexOffset>0</indexOffset>
+ <readLength>1</readLength>
+ <items/>
+ <data>bWFpbi5mX3RyaWdEYXRlaUdlbGVzZW4uTQA=</data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</outgoing-plc-message>
<incoming-plc-message name="Receive Resolve Symbolic Address Response">
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ_WRITE</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>true</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>3</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteResponse">
- <result>0</result>
- <data>AQCAGw==</data>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ_WRITE</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>true</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>3</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadResponse">
+ <result>0</result>
+ <data>AQCAGw==</data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</incoming-plc-message>
<outgoing-plc-message name="Send Ads Read Request">
- <!-- TODO: Should be AmsTCPPacket -->
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>false</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>4</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadRequest">
- <indexGroup>61445</indexGroup>
- <indexOffset>461373441</indexOffset>
- <length>1</length>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>false</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>4</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadRequest">
+ <indexGroup>61445</indexGroup>
+ <indexOffset>461373441</indexOffset>
+ <length>1</length>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</outgoing-plc-message>
<incoming-plc-message name="Receive Ads Read Response">
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ_WRITE</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>true</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>4</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteResponse">
- <result>0</result>
- <data>AAAAAAAAAAABAQ==</data>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>true</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>4</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadResponse">
+ <result>0</result>
+ <data>AAAAAAAAAAABAQ==</data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</incoming-plc-message>
<api-response name="Report Read Response to application">
<DefaultPlcReadResponse className="org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse">
@@ -539,86 +548,89 @@
</TestReadRequest>
</api-request>
<outgoing-plc-message name="Send Ads Read Request">
- <!-- TODO: Should be AmsTCPPacket -->
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>false</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>5</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadRequest">
- <indexGroup>61445</indexGroup>
- <indexOffset>461373441</indexOffset>
- <length>1</length>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>false</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>5</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadRequest">
+ <indexGroup>61445</indexGroup>
+ <indexOffset>461373441</indexOffset>
+ <length>1</length>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</outgoing-plc-message>
<incoming-plc-message name="Receive Ads Read Response">
- <AmsPacket className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
- <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>200</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </targetAmsNetId>
- <targetAmsPort>48898</targetAmsPort>
- <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
- <octet1>192</octet1>
- <octet2>168</octet2>
- <octet3>23</octet3>
- <octet4>20</octet4>
- <octet5>1</octet5>
- <octet6>1</octet6>
- </sourceAmsNetId>
- <sourceAmsPort>48898</sourceAmsPort>
- <commandId>ADS_READ_WRITE</commandId>
- <state className="org.apache.plc4x.java.amsads.readwrite.State">
- <initCommand>false</initCommand>
- <updCommand>false</updCommand>
- <timestampAdded>false</timestampAdded>
- <highPriorityCommand>false</highPriorityCommand>
- <systemCommand>false</systemCommand>
- <adsCommand>true</adsCommand>
- <noReturn>false</noReturn>
- <response>true</response>
- <broadcast>false</broadcast>
- </state>
- <errorCode>0</errorCode>
- <invokeId>5</invokeId>
- <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadWriteResponse">
- <result>0</result>
- <data>AAAAAAAAAAABAQ==</data>
- </data>
- </AmsPacket>
+ <AmsTCPPacket className="org.apache.plc4x.java.amsads.readwrite.AmsTCPPacket">
+ <userdata className="org.apache.plc4x.java.amsads.readwrite.AmsPacket">
+ <targetAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>200</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </targetAmsNetId>
+ <targetAmsPort>48898</targetAmsPort>
+ <sourceAmsNetId className="org.apache.plc4x.java.amsads.readwrite.AmsNetId">
+ <octet1>192</octet1>
+ <octet2>168</octet2>
+ <octet3>23</octet3>
+ <octet4>20</octet4>
+ <octet5>1</octet5>
+ <octet6>1</octet6>
+ </sourceAmsNetId>
+ <sourceAmsPort>48898</sourceAmsPort>
+ <commandId>ADS_READ</commandId>
+ <state className="org.apache.plc4x.java.amsads.readwrite.State">
+ <initCommand>false</initCommand>
+ <updCommand>false</updCommand>
+ <timestampAdded>false</timestampAdded>
+ <highPriorityCommand>false</highPriorityCommand>
+ <systemCommand>false</systemCommand>
+ <adsCommand>true</adsCommand>
+ <noReturn>false</noReturn>
+ <response>true</response>
+ <broadcast>false</broadcast>
+ </state>
+ <errorCode>0</errorCode>
+ <invokeId>5</invokeId>
+ <data className="org.apache.plc4x.java.amsads.readwrite.AdsReadResponse">
+ <result>0</result>
+ <data>AAAAAAAAAAABAQ==</data>
+ </data>
+ </userdata>
+ </AmsTCPPacket>
</incoming-plc-message>
<api-response name="Report Read Response to application">
<DefaultPlcReadResponse className="org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse">