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 2026/08/04 19:53:59 UTC
(plc4x) branch develop updated: Fix/whatever this was (#2672)
This is an automated email from the ASF dual-hosted git repository.
chrisdutz 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 3a7998f363 Fix/whatever this was (#2672)
3a7998f363 is described below
commit 3a7998f3633709f6ebf587570d7f94e8b8467cf7
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Aug 4 21:53:53 2026 +0200
Fix/whatever this was (#2672)
* doc: Fixed an error in the build-tools release documentation.
* chore: Updated the BACnet and KNX Vendor IDs
* chore: Updated to the newly released version of the build-tools.
* chore: Some random change to see if the commit signing works.
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 26 +++++++++++++++++-----
.../java/knxnetip/readwrite/KnxManufacturer.java | 6 +++--
.../knxnetip/readwrite/model/KnxManufacturer.cs | 19 +++++++++++-----
pom.xml | 5 ++---
.../protocols/knxnetip/knx-master-data.mspec | 5 +++--
.../developers/pages/release/build-tools.adoc | 4 ++--
6 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 402632cf30..e71be78416 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -864,8 +864,9 @@ const (
KnxManufacturer_M_READYKNX KnxManufacturer = 818
KnxManufacturer_M_SMARTVOS KnxManufacturer = 819
KnxManufacturer_M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH KnxManufacturer = 820
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 821
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 822
+ KnxManufacturer_M_CHINT KnxManufacturer = 821
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 822
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 823
)
var KnxManufacturerValues []KnxManufacturer
@@ -1694,6 +1695,7 @@ func init() {
KnxManufacturer_M_READYKNX,
KnxManufacturer_M_SMARTVOS,
KnxManufacturer_M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH,
+ KnxManufacturer_M_CHINT,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -4915,10 +4917,14 @@ func (e KnxManufacturer) Number() uint16 {
}
case 821:
{ /* '821' */
- return 43954
+ return 883
}
case 822:
{ /* '822' */
+ return 43954
+ }
+ case 823:
+ { /* '823' */
return 43959
}
case 83:
@@ -8225,10 +8231,14 @@ func (e KnxManufacturer) Name() string {
}
case 821:
{ /* '821' */
- return "ABB - reserved"
+ return "CHINT"
}
case 822:
{ /* '822' */
+ return "ABB - reserved"
+ }
+ case 823:
+ { /* '823' */
return "Busch-Jaeger Elektro - reserved"
}
case 83:
@@ -9927,8 +9937,10 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 820:
return KnxManufacturer_M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH, true
case 821:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_CHINT, true
case 822:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 823:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 83:
return KnxManufacturer_M_DURABLE_TECHNOLOGIES, true
@@ -11578,6 +11590,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_NIKO_ZUBLIN, true
case "M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH":
return KnxManufacturer_M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH, true
+ case "M_CHINT":
+ return KnxManufacturer_M_CHINT, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -13302,6 +13316,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_NIKO_ZUBLIN"
case KnxManufacturer_M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH:
return "M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH"
+ case KnxManufacturer_M_CHINT:
+ return "M_CHINT"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
index 905ad9100d..251081ab6e 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -1667,9 +1667,11 @@ public enum KnxManufacturer {
M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH((int) 820, (int) 881, "ISG Industrielle Steuerungstechnik GmbH"),
- M_ABB___RESERVED((int) 821, (int) 43954, "ABB - reserved"),
+ M_CHINT((int) 821, (int) 883, "CHINT"),
- M_BUSCH_JAEGER_ELEKTRO___RESERVED((int) 822, (int) 43959, "Busch-Jaeger Elektro - reserved");
+ M_ABB___RESERVED((int) 822, (int) 43954, "ABB - reserved"),
+
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED((int) 823, (int) 43959, "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index 5a5a1df1bd..965752d373 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -846,8 +846,9 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_READYKNX = 818,
M_SMARTVOS = 819,
M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH = 820,
- M_ABB___RESERVED = 821,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 822,
+ M_CHINT = 821,
+ M_ABB___RESERVED = 822,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 823,
}
public static class KnxManufacturerInfo
@@ -3266,10 +3267,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH: { /* '820' */
return 881;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '821' */
+ case KnxManufacturer.M_CHINT: { /* '821' */
+ return 883;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '822' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '822' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '823' */
return 43959;
}
case KnxManufacturer.M_DURABLE_TECHNOLOGIES: { /* '83' */
@@ -5745,10 +5749,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH: { /* '820' */
return "ISG Industrielle Steuerungstechnik GmbH";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '821' */
+ case KnxManufacturer.M_CHINT: { /* '821' */
+ return "CHINT";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '822' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '822' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '823' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_DURABLE_TECHNOLOGIES: { /* '83' */
diff --git a/pom.xml b/pom.xml
index f276485ce4..e43965f3e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,10 +95,9 @@
<!-- Exclude all generated code -->
<sonar.exclusions>**/generated-sources</sonar.exclusions>
- <sonar.cfamily.build-wrapper-output>${project.basedir}/plc4c/target/build-wrapper-output
- </sonar.cfamily.build-wrapper-output>
+ <sonar.cfamily.build-wrapper-output>${project.basedir}/plc4c/target/build-wrapper-output</sonar.cfamily.build-wrapper-output>
- <plc4x-code-generation.version>1.9.0-SNAPSHOT</plc4x-code-generation.version>
+ <plc4x-code-generation.version>1.9.0</plc4x-code-generation.version>
<antlr.version>4.13.2</antlr.version>
<apiguardian.version>1.1.2</apiguardian.version>
diff --git a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
index fd91e9779b..62fd86dd43 100644
--- a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
+++ b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
@@ -1573,8 +1573,9 @@
['818' M_READYKNX ['879', '"readyKNX"']]
['819' M_SMARTVOS ['880', '"smartVOS"']]
['820' M_ISG_INDUSTRIELLE_STEUERUNGSTECHNIK_GMBH ['881', '"ISG Industrielle Steuerungstechnik GmbH"']]
- ['821' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['822' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+ ['821' M_CHINT ['883', '"CHINT"']]
+ ['822' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['823' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
]
diff --git a/website/asciidoc/modules/developers/pages/release/build-tools.adoc b/website/asciidoc/modules/developers/pages/release/build-tools.adoc
index 848168d8de..8bde19c695 100644
--- a/website/asciidoc/modules/developers/pages/release/build-tools.adoc
+++ b/website/asciidoc/modules/developers/pages/release/build-tools.adoc
@@ -357,9 +357,9 @@ As a lot of mirrors are serving our releases, it is the Apache policy to clean o
This can be done like this:
- svn delete https://dist.apache.org/repos/dist/release/plc4x/0.3.0/ -m"deleted version 0.3.0"
+ svn delete https://dist.apache.org/repos/dist/release/plc4x/build-tools/code-generation/{1.8.0}/ -m"deleted old version of the build-tools"
-After this, https://dist.apache.org/repos/dist/release/plc4x should only contain the latest release directory.
+After this, https://dist.apache.org/repos/dist/release/plc4x/build-tools/code-generation should only contain the latest release directory.
== Releasing the Maven artifacts