[plc4x-website] branch asf-site updated: Site checkin for project PLC4X: Jenkins Tools
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/plc4x-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 0d1e213 Site checkin for project PLC4X: Jenkins Tools 0d1e213 is described below commit 0d1e213c75901fdb63cb49064fdcb9d73b75212e Author: jenkins AuthorDate: Thu Sep 2 16:36:00 2021 + Site checkin for project PLC4X: Jenkins Tools --- dependency-management.html | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependency-management.html b/dependency-management.html index c2b180a..94baf53 100644 --- a/dependency-management.html +++ b/dependency-management.html @@ -503,31 +503,31 @@ org.junit.jupiter https://junit.org/junit5/;>junit-jupiter -5.7.0 +5.7.2 jar https://www.eclipse.org/legal/epl-v20.html;>Eclipse Public License v2.0 org.junit.jupiter https://junit.org/junit5/;>junit-jupiter-api -5.7.0 +5.7.2 jar https://www.eclipse.org/legal/epl-v20.html;>Eclipse Public License v2.0 org.junit.jupiter https://junit.org/junit5/;>junit-jupiter-engine -5.7.0 +5.7.2 jar https://www.eclipse.org/legal/epl-v20.html;>Eclipse Public License v2.0 org.junit.jupiter https://junit.org/junit5/;>junit-jupiter-params -5.7.0 +5.7.2 jar https://www.eclipse.org/legal/epl-v20.html;>Eclipse Public License v2.0 org.junit.platform https://junit.org/junit5/;>junit-platform-engine -1.7.0 +1.7.2 jar https://www.eclipse.org/legal/epl-v20.html;>Eclipse Public License v2.0
[plc4x] branch develop updated: fix: Updated junit.platform.version to match the updated jupiter version
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git The following commit(s) were added to refs/heads/develop by this push: new d767dc9 fix: Updated junit.platform.version to match the updated jupiter version d767dc9 is described below commit d767dc9b9160ecdfc500be382415d05957af3f48 Author: cdutz AuthorDate: Thu Sep 2 18:06:04 2021 +0200 fix: Updated junit.platform.version to match the updated jupiter version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52d9bb7..88bd1bf 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.10.10 2.7.0 5.7.2 -1.7.0 +1.7.2 2.14.1 1.2.3 0.6.3
[plc4x-website] branch asf-site updated: Site checkin for project PLC4X: Jenkins Tools
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/plc4x-website.git The following commit(s) were added to refs/heads/asf-site by this push: new ee51f12 Site checkin for project PLC4X: Jenkins Tools ee51f12 is described below commit ee51f123665304e03a3dd6caf6b4a8238b3941ee Author: jenkins AuthorDate: Thu Sep 2 15:21:55 2021 + Site checkin for project PLC4X: Jenkins Tools --- dependency-management.html | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependency-management.html b/dependency-management.html index 27f77d1..c2b180a 100644 --- a/dependency-management.html +++ b/dependency-management.html @@ -437,37 +437,37 @@ org.eclipse.milo https://github.com/eclipse/milo/opc-ua-sdk/dictionary-manager;>dictionary-manager -0.6.1 +0.6.3 jar https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html;>Eclipse Public License - v 2.0 org.eclipse.milo https://github.com/eclipse/milo/opc-ua-sdk/sdk-core;>sdk-core -0.6.1 +0.6.3 jar https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html;>Eclipse Public License - v 2.0 org.eclipse.milo https://github.com/eclipse/milo/opc-ua-sdk/sdk-server;>sdk-server -0.6.1 +0.6.3 jar https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html;>Eclipse Public License - v 2.0 org.eclipse.milo https://github.com/eclipse/milo/opc-ua-stack/stack-client;>stack-client -0.6.1 +0.6.3 jar https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html;>Eclipse Public License - v 2.0 org.eclipse.milo https://github.com/eclipse/milo/opc-ua-stack/stack-core;>stack-core -0.6.1 +0.6.3 jar https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html;>Eclipse Public License - v 2.0 org.eclipse.milo https://github.com/eclipse/milo/opc-ua-stack/stack-server;>stack-server -0.6.1 +0.6.3 jar https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html;>Eclipse Public License - v 2.0
[plc4x-website] branch asf-site updated: Site checkin for project PLC4X: Jenkins Tools
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/plc4x-website.git The following commit(s) were added to refs/heads/asf-site by this push: new aba807f Site checkin for project PLC4X: Jenkins Tools aba807f is described below commit aba807f65ca20bfa071b571714f3a20b8f8533e2 Author: jenkins AuthorDate: Thu Sep 2 14:43:46 2021 + Site checkin for project PLC4X: Jenkins Tools --- plugin-management.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-management.html b/plugin-management.html index 23cc6d8..94e29aa 100644 --- a/plugin-management.html +++ b/plugin-management.html @@ -147,7 +147,7 @@ org.apache.karaf.tooling https://www.apache.org/karaf/tooling/karaf-maven-plugin/;>karaf-maven-plugin -4.3.0 +4.3.2 org.apache.maven.plugins http://maven.apache.org/plugins/maven-antrun-plugin/;>maven-antrun-plugin
[plc4x-website] branch asf-site updated: Site checkin for project PLC4X: Jenkins Tools
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/plc4x-website.git The following commit(s) were added to refs/heads/asf-site by this push: new f563599 Site checkin for project PLC4X: Jenkins Tools f563599 is described below commit f563599a0161ae4cc32ccbf59177a87d35483855 Author: jenkins AuthorDate: Thu Sep 2 14:36:30 2021 + Site checkin for project PLC4X: Jenkins Tools --- dependency-management.html | 86 ++--- images/driver-anatomy.png | Bin 16051 -> 16034 bytes plugin-management.html | 4 +-- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dependency-management.html b/dependency-management.html index e122314..27f77d1 100644 --- a/dependency-management.html +++ b/dependency-management.html @@ -131,43 +131,43 @@ com.fasterxml.jackson.core http://github.com/FasterXML/jackson;>jackson-annotations -2.11.3 +2.12.3 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 com.fasterxml.jackson.core https://github.com/FasterXML/jackson-core;>jackson-core -2.11.3 +2.12.3 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 com.fasterxml.jackson.core http://github.com/FasterXML/jackson;>jackson-databind -2.11.3 +2.12.3 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 com.fasterxml.jackson.dataformat https://github.com/FasterXML/jackson-dataformats-text;>jackson-dataformat-csv -2.11.3 +2.12.3 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 com.fasterxml.jackson.dataformat https://github.com/FasterXML/jackson-dataformat-xml;>jackson-dataformat-xml -2.11.3 +2.12.3 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 com.fasterxml.jackson.dataformat https://github.com/FasterXML/jackson-dataformats-text;>jackson-dataformat-yaml -2.11.3 +2.12.3 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 com.fazecast http://fazecast.github.io/jSerialComm/;>jSerialComm -2.6.2 +2.7.0 jar http://www.gnu.org/licenses/lgpl.html;>GNU Lesser GPL, Version 3, http://www.apache.org/licenses/LICENSE-2.0;>Apache Software License, Version 2.0 @@ -185,13 +185,13 @@ com.google.code.gson https://github.com/google/gson/gson;>gson -2.8.6 +2.8.7 jar -http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache 2.0 +https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache 2.0 com.google.guava https://github.com/google/guava/guava;>guava -30.0-jre +30.1.1-jre jar http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 @@ -257,19 +257,19 @@ joda-time https://www.joda.org/joda-time/;>joda-time -2.10.8 +2.10.10 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 net.bytebuddy https://bytebuddy.net/byte-buddy;>byte-buddy -1.10.18 +1.11.0 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 net.java.dev.jna https://github.com/java-native-access/jna;>jna -5.3.1 +5.8.0 jar http://www.gnu.org/licenses/licenses.html;>LGPL, version 2.1, http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License v2.0 @@ -281,13 +281,13 @@ nl.jqno.equalsverifier http://www.jqno.nl/equalsverifier;>equalsverifier -3.5 +3.6.1 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 org.antlr http://www.antlr.org/antlr4-runtime;>antlr4-runtime -4.9.1 +4.9.2 jar http://www.antlr.org/license.html;>The BSD License @@ -317,7 +317,7 @@ org.apache.commons https://commons.apache.org/proper/commons-lang/;>commons-lang3 -3.11 +3.12.0 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 @@ -347,21 +347,21 @@ org.apache.httpcomponents http://hc.apache.org/httpcomponents-core-ga;>httpcore -4.4.13 +4.4.14 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 org.apache.logging.log4j https://logging.apache.org/log4j/2.x/log4j-api/;>log4j-api -2.11.1 +2.14.1 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 org.apache.maven -http://maven.apache.org/ref/3.3.3/maven-artifact;>maven-artifact -3.3.3 +https://maven.apache.org/ref/3.8.1/maven-artifact/;>maven-artifact +3.8.1 jar -http://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 +https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache License, Version 2.0 org.apache.plc4x.plugins https://www.apache.org/plc4x-code-generaton/plc4x-code-generation-language-base/;>plc4x-code-generation-language-base @@ -383,43 +383,43 @@ org.apiguardian https://github.com/apiguardian-team/apiguardian;>apiguardian-api -1.1.0 +1.1.1 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The
[plc4x] branch develop updated: build(deps): bump junit.jupiter.version from 5.7.0 to 5.7.2 (#251)
This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git The following commit(s) were added to refs/heads/develop by this push: new 529cbe8 build(deps): bump junit.jupiter.version from 5.7.0 to 5.7.2 (#251) 529cbe8 is described below commit 529cbe89b9371b2fcb1f981b0a51b04f9a5c6e49 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 2 16:17:24 2021 +0200 build(deps): bump junit.jupiter.version from 5.7.0 to 5.7.2 (#251) Bumps `junit.jupiter.version` from 5.7.0 to 5.7.2. Updates `junit-jupiter` from 5.7.0 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.2) Updates `junit-jupiter-api` from 5.7.0 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.2) Updates `junit-jupiter-engine` from 5.7.0 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.2) Updates `junit-jupiter-params` from 5.7.0 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cdutz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e84dde..52d9bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 5.8.0 2.10.10 2.7.0 -5.7.0 +5.7.2 1.7.0 2.14.1 1.2.3
[plc4x] branch dependabot/maven/junit.jupiter.version-5.7.2 updated (cf134a0 -> 8a9437d)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch dependabot/maven/junit.jupiter.version-5.7.2 in repository https://gitbox.apache.org/repos/asf/plc4x.git. from cf134a0 Merge branch 'develop' into dependabot/maven/junit.jupiter.version-5.7.2 add 69dfa8a plc4x: major dependency updates (#252) add 12a1b2e build(deps): bump karaf-maven-plugin from 4.3.0 to 4.3.2 (#245) add 247beba Bump zookeeper from 3.4.13 to 3.4.14 (#270) add 1eeb340 Bump milo.version from 0.6.1 to 0.6.3 (#269) add a8a0289 build(deps): bump gmavenplus-plugin from 1.6.2 to 1.12.1 (#246) add 8a9437d Merge branch 'develop' into dependabot/maven/junit.jupiter.version-5.7.2 No new revisions were added by this update. Summary of changes: .../s7/include/alarm_message_object_ack_type.h | 2 +- .../s7/include/s7_data_alarm_message.h | 4 +- .../s7/include/s7_payload_user_data_item.h | 6 +- .../s7/src/alarm_message_object_ack_type.c | 8 +- .../s7/src/s7_data_alarm_message.c | 14 +- .../s7/src/s7_payload_user_data_item.c | 24 +-- .../knxnetip/readwrite/model/KnxManufacturer.go| 42 - plc4j/examples/hello-connectivity-kafka/pom.xml| 2 +- plc4j/integrations/apache-camel/pom.xml| 7 +- .../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 9 - .../apache/plc4x/camel/Plc4XPollingConsumer.java | 185 - .../java/org/apache/plc4x/camel/ManualTest.java| 2 +- .../org/apache/plc4x/camel/Plc4XEndpointTest.java | 7 +- .../plc4x/camel/Plc4XPollingConsumerTest.java | 65 plc4j/integrations/apache-kafka/pom.xml| 2 +- plc4j/integrations/apache-nifi/pom.xml | 7 +- .../java/opcuaserver/backend/Plc4xNamespace.java | 2 +- plc4j/osgi/pom.xml | 2 +- plc4j/pom.xml | 4 +- pom.xml| 56 +++ protocols/knxnetip/pom.xml | 2 +- 21 files changed, 119 insertions(+), 333 deletions(-) delete mode 100644 plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java delete mode 100644 plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java
[plc4x] branch develop updated: build(deps): bump gmavenplus-plugin from 1.6.2 to 1.12.1 (#246)
This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git The following commit(s) were added to refs/heads/develop by this push: new a8a0289 build(deps): bump gmavenplus-plugin from 1.6.2 to 1.12.1 (#246) a8a0289 is described below commit a8a02894031e34a88e0f38eb63bcbebcce2d0fec Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 2 16:04:24 2021 +0200 build(deps): bump gmavenplus-plugin from 1.6.2 to 1.12.1 (#246) Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.6.2 to 1.12.1. - [Release notes](https://github.com/groovy/GMavenPlus/releases) - [Commits](https://github.com/groovy/GMavenPlus/compare/1.6.2...1.12.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- plc4j/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plc4j/pom.xml b/plc4j/pom.xml index 5288430..a7bf80a 100644 --- a/plc4j/pom.xml +++ b/plc4j/pom.xml @@ -51,7 +51,7 @@ org.codehaus.gmavenplus gmavenplus-plugin -1.6.2 +1.12.1 compile-groovy-tests
[plc4x] branch develop updated: Bump milo.version from 0.6.1 to 0.6.3 (#269)
This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git The following commit(s) were added to refs/heads/develop by this push: new 1eeb340 Bump milo.version from 0.6.1 to 0.6.3 (#269) 1eeb340 is described below commit 1eeb34020f727515ab672ff5446dbfb96267065e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 2 16:04:10 2021 +0200 Bump milo.version from 0.6.1 to 0.6.3 (#269) Bumps `milo.version` from 0.6.1 to 0.6.3. Updates `sdk-server` from 0.6.1 to 0.6.3 Updates `sdk-core` from 0.6.1 to 0.6.3 Updates `stack-core` from 0.6.1 to 0.6.3 Updates `stack-server` from 0.6.1 to 0.6.3 Updates `stack-client` from 0.6.1 to 0.6.3 Updates `dictionary-manager` from 0.6.1 to 0.6.3 Updates `sdk-client` from 0.6.1 to 0.6.3 Updates `server-examples` from 0.6.1 to 0.6.3 --- updated-dependencies: - dependency-name: org.eclipse.milo:sdk-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:sdk-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:stack-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:stack-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:stack-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:dictionary-manager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:sdk-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.milo:server-examples dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e38400..2e84dde 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 1.7.0 2.14.1 1.2.3 -0.6.1 +0.6.3 3.10.0 4.1.54.Final 6.1.6
[plc4x] branch develop updated: build(deps): bump karaf-maven-plugin from 4.3.0 to 4.3.2 (#245)
This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git The following commit(s) were added to refs/heads/develop by this push: new 12a1b2e build(deps): bump karaf-maven-plugin from 4.3.0 to 4.3.2 (#245) 12a1b2e is described below commit 12a1b2e9fc27519dea7cd37f7bac9481ad5ca8d1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 2 16:03:22 2021 +0200 build(deps): bump karaf-maven-plugin from 4.3.0 to 4.3.2 (#245) Bumps karaf-maven-plugin from 4.3.0 to 4.3.2. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88ad845..3e38400 100644 --- a/pom.xml +++ b/pom.xml @@ -1008,7 +1008,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 4.3.0 + 4.3.2
[plc4x] branch dependabot/maven/org.apache.zookeeper-zookeeper-3.4.14 created (now 708c4e4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.zookeeper-zookeeper-3.4.14 in repository https://gitbox.apache.org/repos/asf/plc4x.git. at 708c4e4 Bump zookeeper from 3.4.13 to 3.4.14 No new revisions were added by this update.
[plc4x] branch dependabot/maven/milo.version-0.6.3 created (now 9820ee1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/milo.version-0.6.3 in repository https://gitbox.apache.org/repos/asf/plc4x.git. at 9820ee1 Bump milo.version from 0.6.1 to 0.6.3 No new revisions were added by this update.
[plc4x] branch develop updated: plc4x: major dependency updates (#252)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 69dfa8a plc4x: major dependency updates (#252)
69dfa8a is described below
commit 69dfa8a8a705804fa91d67529e8b0ab6f5b49a32
Author: Sebastian Rühl
AuthorDate: Thu Sep 2 15:56:30 2021 +0200
plc4x: major dependency updates (#252)
* plc4x: major dependency updates
* Updated with upstream changes
Co-authored-by: cdutz
---
.../s7/include/alarm_message_object_ack_type.h | 2 +-
.../s7/include/s7_data_alarm_message.h | 4 +-
.../s7/include/s7_payload_user_data_item.h | 6 +-
.../s7/src/alarm_message_object_ack_type.c | 8 +-
.../s7/src/s7_data_alarm_message.c | 14 +-
.../s7/src/s7_payload_user_data_item.c | 24 +--
.../knxnetip/readwrite/model/KnxManufacturer.go| 42 -
plc4j/integrations/apache-camel/pom.xml| 7 +-
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 9 -
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 185 -
.../java/org/apache/plc4x/camel/ManualTest.java| 2 +-
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 7 +-
.../plc4x/camel/Plc4XPollingConsumerTest.java | 65
plc4j/integrations/apache-kafka/pom.xml| 2 +-
plc4j/integrations/apache-nifi/pom.xml | 7 +-
.../java/opcuaserver/backend/Plc4xNamespace.java | 2 +-
plc4j/osgi/pom.xml | 2 +-
plc4j/pom.xml | 2 +-
pom.xml| 54 +++---
protocols/knxnetip/pom.xml | 2 +-
20 files changed, 116 insertions(+), 330 deletions(-)
diff --git a/plc4c/generated-sources/s7/include/alarm_message_object_ack_type.h
b/plc4c/generated-sources/s7/include/alarm_message_object_ack_type.h
index 5a270fd..baf4bf6 100644
--- a/plc4c/generated-sources/s7/include/alarm_message_object_ack_type.h
+++ b/plc4c/generated-sources/s7/include/alarm_message_object_ack_type.h
@@ -37,8 +37,8 @@ extern "C" {
// Constant values.
-uint8_t PLC4C_S7_READ_WRITE_ALARM_MESSAGE_OBJECT_ACK_TYPE_LENGTH();
uint8_t PLC4C_S7_READ_WRITE_ALARM_MESSAGE_OBJECT_ACK_TYPE_VARIABLE_SPEC();
+uint8_t PLC4C_S7_READ_WRITE_ALARM_MESSAGE_OBJECT_ACK_TYPE_LENGTH();
struct plc4c_s7_read_write_alarm_message_object_ack_type {
/* Properties */
diff --git a/plc4c/generated-sources/s7/include/s7_data_alarm_message.h
b/plc4c/generated-sources/s7/include/s7_data_alarm_message.h
index 1326d54..5ac6f0f 100644
--- a/plc4c/generated-sources/s7/include/s7_data_alarm_message.h
+++ b/plc4c/generated-sources/s7/include/s7_data_alarm_message.h
@@ -56,10 +56,10 @@ typedef enum plc4c_s7_read_write_s7_data_alarm_message_type
plc4c_s7_read_write_
plc4c_s7_read_write_s7_data_alarm_message_discriminator
plc4c_s7_read_write_s7_data_alarm_message_get_discriminator(plc4c_s7_read_write_s7_data_alarm_message_type
type);
// Constant values.
-uint8_t PLC4C_S7_READ_WRITE_S7_MESSAGE_OBJECT_REQUEST_VARIABLE_SPEC();
uint8_t PLC4C_S7_READ_WRITE_S7_MESSAGE_OBJECT_REQUEST_LENGTH();
-uint8_t PLC4C_S7_READ_WRITE_S7_DATA_ALARM_MESSAGE_FUNCTION_ID();
uint8_t PLC4C_S7_READ_WRITE_S7_DATA_ALARM_MESSAGE_NUMBER_MESSAGE_OBJ();
+uint8_t PLC4C_S7_READ_WRITE_S7_DATA_ALARM_MESSAGE_FUNCTION_ID();
+uint8_t PLC4C_S7_READ_WRITE_S7_MESSAGE_OBJECT_REQUEST_VARIABLE_SPEC();
struct plc4c_s7_read_write_s7_data_alarm_message {
/* This is an abstract type so this property saves the type of this typed
union */
diff --git a/plc4c/generated-sources/s7/include/s7_payload_user_data_item.h
b/plc4c/generated-sources/s7/include/s7_payload_user_data_item.h
index 5f07d42..6a3485a 100644
--- a/plc4c/generated-sources/s7/include/s7_payload_user_data_item.h
+++ b/plc4c/generated-sources/s7/include/s7_payload_user_data_item.h
@@ -81,12 +81,12 @@ typedef enum
plc4c_s7_read_write_s7_payload_user_data_item_type plc4c_s7_read_wr
plc4c_s7_read_write_s7_payload_user_data_item_discriminator
plc4c_s7_read_write_s7_payload_user_data_item_get_discriminator(plc4c_s7_read_write_s7_payload_user_data_item_type
type);
// Constant values.
+uint16_t
PLC4C_S7_READ_WRITE_S7_PAYLOAD_USER_DATA_ITEM_CPU_FUNCTION_READ_SZL_RESPONSE_SZL_ITEM_LENGTH();
+uint8_t
PLC4C_S7_READ_WRITE_S7_PAYLOAD_USER_DATA_ITEM_CPU_FUNCTION_ALARM_QUERY_FUNCTION_ID();
uint8_t
PLC4C_S7_READ_WRITE_S7_PAYLOAD_USER_DATA_ITEM_CPU_FUNCTION_ALARM_QUERY_NUMBER_MESSAGE_OBJ();
+uint8_t
PLC4C_S7_READ_WRITE_S7_PAYLOAD_USER_DATA_ITEM_CPU_FUNCTION_ALARM_QUERY_LENGTH();
uint8_t
PLC4C_S7_READ_WRITE_S7_PAYLOAD_USER_DATA_ITEM_CPU_FUNCTION_ALARM_QUERY_VARIABLE_SPEC();
uint8_t
PLC4C_S7_READ_WRITE_S7_PAYLOAD_USER_DATA_ITEM_CPU_FUNCTION_ALARM_QUERY_RESPONSE_NUMBER_MESSAGE_OBJ();
-uint16_t
[plc4x-website] branch asf-site updated: Site checkin for project PLC4X: Jenkins Tools
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/plc4x-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 98761eb Site checkin for project PLC4X: Jenkins Tools
98761eb is described below
commit 98761eb2143946b8960911ff0e05923e916c2e30
Author: jenkins
AuthorDate: Thu Sep 2 13:56:18 2021 +
Site checkin for project PLC4X: Jenkins Tools
---
users/protocols/opc-ua.html | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/users/protocols/opc-ua.html b/users/protocols/opc-ua.html
index 22e6ef7..be94459 100644
--- a/users/protocols/opc-ua.html
+++ b/users/protocols/opc-ua.html
@@ -441,7 +441,7 @@ is selected based on the datatype of the returned value.
For Unsigned data types
-ns={namespace-index};[s|i|g|b]={Identifier}:{Data Type}
+ns={namespace-index};[s|i|g|b]={Identifier};{Data Type}
@@ -522,7 +522,7 @@ is selected based on the datatype of the returned value.
For Unsigned data types
ns=2;s=HelloWorld/ScalarTypes/Boolean
-ns=2;s=HelloWorld/ScalarTypes/Boolean:BOOL
+ns=2;s=HelloWorld/ScalarTypes/Boolean;BOOL
@@ -531,7 +531,7 @@ ns=2;s=HelloWorld/ScalarTypes/Boolean:BOOL
ns=1;i=1337
-ns=1;i=1337:DINT
+ns=1;i=1337;DINT
@@ -540,7 +540,7 @@ ns=1;i=1337:DINT
ns=2;g=09087e75-8e5e-499b-954f-f2a8624db28a
-ns=2;g=09087e75-8e5e-499b-954f-f2a8624db28a:REAL
+ns=2;g=09087e75-8e5e-499b-954f-f2a8624db28a;REAL
[plc4x-website] branch asf-site updated: Site checkin for project PLC4X: Jenkins Tools
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/plc4x-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 3861cb6 Site checkin for project PLC4X: Jenkins Tools 3861cb6 is described below commit 3861cb66cba0379a7b0ed0202d54b2d05ab32169 Author: jenkins AuthorDate: Thu Sep 2 13:30:44 2021 + Site checkin for project PLC4X: Jenkins Tools --- images/users/protocols/s7.png | Bin 0 -> 19399 bytes images/users/protocols/s7_alert.png | Bin 0 -> 19948 bytes images/users/protocols/s7_banner.png| Bin 0 -> 42137 bytes images/users/protocols/s7_caution.png | Bin 0 -> 18944 bytes images/users/protocols/s7_danger.png| Bin 0 -> 20452 bytes images/users/protocols/s7_dont.png | Bin 0 -> 20067 bytes images/users/protocols/s7_ex.png| Bin 0 -> 20057 bytes images/users/protocols/s7_important.png | Bin 0 -> 19667 bytes images/users/protocols/s7_note.png | Bin 0 -> 19486 bytes images/users/protocols/s7_tip.png | Bin 0 -> 20231 bytes images/users/protocols/s7_toddy.png | Bin 0 -> 20356 bytes images/users/protocols/s7_warning.png | Bin 0 -> 19172 bytes users/protocols/s7.html | 56 ++-- 13 files changed, 54 insertions(+), 2 deletions(-) diff --git a/images/users/protocols/s7.png b/images/users/protocols/s7.png new file mode 100644 index 000..3327d13 Binary files /dev/null and b/images/users/protocols/s7.png differ diff --git a/images/users/protocols/s7_alert.png b/images/users/protocols/s7_alert.png new file mode 100644 index 000..0f6a695 Binary files /dev/null and b/images/users/protocols/s7_alert.png differ diff --git a/images/users/protocols/s7_banner.png b/images/users/protocols/s7_banner.png new file mode 100644 index 000..212aec1 Binary files /dev/null and b/images/users/protocols/s7_banner.png differ diff --git a/images/users/protocols/s7_caution.png b/images/users/protocols/s7_caution.png new file mode 100644 index 000..02a2eba Binary files /dev/null and b/images/users/protocols/s7_caution.png differ diff --git a/images/users/protocols/s7_danger.png b/images/users/protocols/s7_danger.png new file mode 100644 index 000..7e6da2e Binary files /dev/null and b/images/users/protocols/s7_danger.png differ diff --git a/images/users/protocols/s7_dont.png b/images/users/protocols/s7_dont.png new file mode 100644 index 000..21947a2 Binary files /dev/null and b/images/users/protocols/s7_dont.png differ diff --git a/images/users/protocols/s7_ex.png b/images/users/protocols/s7_ex.png new file mode 100644 index 000..d66ad99 Binary files /dev/null and b/images/users/protocols/s7_ex.png differ diff --git a/images/users/protocols/s7_important.png b/images/users/protocols/s7_important.png new file mode 100644 index 000..d5c1890 Binary files /dev/null and b/images/users/protocols/s7_important.png differ diff --git a/images/users/protocols/s7_note.png b/images/users/protocols/s7_note.png new file mode 100644 index 000..84cf05d Binary files /dev/null and b/images/users/protocols/s7_note.png differ diff --git a/images/users/protocols/s7_tip.png b/images/users/protocols/s7_tip.png new file mode 100644 index 000..035093d Binary files /dev/null and b/images/users/protocols/s7_tip.png differ diff --git a/images/users/protocols/s7_toddy.png b/images/users/protocols/s7_toddy.png new file mode 100644 index 000..0f0cb53 Binary files /dev/null and b/images/users/protocols/s7_toddy.png differ diff --git a/images/users/protocols/s7_warning.png b/images/users/protocols/s7_warning.png new file mode 100644 index 000..29f0ad2 Binary files /dev/null and b/images/users/protocols/s7_warning.png differ diff --git a/users/protocols/s7.html b/users/protocols/s7.html index 612769a..9526b00 100644 --- a/users/protocols/s7.html +++ b/users/protocols/s7.html @@ -286,6 +286,11 @@ S7 (Step7) + + + + + Connection String Options @@ -908,6 +913,43 @@ However we also implemented a shorter version, as above version does have some u +S7 Event Subscription + +The S7 driver allows the subscription to asynchronous events generated in the PLC. + + +This type of event is generated by S7-300, S7-400 controllers and VIPA devices. Unfortunately for the S7-1200 and S7-1500 series this functionality has been superseded. + + +For a complete list of compatibility between the S7-300,400 and S7-1200 S7-1500, you can see the document in [1] provided by Siemens. + + +In applications + + + + +MODE: Change of operating state in the controller, change from STOP to RUN and vice versa. + + +SYS: System events, associated with internal events of the controller or events previously parameterized for their indication. + + +USR: Events programmed by the user and that are registered in the internal diagnostic buffer. + + +ALM:
[plc4x] branch develop updated: changed delimiter of opc ua from : to ; (#258)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 69376b3 changed delimiter of opc ua from : to ; (#258)
69376b3 is described below
commit 69376b3601dfc11d194b4acb6bf2ca4c18f4bdc6
Author: Matthias Milan Strljic
AuthorDate: Thu Sep 2 15:22:41 2021 +0200
changed delimiter of opc ua from : to ; (#258)
Co-authored-by: cdutz
---
.../apache/plc4x/java/opcua/field/OpcuaField.java| 2 +-
.../apache/plc4x/java/opcua/OpcuaPlcDriverTest.java | 20 ++--
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java| 18 ++
.../plc4x/java/opcuaserver/OpcuaPlcDriverTest.java | 14 +++---
src/site/asciidoc/users/protocols/opc-ua.adoc| 8
5 files changed, 32 insertions(+), 30 deletions(-)
diff --git
a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/field/OpcuaField.java
b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/field/OpcuaField.java
index 2ac4177..8dd6df9 100644
---
a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/field/OpcuaField.java
+++
b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/field/OpcuaField.java
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
*/
public class OpcuaField implements PlcSubscriptionField {
-public static final Pattern ADDRESS_PATTERN =
Pattern.compile("^ns=(?\\d+);(?[isgb])=((?[^:]+))?(:(?[a-zA-Z_]+))?");
+public static final Pattern ADDRESS_PATTERN =
Pattern.compile("^ns=(?\\d+);(?[isgb])=((?[^;]+))?(;(?[a-zA-Z_]+))?");
private final OpcuaIdentifierType identifierType;
diff --git
a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
index fa240f5..e5c3bbe 100644
---
a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
+++
b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -255,23 +255,23 @@ public class OpcuaPlcDriverTest {
PlcWriteRequest.Builder builder =
opcuaConnection.writeRequestBuilder();
builder.addItem("Bool", BOOL_IDENTIFIER_READ_WRITE, true);
-builder.addItem("Byte", BYTE_IDENTIFIER_READ_WRITE + ":BYTE", (short)
3);
+builder.addItem("Byte", BYTE_IDENTIFIER_READ_WRITE + ";BYTE", (short)
3);
builder.addItem("Double", DOUBLE_IDENTIFIER_READ_WRITE, 0.5d);
builder.addItem("Float", FLOAT_IDENTIFIER_READ_WRITE, 0.5f);
//builder.addItem("Int16", INT16_IDENTIFIER_READ_WRITE + "", (short)
1);
builder.addItem("Int32", INT32_IDENTIFIER_READ_WRITE, 42);
builder.addItem("Int64", INT64_IDENTIFIER_READ_WRITE, 42L);
builder.addItem("Integer", INTEGER_IDENTIFIER_READ_WRITE, 42);
-builder.addItem("SByte", SBYTE_IDENTIFIER_READ_WRITE + ":SINT", -127);
+builder.addItem("SByte", SBYTE_IDENTIFIER_READ_WRITE + ";SINT", -127);
builder.addItem("String", STRING_IDENTIFIER_READ_WRITE, "Helllo
Toddy!");
-builder.addItem("UInt16", UINT16_IDENTIFIER_READ_WRITE + ":UINT",
65535);
-builder.addItem("UInt32", UINT32_IDENTIFIER_READ_WRITE + ":UDINT",
101010101L);
-builder.addItem("UInt64", UINT64_IDENTIFIER_READ_WRITE + ":ULINT", new
BigInteger("1337"));
-builder.addItem("UInteger", UINTEGER_IDENTIFIER_READ_WRITE + ":UDINT",
102020202L);
+builder.addItem("UInt16", UINT16_IDENTIFIER_READ_WRITE + ";UINT",
65535);
+builder.addItem("UInt32", UINT32_IDENTIFIER_READ_WRITE + ";UDINT",
101010101L);
+builder.addItem("UInt64", UINT64_IDENTIFIER_READ_WRITE + ";ULINT", new
BigInteger("1337"));
+builder.addItem("UInteger", UINTEGER_IDENTIFIER_READ_WRITE + ";UDINT",
102020202L);
builder.addItem("BooleanArray", BOOL_ARRAY_IDENTIFIER, new Boolean[]
{true, true, true, true, true});
-builder.addItem("ByteArray", BYTE_ARRAY_IDENTIFIER + ":BYTE", new
Short[] {1, 100, 100, 255, 123});
+builder.addItem("ByteArray", BYTE_ARRAY_IDENTIFIER + ";BYTE", new
Short[] {1, 100, 100, 255, 123});
builder.addItem("DoubleArray", DOUBLE_ARRAY_IDENTIFIER, new Double[]
{1.0,2.0,3.0,4.0,5.0});
builder.addItem("FloatArray", FLOAT_ARRAY_IDENTIFIER, new Float[]
{1.0F,2.0F,3.0F,4.0F,5.0F});
builder.addItem("Int16Array", INT16_ARRAY_IDENTIFIER, new Short[]
{1,2,3,4,5});
@@ -280,9 +280,9 @@ public class OpcuaPlcDriverTest {
builder.addItem("IntegerArray", INT32_ARRAY_IDENTIFIER, new Integer[]
{1,2,3,4,5});
builder.addItem("SByteArray", SBYTE_ARRAY_IDENTIFIER, new Byte[]
{1,2,3,4,5});
builder.addItem("StringArray", STRING_ARRAY_IDENTIFIER, new String[]
{"1","2","3","4","5"});
-builder.addItem("UInt16Array",
[plc4x] branch develop updated (60b0b3e -> fc7634e)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git. from 60b0b3e - Simplified the handling of the transports GetNumReadableBytes to be less of a memory leak (Turns out all transports actually don't block here) add d2face5 S7 mspec test. add 93c19d9 S7 mspec test. add 7c1ad93 Test mspec. add 305b5e1 Test of mspec. add 41acabf Test mspec. add 5482677 Test mspec. add f0745a5 Test mspec. add 5435aa4 Tests mspec. add 24779bd Test mspec. add a21ca21 Test mspec. add 78fbff3 Test mspec. add 6e05263 Test mspec. add 4228b75 S7 MODE,USR,SYS support. Working on./opencv_perf_video add 5884867 S7Event work on. add 2d64b0d S7Event working on. add 70cdcce S7Event working on. add a2073a8 S7Event working on. add 5804800 S7Event working on. add bfe7ac3 S7Event working on. add cfff378 S7Event working on. add 599960b S7Event working on. add 4140a1a S7Event working on. add 8542328 S7Event working on. add 922083b Merge branch 's7event' of https://github.com/glcj/plc4x into s7event add 4c5019c S7Event working on. add abd0d99 S7Event working on. add 41bc00a S7Event working on. add 05215aa S7Event working on. add 1d0de54 S7Event working on. add 3d0c161 Alarm processing. add aa51b05 Alarm working on. add b3e928c Alarm working on. add 31b394d Alarm working on. add c933f80 Alarm working on. add 3c33859 Alarm working on!. add 041ce77 Alarm event working on. add 6c7cf27 Merge branch 's7event' of https://github.com/glcj/plc4x into s7event add 75bd4e3 Alarm working on. add 4f4346d Merge branch 's7event' of https://github.com/glcj/plc4x into s7event add 2edb527 Alarm working on. add 5f8a0ce OSGi test. add 1820de5 Strings.. add 9f1d929 Strings.. add e00b70c String handler... add cd9f609 Fix tools. add 908c0eb S7Event implementation. add 8da75d5 Merge branch 'develop' of github.com:apache/plc4x into s7event add c4ea06f - Fine-tuning of the PR. add 971cbcd - Continued porting the changes to PLC4C - Changed all usages of enum fields in the s7 to simple fields (all except one, where the enum field actually is required) add 22f8c3b - Fixed a typo in a function name add a3b6582 - Continued porting the changes to PLC4C - Changed all usages of enum fields in the s7 to simple fields (all except one, where the enum field actually is required) add d8f10f2 - Continued getting the plc4c build working again add a18e9ed - Cleaned up the pom configuration of the language test for go add ef4d5c1 - Cleaned up the pom configuration of the language test for go add 242bfd9 - Fixed some more enum related problems in PLC4C (We're allmost there) add 39a999c - Fixed the output of the diff-check add efce43c - Fixed the output of the diff-check add 07baaf4 - Finished extending PLC4Go to use the Cesar's event extensions add 932cd21 Merge branch 'develop' of github.com:apache/plc4x into s7event add 37ed824 Added options to the Discovery API which allows passing along options to fine tune how discovery is done. add 985988e Added options to the Discovery API which allows passing along options to fine tune how discovery is done. (Adjusted the BACNet IP driver, which I must have missed adjusting) add 0e57493 fix: PLC4X-312 - CAN NOT READ STRING FROM S7 PLC add d7bdbe7 Restructured the internal and external parts add 1cd8f29 Added "Option" to the name some of the DiscoveryOption types add 4355963 Made the KNX driver interpret the "device name discovery-option" add fc7634e Merge branch 's7event' of github.com:apache/plc4x into s7event No new revisions were added by this update. Summary of changes: .../plc4x/language/c/CLanguageTemplateHelper.java | 35 +- .../resources/templates/c/data-io-template.h.ftlh |1 + .../resources/templates/c/enum-template.c.ftlh | 32 + .../resources/templates/c/enum-template.h.ftlh | 17 + .../resources/templates/c/pojo-template.c.ftlh | 16 +- .../resources/templates/c/pojo-template.h.ftlh |3 +- .../test/resources/integration-test/CMakeLists.txt |2 + .../include/plc4c/driver_test_static.h | 20 +- .../language/go/GoLanguageTemplateHelper.java | 11 +- .../resources/templates/go/model-template.go.ftlh | 26 +- .../go/xml-parser-factory-template.go.ftlh | 12 +- .../language-go/src/test/resources/plc4go/pom.xml | 14 +- .../plc4x/language/java/JavaLanguageOutput.java|1 + .../src/main/resources/protocols/test/test.mspec |8 +- plc4c/drivers/modbus/CMakeLists.txt|2 +-
[plc4x] branch s7event updated (4355963 -> fc7634e)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch s7event in repository https://gitbox.apache.org/repos/asf/plc4x.git. from 4355963 Made the KNX driver interpret the "device name discovery-option" add 0e57493 fix: PLC4X-312 - CAN NOT READ STRING FROM S7 PLC new fc7634e Merge branch 's7event' of github.com:apache/plc4x into s7event The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/plc4x/java/s7/readwrite/field/S7Field.java | 3 ++- .../plc4x/java/s7/readwrite/field/S7FieldTest.java | 17 + 2 files changed, 19 insertions(+), 1 deletion(-)
[plc4x] 01/01: Merge branch 's7event' 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 fc7634e9177c0fbb25261094effba6dda782d5e3 Merge: 0e57493 4355963 Author: cdutz AuthorDate: Thu Sep 2 14:29:50 2021 +0200 Merge branch 's7event' of github.com:apache/plc4x into s7event plc4go/internal/plc4go/knxnetip/Discoverer.go | 26 +++- plc4go/internal/plc4go/knxnetip/Driver.go | 2 +- plc4go/pkg/plc4go/model/plc_discovery.go | 164 ++ 3 files changed, 110 insertions(+), 82 deletions(-)
