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 2021/07/11 15:32:07 UTC
[plc4x] 01/02: Merge branch 'develop' of github.com:apache/plc4x
into feature/profinet-chris
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/profinet-chris
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 6bed9e0b1aaeb48f181bc4ccd4f10030da5ddc99
Merge: fe89bcd 35ff4b5
Author: cdutz <ch...@c-ware.de>
AuthorDate: Sun Jul 11 13:23:55 2021 +0200
Merge branch 'develop' of github.com:apache/plc4x into feature/profinet-chris
Conflicts:
plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
plc4go/internal/plc4go/ads/Field.go
plc4go/internal/plc4go/eip/Field.go
plc4go/internal/plc4go/modbus/Field.go
plc4go/internal/plc4go/s7/Field.go
plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/field/DirectAdsField.java
plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/field/SymbolicAdsStringField.java
plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/field/EipField.java
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/field/ModbusField.java
plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/field/S7Field.java
protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
protocols/eip/src/test/resources/protocols/eip/DriverTestsuite.xml
protocols/modbus/src/test/resources/protocols/modbus/DriverTestsuite.xml
protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
.../testing/protocols/ads/DriverTestsuite.xml | 24 +--
.../testing/protocols/eip/DriverTestsuite.xml | 2 +-
.../testing/protocols/modbus/DriverTestsuite.xml | 24 +--
.../testing/protocols/s7/DriverTestsuite.xml | 16 +-
plc4go/internal/plc4go/ads/Field.go | 17 +-
plc4go/internal/plc4go/bacnetip/Connection.go | 77 ++++++++
plc4go/internal/plc4go/bacnetip/Driver.go | 81 +++++++-
plc4go/internal/plc4go/bacnetip/Field.go | 92 +++++++++
plc4go/internal/plc4go/bacnetip/FieldHandler.go | 64 +++++++
plc4go/internal/plc4go/bacnetip/MessageCodec.go | 102 ++++++++++
plc4go/internal/plc4go/bacnetip/Subscriber.go | 70 +++++++
.../plc4go/bacnetip/{Driver.go => ValueHandler.go} | 12 +-
plc4go/internal/plc4go/eip/Field.go | 3 +-
plc4go/internal/plc4go/knxnetip/Discoverer.go | 61 +++---
plc4go/internal/plc4go/modbus/Field.go | 5 +-
plc4go/internal/plc4go/s7/Field.go | 45 ++++-
.../plc4x/java/ads/field/DirectAdsField.java | 7 +-
.../plc4x/java/ads/field/DirectAdsStringField.java | 6 +-
.../plc4x/java/ads/field/SymbolicAdsField.java | 2 +-
.../java/ads/field/SymbolicAdsStringField.java | 6 +-
.../plc4x/java/eip/readwrite/field/EipField.java | 3 +-
.../plc4x/java/modbus/field/ModbusField.java | 5 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 11 +-
.../java/s7/readwrite/field/S7StringField.java | 8 +-
.../resources/protocols/ads/DriverTestsuite.xml | 24 +--
.../resources/protocols/eip/DriverTestsuite.xml | 2 +-
.../resources/protocols/modbus/DriverTestsuite.xml | 24 +--
.../resources/protocols/s7/DriverTestsuite.xml | 16 +-
.../bacnetip/protocol/BacNetIpProtocolLogic.java | 207 +++++++++++----------
29 files changed, 764 insertions(+), 252 deletions(-)