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/03/19 20:00:37 UTC
[plc4x] branch feature/driver-testsuite updated (f821ccb -> db6ec88)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/driver-testsuite
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from f821ccb - Some further updates on the driver feature/driver-testsuite -- Renamed the xml constants (hopefully more intuitive) -- Streamlined the DriverTestsuiteRunner code
add 7b556a1 Refactor PlcDriverManager as context manager
add 44f0ebc Merge pull request #124 from nuclearpinguin/feature/plc4py
add 986fab3 - Implemented a tool to replay wireshark dumps
add 5403b89 - Fixed the `loop` feature - Added site documentation - Fixed broken links and duplicates in the tools section of the site
add b7b2967 - Ignored one missing dependency
add 7db7c76 - Finished documenting using RAT for validating releases
add 46b55f6 - Fixed a bug in the encoding of single item values
add e90f590 - Made the KNX more robust against NPEs
add d8285fb - Refactored the pcap-replay and the raw-socket to use a shared base - Renamed the pcap-socket module to pcap-replay
add 3c52aad - Updated the NiFi version in the NiFi Integration - Made the KNXNetIP Driver a little more robust
add 491435f - Updated the KNX driver to be a passive mode driver
add 3c9d732 - Fixed some dependency problems
add 976d77d Updated DOAP Site with Release 0.6.0.
add 5d9fed7 Added Release 0.6.0 to the download page
add 635cdc2 Fixed Download Page (0.5.0 / 0.6.0).
add d726147 [fix] Transfer bug fixes from rel/0.6 to 0.7+ which includes correct OPC UA field address matching and connection string parameter recognition
add 3f68dfa Merge pull request #131 from apache/bugfix/OPCUA-transfer-from-0-6
add 7d9a58a - Removed main method from Ets5Parser
add 799e594 - Fixed a typo
add 8f96bcd - Fixed a typo
add c262f13 - Fixed some broken links
add cb707c7 - Fixed some broken links
add c612281 - Fixed a lot of broken links
add 103b45b - Added a new page listing up a lot of slides, videos and blog posts on plc4x
add 5c32c9d - Added a "getPlcValue" method to the PlcReadResponse
add 9e6a786 - Added a config option to the pcap replay channel to allow looping of the replay.
add 6ba8615 - Added documentation on writing and subscribing to the getting started section
add 0e683ff - Added missing names for the S7 connection string options
add 59867a1 - Started adding documentation for transports, protocols and general concepts
add c683afa - Added a description of the connection string options part
add 65fae08 Update general-concepts.adoc
add 6f78958 - Added documentation for S7 resource address strings
add 2e444b4 - Added the missing documentation for the other transports
add 052b111 - Added information to which S7 device supports which datatypes
add 0511f19 - Renamed the file for the serial transport documentation
add 84696f3 - Fixed a broken link
add a3b28b7 - Removed field types which are not explicitly specified in the modbus spec - Decreased the timeout back to one second
add 7f988fd - Added the documentation for the Modbus protocol
add f0dd5f5 - Added a PacketSizeEstimator for the AbETH protocol.
add c814282 added riot.community blog post
add 8aae234 Update blogs-videos-and-slides.adoc
add db74d11 - Changed the generated code to use getSizeInBits and keep getSizeInBytes as a convenience method (Needed if data types are not byte aligned)
add 96da9fa - Added the value range check also to single item requests
add e73e7c3 - Made the serial chanel configurable (baud-rate, data-bits, stop-bits, parity)
add 538011c - First implementation of a Firmata protocol driver able to subscribe to digital values.
add 9407622 - Fixed the digital input to allow reading of all digital pins up to pin 13 - Extended the digital field address syntax to allow specifying a port as "PULLUP" type
add afbb0fe - Added a documentation page for the firmata driver
add e52774a - Added the analog input subscription functionality
add 0d9eb89 - Changed the GeneratedDriverByteToMessageCodec to also call the corrupt package consumer if something goes wrong in the packet size estimation.
add cbe5e28 - Made the Firmata driver more robust against situation where we are connecting and the board is still sending data from a previous connection.
add 196b4e5 - Completely converted the project to use JUnit5 - Fixed the JUnit5 integration in surefire and failsafe - Bumped the Camel version to 3.1.0
add 1b22bc8 - Added the Junit5 dependencies to the build-tools and sandbox repo roots.
add 86fe9b4 - Bumped Netty to version 4.1.47.Final - Testwise added generation of feature.xml and kar archive to the s7 driver
add f2d8a7c - Increased the default delay in the SerialPollingSelector as it was causing problems otherwise
add 59795ad - Made the SimpleValue allow using the getIndex method if the index is 0
add 0828516 - Implemented the write operation
add 9538bf5 - Moved the firmata driver out of the sandbox - Enabled the firmata driver documentation in the main navigation
add f0b54e8 - Greatly refactoed the Webapp example to something pushing data actively from a plc into a web-client (The push part still isn't working well ... will fix that asap)
add 2931cd8 - Updated the download links to the new preferred download url.
add d2b39b2 - Bumped commons configuration due to [CVE-2020-1953]
add b9f6a5b - Removed some obsolete code.
add 3118461 - Added some debug log configuration in the app - Added a dummy data generator to simulate a PLC
add 55182e4 - Minor adjustments and SonarCube findings
add aa5ed2e - Made jacoco generate the jacoco.xml reports so hopefully SonarCloud will import them.
add 5280150 - Prevent the server from publishing data before it's actually started.
add 1a3c316 - Added jms to the dependencies.
add bd90056 - Switched back to short polling (long-polling seems to have issues)
add 66c538b - Test-commit to see if jenkins kicks in ...
add 3aa1de1 - Test-commit to see if jenkins kicks in ...
add d181ec4 - Added the ability to handle vlan traffic.
add ce0f022 - Made the code generation output the real type for discriminator constants.
add b8387e1 - Worked on the firmata tests
add 9eaa746 - Worked on the firmata tests
add 825158a - Renamed the test files so surefire and failsafe will pick them up
add 0e3e593 - Fixed some typos
new fcc5d8a Merge branches 'develop' and 'feature/driver-testsuite' of https://gitbox.apache.org/repos/asf/plc4x into feature/driver-testsuite
new db6ec88 - Updated due to changes on develop
The 2 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:
.gitignore | 4 +
.../language/java/JavaLanguageTemplateHelper.java | 26 +
.../resources/templates/java/pojo-template.ftlh | 18 +-
build-utils/pom.xml | 14 +
build-utils/protocol-base-mspec/pom.xml | 20 -
.../plc4x/java/api/messages/PlcReadResponse.java | 2 +
.../java/api/model/PlcSubscriptionHandle.java | 1 +
.../plc4x/java/api/value/PlcSimpleValue.java | 13 +
.../apache/plc4x/java/PlcDriverManagerTest.java | 24 +-
.../PlcUsernamePasswordAuthenticationTest.java | 14 +-
.../plc4x/java/api/connection/PlcReaderTest.java | 3 -
.../plc4x/java/api/connection/PlcWriterTest.java | 1 -
.../exceptions/PlcInvalidFieldExceptionTest.java | 2 +-
.../api/messages/PlcProprietaryRequestTest.java | 6 -
.../api/messages/PlcProprietaryResponseTest.java | 3 -
.../java/api/messages/PlcReadRequestTest.java | 3 -
.../java/api/messages/PlcReadResponseTest.java | 2 -
.../plc4x/java/api/messages/PlcRequestTest.java | 6 -
.../api/messages/PlcSubscriptionEventTest.java | 3 -
.../api/messages/PlcSubscriptionRequestTest.java | 2 -
.../api/messages/PlcSubscriptionResponseTest.java | 2 -
.../api/messages/PlcUnsubscriptionRequestTest.java | 4 -
.../messages/PlcUnsubscriptionResponseTest.java | 2 -
.../java/api/messages/PlcWriteRequestTest.java | 3 -
.../java/api/messages/PlcWriteResponseTest.java | 2 -
.../specific/TypeSafePlcReadRequestTest.java | 3 -
.../specific/TypeSafePlcWriteRequestTest.java | 3 -
.../java/api/types/PlcClientDatatypeTest.java | 2 +-
.../plc4x/java/api/types/PlcResponseCodeTest.java | 2 +-
.../java/api/types/PlcSubscriptionTypeTest.java | 2 +-
.../apache/plc4x/java/api/value/PlcValuesTest.java | 5 +-
.../org/apache/plc4x/java/abeth/AbEthDriver.java | 16 +
plc4j/drivers/firmata/README.adoc | 31 +
plc4j/drivers/{ab-eth => firmata}/pom.xml | 32 +-
.../java/firmata/readwrite/FirmataDriver.java | 162 +
.../configuration/FirmataConfiguration.java | 18 +-
.../readwrite/context/FirmataDriverContext.java | 158 +
.../firmata/readwrite/field/FirmataField.java} | 14 +-
.../readwrite/field/FirmataFieldAnalog.java | 46 +
.../readwrite/field/FirmataFieldDigital.java | 69 +
.../readwrite/field/FirmataFieldHandler.java} | 72 +-
.../model/FirmataSubscriptionHandle.java} | 25 +-
.../readwrite/protocol/FirmataProtocolLogic.java | 300 ++
.../java/firmata/readwrite/utils/FirmataUtils.java | 54 +
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../readwrite/FirmataParserSerializerTest.java} | 8 +-
.../testsuite/FirmataParserSerializerTest.xml | 286 ++
.../src/test/resources/testsuite/recording.txt | 4239 ++++++++++++++++++++
plc4j/drivers/knxnetip/pom.xml | 21 +
.../configuration/KnxNetIpConfiguration.java | 16 +-
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 5 -
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 336 +-
.../apache/plc4x/java/knxnetip/ManualKnxNetIp.java | 5 +-
plc4j/drivers/mock/pom.xml | 10 +-
.../java/mock/connection/tcp/TcpHexDumper.java | 5 +-
.../mock/protocol/Plc4XSupportedDataTypes.java | 2 +-
.../org/apache/plc4x/java/mock/util/Assert.java | 2 +-
.../java/modbus/config/ModbusConfiguration.java | 2 +-
.../plc4x/java/modbus/field/ModbusField.java | 1 +
.../plc4x/java/modbus/field/ModbusFieldCoil.java | 1 +
.../java/modbus/field/ModbusFieldHandler.java | 13 +-
.../modbus/field/ModbusFieldMaskWriteRegister.java | 98 -
.../java/modbus/field/ModbusFieldRegister.java | 47 -
.../java/modbus/protocol/ModbusProtocolLogic.java | 11 +
.../opcua/connection/OpcuaTcpPlcConnection.java | 32 +-
.../plc4x/java/opcua/protocol/OpcuaField.java | 2 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 6 +-
.../org/apache/plc4x/java/opcua/UtilsTest.java | 3 +-
.../connection/OpcuaTcpPlcConnectionTest.java | 6 +-
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java | 7 +
plc4j/drivers/pom.xml | 1 +
plc4j/drivers/s7/pom.xml | 35 +-
.../readwrite/configuration/S7Configuration.java | 8 +-
.../{S7DriverTestsuite.java => S7DriverIT.java} | 6 +-
...rTestsuite.java => S7ParserSerializerTest.java} | 6 +-
.../{S7DriverTestsuite.xml => S7DriverIT.xml} | 0
...zerTestsuite.xml => S7ParserSerializerTest.xml} | 0
.../simulated/connection/SimulatedDeviceTest.java | 2 +-
.../java/simulated/field/SimulatedFieldTest.java | 2 +-
.../examples/hello-influx-data-collection/pom.xml | 19 +
plc4j/examples/hello-webapp/client/asconfig.json | 20 +
plc4j/examples/hello-webapp/client/pom.xml | 35 +-
.../src/main/resources/plc4x-index-template.html} | 15 +-
.../hello-webapp/client/src/main/royale/App.mxml | 161 +
.../client/src/main/royale/HelloPLC4X.mxml | 104 -
.../client/src/main/royale/service/RobotService.as | 92 -
plc4j/examples/hello-webapp/pom.xml | 5 +-
plc4j/examples/hello-webapp/service/pom.xml | 55 -
.../robot/controllers/RobotController.java | 109 -
plc4j/examples/hello-webapp/webapp/pom.xml | 84 +-
.../examples/{robot => watertank}/Application.java | 2 +-
.../watertank/service/WaterTankService.java | 187 +
.../java/org/springframework/core/JdkVersion.java | 29 +-
.../resources/META-INF/flex/services-config.xml | 98 +
.../src/main/resources/application.properties | 6 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 79 +
.../webapp/src/main/webapp/favicon.ico | Bin 0 -> 1150 bytes
plc4j/examples/pom.xml | 7 +
plc4j/integrations/apache-camel/pom.xml | 29 +-
.../org/apache/plc4x/camel/Plc4XComponent.java | 3 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 8 +-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 9 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 17 +-
.../java/org/apache/plc4x/camel/ConstantsTest.java | 25 +-
.../java/org/apache/plc4x/camel/ManualTest.java | 7 +-
.../org/apache/plc4x/camel/Plc4XComponentTest.java | 4 +-
.../org/apache/plc4x/camel/Plc4XConsumerTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 8 +-
.../plc4x/camel/Plc4XPollingConsumerTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 10 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 3 -
.../apache-nifi/nifi-plc4x-nar/pom.xml | 31 +
.../plc4x4nifi/Plc4xSinkProcessorTest.java | 6 +-
.../plc4x4nifi/Plc4xSourceProcessorTest.java | 6 +-
plc4j/integrations/apache-nifi/pom.xml | 4 +-
.../java/org/apache/plc4x/karaf/FeatureIT.java | 4 +-
plc4j/pom.xml | 32 +-
.../java/io/netty/bootstrap/Plc4xBootstrap.java | 2 +-
.../spi/GeneratedDriverByteToMessageCodec.java | 27 +-
.../java/spi/connection/GeneratedDriverBase.java | 1 +
.../apache/plc4x/java/spi/generation/Message.java | 2 +
.../java/spi/messages/DefaultPlcReadResponse.java | 5 +
.../internal/DefaultSendRequestContextTest.java | 2 +-
.../optimizer/RequestTransactionManagerTest.java | 8 +-
plc4j/tools/capture-replay/README.adoc | 38 +
.../raw-sockets => tools/capture-replay}/pom.xml | 99 +-
.../java/utils/capturereplay/CaptureReplay.java | 114 +
.../plc4x/java/utils/capturereplay/CliOptions.java | 119 +
.../capture-replay}/src/main/resources/logback.xml | 0
plc4j/tools/opm/pom.xml | 5 -
.../apache/plc4x/java/opm/ConnectedEntityTest.java | 3 +-
.../org/apache/plc4x/java/opm/OpmUtilsTest.java | 2 +-
.../plc4x/java/opm/PlcEntityInterceptorTest.java | 3 +-
.../java/opm/PlcEntityManagerComplexTest.java | 12 +-
.../plc4x/java/opm/PlcEntityManagerTest.java | 5 +-
.../plc4x/java/opm/SimpleAliasRegistryTest.java | 2 +-
plc4j/tools/pom.xml | 1 +
plc4j/tools/scraper/pom.xml | 6 -
.../triggeredscraper/TriggeredScraperImplTest.java | 7 +-
.../triggerhandler/TriggerConfigurationTest.java | 5 +-
.../{pcap-socket => pcap-replay}/pom.xml | 18 +-
.../pcapreplay/PcapReplayChannelFactory.java} | 28 +-
.../transport/pcapreplay/PcapReplayTransport.java} | 10 +-
.../PcapReplayTransportConfiguration.java} | 14 +-
.../org.apache.plc4x.java.spi.transport.Transport | 2 +-
plc4j/transports/{tcp => pcap-shared}/pom.xml | 22 +-
.../transport/pcap/PcapTransportConfiguration.java | 15 +-
plc4j/transports/pom.xml | 3 +-
plc4j/transports/raw-socket/pom.xml | 10 +
.../rawsocket/RawSocketChannelFactory.java | 17 +-
.../transport/rawsocket/RawSocketTransport.java | 4 +-
.../rawsocket/RawSocketTransportConfiguration.java | 6 +-
.../plc4x/java/transport/serial/SerialChannel.java | 15 +-
.../java/transport/serial/SerialChannelConfig.java | 109 +
.../transport/serial/SerialChannelFactory.java | 4 +
.../transport/serial/SerialChannelHandler.java | 8 +-
...ialTransport.java => SerialChannelOptions.java} | 47 +-
.../transport/serial/SerialPollingSelector.java | 22 +-
.../serial/SerialTransportConfiguration.java | 15 +
.../base/connection/SerialChannelFactoryTest.java | 2 +-
plc4j/transports/test/pom.xml | 6 -
plc4j/utils/{pcap-sockets => pcap-replay}/pom.xml | 10 +-
.../utils/pcapreplay/netty/PcapReplayChannel.java} | 60 +-
.../netty/address/PcapReplayAddress.java} | 12 +-
.../netty/config/PcapReplayChannelConfig.java | 81 +
.../netty/config/PcapReplayChannelOption.java} | 22 +-
plc4j/utils/{pcap-sockets => pcap-shared}/pom.xml | 15 +-
.../pcap/netty/address/PcapSocketAddress.java | 8 +-
.../utils/pcap/netty/config/PcapChannelConfig.java | 152 +
.../pcap/netty/config/PcapChannelOption.java} | 23 +-
.../utils/pcap/netty/exception/PcapException.java} | 10 +-
.../utils/pcap/netty/handlers}/PacketHandler.java | 2 +-
.../pcap/netty/handlers}/TcpIpPacketHandler.java | 2 +-
.../pcap}/netty/handlers/UdpIpPacketHandler.java | 2 +-
.../utils/pcapsockets/PcapSocketException.java | 34 -
.../pcapsockets/netty/PcapSocketChannelConfig.java | 124 -
.../pcapsockets/netty/handlers/PacketHandler.java | 27 -
.../netty/handlers/TcpIpPacketHandler.java | 41 -
plc4j/utils/pom.xml | 3 +-
plc4j/utils/raw-sockets/pom.xml | 6 +
.../utils/rawsockets/attic/RawEthernetSocket.java | 14 +-
.../java/utils/rawsockets/attic/RawIpSocket.java | 32 +-
.../utils/rawsockets/netty/RawSocketChannel.java | 29 +-
.../rawsockets/netty/RawSocketChannelConfig.java | 66 -
.../utils/rawsockets/netty/RawSocketIpAddress.java | 46 -
.../utils/rawsockets/netty/UdpIpPacketHandler.java | 41 -
.../netty/{ => address}/RawSocketAddress.java | 17 +-
.../netty/config/RawSocketChannelConfig.java} | 11 +-
.../utils/rawsockets/attic/RawIpSocketTest.java | 14 +-
.../rawsockets/netty/RawSocketChannelTest.java | 12 +-
plc4j/utils/test-utils/pom.xml | 13 +-
.../ParserSerializerTestsuiteRunner.java | 13 +-
pom.xml | 81 +-
protocols/{df1 => firmata}/pom.xml | 6 +-
.../plc4x/protocol/firmata/FirmataProtocol.java} | 8 +-
...e.plc4x.plugins.codegenerator.protocol.Protocol | 2 +-
.../main/resources/protocols/firmata/firmata.mspec | 142 +
protocols/pom.xml | 1 +
.../s7/src/main/resources/protocols/s7/s7.mspec | 59 +-
sandbox/code-gen/pom.xml | 17 +-
.../org/apache/plc4x/codegen/DFDLUtilTest.java | 4 +-
.../org/apache/plc4x/codegen/ModuleNodeTest.java | 3 +-
.../plc4x/codegen/ast/JavaGeneratorTest.java | 10 +-
.../plc4x/codegen/ast/PythonGeneratorTest.java | 10 +-
.../apache/plc4x/codegen/util/EnumFactoryTest.java | 3 +-
.../apache/plc4x/codegen/util/PojoFactoryTest.java | 3 +-
sandbox/plc4py/README.md | 23 +-
.../python/org/apache/plc4x/PlcDriverManager.py | 74 +-
sandbox/pom.xml | 15 +-
sandbox/test-java-amsads-driver/pom.xml | 16 -
sandbox/test-java-bacnetip-driver/pom.xml | 2 +-
.../PassiveBacNetIpConfiguration.java | 26 +-
sandbox/test-java-df1-driver/pom.xml | 16 -
sandbox/test-streampipes-plc4x-adapters/pom.xml | 13 +-
src/site/asciidoc/developers/building.adoc | 4 +-
src/site/asciidoc/developers/index.adoc | 8 +-
.../developers/infrastructure/website.adoc | 2 +-
src/site/asciidoc/developers/maturity.adoc | 6 +-
.../asciidoc/developers/release/build-tools.adoc | 4 +-
.../asciidoc/developers/release/validation.adoc | 22 +-
.../asciidoc/users/blogs-videos-and-slides.adoc | 40 +
src/site/asciidoc/users/download.adoc | 36 +-
src/site/asciidoc/users/index.adoc | 13 +
src/site/asciidoc/users/opm.adoc | 73 -
.../asciidoc/users/plc4j/general-concepts.adoc | 106 +
src/site/asciidoc/users/plc4j/gettingstarted.adoc | 124 +-
src/site/asciidoc/users/protocols/ab-eth.adoc | 2 +-
src/site/asciidoc/users/protocols/ads.adoc | 2 +-
src/site/asciidoc/users/protocols/bacnetip.adoc | 2 +-
src/site/asciidoc/users/protocols/deltav.adoc | 2 +-
src/site/asciidoc/users/protocols/df1.adoc | 2 +-
src/site/asciidoc/users/protocols/ethernet-ip.adoc | 2 +-
src/site/asciidoc/users/protocols/firmata.adoc | 120 +
src/site/asciidoc/users/protocols/index.adoc | 2 +-
src/site/asciidoc/users/protocols/knxnetip.adoc | 2 +-
src/site/asciidoc/users/protocols/modbus.adoc | 93 +-
src/site/asciidoc/users/protocols/opc-ua.adoc | 2 +-
src/site/asciidoc/users/protocols/s7.adoc | 260 +-
src/site/asciidoc/users/protocols/simulated.adoc | 2 +-
src/site/asciidoc/users/testing.adoc | 165 -
src/site/asciidoc/users/tools/capture-replay.adoc | 59 +
.../infrastructure => users/transports}/index.adoc | 8 +-
.../pcap-replay.adoc} | 49 +-
.../raw-socket.adoc} | 33 +-
.../apache-kafka.adoc => transports/serial.adoc} | 36 +-
.../apache-kafka.adoc => transports/tcp.adoc} | 33 +-
.../apache-kafka.adoc => transports/udp.adoc} | 33 +-
src/site/resources-filtered/plc4x-doap.rdf | 7 +
.../users/protocols/s7-tia-device-settings.png | Bin 0 -> 391398 bytes
.../images/users/protocols/s7-tia-io-settings.png | Bin 0 -> 42175 bytes
src/site/site.xml | 19 +-
tools/common.sh | 2 +-
253 files changed, 9157 insertions(+), 2285 deletions(-)
create mode 100644 plc4j/drivers/firmata/README.adoc
copy plc4j/drivers/{ab-eth => firmata}/pom.xml (87%)
create mode 100644 plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/FirmataDriver.java
copy sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/configuration/Df1Configuration.java => plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/configuration/FirmataConfiguration.java (71%)
create mode 100644 plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/context/FirmataDriverContext.java
copy plc4j/drivers/{modbus/src/main/java/org/apache/plc4x/java/modbus/field/ModbusField.java => firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/field/FirmataField.java} (86%)
create mode 100644 plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/field/FirmataFieldAnalog.java
create mode 100644 plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/field/FirmataFieldDigital.java
copy plc4j/drivers/{modbus/src/main/java/org/apache/plc4x/java/modbus/field/ModbusFieldHandler.java => firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/field/FirmataFieldHandler.java} (77%)
copy plc4j/drivers/{knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/model/KnxNetIpSubscriptionHandle.java => firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/model/FirmataSubscriptionHandle.java} (73%)
create mode 100644 plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/protocol/FirmataProtocolLogic.java
create mode 100644 plc4j/drivers/firmata/src/main/java/org/apache/plc4x/java/firmata/readwrite/utils/FirmataUtils.java
copy plc4j/drivers/{ab-eth => firmata}/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver (93%)
copy plc4j/drivers/{s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7ParserSerializerTestsuite.java => firmata/src/test/java/org/apache/plc4x/java/firmata/readwrite/FirmataParserSerializerTest.java} (80%)
create mode 100644 plc4j/drivers/firmata/src/test/resources/testsuite/FirmataParserSerializerTest.xml
create mode 100644 plc4j/drivers/firmata/src/test/resources/testsuite/recording.txt
delete mode 100644 plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/field/ModbusFieldMaskWriteRegister.java
delete mode 100644 plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/field/ModbusFieldRegister.java
rename plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/{S7DriverTestsuite.java => S7DriverIT.java} (85%)
rename plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/{S7ParserSerializerTestsuite.java => S7ParserSerializerTest.java} (82%)
rename plc4j/drivers/s7/src/test/resources/testsuite/{S7DriverTestsuite.xml => S7DriverIT.xml} (100%)
rename plc4j/drivers/s7/src/test/resources/testsuite/{S7ParserSerializerTestsuite.xml => S7ParserSerializerTest.xml} (100%)
create mode 100644 plc4j/examples/hello-webapp/client/asconfig.json
copy plc4j/{protocols/ads/LINKS.md => examples/hello-webapp/client/src/main/resources/plc4x-index-template.html} (73%)
create mode 100644 plc4j/examples/hello-webapp/client/src/main/royale/App.mxml
delete mode 100644 plc4j/examples/hello-webapp/client/src/main/royale/HelloPLC4X.mxml
delete mode 100644 plc4j/examples/hello-webapp/client/src/main/royale/service/RobotService.as
delete mode 100644 plc4j/examples/hello-webapp/service/pom.xml
delete mode 100644 plc4j/examples/hello-webapp/service/src/main/java/org/apache/plc4x/examples/robot/controllers/RobotController.java
rename plc4j/examples/hello-webapp/webapp/src/main/java/org/apache/plc4x/examples/{robot => watertank}/Application.java (95%)
create mode 100644 plc4j/examples/hello-webapp/webapp/src/main/java/org/apache/plc4x/examples/watertank/service/WaterTankService.java
copy sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/TypeDefinition.java => plc4j/examples/hello-webapp/webapp/src/main/java/org/springframework/core/JdkVersion.java (57%)
create mode 100644 plc4j/examples/hello-webapp/webapp/src/main/resources/META-INF/flex/services-config.xml
create mode 100644 plc4j/examples/hello-webapp/webapp/src/main/webapp/WEB-INF/web.xml
create mode 100644 plc4j/examples/hello-webapp/webapp/src/main/webapp/favicon.ico
create mode 100644 plc4j/tools/capture-replay/README.adoc
copy plc4j/{utils/raw-sockets => tools/capture-replay}/pom.xml (59%)
create mode 100644 plc4j/tools/capture-replay/src/main/java/org/apache/plc4x/java/utils/capturereplay/CaptureReplay.java
create mode 100644 plc4j/tools/capture-replay/src/main/java/org/apache/plc4x/java/utils/capturereplay/CliOptions.java
copy plc4j/{utils/test-utils => tools/capture-replay}/src/main/resources/logback.xml (100%)
rename plc4j/transports/{pcap-socket => pcap-replay}/pom.xml (76%)
rename plc4j/transports/{pcap-socket/src/main/java/org/apache/plc4x/java/transport/pcap/PcapChannelFactory.java => pcap-replay/src/main/java/org/apache/plc4x/java/transport/pcapreplay/PcapReplayChannelFactory.java} (58%)
rename plc4j/transports/{pcap-socket/src/main/java/org/apache/plc4x/java/transport/pcap/PcapTransport.java => pcap-replay/src/main/java/org/apache/plc4x/java/transport/pcapreplay/PcapReplayTransport.java} (82%)
copy plc4j/{integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/config/Defaults.java => transports/pcap-replay/src/main/java/org/apache/plc4x/java/transport/pcapreplay/PcapReplayTransportConfiguration.java} (70%)
rename plc4j/transports/{pcap-socket => pcap-replay}/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.transport.Transport (92%)
copy plc4j/transports/{tcp => pcap-shared}/pom.xml (75%)
rename plc4j/transports/{pcap-socket => pcap-shared}/src/main/java/org/apache/plc4x/java/transport/pcap/PcapTransportConfiguration.java (72%)
create mode 100644 plc4j/transports/serial/src/main/java/org/apache/plc4x/java/transport/serial/SerialChannelConfig.java
copy plc4j/transports/serial/src/main/java/org/apache/plc4x/java/transport/serial/{SerialTransport.java => SerialChannelOptions.java} (50%)
copy plc4j/utils/{pcap-sockets => pcap-replay}/pom.xml (91%)
rename plc4j/utils/{pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannel.java => pcap-replay/src/main/java/org/apache/plc4x/java/utils/pcapreplay/netty/PcapReplayChannel.java} (82%)
rename plc4j/utils/{pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketAddress.java => pcap-replay/src/main/java/org/apache/plc4x/java/utils/pcapreplay/netty/address/PcapReplayAddress.java} (77%)
create mode 100644 plc4j/utils/pcap-replay/src/main/java/org/apache/plc4x/java/utils/pcapreplay/netty/config/PcapReplayChannelConfig.java
rename plc4j/utils/{raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java => pcap-replay/src/main/java/org/apache/plc4x/java/utils/pcapreplay/netty/config/PcapReplayChannelOption.java} (54%)
rename plc4j/utils/{pcap-sockets => pcap-shared}/pom.xml (82%)
copy sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Node.java => plc4j/utils/pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap/netty/address/PcapSocketAddress.java (84%)
create mode 100644 plc4j/utils/pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap/netty/config/PcapChannelConfig.java
rename plc4j/utils/{pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelOption.java => pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap/netty/config/PcapChannelOption.java} (75%)
rename plc4j/utils/{raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketException.java => pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap/netty/exception/PcapException.java} (76%)
rename plc4j/utils/{raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty => pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap/netty/handlers}/PacketHandler.java (93%)
rename plc4j/utils/{raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty => pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap/netty/handlers}/TcpIpPacketHandler.java (96%)
rename plc4j/utils/{pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets => pcap-shared/src/main/java/org/apache/plc4x/java/utils/pcap}/netty/handlers/UdpIpPacketHandler.java (95%)
delete mode 100644 plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/PcapSocketException.java
delete mode 100644 plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/PcapSocketChannelConfig.java
delete mode 100644 plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/handlers/PacketHandler.java
delete mode 100644 plc4j/utils/pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets/netty/handlers/TcpIpPacketHandler.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelConfig.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketIpAddress.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/UdpIpPacketHandler.java
rename plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/{ => address}/RawSocketAddress.java (71%)
copy plc4j/{drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/ModbusIOTest.java => utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/config/RawSocketChannelConfig.java} (71%)
copy protocols/{df1 => firmata}/pom.xml (87%)
copy protocols/{ab-eth/src/main/java/org/apache/plc4x/protocol/abeth/ABETHProtocol.java => firmata/src/main/java/org/apache/plc4x/protocol/firmata/FirmataProtocol.java} (86%)
copy protocols/{ab-eth => firmata}/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol (94%)
create mode 100644 protocols/firmata/src/main/resources/protocols/firmata/firmata.mspec
create mode 100644 src/site/asciidoc/users/blogs-videos-and-slides.adoc
delete mode 100644 src/site/asciidoc/users/opm.adoc
create mode 100644 src/site/asciidoc/users/plc4j/general-concepts.adoc
create mode 100644 src/site/asciidoc/users/protocols/firmata.adoc
delete mode 100644 src/site/asciidoc/users/testing.adoc
create mode 100644 src/site/asciidoc/users/tools/capture-replay.adoc
copy src/site/asciidoc/{developers/infrastructure => users/transports}/index.adoc (84%)
copy src/site/asciidoc/users/{integrations/apache-kafka.adoc => transports/pcap-replay.adoc} (52%)
copy src/site/asciidoc/users/{integrations/apache-kafka.adoc => transports/raw-socket.adoc} (66%)
copy src/site/asciidoc/users/{integrations/apache-kafka.adoc => transports/serial.adoc} (63%)
copy src/site/asciidoc/users/{integrations/apache-kafka.adoc => transports/tcp.adoc} (64%)
copy src/site/asciidoc/users/{integrations/apache-kafka.adoc => transports/udp.adoc} (64%)
create mode 100644 src/site/resources/images/users/protocols/s7-tia-device-settings.png
create mode 100644 src/site/resources/images/users/protocols/s7-tia-io-settings.png
[plc4x] 02/02: - Updated due to changes on develop
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/driver-testsuite
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit db6ec88101773b6a9b604cc7477198b5a84ee99e
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Mar 19 21:00:29 2020 +0100
- Updated due to changes on develop
---
plc4j/spi/src/main/java/io/netty/bootstrap/Plc4xBootstrap.java | 2 +-
plc4j/utils/test-utils/pom.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/plc4j/spi/src/main/java/io/netty/bootstrap/Plc4xBootstrap.java b/plc4j/spi/src/main/java/io/netty/bootstrap/Plc4xBootstrap.java
index 621439e..c30e401 100644
--- a/plc4j/spi/src/main/java/io/netty/bootstrap/Plc4xBootstrap.java
+++ b/plc4j/spi/src/main/java/io/netty/bootstrap/Plc4xBootstrap.java
@@ -39,7 +39,7 @@ public class Plc4xBootstrap extends Bootstrap {
}
@Override
- void init(Channel channel) throws Exception {
+ void init(Channel channel) {
if((group == null) && (channel instanceof EventLoopProvider)) {
group = ((EventLoopProvider) channel).getEventLoop();
}
diff --git a/plc4j/utils/test-utils/pom.xml b/plc4j/utils/test-utils/pom.xml
index 30d6edd..0ab2215 100644
--- a/plc4j/utils/test-utils/pom.xml
+++ b/plc4j/utils/test-utils/pom.xml
@@ -97,6 +97,10 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
[plc4x] 01/02: Merge branches 'develop' and
'feature/driver-testsuite' of https://gitbox.apache.org/repos/asf/plc4x
into feature/driver-testsuite
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/driver-testsuite
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit fcc5d8a487d4db85db9355f6b3709773cda095c0
Merge: f821ccb 0e3e593
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Mar 19 20:21:23 2020 +0100
Merge branches 'develop' and 'feature/driver-testsuite' of https://gitbox.apache.org/repos/asf/plc4x into feature/driver-testsuite
.gitignore | 4 +
.../language/java/JavaLanguageTemplateHelper.java | 26 +
.../resources/templates/java/pojo-template.ftlh | 18 +-
build-utils/pom.xml | 14 +
build-utils/protocol-base-mspec/pom.xml | 20 -
.../plc4x/java/api/messages/PlcReadResponse.java | 2 +
.../java/api/model/PlcSubscriptionHandle.java | 1 +
.../plc4x/java/api/value/PlcSimpleValue.java | 13 +
.../apache/plc4x/java/PlcDriverManagerTest.java | 24 +-
.../PlcUsernamePasswordAuthenticationTest.java | 14 +-
.../plc4x/java/api/connection/PlcReaderTest.java | 3 -
.../plc4x/java/api/connection/PlcWriterTest.java | 1 -
.../exceptions/PlcInvalidFieldExceptionTest.java | 2 +-
.../api/messages/PlcProprietaryRequestTest.java | 6 -
.../api/messages/PlcProprietaryResponseTest.java | 3 -
.../java/api/messages/PlcReadRequestTest.java | 3 -
.../java/api/messages/PlcReadResponseTest.java | 2 -
.../plc4x/java/api/messages/PlcRequestTest.java | 6 -
.../api/messages/PlcSubscriptionEventTest.java | 3 -
.../api/messages/PlcSubscriptionRequestTest.java | 2 -
.../api/messages/PlcSubscriptionResponseTest.java | 2 -
.../api/messages/PlcUnsubscriptionRequestTest.java | 4 -
.../messages/PlcUnsubscriptionResponseTest.java | 2 -
.../java/api/messages/PlcWriteRequestTest.java | 3 -
.../java/api/messages/PlcWriteResponseTest.java | 2 -
.../specific/TypeSafePlcReadRequestTest.java | 3 -
.../specific/TypeSafePlcWriteRequestTest.java | 3 -
.../java/api/types/PlcClientDatatypeTest.java | 2 +-
.../plc4x/java/api/types/PlcResponseCodeTest.java | 2 +-
.../java/api/types/PlcSubscriptionTypeTest.java | 2 +-
.../apache/plc4x/java/api/value/PlcValuesTest.java | 5 +-
.../org/apache/plc4x/java/abeth/AbEthDriver.java | 16 +
plc4j/drivers/firmata/README.adoc | 31 +
.../drivers/firmata}/pom.xml | 54 +-
.../java/firmata/readwrite/FirmataDriver.java | 162 +
.../configuration/FirmataConfiguration.java} | 19 +-
.../readwrite/context/FirmataDriverContext.java | 158 +
.../firmata/readwrite/field/FirmataField.java} | 14 +-
.../readwrite/field/FirmataFieldAnalog.java | 46 +
.../readwrite/field/FirmataFieldDigital.java | 69 +
.../readwrite/field/FirmataFieldHandler.java} | 72 +-
.../readwrite/model/FirmataSubscriptionHandle.java | 79 +
.../readwrite/protocol/FirmataProtocolLogic.java | 300 ++
.../java/firmata/readwrite/utils/FirmataUtils.java | 54 +
.../services/org.apache.plc4x.java.api.PlcDriver} | 3 +-
.../readwrite/FirmataParserSerializerTest.java} | 8 +-
.../testsuite/FirmataParserSerializerTest.xml | 286 ++
.../src/test/resources/testsuite/recording.txt | 4239 ++++++++++++++++++++
plc4j/drivers/knxnetip/pom.xml | 21 +
.../configuration/KnxNetIpConfiguration.java | 16 +-
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 5 -
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 336 +-
.../apache/plc4x/java/knxnetip/ManualKnxNetIp.java | 5 +-
plc4j/drivers/mock/pom.xml | 10 +-
.../java/mock/connection/tcp/TcpHexDumper.java | 5 +-
.../mock/protocol/Plc4XSupportedDataTypes.java | 2 +-
.../org/apache/plc4x/java/mock/util/Assert.java | 2 +-
.../java/modbus/config/ModbusConfiguration.java | 2 +-
.../plc4x/java/modbus/field/ModbusField.java | 1 +
.../plc4x/java/modbus/field/ModbusFieldCoil.java | 1 +
.../java/modbus/field/ModbusFieldHandler.java | 13 +-
.../modbus/field/ModbusFieldMaskWriteRegister.java | 98 -
.../java/modbus/field/ModbusFieldRegister.java | 47 -
.../java/modbus/protocol/ModbusProtocolLogic.java | 11 +
.../opcua/connection/OpcuaTcpPlcConnection.java | 32 +-
.../plc4x/java/opcua/protocol/OpcuaField.java | 2 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 6 +-
.../org/apache/plc4x/java/opcua/UtilsTest.java | 3 +-
.../connection/OpcuaTcpPlcConnectionTest.java | 6 +-
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java | 7 +
plc4j/drivers/pom.xml | 1 +
plc4j/drivers/s7/pom.xml | 35 +-
.../readwrite/configuration/S7Configuration.java | 8 +-
.../{S7DriverTestsuite.java => S7DriverIT.java} | 6 +-
...rTestsuite.java => S7ParserSerializerTest.java} | 6 +-
.../{S7DriverTestsuite.xml => S7DriverIT.xml} | 0
...zerTestsuite.xml => S7ParserSerializerTest.xml} | 0
.../simulated/connection/SimulatedDeviceTest.java | 2 +-
.../java/simulated/field/SimulatedFieldTest.java | 2 +-
.../examples/hello-influx-data-collection/pom.xml | 19 +
plc4j/examples/hello-webapp/client/asconfig.json | 20 +
plc4j/examples/hello-webapp/client/pom.xml | 35 +-
.../src/main/resources/plc4x-index-template.html | 28 +
.../hello-webapp/client/src/main/royale/App.mxml | 161 +
.../client/src/main/royale/HelloPLC4X.mxml | 104 -
.../client/src/main/royale/service/RobotService.as | 92 -
plc4j/examples/hello-webapp/pom.xml | 5 +-
plc4j/examples/hello-webapp/service/pom.xml | 55 -
.../robot/controllers/RobotController.java | 109 -
plc4j/examples/hello-webapp/webapp/pom.xml | 84 +-
.../examples/{robot => watertank}/Application.java | 2 +-
.../watertank/service/WaterTankService.java | 187 +
.../java/org/springframework/core/JdkVersion.java} | 17 +-
.../resources/META-INF/flex/services-config.xml | 98 +
.../src/main/resources/application.properties | 6 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 79 +
.../webapp/src/main/webapp/favicon.ico | Bin 0 -> 1150 bytes
plc4j/examples/pom.xml | 7 +
plc4j/integrations/apache-camel/pom.xml | 29 +-
.../org/apache/plc4x/camel/Plc4XComponent.java | 3 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 8 +-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 9 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 17 +-
.../java/org/apache/plc4x/camel/ConstantsTest.java | 25 +-
.../java/org/apache/plc4x/camel/ManualTest.java | 7 +-
.../org/apache/plc4x/camel/Plc4XComponentTest.java | 4 +-
.../org/apache/plc4x/camel/Plc4XConsumerTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 8 +-
.../plc4x/camel/Plc4XPollingConsumerTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 10 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 3 -
.../apache-nifi/nifi-plc4x-nar/pom.xml | 31 +
.../plc4x4nifi/Plc4xSinkProcessorTest.java | 6 +-
.../plc4x4nifi/Plc4xSourceProcessorTest.java | 6 +-
plc4j/integrations/apache-nifi/pom.xml | 4 +-
.../java/org/apache/plc4x/karaf/FeatureIT.java | 4 +-
plc4j/pom.xml | 32 +-
.../spi/GeneratedDriverByteToMessageCodec.java | 27 +-
.../java/spi/connection/GeneratedDriverBase.java | 1 +
.../apache/plc4x/java/spi/generation/Message.java | 2 +
.../java/spi/messages/DefaultPlcReadResponse.java | 5 +
.../internal/DefaultSendRequestContextTest.java | 2 +-
.../optimizer/RequestTransactionManagerTest.java | 8 +-
plc4j/tools/capture-replay/README.adoc | 38 +
.../pcap-sockets => tools/capture-replay}/pom.xml | 92 +-
.../java/utils/capturereplay/CaptureReplay.java | 114 +
.../plc4x/java/utils/capturereplay/CliOptions.java | 119 +
.../capture-replay/src/main/resources/logback.xml | 42 +-
plc4j/tools/opm/pom.xml | 5 -
.../apache/plc4x/java/opm/ConnectedEntityTest.java | 3 +-
.../org/apache/plc4x/java/opm/OpmUtilsTest.java | 2 +-
.../plc4x/java/opm/PlcEntityInterceptorTest.java | 3 +-
.../java/opm/PlcEntityManagerComplexTest.java | 12 +-
.../plc4x/java/opm/PlcEntityManagerTest.java | 5 +-
.../plc4x/java/opm/SimpleAliasRegistryTest.java | 2 +-
plc4j/tools/pom.xml | 1 +
plc4j/tools/scraper/pom.xml | 6 -
.../triggeredscraper/TriggeredScraperImplTest.java | 7 +-
.../triggerhandler/TriggerConfigurationTest.java | 5 +-
.../{pcap-socket => pcap-replay}/pom.xml | 18 +-
.../pcapreplay/PcapReplayChannelFactory.java} | 28 +-
.../transport/pcapreplay/PcapReplayTransport.java} | 10 +-
.../PcapReplayTransportConfiguration.java} | 14 +-
.../org.apache.plc4x.java.spi.transport.Transport | 2 +-
.../transports/{raw-socket => pcap-shared}/pom.xml | 20 +-
.../transport/pcap/PcapTransportConfiguration.java | 15 +-
plc4j/transports/pom.xml | 3 +-
plc4j/transports/raw-socket/pom.xml | 10 +
.../rawsocket/RawSocketChannelFactory.java | 17 +-
.../transport/rawsocket/RawSocketTransport.java | 4 +-
.../rawsocket/RawSocketTransportConfiguration.java | 6 +-
.../plc4x/java/transport/serial/SerialChannel.java | 15 +-
.../java/transport/serial/SerialChannelConfig.java | 109 +
.../transport/serial/SerialChannelFactory.java | 4 +
.../transport/serial/SerialChannelHandler.java | 8 +-
.../transport/serial/SerialChannelOptions.java | 49 +
.../transport/serial/SerialPollingSelector.java | 22 +-
.../serial/SerialTransportConfiguration.java | 15 +
.../base/connection/SerialChannelFactoryTest.java | 2 +-
plc4j/transports/test/pom.xml | 6 -
plc4j/utils/{pcap-sockets => pcap-replay}/pom.xml | 10 +-
.../utils/pcapreplay/netty/PcapReplayChannel.java} | 60 +-
.../netty/address/PcapReplayAddress.java} | 12 +-
.../netty/config/PcapReplayChannelConfig.java | 81 +
.../netty/config/PcapReplayChannelOption.java} | 22 +-
plc4j/utils/{pcap-sockets => pcap-shared}/pom.xml | 15 +-
.../pcap/netty/address/PcapSocketAddress.java} | 8 +-
.../utils/pcap/netty/config/PcapChannelConfig.java | 152 +
.../pcap/netty/config/PcapChannelOption.java} | 23 +-
.../utils/pcap/netty/exception/PcapException.java} | 10 +-
.../utils/pcap/netty/handlers}/PacketHandler.java | 2 +-
.../pcap/netty/handlers}/TcpIpPacketHandler.java | 2 +-
.../pcap}/netty/handlers/UdpIpPacketHandler.java | 2 +-
.../utils/pcapsockets/PcapSocketException.java | 34 -
.../pcapsockets/netty/PcapSocketChannelConfig.java | 124 -
.../netty/handlers/TcpIpPacketHandler.java | 41 -
plc4j/utils/pom.xml | 3 +-
plc4j/utils/raw-sockets/pom.xml | 6 +
.../utils/rawsockets/attic/RawEthernetSocket.java | 14 +-
.../java/utils/rawsockets/attic/RawIpSocket.java | 32 +-
.../utils/rawsockets/netty/RawSocketChannel.java | 29 +-
.../rawsockets/netty/RawSocketChannelConfig.java | 66 -
.../utils/rawsockets/netty/RawSocketIpAddress.java | 46 -
.../utils/rawsockets/netty/UdpIpPacketHandler.java | 41 -
.../netty/{ => address}/RawSocketAddress.java | 17 +-
.../netty/config/RawSocketChannelConfig.java} | 11 +-
.../utils/rawsockets/attic/RawIpSocketTest.java | 14 +-
.../rawsockets/netty/RawSocketChannelTest.java | 12 +-
plc4j/utils/test-utils/pom.xml | 9 +-
.../ParserSerializerTestsuiteRunner.java | 13 +-
pom.xml | 81 +-
protocols/firmata/pom.xml | 43 +
.../plc4x/protocol/firmata/FirmataProtocol.java | 46 +
...e.plc4x.plugins.codegenerator.protocol.Protocol | 3 +-
.../main/resources/protocols/firmata/firmata.mspec | 142 +
protocols/pom.xml | 1 +
.../s7/src/main/resources/protocols/s7/s7.mspec | 59 +-
sandbox/code-gen/pom.xml | 17 +-
.../org/apache/plc4x/codegen/DFDLUtilTest.java | 4 +-
.../org/apache/plc4x/codegen/ModuleNodeTest.java | 3 +-
.../plc4x/codegen/ast/JavaGeneratorTest.java | 10 +-
.../plc4x/codegen/ast/PythonGeneratorTest.java | 10 +-
.../apache/plc4x/codegen/util/EnumFactoryTest.java | 3 +-
.../apache/plc4x/codegen/util/PojoFactoryTest.java | 3 +-
sandbox/plc4py/README.md | 23 +-
.../python/org/apache/plc4x/PlcDriverManager.py | 74 +-
sandbox/pom.xml | 15 +-
sandbox/test-java-amsads-driver/pom.xml | 16 -
sandbox/test-java-bacnetip-driver/pom.xml | 2 +-
.../PassiveBacNetIpConfiguration.java | 26 +-
sandbox/test-java-df1-driver/pom.xml | 16 -
sandbox/test-streampipes-plc4x-adapters/pom.xml | 13 +-
src/site/asciidoc/developers/building.adoc | 4 +-
src/site/asciidoc/developers/index.adoc | 8 +-
.../developers/infrastructure/website.adoc | 2 +-
src/site/asciidoc/developers/maturity.adoc | 6 +-
.../asciidoc/developers/release/build-tools.adoc | 4 +-
.../asciidoc/developers/release/validation.adoc | 22 +-
.../asciidoc/users/blogs-videos-and-slides.adoc | 40 +
src/site/asciidoc/users/download.adoc | 36 +-
src/site/asciidoc/users/index.adoc | 13 +
src/site/asciidoc/users/opm.adoc | 73 -
.../asciidoc/users/plc4j/general-concepts.adoc | 106 +
src/site/asciidoc/users/plc4j/gettingstarted.adoc | 124 +-
src/site/asciidoc/users/protocols/ab-eth.adoc | 2 +-
src/site/asciidoc/users/protocols/ads.adoc | 2 +-
src/site/asciidoc/users/protocols/bacnetip.adoc | 2 +-
src/site/asciidoc/users/protocols/deltav.adoc | 2 +-
src/site/asciidoc/users/protocols/df1.adoc | 2 +-
src/site/asciidoc/users/protocols/ethernet-ip.adoc | 2 +-
src/site/asciidoc/users/protocols/firmata.adoc | 120 +
src/site/asciidoc/users/protocols/index.adoc | 2 +-
src/site/asciidoc/users/protocols/knxnetip.adoc | 2 +-
src/site/asciidoc/users/protocols/modbus.adoc | 93 +-
src/site/asciidoc/users/protocols/opc-ua.adoc | 2 +-
src/site/asciidoc/users/protocols/s7.adoc | 260 +-
src/site/asciidoc/users/protocols/simulated.adoc | 2 +-
src/site/asciidoc/users/testing.adoc | 165 -
src/site/asciidoc/users/tools/capture-replay.adoc | 59 +
.../{protocols/ads.adoc => transports/index.adoc} | 8 +-
.../ads.adoc => transports/pcap-replay.adoc} | 49 +-
.../ads.adoc => transports/raw-socket.adoc} | 33 +-
.../{protocols/ads.adoc => transports/serial.adoc} | 36 +-
.../{protocols/ads.adoc => transports/tcp.adoc} | 33 +-
.../{protocols/ads.adoc => transports/udp.adoc} | 33 +-
src/site/resources-filtered/plc4x-doap.rdf | 7 +
.../users/protocols/s7-tia-device-settings.png | Bin 0 -> 391398 bytes
.../images/users/protocols/s7-tia-io-settings.png | Bin 0 -> 42175 bytes
src/site/site.xml | 19 +-
tools/common.sh | 2 +-
251 files changed, 9380 insertions(+), 2219 deletions(-)