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/08/21 13:36:53 UTC

[plc4x] 01/01: Merge branch 'develop' of github.com:apache/plc4x into s7event

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch s7event
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 932cd2194fc3b22cf76f1f67dc38d5f6b42c7cfc
Merge: 07baaf4 60b0b3e
Author: cdutz <ch...@c-ware.de>
AuthorDate: Sat Aug 21 15:36:33 2021 +0200

    Merge branch 'develop' of github.com:apache/plc4x into s7event

 plc4go/internal/plc4go/knxnetip/Browser.go         | 21 ++++++--
 plc4go/internal/plc4go/knxnetip/Connection.go      | 30 +++++++++---
 .../knxnetip/ConnectionDriverSpecificOperations.go | 56 ++++++++++++++++++----
 .../internal/plc4go/knxnetip/ConnectionHelper.go   | 18 ++++---
 .../knxnetip/ConnectionInternalOperations.go       | 15 ++++--
 plc4go/internal/plc4go/knxnetip/Discoverer.go      | 16 +++++--
 plc4go/internal/plc4go/knxnetip/Reader.go          | 21 ++++++--
 plc4go/internal/plc4go/spi/default/DefaultCodec.go | 10 +++-
 .../plc4go/spi/default/DefaultConnection.go        | 10 +++-
 .../plc4go/spi/transports/tcp/Transport.go         | 14 +-----
 .../plc4go/spi/transports/test/Transport.go        |  1 +
 .../plc4go/spi/transports/udp/Transport.go         | 14 +-----
 .../apache/plc4x/java/opcua/OpcuaPlcDriver.java    |  1 +
 .../java/opcua/config/OpcuaConfiguration.java      |  7 +++
 .../plc4x/java/opcua/context/SecureChannel.java    | 45 +++++++++++------
 .../java/opcua/protocol/OpcuaProtocolLogic.java    |  8 +++-
 16 files changed, 203 insertions(+), 84 deletions(-)