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 2024/04/19 07:58:11 UTC
(plc4x) 02/03: chore: Updated vendor ids
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
commit 7800fd1ac1f3adf36a8a2b7347557477ab84ed18
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Fri Apr 19 09:56:51 2024 +0200
chore: Updated vendor ids
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 42 +++++++++++++++-------
.../java/knxnetip/readwrite/KnxManufacturer.java | 7 ++--
.../knxnetip/readwrite/model/KnxManufacturer.cs | 27 ++++++++------
.../protocols/knxnetip/knx-master-data.mspec | 7 ++--
4 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index eef147cc0f..5615a293c0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -547,7 +547,7 @@ const (
KnxManufacturer_M_AUTOMATIONPlus KnxManufacturer = 501
KnxManufacturer_M_BLUE_AND_RED KnxManufacturer = 502
KnxManufacturer_M_FROGBLUE KnxManufacturer = 503
- KnxManufacturer_M_SAVESOR KnxManufacturer = 504
+ KnxManufacturer_M_LUXIO KnxManufacturer = 504
KnxManufacturer_M_APP_TECH KnxManufacturer = 505
KnxManufacturer_M_SENSORTEC_AG KnxManufacturer = 506
KnxManufacturer_M_NYSA_TECHNOLOGY_AND_SOLUTIONS KnxManufacturer = 507
@@ -716,8 +716,9 @@ const (
KnxManufacturer_M_MARLEY_DEUTSCHLAND_GMBH KnxManufacturer = 670
KnxManufacturer_M_CREATROL KnxManufacturer = 671
KnxManufacturer_M_EUTELSAT KnxManufacturer = 672
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 673
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 674
+ KnxManufacturer_M_TECNIKABEL KnxManufacturer = 673
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 674
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 675
)
var KnxManufacturerValues []KnxManufacturer
@@ -1229,7 +1230,7 @@ func init() {
KnxManufacturer_M_AUTOMATIONPlus,
KnxManufacturer_M_BLUE_AND_RED,
KnxManufacturer_M_FROGBLUE,
- KnxManufacturer_M_SAVESOR,
+ KnxManufacturer_M_LUXIO,
KnxManufacturer_M_APP_TECH,
KnxManufacturer_M_SENSORTEC_AG,
KnxManufacturer_M_NYSA_TECHNOLOGY_AND_SOLUTIONS,
@@ -1398,6 +1399,7 @@ func init() {
KnxManufacturer_M_MARLEY_DEUTSCHLAND_GMBH,
KnxManufacturer_M_CREATROL,
KnxManufacturer_M_EUTELSAT,
+ KnxManufacturer_M_TECNIKABEL,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3959,10 +3961,14 @@ func (e KnxManufacturer) Number() uint16 {
}
case 673:
{ /* '673' */
- return 43954
+ return 731
}
case 674:
{ /* '674' */
+ return 43954
+ }
+ case 675:
+ { /* '675' */
return 43959
}
case 68:
@@ -5929,7 +5935,7 @@ func (e KnxManufacturer) Name() string {
}
case 504:
{ /* '504' */
- return "SAVESOR"
+ return "LUXIO"
}
case 505:
{ /* '505' */
@@ -6677,10 +6683,14 @@ func (e KnxManufacturer) Name() string {
}
case 673:
{ /* '673' */
- return "ABB - reserved"
+ return "TECNIKABEL"
}
case 674:
{ /* '674' */
+ return "ABB - reserved"
+ }
+ case 675:
+ { /* '675' */
return "Busch-Jaeger Elektro - reserved"
}
case 68:
@@ -7743,7 +7753,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 503:
return KnxManufacturer_M_FROGBLUE, true
case 504:
- return KnxManufacturer_M_SAVESOR, true
+ return KnxManufacturer_M_LUXIO, true
case 505:
return KnxManufacturer_M_APP_TECH, true
case 506:
@@ -8117,8 +8127,10 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 672:
return KnxManufacturer_M_EUTELSAT, true
case 673:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_TECNIKABEL, true
case 674:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 675:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 68:
return KnxManufacturer_M_WAREMA_RENKHOFF_SE, true
@@ -9098,8 +9110,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_BLUE_AND_RED, true
case "M_FROGBLUE":
return KnxManufacturer_M_FROGBLUE, true
- case "M_SAVESOR":
- return KnxManufacturer_M_SAVESOR, true
+ case "M_LUXIO":
+ return KnxManufacturer_M_LUXIO, true
case "M_APP_TECH":
return KnxManufacturer_M_APP_TECH, true
case "M_SENSORTEC_AG":
@@ -9472,6 +9484,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_CREATROL, true
case "M_EUTELSAT":
return KnxManufacturer_M_EUTELSAT, true
+ case "M_TECNIKABEL":
+ return KnxManufacturer_M_TECNIKABEL, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -10515,8 +10529,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_BLUE_AND_RED"
case KnxManufacturer_M_FROGBLUE:
return "M_FROGBLUE"
- case KnxManufacturer_M_SAVESOR:
- return "M_SAVESOR"
+ case KnxManufacturer_M_LUXIO:
+ return "M_LUXIO"
case KnxManufacturer_M_APP_TECH:
return "M_APP_TECH"
case KnxManufacturer_M_SENSORTEC_AG:
@@ -10889,6 +10903,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_CREATROL"
case KnxManufacturer_M_EUTELSAT:
return "M_EUTELSAT"
+ case KnxManufacturer_M_TECNIKABEL:
+ return "M_TECNIKABEL"
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 a19f2ac8fe..5331d303a4 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
@@ -578,7 +578,7 @@ public enum KnxManufacturer {
M_AUTOMATIONPlus((int) 501, (int) 556, (String) "Automation+"),
M_BLUE_AND_RED((int) 502, (int) 557, (String) "blue and red"),
M_FROGBLUE((int) 503, (int) 558, (String) "frogblue"),
- M_SAVESOR((int) 504, (int) 559, (String) "SAVESOR"),
+ M_LUXIO((int) 504, (int) 559, (String) "LUXIO"),
M_APP_TECH((int) 505, (int) 560, (String) "App Tech"),
M_SENSORTEC_AG((int) 506, (int) 561, (String) "sensortec AG"),
M_NYSA_TECHNOLOGY_AND_SOLUTIONS((int) 507, (int) 562, (String) "nysa technology & solutions"),
@@ -776,9 +776,10 @@ public enum KnxManufacturer {
M_MARLEY_DEUTSCHLAND_GMBH((int) 670, (int) 728, (String) "Marley Deutschland GmbH"),
M_CREATROL((int) 671, (int) 729, (String) "Creatrol"),
M_EUTELSAT((int) 672, (int) 730, (String) "EUTELSAT"),
- M_ABB___RESERVED((int) 673, (int) 43954, (String) "ABB - reserved"),
+ M_TECNIKABEL((int) 673, (int) 731, (String) "TECNIKABEL"),
+ M_ABB___RESERVED((int) 674, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 674, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 675, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
static {
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 b96d4ab701..2e9f98e3a6 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -528,7 +528,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_AUTOMATIONPlus = 501,
M_BLUE_AND_RED = 502,
M_FROGBLUE = 503,
- M_SAVESOR = 504,
+ M_LUXIO = 504,
M_APP_TECH = 505,
M_SENSORTEC_AG = 506,
M_NYSA_TECHNOLOGY_AND_SOLUTIONS = 507,
@@ -697,8 +697,9 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_MARLEY_DEUTSCHLAND_GMBH = 670,
M_CREATROL = 671,
M_EUTELSAT = 672,
- M_ABB___RESERVED = 673,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 674,
+ M_TECNIKABEL = 673,
+ M_ABB___RESERVED = 674,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 675,
}
public static class KnxManufacturerInfo
@@ -2061,7 +2062,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_FROGBLUE: { /* '503' */
return 558;
}
- case KnxManufacturer.M_SAVESOR: { /* '504' */
+ case KnxManufacturer.M_LUXIO: { /* '504' */
return 559;
}
case KnxManufacturer.M_APP_TECH: { /* '505' */
@@ -2622,10 +2623,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_EUTELSAT: { /* '672' */
return 730;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '673' */
+ case KnxManufacturer.M_TECNIKABEL: { /* '673' */
+ return 731;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '674' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '674' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '675' */
return 43959;
}
case KnxManufacturer.M_WAREMA_RENKHOFF_SE: { /* '68' */
@@ -4096,8 +4100,8 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_FROGBLUE: { /* '503' */
return "frogblue";
}
- case KnxManufacturer.M_SAVESOR: { /* '504' */
- return "SAVESOR";
+ case KnxManufacturer.M_LUXIO: { /* '504' */
+ return "LUXIO";
}
case KnxManufacturer.M_APP_TECH: { /* '505' */
return "App Tech";
@@ -4657,10 +4661,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_EUTELSAT: { /* '672' */
return "EUTELSAT";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '673' */
+ case KnxManufacturer.M_TECNIKABEL: { /* '673' */
+ return "TECNIKABEL";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '674' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '674' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '675' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_WAREMA_RENKHOFF_SE: { /* '68' */
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 88970fb19c..2d542518f7 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
@@ -1252,7 +1252,7 @@
['501' M_AUTOMATIONPlus ['556', '"Automation+"']]
['502' M_BLUE_AND_RED ['557', '"blue and red"']]
['503' M_FROGBLUE ['558', '"frogblue"']]
- ['504' M_SAVESOR ['559', '"SAVESOR"']]
+ ['504' M_LUXIO ['559', '"LUXIO"']]
['505' M_APP_TECH ['560', '"App Tech"']]
['506' M_SENSORTEC_AG ['561', '"sensortec AG"']]
['507' M_NYSA_TECHNOLOGY_AND_SOLUTIONS ['562', '"nysa technology & solutions"']]
@@ -1421,8 +1421,9 @@
['670' M_MARLEY_DEUTSCHLAND_GMBH ['728', '"Marley Deutschland GmbH"']]
['671' M_CREATROL ['729', '"Creatrol"']]
['672' M_EUTELSAT ['730', '"EUTELSAT"']]
- ['673' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['674' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+ ['673' M_TECNIKABEL ['731', '"TECNIKABEL"']]
+ ['674' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['675' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
]