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/12/17 10:24:29 UTC

[plc4x] 01/01: Merge branches 'develop' and 'feature/knxnet-ip-3' of https://gitbox.apache.org/repos/asf/plc4x into feature/knxnet-ip-3

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

cdutz pushed a commit to branch feature/knxnet-ip-3
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit a6d8d85907c5b10d5bcc30bad17df9e922da35a8
Merge: 70ce8d5 bcdea4f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Dec 17 11:09:07 2019 +0100

    Merge branches 'develop' and 'feature/knxnet-ip-3' of https://gitbox.apache.org/repos/asf/plc4x into feature/knxnet-ip-3

 plc4j/drivers/opcua/pom.xml                        |  55 ++--
 .../apache/plc4x/java/opcua/OpcuaPlcDriver.java    |   7 +-
 .../opcua/connection/BaseOpcuaPlcConnection.java   |  14 +-
 .../opcua/connection/OpcuaConnectionFactory.java   |   4 +-
 .../opcua/connection/OpcuaTcpPlcConnection.java    | 307 ++++++++++++---------
 .../plc4x/java/opcua/protocol/OpcuaField.java      |   8 +-
 .../java/opcua/protocol/OpcuaPlcFieldHandler.java  |  27 +-
 .../opcua/protocol/OpcuaSubsriptionHandle.java     |  43 +--
 .../java/opcua/protocol/model/OpcuaDataTypes.java  |   4 +-
 .../opcua/protocol/model/OpcuaIdentifierType.java  |  11 +-
 .../apache/plc4x/java/opcua/ManualPLC4XOpcua.java  |  92 ++++--
 .../plc4x/java/opcua/OpcuaPlcDriverTest.java       |   6 +-
 .../org/apache/plc4x/java/opcua/UtilsTest.java     |   4 +-
 .../connection/OpcuaTcpPlcConnectionTest.java      |  55 +++-
 .../plc4x/java/opcua/protocol/OpcuaFieldTest.java  |   4 +-
 .../opcua/protocol/OpcuaPlcFieldHandlerTest.java   |   4 +-
 .../protocol/OpcuaSubscriptionHandleTest.java      |   4 +-
 .../items/DefaultModbusByteArrayFieldItem.java     |  46 ++-
 .../items/DefaultModbusByteArrayFieldItemTest.java |  36 ++-
 19 files changed, 488 insertions(+), 243 deletions(-)