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/02 13:50:46 UTC
[plc4x] 02/05: 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 5fd85ac033c18575950feaffe2728d8a71ff7791
Merge: 60ef131 b2a15f3
Author: cdutz <ch...@c-ware.de>
AuthorDate: Wed Jun 30 16:56:25 2021 +0200
Merge branch 'develop' of github.com:apache/plc4x into feature/profinet-chris
Conflicts:
plc4go/internal/plc4go/knxnetip/Connection.go
plc4go/internal/plc4go/knxnetip/ConnectionDriverSpecificOperations.go
plc4c/pom.xml | 1 +
plc4go/internal/plc4go/ads/Driver.go | 2 +-
plc4go/internal/plc4go/eip/Driver.go | 2 +-
plc4go/internal/plc4go/knxnetip/Connection.go | 14 +++----
.../knxnetip/ConnectionDriverSpecificOperations.go | 22 ++++-------
.../internal/plc4go/knxnetip/ConnectionHelper.go | 6 +--
.../knxnetip/ConnectionInternalOperations.go | 4 ++
plc4go/internal/plc4go/knxnetip/Driver.go | 2 +-
plc4go/internal/plc4go/knxnetip/MessageCodec.go | 2 +-
plc4go/internal/plc4go/knxnetip/Reader.go | 1 +
plc4go/internal/plc4go/modbus/Driver.go | 2 +-
plc4go/internal/plc4go/s7/Driver.go | 2 +-
plc4go/internal/plc4go/spi/default/DefaultCodec.go | 9 ++---
plc4go/internal/plc4go/spi/utils/CastUtils.go | 46 ++++++++++++++--------
14 files changed, 64 insertions(+), 51 deletions(-)