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 4bbb0a11ecf7ceb0cd2e64e05b5aae3c3e82a3b1
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Thu Jan 11 23:01:24 2024 +0100
chore: Update vendor ids
---
.../bacnetip/readwrite/model/BACnetVendorId.go | 48 ++++++++++++++++++++++
.../knxnetip/readwrite/model/KnxManufacturer.go | 40 ++++++++++++------
.../java/bacnetip/readwrite/BACnetVendorId.java | 3 ++
.../java/knxnetip/readwrite/KnxManufacturer.java | 5 ++-
.../knxnetip/readwrite/model/KnxManufacturer.cs | 27 +++++++-----
.../protocols/bacnetip/bacnet-vendorids.mspec | 3 ++
.../protocols/knxnetip/knx-master-data.mspec | 5 ++-
7 files changed, 105 insertions(+), 26 deletions(-)
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index a11ceb4419..a391a945bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -1494,6 +1494,9 @@ const (
BACnetVendorId_AETERLINK_CORPORATION
BACnetVendorId = 1457
BACnetVendorId_ALPHA_EPSILON_AUTOMATION
BACnetVendorId = 1458
BACnetVendorId_ASTRALITE_INC
BACnetVendorId = 1459
+ BACnetVendorId_DELTA_FIRE_LTDA
BACnetVendorId = 1460
+ BACnetVendorId_BOCK_WATER_HEATERS_INC
BACnetVendorId = 1461
+ BACnetVendorId_CLEAVER_BROOKS
BACnetVendorId = 1462
BACnetVendorId_UNKNOWN_VENDOR
BACnetVendorId = 0xFFFF
)
@@ -2953,6 +2956,9 @@ func init() {
BACnetVendorId_AETERLINK_CORPORATION,
BACnetVendorId_ALPHA_EPSILON_AUTOMATION,
BACnetVendorId_ASTRALITE_INC,
+ BACnetVendorId_DELTA_FIRE_LTDA,
+ BACnetVendorId_BOCK_WATER_HEATERS_INC,
+ BACnetVendorId_CLEAVER_BROOKS,
BACnetVendorId_UNKNOWN_VENDOR,
}
}
@@ -5007,6 +5013,18 @@ func (e BACnetVendorId) VendorId() uint16 {
{ /* '146' */
return 146
}
+ case 1460:
+ { /* '1460' */
+ return 1460
+ }
+ case 1461:
+ { /* '1461' */
+ return 1461
+ }
+ case 1462:
+ { /* '1462' */
+ return 1462
+ }
case 147:
{ /* '147' */
return 147
@@ -10833,6 +10851,18 @@ func (e BACnetVendorId) VendorName() string {
{ /* '146' */
return "Sanyo Electric Co., Ltd."
}
+ case 1460:
+ { /* '1460' */
+ return "Delta Fire Ltda."
+ }
+ case 1461:
+ { /* '1461' */
+ return "Bock Water Heaters, Inc."
+ }
+ case 1462:
+ { /* '1462' */
+ return "Cleaver-Brooks"
+ }
case 147:
{ /* '147' */
return "Integrated Information Systems, Inc."
@@ -15634,6 +15664,12 @@ func BACnetVendorIdByValue(value uint16) (enum
BACnetVendorId, ok bool) {
return BACnetVendorId_ASTRALITE_INC, true
case 146:
return BACnetVendorId_SANYO_ELECTRIC_CO_LTD, true
+ case 1460:
+ return BACnetVendorId_DELTA_FIRE_LTDA, true
+ case 1461:
+ return BACnetVendorId_BOCK_WATER_HEATERS_INC, true
+ case 1462:
+ return BACnetVendorId_CLEAVER_BROOKS, true
case 147:
return BACnetVendorId_INTEGRATED_INFORMATION_SYSTEMS_INC, true
case 148:
@@ -18544,6 +18580,12 @@ func BACnetVendorIdByName(value string) (enum
BACnetVendorId, ok bool) {
return BACnetVendorId_ASTRALITE_INC, true
case "SANYO_ELECTRIC_CO_LTD":
return BACnetVendorId_SANYO_ELECTRIC_CO_LTD, true
+ case "DELTA_FIRE_LTDA":
+ return BACnetVendorId_DELTA_FIRE_LTDA, true
+ case "BOCK_WATER_HEATERS_INC":
+ return BACnetVendorId_BOCK_WATER_HEATERS_INC, true
+ case "CLEAVER_BROOKS":
+ return BACnetVendorId_CLEAVER_BROOKS, true
case "INTEGRATED_INFORMATION_SYSTEMS_INC":
return BACnetVendorId_INTEGRATED_INFORMATION_SYSTEMS_INC, true
case "TEMCO_CONTROLS_LTD":
@@ -21515,6 +21557,12 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "ASTRALITE_INC"
case BACnetVendorId_SANYO_ELECTRIC_CO_LTD:
return "SANYO_ELECTRIC_CO_LTD"
+ case BACnetVendorId_DELTA_FIRE_LTDA:
+ return "DELTA_FIRE_LTDA"
+ case BACnetVendorId_BOCK_WATER_HEATERS_INC:
+ return "BOCK_WATER_HEATERS_INC"
+ case BACnetVendorId_CLEAVER_BROOKS:
+ return "CLEAVER_BROOKS"
case BACnetVendorId_INTEGRATED_INFORMATION_SYSTEMS_INC:
return "INTEGRATED_INFORMATION_SYSTEMS_INC"
case BACnetVendorId_TEMCO_CONTROLS_LTD:
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 6b453c9c37..90f6b2eb10 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -701,8 +701,9 @@ const (
KnxManufacturer_M_CAV_AUDIOGUANGZHOUCO__LTD
KnxManufacturer = 655
KnxManufacturer_M_HELKAMA_BICA_OY
KnxManufacturer = 656
KnxManufacturer_M_MODULYTE
KnxManufacturer = 657
- KnxManufacturer_M_ABB___RESERVED
KnxManufacturer = 658
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
KnxManufacturer = 659
+ KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH
KnxManufacturer = 658
+ KnxManufacturer_M_ABB___RESERVED
KnxManufacturer = 659
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
KnxManufacturer = 660
)
var KnxManufacturerValues []KnxManufacturer
@@ -1368,6 +1369,7 @@ func init() {
KnxManufacturer_M_CAV_AUDIOGUANGZHOUCO__LTD,
KnxManufacturer_M_HELKAMA_BICA_OY,
KnxManufacturer_M_MODULYTE,
+ KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3861,16 +3863,20 @@ func (e KnxManufacturer) Number() uint16 {
}
case 658:
{ /* '658' */
- return 43954
+ return 716
}
case 659:
{ /* '659' */
- return 43959
+ return 43954
}
case 66:
{ /* '66' */
return 105
}
+ case 660:
+ { /* '660' */
+ return 43959
+ }
case 67:
{ /* '67' */
return 106
@@ -6519,16 +6525,20 @@ func (e KnxManufacturer) Name() string {
}
case 658:
{ /* '658' */
- return "ABB - reserved"
+ return "Consolinno Energy GmbH"
}
case 659:
{ /* '659' */
- return "Busch-Jaeger Elektro - reserved"
+ return "ABB - reserved"
}
case 66:
{ /* '66' */
return "RTS Automation"
}
+ case 660:
+ { /* '660' */
+ return "Busch-Jaeger Elektro - reserved"
+ }
case 67:
{ /* '67' */
return "EIBMARKT GmbH"
@@ -7933,11 +7943,13 @@ func KnxManufacturerByValue(value uint16) (enum
KnxManufacturer, ok bool) {
case 657:
return KnxManufacturer_M_MODULYTE, true
case 658:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH, true
case 659:
- return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
+ return KnxManufacturer_M_ABB___RESERVED, true
case 66:
return KnxManufacturer_M_RTS_AUTOMATION, true
+ case 660:
+ return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 67:
return KnxManufacturer_M_EIBMARKT_GMBH, true
case 68:
@@ -9258,12 +9270,14 @@ func KnxManufacturerByName(value string) (enum
KnxManufacturer, ok bool) {
return KnxManufacturer_M_HELKAMA_BICA_OY, true
case "M_MODULYTE":
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_BUSCH_JAEGER_ELEKTRO___RESERVED":
- return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case "M_RTS_AUTOMATION":
return KnxManufacturer_M_RTS_AUTOMATION, true
+ case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
+ return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case "M_EIBMARKT_GMBH":
return KnxManufacturer_M_EIBMARKT_GMBH, true
case "M_WAREMA_RENKHOFF_SE":
@@ -10645,12 +10659,14 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_HELKAMA_BICA_OY"
case KnxManufacturer_M_MODULYTE:
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_BUSCH_JAEGER_ELEKTRO___RESERVED:
- return "M_BUSCH_JAEGER_ELEKTRO___RESERVED"
case KnxManufacturer_M_RTS_AUTOMATION:
return "M_RTS_AUTOMATION"
+ case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
+ return "M_BUSCH_JAEGER_ELEKTRO___RESERVED"
case KnxManufacturer_M_EIBMARKT_GMBH:
return "M_EIBMARKT_GMBH"
case KnxManufacturer_M_WAREMA_RENKHOFF_SE:
diff --git
a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
index cb0ce804d2..8702da2184 100644
---
a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
+++
b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
@@ -1673,6 +1673,9 @@ public enum BACnetVendorId {
AETERLINK_CORPORATION((int) 1457, (int) 1457, (String) "Aeterlink
Corporation"),
ALPHA_EPSILON_AUTOMATION((int) 1458, (int) 1458, (String) "Alpha Epsilon
Automation"),
ASTRALITE_INC((int) 1459, (int) 1459, (String) "Astralite Inc."),
+ DELTA_FIRE_LTDA((int) 1460, (int) 1460, (String) "Delta Fire Ltda."),
+ BOCK_WATER_HEATERS_INC((int) 1461, (int) 1461, (String) "Bock Water Heaters,
Inc."),
+ CLEAVER_BROOKS((int) 1462, (int) 1462, (String) "Cleaver-Brooks"),
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
private static final Map<Integer, BACnetVendorId> map;
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 875557c16a..c8a9a2e77a 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
@@ -755,9 +755,10 @@ public enum KnxManufacturer {
M_CAV_AUDIOGUANGZHOUCO__LTD((int) 655, (int) 713, (String) "CAV
AUDIO(GUANGZHOU)CO.,LTD"),
M_HELKAMA_BICA_OY((int) 656, (int) 714, (String) "Helkama Bica Oy"),
M_MODULYTE((int) 657, (int) 715, (String) "ModuLyte"),
- M_ABB___RESERVED((int) 658, (int) 43954, (String) "ABB - reserved"),
+ M_CONSOLINNO_ENERGY_GMBH((int) 658, (int) 716, (String) "Consolinno Energy
GmbH"),
+ M_ABB___RESERVED((int) 659, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 659, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 660, (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 698c63fe19..9f1c258515 100644
---
a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++
b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -682,8 +682,9 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
M_CAV_AUDIOGUANGZHOUCO__LTD = 655,
M_HELKAMA_BICA_OY = 656,
M_MODULYTE = 657,
- M_ABB___RESERVED = 658,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 659,
+ M_CONSOLINNO_ENERGY_GMBH = 658,
+ M_ABB___RESERVED = 659,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 660,
}
public static class KnxManufacturerInfo
@@ -2556,15 +2557,18 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_MODULYTE: { /* '657' */
return 715;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '658' */
- return 43954;
+ case KnxManufacturer.M_CONSOLINNO_ENERGY_GMBH: { /* '658' */
+ return 716;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'659' */
- return 43959;
+ case KnxManufacturer.M_ABB___RESERVED: { /* '659' */
+ return 43954;
}
case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */
return 105;
}
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'660' */
+ return 43959;
+ }
case KnxManufacturer.M_EIBMARKT_GMBH: { /* '67' */
return 106;
}
@@ -4546,15 +4550,18 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_MODULYTE: { /* '657' */
return "ModuLyte";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '658' */
- return "ABB - reserved";
+ case KnxManufacturer.M_CONSOLINNO_ENERGY_GMBH: { /* '658' */
+ return "Consolinno Energy GmbH";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'659' */
- return "Busch-Jaeger Elektro - reserved";
+ case KnxManufacturer.M_ABB___RESERVED: { /* '659' */
+ return "ABB - reserved";
}
case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */
return "RTS Automation";
}
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'660' */
+ return "Busch-Jaeger Elektro - reserved";
+ }
case KnxManufacturer.M_EIBMARKT_GMBH: { /* '67' */
return "EIBMARKT GmbH";
}
diff --git
a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
index 3860325e2f..b49f4330af 100644
---
a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
+++
b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
@@ -1472,6 +1472,9 @@
['1457' AETERLINK_CORPORATION ['1457', '"Aeterlink Corporation"']]
['1458' ALPHA_EPSILON_AUTOMATION ['1458', '"Alpha Epsilon Automation"']]
['1459' ASTRALITE_INC ['1459', '"Astralite Inc."']]
+ ['1460' DELTA_FIRE_LTDA ['1460', '"Delta Fire Ltda."']]
+ ['1461' BOCK_WATER_HEATERS_INC ['1461', '"Bock Water Heaters, Inc."']]
+ ['1462' CLEAVER_BROOKS ['1462', '"Cleaver-Brooks"']]
['0xFFFF' UNKNOWN_VENDOR ['0xFFFF', '"Unknown"']]
]
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 a162508f1f..21d8061a7f 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
@@ -1406,8 +1406,9 @@
['655' M_CAV_AUDIOGUANGZHOUCO__LTD ['713', '"CAV
AUDIO(GUANGZHOU)CO.,LTD"']]
['656' M_HELKAMA_BICA_OY ['714', '"Helkama Bica Oy"']]
['657' M_MODULYTE ['715', '"ModuLyte"']]
- ['658' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['659' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
+ ['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"']]
]
