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 2019/08/09 06:57:17 UTC
[plc4x] 01/02: Merge remote-tracking branch
'github/feature/implement-df1-driver' into develop
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 33f3a3f1e32476c18b517487c384c7d33f42ae4f
Merge: c58d402 c8b5e5d
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Aug 9 08:56:15 2019 +0200
Merge remote-tracking branch 'github/feature/implement-df1-driver' into develop
.../language/java/JavaLanguageTemplateHelper.java | 58 ++++-
.../main/resources/templates/java/io-template.ftlh | 110 ++++++++--
.../resources/templates/java/pojo-template.ftlh | 30 +++
.../plugins/codegenerator/language/mspec/MSpec.g4 | 86 ++++----
.../mspec/model/fields/DefaultArrayField.java | 5 -
...ltArrayField.java => DefaultChecksumField.java} | 30 +--
...rrayField.java => DefaultManualArrayField.java} | 27 ++-
...aultArrayField.java => DefaultManualField.java} | 28 +--
...ultArrayField.java => DefaultPaddingField.java} | 28 +--
.../mspec/parser/MessageFormatListener.java | 143 ++++++++----
plc4j/examples/hello-world-plc4x/pom.xml | 7 +
.../java/base/connection/SerialChannelFactory.java | 5 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 4 +
plc4j/protocols/pom.xml | 2 +-
.../org/apache/plc4x/java/utils/ReadBuffer.java | 39 +++-
.../org/apache/plc4x/java/utils/WriteBuffer.java | 27 ++-
.../protocol/test/ProtocolTestsuiteRunner.java | 14 +-
.../protocol/test/model/ProtocolTestsuite.java | 8 +-
.../src/main/resources/schemas/testsuite.xsd | 1 +
pom.xml | 2 +-
protocols/df1/pom.xml | 43 ++++
.../org/apache/plc4x/protocol/df1/Df1Protocol.java | 46 ++++
...e.plc4x.plugins.codegenerator.protocol.Protocol | 19 ++
.../df1/src/main/resources/protocols/df1/df1.mspec | 53 +++++
.../resources/protocols/knxnetip/knxnetip.mspec | 206 ++++++++---------
protocols/pom.xml | 1 +
.../org/apache/plc4x/protocol/s7/S7Protocol.java | 2 +-
.../protocols/s7/{protocol.mspec => s7.mspec} | 123 +++++------
sandbox/pom.xml | 1 +
sandbox/test-java-df1-driver/README.adoc | 35 +++
sandbox/test-java-df1-driver/pom.xml | 183 ++++++++++++++++
.../org/apache/plc4x/java/df1/DF1PlcDriver.java | 73 ++++++
.../java/org/apache/plc4x/java/df1/Df1Field.java | 51 +++++
.../java/df1/connection/BaseDf1Connection.java | 24 +-
.../java/df1/connection/SerialDf1Connection.java | 148 +++++++++++++
.../org/apache/plc4x/java/df1/fields/DataType.java | 37 ++--
.../plc4x/java/df1/protocol/Df1Protocol.java | 149 +++++++++++++
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 63 ++++++
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 122 +++++++++++
.../plc4x/java/df1/util/Df1FieldHandler.java | 29 ++-
.../services/org.apache.plc4x.java.spi.PlcDriver | 19 ++
.../apache/plc4x/java/df1/DF1PlcDriverTest.java | 44 ++++
.../plc4x/protocol/df1/BenchmarkGeneratedDf1.java | 81 +++++++
.../plc4x/protocol/df1/BenchmarkManualDf1.java | 244 +++++++++++++++++++++
.../org/apache/plc4x/protocol/df1/Df1Test.java | 30 +++
.../apache/plc4x/protocol/df1/EndToEndTest.java | 55 +++++
.../java/org/apache/plc4x/protocol/df1/IOTest.java | 99 +++++++++
.../src/test/resources/testsuite/Df1Testsuite.xml | 81 +++++++
.../main/resources/protocols/df1}/protocol.mspec | 123 +++++------
49 files changed, 2367 insertions(+), 471 deletions(-)