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 2023/12/09 11:54:54 UTC

(plc4x) 01/01: Merge remote-tracking branch 'origin/develop' into feature/new-ui-tool

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

cdutz pushed a commit to branch feature/new-ui-tool
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit dae735399f6ff84af6cf2d5ead4c9f7086e90446
Merge: 4c51a18aa5 40c01b7838
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sat Dec 9 12:54:34 2023 +0100

    Merge remote-tracking branch 'origin/develop' into feature/new-ui-tool
    
    # Conflicts:
    #       plc4j/drivers/all/pom.xml
    #       plc4j/drivers/profinet-ng/src/test/java/org/apache/plc4x/java/profinet/ManualProfinetIoTest.java

 .../plc4x/java/api/model/PlcSubscriptionTag.java   |  2 +
 plc4j/drivers/all/pom.xml                          |  6 --
 .../org/apache/plc4x/java/opcua/tag/OpcuaTag.java  |  6 ++
 .../profinet/discovery/ProfinetDiscoverer.java     |  2 +-
 .../profinet/protocol/ProfinetProtocolLogic.java   | 89 +++++++++++++---------
 .../profinet/utils/ProfinetDataTypeMapper.java     | 13 +++-
 .../plc4x/java/profinet/ManualProfinetIoTest.java  | 23 +++---
 .../utils/rawsockets/netty/RawSocketChannel.java   | 37 ++++++---
 pom.xml                                            | 10 +--
 9 files changed, 116 insertions(+), 72 deletions(-)