This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch fix/opc-ua-fine-tuning in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 58eca3c2f06a969deff5e8bbf676bc5303b5b6e2 Author: Christofer Dutz <[email protected]> AuthorDate: Tue Feb 17 18:20:55 2026 +0100 chore: Updated KNX manufacturer data --- .../java/bacnetip/readwrite/BACnetVendorId.java | 19 ++++++++++-- .../java/knxnetip/readwrite/KnxManufacturer.java | 36 +++++++++++++++++----- .../protocols/bacnetip/bacnet-vendorids.mspec | 17 ++++++++-- .../protocols/knxnetip/knx-master-data.mspec | 31 ++++++++++++++----- 4 files changed, 85 insertions(+), 18 deletions(-) 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 5e5951da3a..d0b436453f 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 @@ -101,7 +101,7 @@ public enum BACnetVendorId { REGULATOR_AUSTRALIAPTY_LTD((int) 67, (int) 67, (String) "Regulator Australia PTY Ltd."), TOUCH_PLATE_LIGHTING_CONTROLS((int) 68, (int) 68, (String) "Touch-Plate Lighting Controls"), AMANN_GMBH((int) 69, (int) 69, (String) "Amann GmbH"), - RLE_TECHNOLOGIES((int) 70, (int) 70, (String) "RLE Technologies"), + PARAMETERLLC((int) 70, (int) 70, (String) "Parameter LLC"), CARDKEY_SYSTEMS((int) 71, (int) 71, (String) "Cardkey Systems"), SECOM_CO_LTD((int) 72, (int) 72, (String) "SECOM Co., Ltd."), ABB_GEBUDETECHNIKAG_BEREICH_NET_SERV( @@ -404,7 +404,7 @@ public enum BACnetVendorId { CEMTREX_INC((int) 326, (int) 326, (String) "Cemtrex, Inc."), PERFORMANCE_TECHNOLOGIES_INC((int) 327, (int) 327, (String) "Performance Technologies, Inc."), XTRALIS_AUST_PTY_LTD((int) 328, (int) 328, (String) "Xtralis (Aust) Pty Ltd"), - TROX_GMBH((int) 329, (int) 329, (String) "TROX GmbH"), + TROXSE((int) 329, (int) 329, (String) "TROX SE"), BEIJING_HYSINE_TECHNOLOGY_CO_LTD( (int) 330, (int) 330, (String) "Beijing Hysine Technology Co., Ltd"), RCK_CONTROLS_INC((int) 331, (int) 331, (String) "RCK Controls, Inc."), @@ -1814,6 +1814,21 @@ public enum BACnetVendorId { SYSTEM_MART_LTD((int) 1579, (int) 1579, (String) "System Mart Ltd."), SPOT_GMBH((int) 1580, (int) 1580, (String) "Spot7 GmbH"), INTEMPCO_CONTROLS_LTD((int) 1581, (int) 1581, (String) "Intempco Controls Ltd."), + ROSEMONT_ENGINEERING_INC((int) 1582, (int) 1582, (String) "Rosemont Engineering, Inc."), + MINIVEIL_INDUSTRIES_LTD((int) 1583, (int) 1583, (String) "Miniveil Industries Ltd."), + PROFCONAB((int) 1584, (int) 1584, (String) "Profcon AB"), + KE_AUTOMASJONAS((int) 1585, (int) 1585, (String) "KE Automasjon AS"), + NORDOMATIC_PROPERTY_TECHNOLOGIESAB( + (int) 1586, (int) 1586, (String) "Nordomatic Property Technologies AB"), + RUNWISE((int) 1587, (int) 1587, (String) "Runwise"), + KARELAVOJSKY((int) 1588, (int) 1588, (String) "Karel Čavojsky"), + ABBLV_INSTALLATION_MATERIALS_CO_LTD_BEIJING( + (int) 1589, (int) 1589, (String) "ABB LV Installation Materials Co., Ltd. Beijing"), + ENER_SEARCH_SOLAR_GMBH((int) 1590, (int) 1590, (String) "EnerSearch Solar GmbH"), + ZURN_ELKAY_WATER_SOLUTIONS((int) 1591, (int) 1591, (String) "Zurn Elkay Water Solutions"), + ANDIVI((int) 1592, (int) 1592, (String) "Andivi"), + CHYI_LEE_INDUSTRY_CO_LTD((int) 1593, (int) 1593, (String) "Chyi Lee Industry Co., Ltd."), + ALLBEEBV((int) 1594, (int) 1594, (String) "Allbee B.V."), 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 631f3daf57..f08ae50fd3 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 @@ -28,11 +28,11 @@ import java.util.Map; public enum KnxManufacturer { M_UNKNOWN((int) 0, (int) 0, (String) "Unknown Manufacturer"), M_SIEMENS((int) 1, (int) 1, (String) "Siemens"), - M_ABB_AG_STOTZ___KONTAKT((int) 2, (int) 2, (String) "ABB AG (Stotz - Kontakt)"), + M_ABB_AG___STOTZ_KONTAKT((int) 2, (int) 2, (String) "ABB AG - STOTZ-KONTAKT"), M_ALBRECHT_JUNG((int) 3, (int) 4, (String) "Albrecht Jung"), M_BTICINO((int) 4, (int) 5, (String) "Bticino"), M_BERKER((int) 5, (int) 6, (String) "Berker"), - M_ABB_AG_BUSCH___JAEGER((int) 6, (int) 7, (String) "ABB AG (Busch - Jaeger)"), + M_ABB_AG___BUSCH_JAEGER((int) 6, (int) 7, (String) "ABB AG - BUSCH-JAEGER"), M_GIRA_GIERSIEPEN((int) 7, (int) 8, (String) "GIRA Giersiepen"), M_HAGER_ELECTRO((int) 8, (int) 9, (String) "Hager Electro"), M_INSTA_GMBH((int) 9, (int) 10, (String) "Insta GmbH"), @@ -364,7 +364,7 @@ public enum KnxManufacturer { M_EVN_LICHTTECHNIK((int) 318, (int) 369, (String) "EVN-Lichttechnik"), M_RUTEC((int) 319, (int) 370, (String) "rutec"), M_FINDER((int) 320, (int) 371, (String) "Finder"), - M_FUJITSU_GENERAL_LIMITED((int) 321, (int) 372, (String) "Fujitsu General Limited"), + M_GENERAL_INC_((int) 321, (int) 372, (String) "GENERAL Inc."), M_ZF_FRIEDRICHSHAFEN_AG((int) 322, (int) 373, (String) "ZF Friedrichshafen AG"), M_CREALED((int) 323, (int) 374, (String) "Crealed"), M_MILES_MAGIC_AUTOMATION_PRIVATE_LIMITED( @@ -677,7 +677,7 @@ public enum KnxManufacturer { (int) 587, (int) 643, (String) "Hefei Chuang Yue Intelligent Technology Co.,LTD"), M_LARFE((int) 588, (int) 644, (String) "Larfe"), M_DONGGUAN_MUHCCI_ELECTRICAL((int) 589, (int) 645, (String) "Dongguan Muhcci Electrical"), - M_STEC((int) 590, (int) 646, (String) "STEC"), + M_SDEKE((int) 590, (int) 646, (String) "Sdeke"), M_ARIGO_SOFTWARE_GMBH((int) 591, (int) 647, (String) "ARIGO Software GmbH"), M_FEISHELEC((int) 592, (int) 648, (String) "Feishelec"), M_GORDIC((int) 593, (int) 649, (String) "GORDIC"), @@ -765,7 +765,7 @@ public enum KnxManufacturer { M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_( (int) 662, (int) 720, (String) "Foshan Haydn Technology Lighting Co.,Ltd."), M_KNXES_COMPANY_LIMITED((int) 663, (int) 721, (String) "KNXES COMPANY LIMITED"), - M_AKUVOX((int) 664, (int) 722, (String) "Akuvox"), + M_AKUBELA((int) 664, (int) 722, (String) "akubela"), M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_( (int) 665, (int) 723, (String) "NingBo Yinzhou ShengRuiJie Electronics Co. Ltd."), M_SHENZHEN_HAIZHICHUANG_TECHNOLOGY_CO___LTD( @@ -904,9 +904,31 @@ public enum KnxManufacturer { M_OSPA_APPARATEBAU_PAUSER_GMBH_AND_CO__KG( (int) 766, (int) 827, (String) "Ospa Apparatebau Pauser GmbH & Co. KG"), M_PLH((int) 767, (int) 828, (String) "PLH"), - M_ABB___RESERVED((int) 768, (int) 43954, (String) "ABB - reserved"), + M_HANGZHOU_ZION_COMMUNICATION_CO__LTD( + (int) 768, (int) 829, (String) "HANGZHOU ZION COMMUNICATION CO.,LTD"), + M_WEIYI_TECHNOLOGY_ZHEJIANG_CO___LTD( + (int) 769, (int) 830, (String) "Weiyi Technology (Zhejiang) Co., Ltd"), + M_AUTERAS((int) 770, (int) 831, (String) "AUTERAS"), + M_OSUM_SMART((int) 771, (int) 832, (String) "OSUM Smart"), + M_TEKNOLINE((int) 772, (int) 833, (String) "TEKNOLINE"), + M_HIMEL_HONG_KONG_LIMITED((int) 773, (int) 834, (String) "HIMEL HONG KONG LIMITED"), + M_MICRONIC_KOREA_CO___LTD_((int) 774, (int) 835, (String) "Micronic Korea Co., Ltd."), + M_ROBUSTEL_LIMITED((int) 775, (int) 836, (String) "Robustel Limited"), + M_LEXA_LIFESTYLE((int) 776, (int) 837, (String) "Lexa LIFESTYLE"), + M_CASAMBI((int) 777, (int) 838, (String) "casambi"), + M_BELCAB_UK_LTD((int) 778, (int) 839, (String) "BELCAB UK LTD"), + M_CHANNEL_SMART_BUILDINGS((int) 779, (int) 840, (String) "Channel Smart Buildings"), + M_NANJING_KLEVEN_ELECTRONIC_TECHNOLOGY_CO___LTD( + (int) 780, (int) 841, (String) "Nanjing Kleven Electronic Technology Co., Ltd"), + M_ZHEJIANG_CHATNOW_NEW_MATERIAL_TECHNOLOGY_CO___LTD( + (int) 781, (int) 842, (String) "Zhejiang Chatnow New Material Technology Co., Ltd"), + M_OCCHIO_GMBH((int) 782, (int) 843, (String) "Occhio GmbH"), + M_INSTELL((int) 783, (int) 844, (String) "Instell"), + M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH( + (int) 784, (int) 845, (String) "VOKA Vogtländisches Kabelwerk GmbH"), + M_ABB___RESERVED((int) 785, (int) 43954, (String) "ABB - reserved"), M_BUSCH_JAEGER_ELEKTRO___RESERVED( - (int) 769, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); + (int) 786, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); private static final Map<Integer, KnxManufacturer> map; static { 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 7d3975cfb0..bcf9e33291 100644 --- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec +++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec @@ -91,7 +91,7 @@ ['67' REGULATOR_AUSTRALIAPTY_LTD ['67', '"Regulator Australia PTY Ltd."']] ['68' TOUCH_PLATE_LIGHTING_CONTROLS ['68', '"Touch-Plate Lighting Controls"']] ['69' AMANN_GMBH ['69', '"Amann GmbH"']] - ['70' RLE_TECHNOLOGIES ['70', '"RLE Technologies"']] + ['70' PARAMETERLLC ['70', '"Parameter LLC"']] ['71' CARDKEY_SYSTEMS ['71', '"Cardkey Systems"']] ['72' SECOM_CO_LTD ['72', '"SECOM Co., Ltd."']] ['73' ABB_GEBUDETECHNIKAG_BEREICH_NET_SERV ['73', '"ABB Gebäudetechnik AG Bereich NetServ"']] @@ -350,7 +350,7 @@ ['326' CEMTREX_INC ['326', '"Cemtrex, Inc."']] ['327' PERFORMANCE_TECHNOLOGIES_INC ['327', '"Performance Technologies, Inc."']] ['328' XTRALIS_AUST_PTY_LTD ['328', '"Xtralis (Aust) Pty Ltd"']] - ['329' TROX_GMBH ['329', '"TROX GmbH"']] + ['329' TROXSE ['329', '"TROX SE"']] ['330' BEIJING_HYSINE_TECHNOLOGY_CO_LTD ['330', '"Beijing Hysine Technology Co., Ltd"']] ['331' RCK_CONTROLS_INC ['331', '"RCK Controls, Inc."']] ['332' DISTECH_CONTROLSSAS ['332', '"Distech Controls SAS"']] @@ -1593,6 +1593,19 @@ ['1579' SYSTEM_MART_LTD ['1579', '"System Mart Ltd."']] ['1580' SPOT_GMBH ['1580', '"Spot7 GmbH"']] ['1581' INTEMPCO_CONTROLS_LTD ['1581', '"Intempco Controls Ltd."']] + ['1582' ROSEMONT_ENGINEERING_INC ['1582', '"Rosemont Engineering, Inc."']] + ['1583' MINIVEIL_INDUSTRIES_LTD ['1583', '"Miniveil Industries Ltd."']] + ['1584' PROFCONAB ['1584', '"Profcon AB"']] + ['1585' KE_AUTOMASJONAS ['1585', '"KE Automasjon AS"']] + ['1586' NORDOMATIC_PROPERTY_TECHNOLOGIESAB ['1586', '"Nordomatic Property Technologies AB"']] + ['1587' RUNWISE ['1587', '"Runwise"']] + ['1588' KARELAVOJSKY ['1588', '"Karel Čavojsky"']] + ['1589' ABBLV_INSTALLATION_MATERIALS_CO_LTD_BEIJING ['1589', '"ABB LV Installation Materials Co., Ltd. Beijing"']] + ['1590' ENER_SEARCH_SOLAR_GMBH ['1590', '"EnerSearch Solar GmbH"']] + ['1591' ZURN_ELKAY_WATER_SOLUTIONS ['1591', '"Zurn Elkay Water Solutions"']] + ['1592' ANDIVI ['1592', '"Andivi"']] + ['1593' CHYI_LEE_INDUSTRY_CO_LTD ['1593', '"Chyi Lee Industry Co., Ltd."']] + ['1594' ALLBEEBV ['1594', '"Allbee B.V."']] ['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 642aa45c4f..4962ea9cfe 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 @@ -754,11 +754,11 @@ [enum uint 16 KnxManufacturer(uint 16 number, string 8 name) ['0' M_UNKNOWN ['0', '"Unknown Manufacturer"']] ['1' M_SIEMENS ['1', '"Siemens"']] - ['2' M_ABB_AG_STOTZ___KONTAKT ['2', '"ABB AG (Stotz - Kontakt)"']] + ['2' M_ABB_AG___STOTZ_KONTAKT ['2', '"ABB AG - STOTZ-KONTAKT"']] ['3' M_ALBRECHT_JUNG ['4', '"Albrecht Jung"']] ['4' M_BTICINO ['5', '"Bticino"']] ['5' M_BERKER ['6', '"Berker"']] - ['6' M_ABB_AG_BUSCH___JAEGER ['7', '"ABB AG (Busch - Jaeger)"']] + ['6' M_ABB_AG___BUSCH_JAEGER ['7', '"ABB AG - BUSCH-JAEGER"']] ['7' M_GIRA_GIERSIEPEN ['8', '"GIRA Giersiepen"']] ['8' M_HAGER_ELECTRO ['9', '"Hager Electro"']] ['9' M_INSTA_GMBH ['10', '"Insta GmbH"']] @@ -1073,7 +1073,7 @@ ['318' M_EVN_LICHTTECHNIK ['369', '"EVN-Lichttechnik"']] ['319' M_RUTEC ['370', '"rutec"']] ['320' M_FINDER ['371', '"Finder"']] - ['321' M_FUJITSU_GENERAL_LIMITED ['372', '"Fujitsu General Limited"']] + ['321' M_GENERAL_INC_ ['372', '"GENERAL Inc."']] ['322' M_ZF_FRIEDRICHSHAFEN_AG ['373', '"ZF Friedrichshafen AG"']] ['323' M_CREALED ['374', '"Crealed"']] ['324' M_MILES_MAGIC_AUTOMATION_PRIVATE_LIMITED ['375', '"Miles Magic Automation Private Limited"']] @@ -1342,7 +1342,7 @@ ['587' M_HEFEI_CHUANG_YUE_INTELLIGENT_TECHNOLOGY_CO__LTD ['643', '"Hefei Chuang Yue Intelligent Technology Co.,LTD"']] ['588' M_LARFE ['644', '"Larfe"']] ['589' M_DONGGUAN_MUHCCI_ELECTRICAL ['645', '"Dongguan Muhcci Electrical"']] - ['590' M_STEC ['646', '"STEC"']] + ['590' M_SDEKE ['646', '"Sdeke"']] ['591' M_ARIGO_SOFTWARE_GMBH ['647', '"ARIGO Software GmbH"']] ['592' M_FEISHELEC ['648', '"Feishelec"']] ['593' M_GORDIC ['649', '"GORDIC"']] @@ -1416,7 +1416,7 @@ ['661' M_ARKLYFE ['719', '"Arklyfe"']] ['662' M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_ ['720', '"Foshan Haydn Technology Lighting Co.,Ltd."']] ['663' M_KNXES_COMPANY_LIMITED ['721', '"KNXES COMPANY LIMITED"']] - ['664' M_AKUVOX ['722', '"Akuvox"']] + ['664' M_AKUBELA ['722', '"akubela"']] ['665' M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_ ['723', '"NingBo Yinzhou ShengRuiJie Electronics Co. Ltd."']] ['666' M_SHENZHEN_HAIZHICHUANG_TECHNOLOGY_CO___LTD ['724', '"Shenzhen Haizhichuang Technology Co., Ltd"']] ['667' M_SHENZHEN_EASYDETEK_TECHNOLOGY_CO_LTD ['725', '"Shenzhen easydetek technology Co.Ltd"']] @@ -1520,8 +1520,25 @@ ['765' M_SPECIALCAVI_BALDASSARI_SRL ['826', '"SPECIALCAVI BALDASSARI SRL"']] ['766' M_OSPA_APPARATEBAU_PAUSER_GMBH_AND_CO__KG ['827', '"Ospa Apparatebau Pauser GmbH & Co. KG"']] ['767' M_PLH ['828', '"PLH"']] - ['768' M_ABB___RESERVED ['43954', '"ABB - reserved"']] - ['769' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] + ['768' M_HANGZHOU_ZION_COMMUNICATION_CO__LTD ['829', '"HANGZHOU ZION COMMUNICATION CO.,LTD"']] + ['769' M_WEIYI_TECHNOLOGY_ZHEJIANG_CO___LTD ['830', '"Weiyi Technology (Zhejiang) Co., Ltd"']] + ['770' M_AUTERAS ['831', '"AUTERAS"']] + ['771' M_OSUM_SMART ['832', '"OSUM Smart"']] + ['772' M_TEKNOLINE ['833', '"TEKNOLINE"']] + ['773' M_HIMEL_HONG_KONG_LIMITED ['834', '"HIMEL HONG KONG LIMITED"']] + ['774' M_MICRONIC_KOREA_CO___LTD_ ['835', '"Micronic Korea Co., Ltd."']] + ['775' M_ROBUSTEL_LIMITED ['836', '"Robustel Limited"']] + ['776' M_LEXA_LIFESTYLE ['837', '"Lexa LIFESTYLE"']] + ['777' M_CASAMBI ['838', '"casambi"']] + ['778' M_BELCAB_UK_LTD ['839', '"BELCAB UK LTD"']] + ['779' M_CHANNEL_SMART_BUILDINGS ['840', '"Channel Smart Buildings"']] + ['780' M_NANJING_KLEVEN_ELECTRONIC_TECHNOLOGY_CO___LTD ['841', '"Nanjing Kleven Electronic Technology Co., Ltd"']] + ['781' M_ZHEJIANG_CHATNOW_NEW_MATERIAL_TECHNOLOGY_CO___LTD ['842', '"Zhejiang Chatnow New Material Technology Co., Ltd"']] + ['782' M_OCCHIO_GMBH ['843', '"Occhio GmbH"']] + ['783' M_INSTELL ['844', '"Instell"']] + ['784' M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH ['845', '"VOKA Vogtländisches Kabelwerk GmbH"']] + ['785' M_ABB___RESERVED ['43954', '"ABB - reserved"']] + ['786' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] ]
