You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2021/10/03 11:37:15 UTC
[plc4x] 01/01: Merge branch 'develop' into feature/mspec-ng
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch feature/mspec-ng
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit ea111b497b0491ee1eb70f6b5f5aa6649e46649a
Merge: bd02327 4156659
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sun Oct 3 13:36:55 2021 +0200
Merge branch 'develop' into feature/mspec-ng
# Conflicts:
# code-generation/language-java/src/test/resources/integration-test/pom.xml
.../freemarker/FreemarkerLanguageOutput.java | 11 +-
code-generation/language-java/pom.xml | 13 +
.../plc4x/language/java/JavaLanguageOutput.java | 26 +-
.../src/test/resources/integration-test/pom.xml | 338 ++++++++++-----------
plc4go/internal/plc4go/ads/Driver.go | 33 +-
plc4go/internal/plc4go/bacnetip/Driver.go | 33 +-
plc4go/internal/plc4go/eip/Driver.go | 32 +-
plc4go/internal/plc4go/knxnetip/Discoverer.go | 5 +-
plc4go/internal/plc4go/knxnetip/Driver.go | 20 +-
plc4go/internal/plc4go/modbus/Driver.go | 33 +-
plc4go/internal/plc4go/s7/Driver.go | 32 +-
plc4go/internal/plc4go/spi/PlcDiscoverer.go | 7 +-
plc4go/internal/plc4go/spi/PlcFieldHandler.go | 3 +-
plc4go/internal/plc4go/spi/default/DefaultCodec.go | 12 +-
.../plc4go/spi/default/DefaultConnection.go | 20 +-
.../internal/plc4go/spi/default/DefaultDriver.go | 96 ++++++
.../plc4go/spi/options/DiscoveryOption.go} | 162 ++++------
.../spi/{default/Options.go => options/Option.go} | 7 +-
plc4go/pkg/plc4go/driver.go | 5 +-
plc4go/pkg/plc4go/driverManager.go | 29 +-
plc4go/pkg/plc4go/model/plc_discovery.go | 207 +------------
21 files changed, 452 insertions(+), 672 deletions(-)