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/01/15 21:05:08 UTC
(plc4x) 02/05: chore: Update vendor ids
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 9005bbe444928095ab1f5f5bf71f9e887e86a611
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Mon Jan 15 22:02:09 2024 +0100
chore: Update vendor ids
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 50 ++++++++++++++++++----
.../java/knxnetip/readwrite/KnxManufacturer.java | 7 ++-
.../knxnetip/readwrite/model/KnxManufacturer.cs | 30 +++++++++----
.../protocols/knxnetip/knx-master-data.mspec | 6 ++-
4 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 90f6b2eb10..93c7253019 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -702,8 +702,10 @@ const (
KnxManufacturer_M_HELKAMA_BICA_OY KnxManufacturer = 656
KnxManufacturer_M_MODULYTE KnxManufacturer = 657
KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH KnxManufacturer = 658
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 659
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 660
+ KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED KnxManufacturer = 659
+ KnxManufacturer_M_3R KnxManufacturer = 660
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 661
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 662
)
var KnxManufacturerValues []KnxManufacturer
@@ -1370,6 +1372,8 @@ func init() {
KnxManufacturer_M_HELKAMA_BICA_OY,
KnxManufacturer_M_MODULYTE,
KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH,
+ KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED,
+ KnxManufacturer_M_3R,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3867,7 +3871,7 @@ func (e KnxManufacturer) Number() uint16 {
}
case 659:
{ /* '659' */
- return 43954
+ return 717
}
case 66:
{ /* '66' */
@@ -3875,6 +3879,14 @@ func (e KnxManufacturer) Number() uint16 {
}
case 660:
{ /* '660' */
+ return 718
+ }
+ case 661:
+ { /* '661' */
+ return 43954
+ }
+ case 662:
+ { /* '662' */
return 43959
}
case 67:
@@ -6529,7 +6541,7 @@ func (e KnxManufacturer) Name() string {
}
case 659:
{ /* '659' */
- return "ABB - reserved"
+ return "SCHIDERON ELECTRIC (ASIA) LIMITED"
}
case 66:
{ /* '66' */
@@ -6537,6 +6549,14 @@ func (e KnxManufacturer) Name() string {
}
case 660:
{ /* '660' */
+ return "3R"
+ }
+ case 661:
+ { /* '661' */
+ return "ABB - reserved"
+ }
+ case 662:
+ { /* '662' */
return "Busch-Jaeger Elektro - reserved"
}
case 67:
@@ -7945,10 +7965,14 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 658:
return KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH, true
case 659:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED, true
case 66:
return KnxManufacturer_M_RTS_AUTOMATION, true
case 660:
+ return KnxManufacturer_M_3R, true
+ case 661:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 662:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 67:
return KnxManufacturer_M_EIBMARKT_GMBH, true
@@ -9272,10 +9296,14 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_MODULYTE, true
case "M_CONSOLINNO_ENERGY_GMBH":
return KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH, true
- case "M_ABB___RESERVED":
- return KnxManufacturer_M_ABB___RESERVED, true
+ case "M_SCHIDERON_ELECTRIC_ASIA_LIMITED":
+ return KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED, true
case "M_RTS_AUTOMATION":
return KnxManufacturer_M_RTS_AUTOMATION, true
+ case "M_3R":
+ return KnxManufacturer_M_3R, true
+ case "M_ABB___RESERVED":
+ return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case "M_EIBMARKT_GMBH":
@@ -10661,10 +10689,14 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_MODULYTE"
case KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH:
return "M_CONSOLINNO_ENERGY_GMBH"
- case KnxManufacturer_M_ABB___RESERVED:
- return "M_ABB___RESERVED"
+ case KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED:
+ return "M_SCHIDERON_ELECTRIC_ASIA_LIMITED"
case KnxManufacturer_M_RTS_AUTOMATION:
return "M_RTS_AUTOMATION"
+ case KnxManufacturer_M_3R:
+ return "M_3R"
+ case KnxManufacturer_M_ABB___RESERVED:
+ return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
return "M_BUSCH_JAEGER_ELEKTRO___RESERVED"
case KnxManufacturer_M_EIBMARKT_GMBH:
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 c8a9a2e77a..d77e50518a 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
@@ -756,9 +756,12 @@ public enum KnxManufacturer {
M_HELKAMA_BICA_OY((int) 656, (int) 714, (String) "Helkama Bica Oy"),
M_MODULYTE((int) 657, (int) 715, (String) "ModuLyte"),
M_CONSOLINNO_ENERGY_GMBH((int) 658, (int) 716, (String) "Consolinno Energy GmbH"),
- M_ABB___RESERVED((int) 659, (int) 43954, (String) "ABB - reserved"),
+ M_SCHIDERON_ELECTRIC_ASIA_LIMITED(
+ (int) 659, (int) 717, (String) "SCHIDERON ELECTRIC (ASIA) LIMITED"),
+ M_3R((int) 660, (int) 718, (String) "3R"),
+ M_ABB___RESERVED((int) 661, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 660, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 662, (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 9f1c258515..b26c08f82a 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -683,8 +683,10 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_HELKAMA_BICA_OY = 656,
M_MODULYTE = 657,
M_CONSOLINNO_ENERGY_GMBH = 658,
- M_ABB___RESERVED = 659,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 660,
+ M_SCHIDERON_ELECTRIC_ASIA_LIMITED = 659,
+ M_3R = 660,
+ M_ABB___RESERVED = 661,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 662,
}
public static class KnxManufacturerInfo
@@ -2560,13 +2562,19 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_CONSOLINNO_ENERGY_GMBH: { /* '658' */
return 716;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '659' */
- return 43954;
+ case KnxManufacturer.M_SCHIDERON_ELECTRIC_ASIA_LIMITED: { /* '659' */
+ return 717;
}
case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */
return 105;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '660' */
+ case KnxManufacturer.M_3R: { /* '660' */
+ return 718;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '661' */
+ return 43954;
+ }
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '662' */
return 43959;
}
case KnxManufacturer.M_EIBMARKT_GMBH: { /* '67' */
@@ -4553,13 +4561,19 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_CONSOLINNO_ENERGY_GMBH: { /* '658' */
return "Consolinno Energy GmbH";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '659' */
- return "ABB - reserved";
+ case KnxManufacturer.M_SCHIDERON_ELECTRIC_ASIA_LIMITED: { /* '659' */
+ return "SCHIDERON ELECTRIC (ASIA) LIMITED";
}
case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */
return "RTS Automation";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '660' */
+ case KnxManufacturer.M_3R: { /* '660' */
+ return "3R";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '661' */
+ return "ABB - reserved";
+ }
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '662' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_EIBMARKT_GMBH: { /* '67' */
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 21d8061a7f..e53ad10795 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
@@ -1407,8 +1407,10 @@
['656' M_HELKAMA_BICA_OY ['714', '"Helkama Bica Oy"']]
['657' M_MODULYTE ['715', '"ModuLyte"']]
['658' M_CONSOLINNO_ENERGY_GMBH ['716', '"Consolinno Energy GmbH"']]
- ['659' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['660' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+ ['659' M_SCHIDERON_ELECTRIC_ASIA_LIMITED ['717', '"SCHIDERON ELECTRIC (ASIA) LIMITED"']]
+ ['660' M_3R ['718', '"3R"']]
+ ['661' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['662' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
]