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/17 13:55:25 UTC
[incubator-plc4x] 03/03: Merge branch '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 feature/ethernet-ip
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 8e6af2d4241334863b724d4243f8ef9e0b00092e
Merge: 66ff504 276768b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Aug 17 15:55:09 2018 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
.../dummydriver/connection/DummyConnection.java | 12 +-
.../examples/dummydriver/netty/DummyProtocol.java | 6 +-
.../plc4x/java/examples/plclogger/PlcLogger.java | 2 +-
examples/plclogger/src/main/resources/logback.xml | 2 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
plc4j/api/pom.xml | 6 +
.../apache/plc4x/java/api/messages/PlcRequest.java | 6 +-
.../java/api/messages/PlcSubscriptionRequest.java | 51 ++-
.../api/messages/PlcUnsubscriptionRequest.java | 57 ++++
.../api/messages/items/SubscriptionEventItem.java | 6 +-
.../SubscriptionRequestChangeOfStateItem.java | 4 +-
.../items/SubscriptionRequestCyclicItem.java | 10 +-
.../items/SubscriptionRequestEventItem.java | 6 +-
.../messages/items/SubscriptionRequestItem.java | 4 +-
.../apache/plc4x/java/api/ImmutabilityTest.java | 103 +++++++
.../ads/connection/AdsAbstractPlcConnection.java | 1 +
.../java/ads/connection/AdsTcpPlcConnection.java | 1 +
.../java/ads/model/AdsSubscriptionHandle.java | 25 ++
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 1 +
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 36 ++-
.../connection/AdsAbstractPlcConnectionTest.java | 1 +
.../ads/connection/AdsTcpPlcConnectionTests.java | 10 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 6 +-
.../java/base}/messages/PlcRequestContainer.java | 42 +--
.../base}/messages/PlcRequestContainerTest.java | 8 +-
.../modbus/connection/BaseModbusPlcConnection.java | 6 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 1 +
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 6 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 6 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 3 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 341 +++++++++++++++++----
.../S7IdentifiedEvent.java} | 13 +-
.../netty/model/params/CpuServicesParameter.java | 25 +-
...meter.java => CpuServicesRequestParameter.java} | 11 +-
.../model/params/CpuServicesResponseParameter.java | 50 +++
.../netty/model/payloads/CpuServicesPayload.java | 71 +++++
.../ssls/SslDataRecord.java} | 12 +-
.../ssls/SslModuleIdentificationDataRecord.java | 66 ++++
.../types/CpuServicesParameterFunctionGroup.java | 59 ++++
.../CpuServicesParameterSubFunctionGroup.java | 59 ++++
.../plc4x/java/s7/netty/model/types/SslId.java | 99 ++++++
.../plc4x/java/s7/netty/util/S7SizeHelper.java | 20 ++
.../java/s7/connection/S7PlcConnectionIT.java | 3 +-
.../java/s7/connection/S7PlcTestConnection.java | 35 ++-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 2 +-
.../s7/netty/model/params/S7ParameterTests.java | 8 +-
.../plc4x/java/s7/netty/util/S7SizeHelperTest.java | 5 +-
.../s7/connection/s7-cpu-functions-response.pcap | Bin 0 -> 219 bytes
src/site/asciidoc/index.adoc | 19 +-
49 files changed, 1158 insertions(+), 177 deletions(-)