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:58:00 UTC
[incubator-plc4x] branch feature/site-generation-fixes updated
(0be404c -> db00cb4)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/site-generation-fixes
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 0be404c Merged changes from master
add e413887 refined test for modbus protocol
add 917c7fb added sanity checks for produced values and cleaned up type checks
add c4a35b3 added tests for double data type in ads
add be1703c create a blacklist of not yet supported types on modbus
add 234c121 refactored common used test code into driver-bases-test
add 6adebdf fixed calender tests and simplified assertions while at it
add 5f3d7ab removed unsused method (cleanup for 6adebdf)
add 14d5585 added BigInteger support on modbus and ads
add 9efd47c fixed documentation of test class javadoc
add 18bb3f3 modbus: fixed coil parsing
add 9e05e64 modbus protocol test: increased readability by extracting duplicate code
add 11db5b9 added byte[] and Byte[] to supported data types test
add 9221ed5 small fix in supported data types regarding byte[] and Byte[] mixup
add 5d06aa7 supported data type tests: increase readability by introducing typed class
add 947579f added support for float and double in modbus
add dbc6812 fixed upper bounds for registers.
add bd291ae added type generator function to Plc4XS7ProtocolTest
add c0b3745 added double support to S7
add d7159aa added PlcNotImplementedException to mark not yet implemented code parts.
add 810d649 fixed double implementation in S7
add d6a498e Made Jenkins use a ".repository" as local repo directory for deployment instead of the default one in an attempt to solve deployment problems on jenkins.
add 4bec0c1 Exclude the Ubuntu node H32 from the nodes used for deploying as this seems to have issues with using GIT
add f567718 Added an enforcer rule, that fails the build if any dependencies (direct and transitive) are used for which known vulnerabilities exist.
add 44c0d68 Added an enforcer rule, that fails the build if any dependencies (direct and transitive) are used for which known vulnerabilities exist.
add 75bf337 Added some javadoc to S7 communication path and several todos that may be helpful.
add a919e94 Added javadoc on S7PlcConnection.
add b1c4c86 Merge branch 's7-communication-documentation' of https://github.com/JulianFeinauer/incubator-plc4x into JulianFeinauer-s7-communication-documentation
add 4caff3c Removed the TODOs
add 8639d34 Merge branch 'JulianFeinauer-s7-communication-documentation'
add 5363805 Avoid some exceptions when disconnecting from S7 PLCs
add 972c532 Added byte[] and Byte[] implementation to modbus.
add f80c9ef Made the disconnect for S7 respect the ISO TP protocol.
add 8c87fca Added byte[] and Byte[] implementation to ads.
add 4f38a3f fixed some sonar bugs
add 7a38a36 fixed some sonar bugs
add 4d5bf28 manage commons-collections dependency
add 07b6007 removed obsolete supported datatype checking code
add 093de00 added missing toString()/hashCode()/equals()
add 68b0388 Fixed a typo
add e986509 - Did some cleaning up in the sites protocols section - Added some initial documentation on the DeltaV protocol
add 001c092 Some super-minor textual changes
add 43dca59 Fine tuned the generated diagrams
add fa3d375 Added some information on how we did the reverse-engineering
add d54464b Increased the timeout of this test as it was randomly failing on jenkins.
add 5202c9d Implement basic example of connecting an S7 device to Azure IoT Hub
add 552385d Merge branch 's7_azure_iothub_example' of https://github.com/DerDackel/incubator-plc4x into DerDackel-s7_azure_iothub_example
add ec261d5 fix a few typos
add d220353 Merge pull request #12 from bodewig/fix-some-typos
add 1436e2c Merge branch 'master' of github.com:apache/incubator-plc4x into DerDackel-s7_azure_iothub_example
add d0d80ea Manually updated the project: - Added ASF headers - Made the Maven build work (Were version conflicts in the MS dependencies) - Fixed some little problems in the Example itself.
add 49cd675 Merge branch 'DerDackel-s7_azure_iothub_example'
add d2035b3 Created a first version of a S7DataType enum to help with the TIA portal type addresses.
add 5877abe - Worked on the documentation of how to get involved and where to meet the community (or part of it) - Fixed the links in the community menu.
add 4bdc006 - Freshup for the start page
add 5b2f695 Added apache header to apache nifi logo
add 0d718a2 Fixed the fontawesome icon support
add 02b8b7b - Workaround for an output error when using asciidoctor [TIP]
add 2d4b799 Some more fine-tuning of the start-page
add d04b40d Introduced build for PlcSubscriptionRequest and PlcUnsubscriptionRequest + generified items for subscription + reordered SubscriptionRequestCyclicItem so that consumer is the last parameter. + adjusted manual test
add 73a3f42 moved PlcRequestContainer to driver-bases
add ec3fb9f added toString()/equals()/hashCode() to AdsSubscriptionHandle
add 47ff4f0 added a immutability test to plc4j-api to track immutability
add 78853ad - Make the S7 Driver inspect the type of S7 device it is connected to.
add 276768b Minor updates pulled from the kafka branch
new db00cb4 Merging feature/site-generation-fixes
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 6 +-
examples/{iotree => azure}/pom.xml | 75 ++--
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 95 +++++
.../dummydriver/connection/DummyConnection.java | 12 +-
.../examples/dummydriver/netty/DummyProtocol.java | 6 +-
examples/kafka-bridge/pom.xml | 12 +-
.../plc4x/java/examples/plclogger/PlcLogger.java | 2 +-
examples/plclogger/src/main/resources/logback.xml | 2 +-
examples/pom.xml | 1 +
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
plc4j/api/pom.xml | 6 +
.../exceptions/PlcNotImplementedException.java} | 10 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 17 +
.../plc4x/java/api/messages/PlcReadResponse.java | 15 +
.../apache/plc4x/java/api/messages/PlcRequest.java | 6 +-
.../java/api/messages/PlcSubscriptionEvent.java | 24 ++
.../java/api/messages/PlcSubscriptionRequest.java | 55 ++-
.../java/api/messages/PlcSubscriptionResponse.java | 4 +
.../api/messages/PlcUnsubscriptionRequest.java | 80 ++++
.../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 | 19 +
.../java/api/messages/items/ReadResponseItem.java | 15 +-
.../plc4x/java/api/messages/items/RequestItem.java | 5 +
.../api/messages/items/SubscriptionEventItem.java | 34 +-
.../SubscriptionRequestChangeOfStateItem.java | 8 +-
.../items/SubscriptionRequestCyclicItem.java | 39 +-
.../items/SubscriptionRequestEventItem.java | 10 +-
.../messages/items/SubscriptionRequestItem.java | 33 +-
.../messages/items/SubscriptionResponseItem.java | 30 +-
.../messages/items/UnsubscriptionResponseItem.java | 29 --
.../java/api/messages/items/WriteRequestItem.java | 7 +
.../java/api/messages/items/WriteResponseItem.java | 4 +
.../messages/specific/TypeSafePlcReadRequest.java | 15 +
.../messages/specific/TypeSafePlcReadResponse.java | 5 +
.../messages/specific/TypeSafePlcWriteRequest.java | 7 +
.../specific/TypeSafePlcWriteResponse.java | 5 +
.../apache/plc4x/java/api/ImmutabilityTest.java | 103 ++++++
.../plc4x/java/api/connection/PlcReaderTest.java | 2 +-
.../plc4x/java/api/messages/APIMessageTests.java | 15 +
.../api/messages/PlcProprietaryRequestTest.java} | 27 +-
.../api/messages/PlcProprietaryResponseTest.java | 53 +++
.../java/api/messages/PlcReadRequestTest.java | 2 +-
.../java/api/messages/PlcReadResponseTest.java | 2 +-
.../plc4x/java/api/messages/PlcRequestTest.java | 10 +
.../plc4x/java/api/messages/PlcResponseTest.java | 20 +-
.../api/messages/PlcSubscriptionEventTest.java | 59 +++
.../api/messages/PlcSubscriptionRequestTest.java} | 14 +-
.../api/messages/PlcSubscriptionResponseTest.java | 31 +-
...Test.java => PlcUnsubscriptionRequestTest.java} | 63 +---
.../messages/PlcUnsubscriptionResponseTest.java} | 15 +-
.../java/api/messages/PlcWriteRequestTest.java | 4 +
.../java/api/messages/PlcWriteResponseTest.java | 6 +-
.../ads/connection/AdsAbstractPlcConnection.java | 4 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 176 ++++-----
.../java/ads/model/AdsSubscriptionHandle.java | 25 ++
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 1 +
.../ads/protocol/util/LittleEndianDecoder.java | 18 +
.../ads/protocol/util/LittleEndianEncoder.java | 30 ++
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 36 +-
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 6 +-
.../connection/AdsAbstractPlcConnectionTest.java | 1 +
.../ads/connection/AdsTcpPlcConnectionTests.java | 10 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 81 ++---
.../base/connection/AbstractPlcConnection.java | 2 +-
.../java/base}/messages/PlcRequestContainer.java | 42 ++-
.../base/messages/PlcRequestContainerTest.java | 84 +++++
.../java/base/connection/tcp/TcpHexDumper.java | 14 +-
.../base/protocol/Plc4XSupportedDataTypes.java | 238 ++++++++++++
.../org/apache/plc4x/java/base/util/Assert.java | 7 +-
.../plc4x/java/base/util/Junit5Backport.java | 6 +-
.../modbus/connection/BaseModbusPlcConnection.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 | 296 +++++++++++----
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 44 ++-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 402 ++++++++++++++-------
plc4j/protocols/s7/pom.xml | 4 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 70 +++-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 35 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 350 +++++++++++++++---
...7ConnectedEvent.java => S7IdentifiedEvent.java} | 2 +-
.../java/s7/netty/model/messages/S7Message.java | 10 +
.../s7/netty/model/messages/S7RequestMessage.java | 5 +
.../s7/netty/model/messages/S7ResponseMessage.java | 3 +
.../netty/model/params/CpuServicesParameter.java | 25 +-
...meter.java => CpuServicesRequestParameter.java} | 11 +-
.../model/params/CpuServicesResponseParameter.java | 50 +++
.../java/s7/netty/model/params/VarParameter.java | 6 +-
.../model/params/items/S7AnyVarParameterItem.java | 15 +
.../netty/model/payloads/CpuServicesPayload.java | 71 ++++
.../java/s7/netty/model/payloads/VarPayload.java | 5 +
.../netty/model/payloads/ssls/SslDataRecord.java} | 7 +-
.../ssls/SslModuleIdentificationDataRecord.java | 66 ++++
...java => CpuServicesParameterFunctionGroup.java} | 27 +-
...a => CpuServicesParameterSubFunctionGroup.java} | 27 +-
.../plc4x/java/s7/netty/model/types/SslId.java | 99 +++++
.../plc4x/java/s7/netty/util/S7SizeHelper.java | 20 +
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 27 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 31 +-
.../plc4x/java/s7/types/S7ControllerType.java} | 11 +-
.../org/apache/plc4x/java/s7/types/S7DataType.java | 155 ++++++++
.../java/s7/connection/S7PlcConnectionIT.java | 17 +-
.../java/s7/connection/S7PlcTestConnection.java | 35 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 57 ++-
.../s7/netty/model/params/S7ParameterTests.java | 8 +-
.../plc4x/java/s7/netty/util/S7SizeHelperTest.java | 5 +-
.../types/S7DataTypeTest.java} | 41 +--
.../s7/connection/s7-cpu-functions-response.pcap | Bin 0 -> 219 bytes
pom.xml | 27 +-
src/site/asciidoc/community/conferences.adoc | 24 +-
src/site/asciidoc/community/getting-involved.adoc | 62 +++-
src/site/asciidoc/index.adoc | 59 +--
.../ads/index.adoc} | 6 +-
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/resources/img/S7300.png | Bin 211110 -> 0 bytes
src/site/resources/img/apache_kafka_logo.png | Bin 0 -> 78411 bytes
src/site/resources/img/apache_nifi_logo.svg | 19 +
.../resources/img/community-contribute-fork.png | Bin 0 -> 195211 bytes
src/site/resources/img/iot-lab.jpg | Bin 0 -> 664977 bytes
src/site/site.xml | 9 +-
src/site/template/maven-site.vm | 2 +
131 files changed, 3820 insertions(+), 874 deletions(-)
copy examples/{iotree => azure}/pom.xml (67%)
create mode 100644 examples/azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub/S7PlcToAzureIoTHubSample.java
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/package-info.java => api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java} (74%)
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/UnsubscriptionResponseItem.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/ImmutabilityTest.java
copy plc4j/{protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/DeviceTest.java => api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequestTest.java} (55%)
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponseTest.java
create mode 100644 plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionEventTest.java
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java => api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionRequestTest.java} (78%)
copy integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XConsumerTest.java => plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcSubscriptionResponseTest.java (67%)
copy plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/{PlcRequestTest.java => PlcUnsubscriptionRequestTest.java} (50%)
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java => api/src/test/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionResponseTest.java} (78%)
rename plc4j/{api/src/main/java/org/apache/plc4x/java/api => protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base}/messages/PlcRequestContainer.java (61%)
create mode 100644 plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java
create mode 100644 plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/protocol/Plc4XSupportedDataTypes.java
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/events/{S7ConnectedEvent.java => S7IdentifiedEvent.java} (96%)
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/{CpuServicesParameter.java => CpuServicesRequestParameter.java} (63%)
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/CpuServicesResponseParameter.java
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/CpuServicesPayload.java
copy plc4j/protocols/{driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectedEvent.java => s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslDataRecord.java} (85%)
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/payloads/ssls/SslModuleIdentificationDataRecord.java
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/{DataTransportErrorCode.java => CpuServicesParameterFunctionGroup.java} (62%)
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/{DataTransportErrorCode.java => CpuServicesParameterSubFunctionGroup.java} (61%)
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
copy plc4j/protocols/{driver-bases/base/src/main/java/org/apache/plc4x/java/base/events/ConnectEvent.java => s7/src/main/java/org/apache/plc4x/java/s7/types/S7ControllerType.java} (85%)
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/types/S7DataType.java
copy plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/{isotp/netty/model/params/TsapParameterTests.java => s7/types/S7DataTypeTest.java} (51%)
create mode 100644 plc4j/protocols/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-cpu-functions-response.pcap
copy src/site/asciidoc/{users/gettingstarted.adoc => protocols/ads/index.adoc} (95%)
create mode 100644 src/site/asciidoc/protocols/delta-v/index.adoc
create mode 100644 src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
copy src/site/asciidoc/protocols/{ => ethernet-ip}/index.adoc (75%)
delete mode 100644 src/site/resources/img/S7300.png
create mode 100644 src/site/resources/img/apache_kafka_logo.png
create mode 100644 src/site/resources/img/apache_nifi_logo.svg
create mode 100644 src/site/resources/img/community-contribute-fork.png
create mode 100644 src/site/resources/img/iot-lab.jpg
[incubator-plc4x] 01/01: Merging feature/site-generation-fixes
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/site-generation-fixes
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit db00cb4d3e27e19c7f8103c8df5bcfdc60da9bff
Merge: 0be404c 276768b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Aug 17 15:57:56 2018 +0200
Merging feature/site-generation-fixes
Jenkinsfile | 6 +-
examples/{kafka-bridge => azure}/pom.xml | 107 ++----
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 95 +++++
.../dummydriver/connection/DummyConnection.java | 12 +-
.../examples/dummydriver/netty/DummyProtocol.java | 6 +-
examples/kafka-bridge/pom.xml | 12 +-
.../plc4x/java/examples/plclogger/PlcLogger.java | 2 +-
examples/plclogger/src/main/resources/logback.xml | 2 +-
examples/pom.xml | 1 +
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
plc4j/api/pom.xml | 6 +
.../PlcNotImplementedException.java} | 17 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 17 +
.../plc4x/java/api/messages/PlcReadResponse.java | 15 +
.../apache/plc4x/java/api/messages/PlcRequest.java | 6 +-
.../java/api/messages/PlcSubscriptionEvent.java | 24 ++
.../java/api/messages/PlcSubscriptionRequest.java | 55 ++-
.../java/api/messages/PlcSubscriptionResponse.java | 4 +
.../api/messages/PlcUnsubscriptionRequest.java | 80 ++++
.../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 | 19 +
.../java/api/messages/items/ReadResponseItem.java | 15 +-
.../plc4x/java/api/messages/items/RequestItem.java | 5 +
.../api/messages/items/SubscriptionEventItem.java | 34 +-
.../SubscriptionRequestChangeOfStateItem.java | 8 +-
.../items/SubscriptionRequestCyclicItem.java | 39 +-
.../items/SubscriptionRequestEventItem.java | 10 +-
.../messages/items/SubscriptionRequestItem.java | 33 +-
.../messages/items/SubscriptionResponseItem.java | 30 +-
.../java/api/messages/items/WriteRequestItem.java | 7 +
.../java/api/messages/items/WriteResponseItem.java | 4 +
.../messages/specific/TypeSafePlcReadRequest.java | 15 +
.../messages/specific/TypeSafePlcReadResponse.java | 5 +
.../messages/specific/TypeSafePlcWriteRequest.java | 7 +
.../specific/TypeSafePlcWriteResponse.java | 5 +
.../apache/plc4x/java/api/ImmutabilityTest.java | 103 ++++++
.../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 +-
.../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/connection/AdsAbstractPlcConnection.java | 4 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 176 ++++-----
.../java/ads/model/AdsSubscriptionHandle.java | 25 ++
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 1 +
.../ads/protocol/util/LittleEndianDecoder.java | 18 +
.../ads/protocol/util/LittleEndianEncoder.java | 30 ++
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 36 +-
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 6 +-
.../connection/AdsAbstractPlcConnectionTest.java | 1 +
.../ads/connection/AdsTcpPlcConnectionTests.java | 10 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 81 ++---
.../base/connection/AbstractPlcConnection.java | 2 +-
.../java/base}/messages/PlcRequestContainer.java | 42 ++-
.../base/messages/PlcRequestContainerTest.java | 84 +++++
.../java/base/connection/tcp/TcpHexDumper.java | 14 +-
.../base/protocol/Plc4XSupportedDataTypes.java | 238 ++++++++++++
.../org/apache/plc4x/java/base/util/Assert.java | 7 +-
.../plc4x/java/base/util/Junit5Backport.java | 6 +-
.../modbus/connection/BaseModbusPlcConnection.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 | 296 +++++++++++----
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 44 ++-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 402 ++++++++++++++-------
plc4j/protocols/s7/pom.xml | 4 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 70 +++-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 35 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 350 +++++++++++++++---
.../java/s7/netty/events/S7IdentifiedEvent.java} | 4 +-
.../java/s7/netty/model/messages/S7Message.java | 10 +
.../s7/netty/model/messages/S7RequestMessage.java | 5 +
.../s7/netty/model/messages/S7ResponseMessage.java | 3 +
.../netty/model/params/CpuServicesParameter.java | 25 +-
...meter.java => CpuServicesRequestParameter.java} | 11 +-
.../model/params/CpuServicesResponseParameter.java | 50 +++
.../java/s7/netty/model/params/VarParameter.java | 6 +-
.../model/params/items/S7AnyVarParameterItem.java | 15 +
.../netty/model/payloads/CpuServicesPayload.java | 71 ++++
.../java/s7/netty/model/payloads/VarPayload.java | 5 +
.../netty/model/payloads/ssls/SslDataRecord.java} | 7 +-
.../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 +
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 27 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 31 +-
.../plc4x/java/s7/types/S7ControllerType.java} | 11 +-
.../org/apache/plc4x/java/s7/types/S7DataType.java | 155 ++++++++
.../java/s7/connection/S7PlcConnectionIT.java | 17 +-
.../java/s7/connection/S7PlcTestConnection.java | 35 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 57 ++-
.../s7/netty/model/params/S7ParameterTests.java | 8 +-
.../plc4x/java/s7/netty/util/S7SizeHelperTest.java | 5 +-
.../apache/plc4x/java/s7/types/S7DataTypeTest.java | 57 +++
.../s7/connection/s7-cpu-functions-response.pcap | Bin 0 -> 219 bytes
pom.xml | 27 +-
src/site/asciidoc/community/conferences.adoc | 24 +-
src/site/asciidoc/community/getting-involved.adoc | 62 +++-
src/site/asciidoc/index.adoc | 59 +--
.../ads/index.adoc} | 25 +-
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/resources/img/S7300.png | Bin 211110 -> 0 bytes
src/site/resources/img/apache_kafka_logo.png | Bin 0 -> 78411 bytes
src/site/resources/img/apache_nifi_logo.svg | 19 +
.../resources/img/community-contribute-fork.png | Bin 0 -> 195211 bytes
src/site/resources/img/iot-lab.jpg | Bin 0 -> 664977 bytes
src/site/site.xml | 9 +-
src/site/template/maven-site.vm | 2 +
130 files changed, 3954 insertions(+), 851 deletions(-)