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 397a2b949b59eefbcc9e5f3485f27d7f1654cc01 Author: Christofer Dutz <[email protected]> AuthorDate: Wed Jul 30 23:06:05 2025 +0200 chore: Updated vendor ids for KNX and BacNet --- .../knxnetip/readwrite/model/KnxManufacturer.go | 104 +++++++++++++++++---- .../java/knxnetip/readwrite/KnxManufacturer.java | 12 ++- .../knxnetip/readwrite/model/KnxManufacturer.cs | 56 ++++++++--- .../protocols/knxnetip/knx-master-data.mspec | 10 +- 4 files changed, 142 insertions(+), 40 deletions(-) diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go index 57fb635489..1f53679f1d 100644 --- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go +++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go @@ -436,7 +436,7 @@ const ( KnxManufacturer_M_MOORGEN_DEUTSCHLAND_GMBH KnxManufacturer = 390 KnxManufacturer_M_CULLMANN_TECH KnxManufacturer = 391 KnxManufacturer_M_EYRISE_B_V KnxManufacturer = 392 - KnxManufacturer_M_ABEGO KnxManufacturer = 393 + KnxManufacturer_M_DOBNEL KnxManufacturer = 393 KnxManufacturer_M_MYGEKKO KnxManufacturer = 394 KnxManufacturer_M_ERGO3_SARL KnxManufacturer = 395 KnxManufacturer_M_STMICROELECTRONICS_INTERNATIONAL_N_V_ KnxManufacturer = 396 @@ -789,8 +789,12 @@ const ( KnxManufacturer_M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT KnxManufacturer = 743 KnxManufacturer_M_ABI_SICHERHEITSSYSTEME_GMBH KnxManufacturer = 744 KnxManufacturer_M_RYT KnxManufacturer = 745 - KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 746 - KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 747 + KnxManufacturer_M_AURIGA_SYSTEMS KnxManufacturer = 746 + KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH KnxManufacturer = 747 + KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD KnxManufacturer = 748 + KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED KnxManufacturer = 749 + KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 750 + KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 751 ) var KnxManufacturerValues []KnxManufacturer @@ -1191,7 +1195,7 @@ func init() { KnxManufacturer_M_MOORGEN_DEUTSCHLAND_GMBH, KnxManufacturer_M_CULLMANN_TECH, KnxManufacturer_M_EYRISE_B_V, - KnxManufacturer_M_ABEGO, + KnxManufacturer_M_DOBNEL, KnxManufacturer_M_MYGEKKO, KnxManufacturer_M_ERGO3_SARL, KnxManufacturer_M_STMICROELECTRONICS_INTERNATIONAL_N_V_, @@ -1544,6 +1548,10 @@ func init() { KnxManufacturer_M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT, KnxManufacturer_M_ABI_SICHERHEITSSYSTEME_GMBH, KnxManufacturer_M_RYT, + KnxManufacturer_M_AURIGA_SYSTEMS, + KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH, + KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD, + KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED, KnxManufacturer_M_ABB___RESERVED, KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, } @@ -4429,16 +4437,32 @@ func (e KnxManufacturer) Number() uint16 { } case 746: { /* '746' */ - return 43954 + return 807 } case 747: { /* '747' */ - return 43959 + return 808 + } + case 748: + { /* '748' */ + return 809 + } + case 749: + { /* '749' */ + return 810 } case 75: { /* '75' */ return 114 } + case 750: + { /* '750' */ + return 43954 + } + case 751: + { /* '751' */ + return 43959 + } case 76: { /* '76' */ return 115 @@ -5871,7 +5895,7 @@ func (e KnxManufacturer) Name() string { } case 393: { /* '393' */ - return "ABEGO" + return "Dobnel" } case 394: { /* '394' */ @@ -7439,16 +7463,32 @@ func (e KnxManufacturer) Name() string { } case 746: { /* '746' */ - return "ABB - reserved" + return "Auriga Systems" } case 747: { /* '747' */ - return "Busch-Jaeger Elektro - reserved" + return "Alzinger&Vogel Softwareentwicklungs GmbH" + } + case 748: + { /* '748' */ + return "Gianfranco Smart Solutions Ltd" + } + case 749: + { /* '749' */ + return "Rogerwell Control System Limited" } case 75: { /* '75' */ return "TAPKO Technologies" } + case 750: + { /* '750' */ + return "ABB - reserved" + } + case 751: + { /* '751' */ + return "Busch-Jaeger Elektro - reserved" + } case 76: { /* '76' */ return "HDL" @@ -8225,7 +8265,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 392: return KnxManufacturer_M_EYRISE_B_V, true case 393: - return KnxManufacturer_M_ABEGO, true + return KnxManufacturer_M_DOBNEL, true case 394: return KnxManufacturer_M_MYGEKKO, true case 395: @@ -9009,11 +9049,19 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 745: return KnxManufacturer_M_RYT, true case 746: - return KnxManufacturer_M_ABB___RESERVED, true + return KnxManufacturer_M_AURIGA_SYSTEMS, true case 747: - return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true + return KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH, true + case 748: + return KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD, true + case 749: + return KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED, true case 75: return KnxManufacturer_M_TAPKO_TECHNOLOGIES, true + case 750: + return KnxManufacturer_M_ABB___RESERVED, true + case 751: + return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true case 76: return KnxManufacturer_M_HDL, true case 77: @@ -9726,8 +9774,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_CULLMANN_TECH, true case "M_EYRISE_B_V": return KnxManufacturer_M_EYRISE_B_V, true - case "M_ABEGO": - return KnxManufacturer_M_ABEGO, true + case "M_DOBNEL": + return KnxManufacturer_M_DOBNEL, true case "M_MYGEKKO": return KnxManufacturer_M_MYGEKKO, true case "M_ERGO3_SARL": @@ -10510,12 +10558,20 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_ABI_SICHERHEITSSYSTEME_GMBH, true case "M_RYT": return KnxManufacturer_M_RYT, true + case "M_AURIGA_SYSTEMS": + return KnxManufacturer_M_AURIGA_SYSTEMS, true + case "M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH": + return KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH, true + case "M_GIANFRANCO_SMART_SOLUTIONS_LTD": + return KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD, true + case "M_ROGERWELL_CONTROL_SYSTEM_LIMITED": + return KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED, true + case "M_TAPKO_TECHNOLOGIES": + return KnxManufacturer_M_TAPKO_TECHNOLOGIES, 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_TAPKO_TECHNOLOGIES": - return KnxManufacturer_M_TAPKO_TECHNOLOGIES, true case "M_HDL": return KnxManufacturer_M_HDL, true case "M_UPONOR": @@ -11300,8 +11356,8 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_CULLMANN_TECH" case KnxManufacturer_M_EYRISE_B_V: return "M_EYRISE_B_V" - case KnxManufacturer_M_ABEGO: - return "M_ABEGO" + case KnxManufacturer_M_DOBNEL: + return "M_DOBNEL" case KnxManufacturer_M_MYGEKKO: return "M_MYGEKKO" case KnxManufacturer_M_ERGO3_SARL: @@ -12084,12 +12140,20 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_ABI_SICHERHEITSSYSTEME_GMBH" case KnxManufacturer_M_RYT: return "M_RYT" + case KnxManufacturer_M_AURIGA_SYSTEMS: + return "M_AURIGA_SYSTEMS" + case KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH: + return "M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH" + case KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD: + return "M_GIANFRANCO_SMART_SOLUTIONS_LTD" + case KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED: + return "M_ROGERWELL_CONTROL_SYSTEM_LIMITED" + case KnxManufacturer_M_TAPKO_TECHNOLOGIES: + return "M_TAPKO_TECHNOLOGIES" 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_TAPKO_TECHNOLOGIES: - return "M_TAPKO_TECHNOLOGIES" case KnxManufacturer_M_HDL: return "M_HDL" case KnxManufacturer_M_UPONOR: 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 24c23b73e6..bb271e0af8 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 @@ -442,7 +442,7 @@ public enum KnxManufacturer { M_MOORGEN_DEUTSCHLAND_GMBH((int) 390, (int) 441, (String) "Moorgen Deutschland GmbH"), M_CULLMANN_TECH((int) 391, (int) 442, (String) "CULLMANN TECH"), M_EYRISE_B_V((int) 392, (int) 443, (String) "eyrise B.V"), - M_ABEGO((int) 393, (int) 444, (String) "ABEGO"), + M_DOBNEL((int) 393, (int) 444, (String) "Dobnel"), M_MYGEKKO((int) 394, (int) 445, (String) "myGEKKO"), M_ERGO3_SARL((int) 395, (int) 446, (String) "Ergo3 Sarl"), M_STMICROELECTRONICS_INTERNATIONAL_N_V_( @@ -873,9 +873,15 @@ public enum KnxManufacturer { (int) 743, (int) 804, (String) "Shanghai Innovatech Information Technology Co., Lt"), M_ABI_SICHERHEITSSYSTEME_GMBH((int) 744, (int) 805, (String) "ABI Sicherheitssysteme GmbH"), M_RYT((int) 745, (int) 806, (String) "RYT"), - M_ABB___RESERVED((int) 746, (int) 43954, (String) "ABB - reserved"), + M_AURIGA_SYSTEMS((int) 746, (int) 807, (String) "Auriga Systems"), + M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH( + (int) 747, (int) 808, (String) "Alzinger&Vogel Softwareentwicklungs GmbH"), + M_GIANFRANCO_SMART_SOLUTIONS_LTD((int) 748, (int) 809, (String) "Gianfranco Smart Solutions Ltd"), + M_ROGERWELL_CONTROL_SYSTEM_LIMITED( + (int) 749, (int) 810, (String) "Rogerwell Control System Limited"), + M_ABB___RESERVED((int) 750, (int) 43954, (String) "ABB - reserved"), M_BUSCH_JAEGER_ELEKTRO___RESERVED( - (int) 747, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); + (int) 751, (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 08442becd8..30b8170df5 100644 --- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs +++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs @@ -418,7 +418,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model M_MOORGEN_DEUTSCHLAND_GMBH = 390, M_CULLMANN_TECH = 391, M_EYRISE_B_V = 392, - M_ABEGO = 393, + M_DOBNEL = 393, M_MYGEKKO = 394, M_ERGO3_SARL = 395, M_STMICROELECTRONICS_INTERNATIONAL_N_V_ = 396, @@ -771,8 +771,12 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT = 743, M_ABI_SICHERHEITSSYSTEME_GMBH = 744, M_RYT = 745, - M_ABB___RESERVED = 746, - M_BUSCH_JAEGER_ELEKTRO___RESERVED = 747, + M_AURIGA_SYSTEMS = 746, + M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH = 747, + M_GIANFRANCO_SMART_SOLUTIONS_LTD = 748, + M_ROGERWELL_CONTROL_SYSTEM_LIMITED = 749, + M_ABB___RESERVED = 750, + M_BUSCH_JAEGER_ELEKTRO___RESERVED = 751, } public static class KnxManufacturerInfo @@ -1763,7 +1767,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_EYRISE_B_V: { /* '392' */ return 443; } - case KnxManufacturer.M_ABEGO: { /* '393' */ + case KnxManufacturer.M_DOBNEL: { /* '393' */ return 444; } case KnxManufacturer.M_MYGEKKO: { /* '394' */ @@ -2939,15 +2943,27 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_RYT: { /* '745' */ return 806; } - case KnxManufacturer.M_ABB___RESERVED: { /* '746' */ - return 43954; + case KnxManufacturer.M_AURIGA_SYSTEMS: { /* '746' */ + return 807; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '747' */ - return 43959; + case KnxManufacturer.M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH: { /* '747' */ + return 808; + } + case KnxManufacturer.M_GIANFRANCO_SMART_SOLUTIONS_LTD: { /* '748' */ + return 809; + } + case KnxManufacturer.M_ROGERWELL_CONTROL_SYSTEM_LIMITED: { /* '749' */ + return 810; } case KnxManufacturer.M_TAPKO_TECHNOLOGIES: { /* '75' */ return 114; } + case KnxManufacturer.M_ABB___RESERVED: { /* '750' */ + return 43954; + } + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '751' */ + return 43959; + } case KnxManufacturer.M_HDL: { /* '76' */ return 115; } @@ -4017,8 +4033,8 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_EYRISE_B_V: { /* '392' */ return "eyrise B.V"; } - case KnxManufacturer.M_ABEGO: { /* '393' */ - return "ABEGO"; + case KnxManufacturer.M_DOBNEL: { /* '393' */ + return "Dobnel"; } case KnxManufacturer.M_MYGEKKO: { /* '394' */ return "myGEKKO"; @@ -5193,15 +5209,27 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_RYT: { /* '745' */ return "RYT"; } - case KnxManufacturer.M_ABB___RESERVED: { /* '746' */ - return "ABB - reserved"; + case KnxManufacturer.M_AURIGA_SYSTEMS: { /* '746' */ + return "Auriga Systems"; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '747' */ - return "Busch-Jaeger Elektro - reserved"; + case KnxManufacturer.M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH: { /* '747' */ + return "Alzinger&Vogel Softwareentwicklungs GmbH"; + } + case KnxManufacturer.M_GIANFRANCO_SMART_SOLUTIONS_LTD: { /* '748' */ + return "Gianfranco Smart Solutions Ltd"; + } + case KnxManufacturer.M_ROGERWELL_CONTROL_SYSTEM_LIMITED: { /* '749' */ + return "Rogerwell Control System Limited"; } case KnxManufacturer.M_TAPKO_TECHNOLOGIES: { /* '75' */ return "TAPKO Technologies"; } + case KnxManufacturer.M_ABB___RESERVED: { /* '750' */ + return "ABB - reserved"; + } + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '751' */ + return "Busch-Jaeger Elektro - reserved"; + } case KnxManufacturer.M_HDL: { /* '76' */ return "HDL"; } 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 cb7cda7db6..b18ccfddd9 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 @@ -1142,7 +1142,7 @@ ['390' M_MOORGEN_DEUTSCHLAND_GMBH ['441', '"Moorgen Deutschland GmbH"']] ['391' M_CULLMANN_TECH ['442', '"CULLMANN TECH"']] ['392' M_EYRISE_B_V ['443', '"eyrise B.V"']] - ['393' M_ABEGO ['444', '"ABEGO"']] + ['393' M_DOBNEL ['444', '"Dobnel"']] ['394' M_MYGEKKO ['445', '"myGEKKO"']] ['395' M_ERGO3_SARL ['446', '"Ergo3 Sarl"']] ['396' M_STMICROELECTRONICS_INTERNATIONAL_N_V_ ['447', '"STmicroelectronics International N.V."']] @@ -1495,8 +1495,12 @@ ['743' M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT ['804', '"Shanghai Innovatech Information Technology Co., Lt"']] ['744' M_ABI_SICHERHEITSSYSTEME_GMBH ['805', '"ABI Sicherheitssysteme GmbH"']] ['745' M_RYT ['806', '"RYT"']] - ['746' M_ABB___RESERVED ['43954', '"ABB - reserved"']] - ['747' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] + ['746' M_AURIGA_SYSTEMS ['807', '"Auriga Systems"']] + ['747' M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH ['808', '"Alzinger&Vogel Softwareentwicklungs GmbH"']] + ['748' M_GIANFRANCO_SMART_SOLUTIONS_LTD ['809', '"Gianfranco Smart Solutions Ltd"']] + ['749' M_ROGERWELL_CONTROL_SYSTEM_LIMITED ['810', '"Rogerwell Control System Limited"']] + ['750' M_ABB___RESERVED ['43954', '"ABB - reserved"']] + ['751' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] ]
