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
commit b9b94176f176387c1b12da0da813eaefeb18bdc7 Merge: 3124e57 911135e Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Fri Feb 16 19:00:19 2018 +0100 Merge branch 'feature/Beckhoff_ADS_protocol' plc4j/protocols/{pom.xml => ads/LINKS.md} | 25 +- plc4j/protocols/ads/pom.xml | 91 ++++++ .../org/apache/plc4x/java/ads/ADSPlcDriver.java | 87 ++++++ .../java/ads/api/commands/ADSAbstractRequest.java | 45 +++ .../java/ads/api/commands/ADSAbstractResponse.java | 45 +++ .../commands/ADSAddDeviceNotificationRequest.java | 140 +++++++++ .../commands/ADSAddDeviceNotificationResponse.java | 81 +++++ .../java/ads/api/commands/ADSCommandType.java | 35 +++ .../ADSDeleteDeviceNotificationRequest.java | 81 +++++ .../ADSDeleteDeviceNotificationResponse.java | 72 +++++ .../api/commands/ADSDeviceNotificationRequest.java | 123 ++++++++ .../commands/ADSDeviceNotificationResponse.java | 40 +++ .../ads/api/commands/ADSReadDeviceInfoRequest.java | 66 ++++ .../api/commands/ADSReadDeviceInfoResponse.java | 100 ++++++ .../java/ads/api/commands/ADSReadRequest.java | 101 ++++++ .../java/ads/api/commands/ADSReadResponse.java | 112 +++++++ .../java/ads/api/commands/ADSReadStateRequest.java | 66 ++++ .../ads/api/commands/ADSReadStateResponse.java | 72 +++++ .../java/ads/api/commands/ADSReadWriteRequest.java | 129 ++++++++ .../ads/api/commands/ADSReadWriteResponse.java | 102 +++++++ .../ads/api/commands/ADSWriteControlRequest.java | 124 ++++++++ .../ads/api/commands/ADSWriteControlResponse.java | 71 +++++ .../java/ads/api/commands/ADSWriteRequest.java | 120 ++++++++ .../java/ads/api/commands/ADSWriteResponse.java | 76 +++++ .../java/ads/api/commands/UnknownCommand.java | 51 ++++ .../java/ads/api/commands/types/ADSState.java | 56 ++++ .../api/commands/types/AdsNotificationSample.java | 88 ++++++ .../java/ads/api/commands/types/AdsReturnCode.java | 201 ++++++++++++ .../ads/api/commands/types/AdsStampHeader.java | 67 ++++ .../java/ads/api/commands/types/CycleTime.java | 52 ++++ .../plc4x/java/ads/api/commands/types/Data.java | 36 +++ .../plc4x/java/ads/api/commands/types/Device.java | 42 +++ .../java/ads/api/commands/types/DeviceState.java | 56 ++++ .../java/ads/api/commands/types/IndexGroup.java | 52 ++++ .../java/ads/api/commands/types/IndexOffset.java | 52 ++++ .../plc4x/java/ads/api/commands/types/Length.java | 57 ++++ .../java/ads/api/commands/types/MajorVersion.java | 42 +++ .../java/ads/api/commands/types/MaxDelay.java | 52 ++++ .../java/ads/api/commands/types/MinorVersion.java | 42 +++ .../ads/api/commands/types/NotificationHandle.java | 52 ++++ .../java/ads/api/commands/types/ReadLength.java | 56 ++++ .../plc4x/java/ads/api/commands/types/Result.java | 61 ++++ .../java/ads/api/commands/types/SampleSize.java | 56 ++++ .../plc4x/java/ads/api/commands/types/Samples.java | 56 ++++ .../plc4x/java/ads/api/commands/types/Stamps.java | 52 ++++ .../java/ads/api/commands/types/TimeStamp.java | 67 ++++ .../ads/api/commands/types/TransmissionMode.java | 52 ++++ .../plc4x/java/ads/api/commands/types/Version.java | 56 ++++ .../java/ads/api/commands/types/WriteLength.java | 56 ++++ .../apache/plc4x/java/ads/api/generic/ADSData.java | 32 ++ .../plc4x/java/ads/api/generic/AMSHeader.java | 183 +++++++++++ .../plc4x/java/ads/api/generic/AMSTCPHeader.java | 108 +++++++ .../plc4x/java/ads/api/generic/AMSTCPPaket.java | 89 ++++++ .../plc4x/java/ads/api/generic/types/AMSError.java | 64 ++++ .../plc4x/java/ads/api/generic/types/AMSNetId.java | 79 +++++ .../plc4x/java/ads/api/generic/types/AMSPort.java | 66 ++++ .../plc4x/java/ads/api/generic/types/Command.java | 105 +++++++ .../java/ads/api/generic/types/DataLength.java | 56 ++++ .../plc4x/java/ads/api/generic/types/Invoke.java | 54 ++++ .../plc4x/java/ads/api/generic/types/Length.java | 58 ++++ .../plc4x/java/ads/api/generic/types/State.java | 189 ++++++++++++ .../apache/plc4x/java/ads/api/package-info.java | 23 ++ .../plc4x/java/ads/api/util/ByteReadable.java | 39 +++ .../plc4x/java/ads/api/util/ByteReadableUtils.java | 37 +++ .../apache/plc4x/java/ads/api/util/ByteValue.java | 88 ++++++ .../plc4x/java/ads/api/util/LengthSupplier.java | 25 ++ .../java/ads/api/util/UnsignedIntLEByteValue.java | 65 ++++ .../ads/api/util/UnsignedShortLEByteValue.java | 65 ++++ .../java/ads/connection/ADSPlcConnection.java | 134 ++++++++ .../apache/plc4x/java/ads/model/ADSAddress.java | 64 ++++ .../apache/plc4x/java/ads/model/package-info.java | 22 ++ .../apache/plc4x/java/ads/netty/ADSProtocol.java | 270 ++++++++++++++++ .../plc4x/java/ads/netty/Plc4XADSProtocol.java | 339 +++++++++++++++++++++ .../services/org.apache.plc4x.java.api.PlcDriver | 19 ++ plc4j/protocols/ads/src/site/asciidoc/index.adoc | 103 +++++++ .../java/org/apache/plc4x/java/ads/ADSDumper.java | 110 +++++++ .../apache/plc4x/java/ads/ADSPlcDriverTest.java | 58 ++++ .../java/ads/api/commands/types/LengthTest.java | 58 ++++ .../ads/api/commands/types/ReadLengthTest.java | 59 ++++ .../ads/api/commands/types/SampleSizeTest.java | 59 ++++ .../java/ads/api/commands/types/SamplesTest.java | 59 ++++ .../ads/api/commands/types/WriteLengthTest.java | 61 ++++ .../java/ads/api/generic/types/AMSPortTest.java | 59 ++++ .../java/ads/api/generic/types/DataLengthTest.java | 61 ++++ .../java/ads/api/generic/types/LengthTest.java | 60 ++++ .../java/ads/connection/ADSPlcConnectionTests.java | 72 +++++ .../plc4x/java/ads/netty/ADSProtocolTest.java | 192 ++++++++++++ .../plc4x/java/ads/netty/Plc4XADSProtocolTest.java | 101 ++++++ .../apache/plc4x/java/ads/util/Junit5Backport.java | 37 +++ .../apache/plc4x/java/ads/util/TcpHexDumper.java | 142 +++++++++ .../src/test/resources/logback.xml} | 40 ++- .../base/connection/AbstractPlcConnection.java | 25 +- plc4j/protocols/pom.xml | 1 + .../plc4x/java/s7/connection/S7PlcConnection.java | 21 +- 94 files changed, 7099 insertions(+), 66 deletions(-) -- To stop receiving notification emails like this one, please contact sru...@apache.org.