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 2018/08/23 09:29:18 UTC
[incubator-plc4x] 01/15: Merge branches 'feature/ethernet-ip' and
'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/ethernet-ip
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 0bc1f0db153eef73372c5d06417e2b08e4e79648
Merge: 9a299c8 49cd675
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Aug 14 13:49:45 2018 +0200
Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
examples/azure/pom.xml | 88 ++++++++
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 95 ++++++++
examples/pom.xml | 1 +
.../plc4x/java/api/messages/PlcReadRequest.java | 8 +-
.../plc4x/java/api/messages/PlcReadResponse.java | 9 +-
.../java/api/messages/PlcSubscriptionEvent.java | 24 ++
.../java/api/messages/PlcSubscriptionRequest.java | 4 +
.../java/api/messages/PlcSubscriptionResponse.java | 4 +
.../api/messages/PlcUnsubscriptionRequest.java | 23 ++
.../api/messages/PlcUnsubscriptionResponse.java | 4 +
.../plc4x/java/api/messages/PlcWriteRequest.java | 5 +
.../plc4x/java/api/messages/PlcWriteResponse.java | 5 +
.../java/api/messages/items/ReadRequestItem.java | 7 +
.../java/api/messages/items/ReadResponseItem.java | 9 +-
.../api/messages/items/SubscriptionEventItem.java | 28 +++
.../SubscriptionRequestChangeOfStateItem.java | 4 +
.../items/SubscriptionRequestCyclicItem.java | 29 +++
.../items/SubscriptionRequestEventItem.java | 4 +
.../messages/items/SubscriptionRequestItem.java | 29 +++
.../messages/items/SubscriptionResponseItem.java | 30 ++-
.../java/api/messages/items/WriteRequestItem.java | 7 +
.../java/api/messages/items/WriteResponseItem.java | 4 +
.../messages/specific/TypeSafePlcReadRequest.java | 7 +
.../messages/specific/TypeSafePlcReadResponse.java | 5 +
.../messages/specific/TypeSafePlcWriteRequest.java | 7 +
.../specific/TypeSafePlcWriteResponse.java | 5 +
.../plc4x/java/api/connection/PlcReaderTest.java | 2 +-
.../plc4x/java/api/messages/APIMessageTests.java | 15 ++
...nseTest.java => PlcProprietaryRequestTest.java} | 33 ++-
.../api/messages/PlcProprietaryResponseTest.java | 53 +++++
.../java/api/messages/PlcReadRequestTest.java | 2 +-
.../java/api/messages/PlcReadResponseTest.java | 2 +-
.../java/api/messages/PlcRequestContainerTest.java | 80 +++++++
.../plc4x/java/api/messages/PlcRequestTest.java | 10 +
.../plc4x/java/api/messages/PlcResponseTest.java | 20 +-
.../api/messages/PlcSubscriptionEventTest.java | 59 +++++
.../api/messages/PlcSubscriptionRequestTest.java} | 16 +-
.../api/messages/PlcSubscriptionResponseTest.java} | 21 +-
...Test.java => PlcUnsubscriptionRequestTest.java} | 63 ++----
.../messages/PlcUnsubscriptionResponseTest.java} | 17 +-
.../java/api/messages/PlcWriteRequestTest.java | 4 +
.../java/api/messages/PlcWriteResponseTest.java | 6 +-
.../ads/protocol/util/LittleEndianDecoder.java | 6 +
.../ads/protocol/util/LittleEndianEncoder.java | 12 +
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 6 +-
.../java/base/connection/tcp/TcpHexDumper.java | 14 +-
.../org/apache/plc4x/java/base/util/Assert.java | 7 +-
.../plc4x/java/base/util/Junit5Backport.java | 6 +-
.../plc4x/java/modbus/model/CoilModbusAddress.java | 2 +-
.../model/MaskWriteRegisterModbusAddress.java | 6 +-
.../model/ReadDiscreteInputsModbusAddress.java | 2 +-
.../model/ReadHoldingRegistersModbusAddress.java | 2 +-
.../model/ReadInputRegistersModbusAddress.java | 2 +-
.../java/modbus/model/RegisterModbusAddress.java | 2 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 47 ++--
.../plc4x/java/s7/connection/S7PlcConnection.java | 9 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 4 +-
.../java/s7/connection/S7PlcConnectionIT.java | 2 +-
pom.xml | 6 +
src/site/asciidoc/protocols/{ => ads}/index.adoc | 16 +-
src/site/asciidoc/protocols/delta-v/index.adoc | 197 +++++++++++++++++
.../protocols/delta-v/reverse-engineering.adoc | 245 +++++++++++++++++++++
.../protocols/{ => ethernet-ip}/index.adoc | 15 +-
src/site/asciidoc/protocols/features.adoc | 36 ++-
src/site/asciidoc/protocols/index.adoc | 11 +-
src/site/site.xml | 5 +-
66 files changed, 1305 insertions(+), 203 deletions(-)