You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ot...@apache.org on 2021/01/06 21:43:10 UTC
[plc4x] 16/17: Merge branch 'develop' of
https://github.com/apache/plc4x into develop
This is an automated email from the ASF dual-hosted git repository.
otluk pushed a commit to branch feature/plc4py
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b2fffde4fa330e3649853310632ae2f147430e75
Merge: 4fd2cef 96fc8ef
Author: ottlukas <ot...@gmail.com>
AuthorDate: Fri Nov 6 19:44:37 2020 +0100
Merge branch 'develop' of https://github.com/apache/plc4x into develop
Jenkinsfile | 4 +-
README.md | 2 +-
.../language/java/JavaLanguageTemplateHelper.java | 16 +-
.../resources/templates/java/data-io-template.ftlh | 14 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 3 +
.../plc4x/java/api/messages/PlcWriteRequest.java | 16 +
.../org/apache/plc4x/java/api/model/PlcField.java | 29 +
.../org/apache/plc4x/java/api/value/PlcBOOL.java | 14 +-
.../org/apache/plc4x/java/api/value/PlcBYTE.java | 120 +-
.../org/apache/plc4x/java/api/value/PlcCHAR.java | 118 +-
.../org/apache/plc4x/java/api/value/PlcDINT.java | 21 +-
.../org/apache/plc4x/java/api/value/PlcDWORD.java | 120 +-
.../org/apache/plc4x/java/api/value/PlcINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcLINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcLREAL.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcLWORD.java | 120 +-
.../org/apache/plc4x/java/api/value/PlcREAL.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcSINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcString.java | 6 +
.../org/apache/plc4x/java/api/value/PlcUDINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcUINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcULINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcUSINT.java | 7 +-
.../org/apache/plc4x/java/api/value/PlcValues.java | 123 +-
.../org/apache/plc4x/java/api/value/PlcWCHAR.java | 114 +-
.../org/apache/plc4x/java/api/value/PlcWORD.java | 120 +-
.../apache/plc4x/java/abeth/field/AbEthField.java | 5 +
plc4j/drivers/ads/pom.xml | 14 +-
.../org/apache/plc4x/java/ads/field/AdsField.java | 2 -
.../plc4x/java/ads/field/AdsFieldHandler.java | 1063 -----------
.../plc4x/java/ads/field/DirectAdsField.java | 6 +
.../plc4x/java/ads/field/SymbolicAdsField.java | 6 +
.../ads/AdsDiscoverySerializerParserTest.java | 30 +
.../testsuite/AdsDiscoverySerializerTest.xml | 377 ++++
.../src/test/resources/testsuite/AdsDriverIT.xml | 8 +-
.../plc4x/java/eip/readwrite/field/EipField.java | 5 +
.../java/eip/readwrite/field/EipFieldHandler.java | 393 +---
.../readwrite/context/FirmataDriverContext.java | 12 +-
.../java/firmata/readwrite/field/FirmataField.java | 2 +-
.../readwrite/field/FirmataFieldAnalog.java | 5 +
.../readwrite/field/FirmataFieldDigital.java | 7 +-
.../readwrite/field/FirmataFieldHandler.java | 104 -
.../readwrite/protocol/FirmataProtocolLogic.java | 6 +-
.../plc4x/java/knxnetip/field/KnxNetIpField.java | 5 +
.../java/knxnetip/field/KnxNetIpFieldHandler.java | 80 -
.../plc4x/java/knxnetip/utils/KnxHelper.java | 11 +-
.../apache/plc4x/java/mock/field/MockField.java | 5 +
.../plc4x/java/modbus/field/ModbusField.java | 7 +-
.../java/modbus/field/ModbusFieldHandler.java | 1839 ------------------
.../java/modbus/protocol/ModbusProtocolLogic.java | 344 +---
.../apache/plc4x/java/modbus/ModbusEncodeTest.java | 13 +-
.../plc4x/java/modbus/ModbusFieldDataTypeTest.java | 10 +-
.../apache/plc4x/java/modbus/ModbusFieldTest.java | 10 +-
plc4j/drivers/opcua/pom.xml | 4 -
.../opcua/connection/OpcuaTcpPlcConnection.java | 2 +-
.../plc4x/java/opcua/protocol/OpcuaField.java | 5 +
.../java/opcua/protocol/OpcuaPlcFieldHandler.java | 114 --
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 2 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 6 +-
.../java/s7/readwrite/field/S7PlcFieldHandler.java | 511 -----
.../java/s7/readwrite/optimizer/S7Optimizer.java | 4 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 6 +-
.../plc4x/java/s7/readwrite/field/S7FieldTest.java | 2 +-
.../s7/src/test/resources/testsuite/S7DriverIT.xml | 6 +-
.../plc4x/java/simulated/field/SimulatedField.java | 6 +-
.../simulated/field/SimulatedFieldHandler.java | 121 +-
.../simulated/field/SimularedFieldHandlerTest.java | 19 +-
.../java/simulated/field/SimulatedFieldTest.java | 2 +-
.../examples/helloplc4x/write/HelloPlc4xWrite.java | 8 +-
.../apache-kafka/config/plc4x-source.properties | 2 +
.../apache/plc4x/kafka/Plc4xSourceConnector.java | 10 +
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 25 +-
.../java/org/apache/plc4x/kafka/config/Source.java | 14 +-
.../apache/plc4x/kafka/config/SourceConfig.java | 16 +-
.../plc4x/kafka/config/SourceConfigTest.java | 2 +
.../spi/connection/DefaultPlcFieldHandler.java | 1991 +++++++++++++++++++-
.../plc4x/java/spi/generation/ReadBuffer.java | 2 +-
.../plc4x/java/spi/generation/WriteBuffer.java | 65 +-
.../java/spi/messages/DefaultPlcReadRequest.java | 17 +-
.../java/spi/messages/DefaultPlcWriteRequest.java | 94 +-
.../plc4x/java/spi/generation/ReadBufferTest.java} | 31 +-
.../java/opm/PlcEntityManagerComplexTest.java | 5 +-
pom.xml | 39 +-
.../plc4x/protocol/ads/ADSDiscoveryProtocol.java | 49 +
...e.plc4x.plugins.codegenerator.protocol.Protocol | 3 +-
.../resources/protocols/ads/ads-discovery.mspec | 89 +-
sandbox/code-gen/pom.xml | 28 +-
sandbox/opcua-server/README.adoc | 121 ++
sandbox/opcua-server/pom.xml | 244 +++
.../java/opcuaserver/AttributeLoggingFilter.java | 73 +
.../plc4x/java/opcuaserver/Configuration.java | 82 +
.../java/opcuaserver/DeviceConfiguration.java | 35 +-
.../plc4x/java/opcuaserver/KeyStoreLoader.java | 170 ++
.../apache/plc4x/java/opcuaserver/OPCUAServer.java | 357 ++++
.../java/opcuaserver/PasswordConfiguration.java | 92 +
.../java/opcuaserver/RestrictedAccessFilter.java | 55 +
.../org/apache/plc4x/java/opcuaserver/Tag.java | 28 +-
.../org/apache/plc4x/java/opcuaserver/User.java | 104 +
.../opcuaserver/backend/Plc4xCommunication.java | 254 +++
.../java/opcuaserver/backend/Plc4xNamespace.java | 258 +++
sandbox/opcua-server/src/main/resources/config.yml | 43 +
.../opcua-server/src/main/resources/logback.xml | 34 +
.../org/apache/plc4x/java/opcuaserver/AppTest.java | 33 +-
sandbox/pom.xml | 29 +-
sandbox/test-java-df1-driver/pom.xml | 19 +-
src/site/asciidoc/users/adopters.adoc | 3 +
.../asciidoc/users/blogs-videos-and-slides.adoc | 3 +
src/site/asciidoc/users/protocols/modbus.adoc | 21 +-
.../logo_record_evolution_single_dark_bgfont.png | Bin 0 -> 10498 bytes
109 files changed, 5937 insertions(+), 4813 deletions(-)