From 991e5ee7e050b5e231c6dee84e6a7f799b86931f Mon Sep 17 00:00:00 2001 From: Christofer Dutz Date: Tue, 28 Jan 2025 15:45:22 +0100 Subject: [PATCH] chore: Updated the KNX vendor ids --- .../readwrite/model/KnxManufacturer.go | 98 +++++++++++++++++-- .../knxnetip/readwrite/KnxManufacturer.java | 10 +- .../readwrite/model/KnxManufacturer.cs | 51 ++++++++-- .../protocols/knxnetip/knx-master-data.mspec | 9 +- 4 files changed, 147 insertions(+), 21 deletions(-) diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go index e3d548f9a0..fa31912914 100644 --- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go +++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go @@ -752,8 +752,13 @@ const ( KnxManufacturer_M_LEAX_CONTROLS_CO___LTD_ KnxManufacturer = 706 KnxManufacturer_M_ALCAD KnxManufacturer = 707 KnxManufacturer_M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD KnxManufacturer = 708 - KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 709 - KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 710 + KnxManufacturer_M_TAOS_ELECTRIC_CO___LTD KnxManufacturer = 709 + KnxManufacturer_M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION KnxManufacturer = 710 + KnxManufacturer_M_ASAY_Q KnxManufacturer = 711 + KnxManufacturer_M_LAPP KnxManufacturer = 712 + KnxManufacturer_M_ZEROBIT_DYNAMIC KnxManufacturer = 713 + KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 714 + KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 715 ) var KnxManufacturerValues []KnxManufacturer @@ -1470,6 +1475,11 @@ func init() { KnxManufacturer_M_LEAX_CONTROLS_CO___LTD_, KnxManufacturer_M_ALCAD, KnxManufacturer_M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD, + KnxManufacturer_M_TAOS_ELECTRIC_CO___LTD, + KnxManufacturer_M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION, + KnxManufacturer_M_ASAY_Q, + KnxManufacturer_M_LAPP, + KnxManufacturer_M_ZEROBIT_DYNAMIC, KnxManufacturer_M_ABB___RESERVED, KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, } @@ -4191,7 +4201,7 @@ func (e KnxManufacturer) Number() uint16 { } case 709: { /* '709' */ - return 43954 + return 769 } case 71: { /* '71' */ @@ -4199,6 +4209,26 @@ func (e KnxManufacturer) Number() uint16 { } case 710: { /* '710' */ + return 771 + } + case 711: + { /* '711' */ + return 772 + } + case 712: + { /* '712' */ + return 773 + } + case 713: + { /* '713' */ + return 774 + } + case 714: + { /* '714' */ + return 43954 + } + case 715: + { /* '715' */ return 43959 } case 72: @@ -7053,7 +7083,7 @@ func (e KnxManufacturer) Name() string { } case 709: { /* '709' */ - return "ABB - reserved" + return "Taos Electric Co., Ltd" } case 71: { /* '71' */ @@ -7061,6 +7091,26 @@ func (e KnxManufacturer) Name() string { } case 710: { /* '710' */ + return "Konstantin Bobic Systemintegration" + } + case 711: + { /* '711' */ + return "Asay Q" + } + case 712: + { /* '712' */ + return "LAPP" + } + case 713: + { /* '713' */ + return "ZEROBIT DYNAMIC" + } + case 714: + { /* '714' */ + return "ABB - reserved" + } + case 715: + { /* '715' */ return "Busch-Jaeger Elektro - reserved" } case 72: @@ -8557,10 +8607,20 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 708: return KnxManufacturer_M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD, true case 709: - return KnxManufacturer_M_ABB___RESERVED, true + return KnxManufacturer_M_TAOS_ELECTRIC_CO___LTD, true case 71: return KnxManufacturer_M_BECKER_ANTRIEBE_GMBH, true case 710: + return KnxManufacturer_M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION, true + case 711: + return KnxManufacturer_M_ASAY_Q, true + case 712: + return KnxManufacturer_M_LAPP, true + case 713: + return KnxManufacturer_M_ZEROBIT_DYNAMIC, true + case 714: + return KnxManufacturer_M_ABB___RESERVED, true + case 715: return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true case 72: return KnxManufacturer_M_J_STEHLEPlusSOEHNE_GMBH, true @@ -9984,10 +10044,20 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_ALCAD, true case "M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD": return KnxManufacturer_M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD, true - case "M_ABB___RESERVED": - return KnxManufacturer_M_ABB___RESERVED, true + case "M_TAOS_ELECTRIC_CO___LTD": + return KnxManufacturer_M_TAOS_ELECTRIC_CO___LTD, true case "M_BECKER_ANTRIEBE_GMBH": return KnxManufacturer_M_BECKER_ANTRIEBE_GMBH, true + case "M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION": + return KnxManufacturer_M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION, true + case "M_ASAY_Q": + return KnxManufacturer_M_ASAY_Q, true + case "M_LAPP": + return KnxManufacturer_M_LAPP, true + case "M_ZEROBIT_DYNAMIC": + return KnxManufacturer_M_ZEROBIT_DYNAMIC, 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_J_STEHLEPlusSOEHNE_GMBH": @@ -11484,10 +11554,20 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_ALCAD" case KnxManufacturer_M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD: return "M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD" - case KnxManufacturer_M_ABB___RESERVED: - return "M_ABB___RESERVED" + case KnxManufacturer_M_TAOS_ELECTRIC_CO___LTD: + return "M_TAOS_ELECTRIC_CO___LTD" case KnxManufacturer_M_BECKER_ANTRIEBE_GMBH: return "M_BECKER_ANTRIEBE_GMBH" + case KnxManufacturer_M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION: + return "M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION" + case KnxManufacturer_M_ASAY_Q: + return "M_ASAY_Q" + case KnxManufacturer_M_LAPP: + return "M_LAPP" + case KnxManufacturer_M_ZEROBIT_DYNAMIC: + return "M_ZEROBIT_DYNAMIC" + 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_J_STEHLEPlusSOEHNE_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 3690953a63..3985e16c86 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 @@ -827,9 +827,15 @@ public enum KnxManufacturer { M_ALCAD((int) 707, (int) 765, (String) "alcad"), M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD( (int) 708, (int) 766, (String) "GUANG DONG REMAC SMART TECHNOLOGY CO., LTD"), - M_ABB___RESERVED((int) 709, (int) 43954, (String) "ABB - reserved"), + M_TAOS_ELECTRIC_CO___LTD((int) 709, (int) 769, (String) "Taos Electric Co., Ltd"), + M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION( + (int) 710, (int) 771, (String) "Konstantin Bobic Systemintegration"), + M_ASAY_Q((int) 711, (int) 772, (String) "Asay Q"), + M_LAPP((int) 712, (int) 773, (String) "LAPP"), + M_ZEROBIT_DYNAMIC((int) 713, (int) 774, (String) "ZEROBIT DYNAMIC"), + M_ABB___RESERVED((int) 714, (int) 43954, (String) "ABB - reserved"), M_BUSCH_JAEGER_ELEKTRO___RESERVED( - (int) 710, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); + (int) 715, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); private static final Map 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 752ae40b83..66b76b2a1e 100644 --- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs +++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs @@ -733,8 +733,13 @@ public enum KnxManufacturer M_LEAX_CONTROLS_CO___LTD_ = 706, M_ALCAD = 707, M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD = 708, - M_ABB___RESERVED = 709, - M_BUSCH_JAEGER_ELEKTRO___RESERVED = 710, + M_TAOS_ELECTRIC_CO___LTD = 709, + M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION = 710, + M_ASAY_Q = 711, + M_LAPP = 712, + M_ZEROBIT_DYNAMIC = 713, + M_ABB___RESERVED = 714, + M_BUSCH_JAEGER_ELEKTRO___RESERVED = 715, } public static class KnxManufacturerInfo @@ -2778,13 +2783,28 @@ public static class KnxManufacturerInfo case KnxManufacturer.M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD: { /* '708' */ return 766; } - case KnxManufacturer.M_ABB___RESERVED: { /* '709' */ - return 43954; + case KnxManufacturer.M_TAOS_ELECTRIC_CO___LTD: { /* '709' */ + return 769; } case KnxManufacturer.M_BECKER_ANTRIEBE_GMBH: { /* '71' */ return 110; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '710' */ + case KnxManufacturer.M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION: { /* '710' */ + return 771; + } + case KnxManufacturer.M_ASAY_Q: { /* '711' */ + return 772; + } + case KnxManufacturer.M_LAPP: { /* '712' */ + return 773; + } + case KnxManufacturer.M_ZEROBIT_DYNAMIC: { /* '713' */ + return 774; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '714' */ + return 43954; + } + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '715' */ return 43959; } case KnxManufacturer.M_J_STEHLEPlusSOEHNE_GMBH: { /* '72' */ @@ -4921,13 +4941,28 @@ public static string Name(this KnxManufacturer value) case KnxManufacturer.M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD: { /* '708' */ return "GUANG DONG REMAC SMART TECHNOLOGY CO., LTD"; } - case KnxManufacturer.M_ABB___RESERVED: { /* '709' */ - return "ABB - reserved"; + case KnxManufacturer.M_TAOS_ELECTRIC_CO___LTD: { /* '709' */ + return "Taos Electric Co., Ltd"; } case KnxManufacturer.M_BECKER_ANTRIEBE_GMBH: { /* '71' */ return "Becker-Antriebe GmbH"; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '710' */ + case KnxManufacturer.M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION: { /* '710' */ + return "Konstantin Bobic Systemintegration"; + } + case KnxManufacturer.M_ASAY_Q: { /* '711' */ + return "Asay Q"; + } + case KnxManufacturer.M_LAPP: { /* '712' */ + return "LAPP"; + } + case KnxManufacturer.M_ZEROBIT_DYNAMIC: { /* '713' */ + return "ZEROBIT DYNAMIC"; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '714' */ + return "ABB - reserved"; + } + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '715' */ return "Busch-Jaeger Elektro - reserved"; } case KnxManufacturer.M_J_STEHLEPlusSOEHNE_GMBH: { /* '72' */ 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 fd5a2a1dd6..4bf85d5d54 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 @@ -1458,8 +1458,13 @@ ['706' M_LEAX_CONTROLS_CO___LTD_ ['764', '"LEAX CONTROLS CO., LTD."']] ['707' M_ALCAD ['765', '"alcad"']] ['708' M_GUANG_DONG_REMAC_SMART_TECHNOLOGY_CO___LTD ['766', '"GUANG DONG REMAC SMART TECHNOLOGY CO., LTD"']] - ['709' M_ABB___RESERVED ['43954', '"ABB - reserved"']] - ['710' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] + ['709' M_TAOS_ELECTRIC_CO___LTD ['769', '"Taos Electric Co., Ltd"']] + ['710' M_KONSTANTIN_BOBIC_SYSTEMINTEGRATION ['771', '"Konstantin Bobic Systemintegration"']] + ['711' M_ASAY_Q ['772', '"Asay Q"']] + ['712' M_LAPP ['773', '"LAPP"']] + ['713' M_ZEROBIT_DYNAMIC ['774', '"ZEROBIT DYNAMIC"']] + ['714' M_ABB___RESERVED ['43954', '"ABB - reserved"']] + ['715' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] ]