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 61e80b3929b96fa454d89216530f0c56e1a0c1dc Author: Christofer Dutz <cd...@apache.org> AuthorDate: Sun Sep 8 13:12:18 2024 +0200 chore: Added new knx vendor ids --- .../knxnetip/readwrite/model/KnxManufacturer.go | 26 +++++++++++++++++----- .../java/knxnetip/readwrite/KnxManufacturer.java | 5 +++-- .../knxnetip/readwrite/model/KnxManufacturer.cs | 19 +++++++++++----- .../protocols/knxnetip/knx-master-data.mspec | 5 +++-- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go index d05304391d..0b14d33924 100644 --- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go +++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go @@ -730,8 +730,9 @@ const ( KnxManufacturer_M_DETRONS KnxManufacturer = 684 KnxManufacturer_M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD KnxManufacturer = 685 KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED KnxManufacturer = 686 - KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 687 - KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 688 + KnxManufacturer_M_3A_ENTREPRISE_APS KnxManufacturer = 687 + KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 688 + KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 689 ) var KnxManufacturerValues []KnxManufacturer @@ -1426,6 +1427,7 @@ func init() { KnxManufacturer_M_DETRONS, KnxManufacturer_M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD, KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED, + KnxManufacturer_M_3A_ENTREPRISE_APS, KnxManufacturer_M_ABB___RESERVED, KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, } @@ -4047,10 +4049,14 @@ func (e KnxManufacturer) Number() uint16 { } case 687: { /* '687' */ - return 43954 + return 745 } case 688: { /* '688' */ + return 43954 + } + case 689: + { /* '689' */ return 43959 } case 69: @@ -6821,10 +6827,14 @@ func (e KnxManufacturer) Name() string { } case 687: { /* '687' */ - return "ABB - reserved" + return "3a entreprise aps" } case 688: { /* '688' */ + return "ABB - reserved" + } + case 689: + { /* '689' */ return "Busch-Jaeger Elektro - reserved" } case 69: @@ -8287,8 +8297,10 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 686: return KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED, true case 687: - return KnxManufacturer_M_ABB___RESERVED, true + return KnxManufacturer_M_3A_ENTREPRISE_APS, true case 688: + return KnxManufacturer_M_ABB___RESERVED, true + case 689: return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true case 69: return KnxManufacturer_M_EELECTRON, true @@ -9670,6 +9682,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD, true case "M_VARNI_DIGITAL_PRIVATE_LIMITED": return KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED, true + case "M_3A_ENTREPRISE_APS": + return KnxManufacturer_M_3A_ENTREPRISE_APS, true case "M_ABB___RESERVED": return KnxManufacturer_M_ABB___RESERVED, true case "M_BUSCH_JAEGER_ELEKTRO___RESERVED": @@ -11126,6 +11140,8 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD" case KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED: return "M_VARNI_DIGITAL_PRIVATE_LIMITED" + case KnxManufacturer_M_3A_ENTREPRISE_APS: + return "M_3A_ENTREPRISE_APS" 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 b09606afa1..9661a3bbba 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 @@ -797,9 +797,10 @@ public enum KnxManufacturer { M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD( (int) 685, (int) 743, (String) "Zhejiang FORICK, Intelligent Technology Co., LTD"), M_VARNI_DIGITAL_PRIVATE_LIMITED((int) 686, (int) 744, (String) "Varni Digital Private Limited"), - M_ABB___RESERVED((int) 687, (int) 43954, (String) "ABB - reserved"), + M_3A_ENTREPRISE_APS((int) 687, (int) 745, (String) "3a entreprise aps"), + M_ABB___RESERVED((int) 688, (int) 43954, (String) "ABB - reserved"), M_BUSCH_JAEGER_ELEKTRO___RESERVED( - (int) 688, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); + (int) 689, (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 013c90d120..dace26735b 100644 --- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs +++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs @@ -711,8 +711,9 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model M_DETRONS = 684, M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD = 685, M_VARNI_DIGITAL_PRIVATE_LIMITED = 686, - M_ABB___RESERVED = 687, - M_BUSCH_JAEGER_ELEKTRO___RESERVED = 688, + M_3A_ENTREPRISE_APS = 687, + M_ABB___RESERVED = 688, + M_BUSCH_JAEGER_ELEKTRO___RESERVED = 689, } public static class KnxManufacturerInfo @@ -2681,10 +2682,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_VARNI_DIGITAL_PRIVATE_LIMITED: { /* '686' */ return 744; } - case KnxManufacturer.M_ABB___RESERVED: { /* '687' */ + case KnxManufacturer.M_3A_ENTREPRISE_APS: { /* '687' */ + return 745; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '688' */ return 43954; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '688' */ + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '689' */ return 43959; } case KnxManufacturer.M_EELECTRON: { /* '69' */ @@ -4758,10 +4762,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_VARNI_DIGITAL_PRIVATE_LIMITED: { /* '686' */ return "Varni Digital Private Limited"; } - case KnxManufacturer.M_ABB___RESERVED: { /* '687' */ + case KnxManufacturer.M_3A_ENTREPRISE_APS: { /* '687' */ + return "3a entreprise aps"; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '688' */ return "ABB - reserved"; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '688' */ + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '689' */ return "Busch-Jaeger Elektro - reserved"; } case KnxManufacturer.M_EELECTRON: { /* '69' */ 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 860187b4f6..680dfba4ad 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 @@ -1436,8 +1436,9 @@ ['684' M_DETRONS ['742', '"DETRONS"']] ['685' M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD ['743', '"Zhejiang FORICK, Intelligent Technology Co., LTD"']] ['686' M_VARNI_DIGITAL_PRIVATE_LIMITED ['744', '"Varni Digital Private Limited"']] - ['687' M_ABB___RESERVED ['43954', '"ABB - reserved"']] - ['688' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] + ['687' M_3A_ENTREPRISE_APS ['745', '"3a entreprise aps"']] + ['688' M_ABB___RESERVED ['43954', '"ABB - reserved"']] + ['689' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] ]