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 6e14c17c936befc7e4bba0533c312cc4c158f9b3 Author: Christofer Dutz <[email protected]> AuthorDate: Sat May 24 13:48:39 2025 +0200 chore: Updated vendor ids for KNX and BacNet --- .../bacnetip/readwrite/model/BACnetVendorId.go | 160 +++++++++++++++-- .../knxnetip/readwrite/model/KnxManufacturer.go | 200 ++++++++++++++++++--- .../java/bacnetip/readwrite/BACnetVendorId.java | 14 +- .../java/knxnetip/readwrite/KnxManufacturer.java | 18 +- .../knxnetip/readwrite/model/KnxManufacturer.cs | 98 ++++++++-- .../protocols/bacnetip/bacnet-vendorids.mspec | 12 +- .../protocols/knxnetip/knx-master-data.mspec | 16 +- 7 files changed, 458 insertions(+), 60 deletions(-) diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go index b08f4c7fff..3d9360af00 100644 --- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go +++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go @@ -322,7 +322,7 @@ const ( BACnetVendorId_GE_CONSUMER_INDUSTRIAL BACnetVendorId = 276 BACnetVendorId_FUNCTIONAL_DEVICES_INC BACnetVendorId = 277 BACnetVendorId_STUDIOSC BACnetVendorId = 278 - BACnetVendorId_M_SYSTEM_CO_LTD BACnetVendorId = 279 + BACnetVendorId_MGCOLTD BACnetVendorId = 279 BACnetVendorId_YOKOTA_CO_LTD BACnetVendorId = 280 BACnetVendorId_HITRANSE_TECHNOLOGY_COLTD BACnetVendorId = 281 BACnetVendorId_VIGILENT_CORPORATION BACnetVendorId = 282 @@ -1566,13 +1566,21 @@ const ( BACnetVendorId_BUILDING_LOGIX BACnetVendorId = 1530 BACnetVendorId_IFESCA_GMBH BACnetVendorId = 1531 BACnetVendorId_FELLOWES_INC BACnetVendorId = 1532 - BACnetVendorId_BLANK BACnetVendorId = 1533 + BACnetVendorId_CALEFFI_SPA BACnetVendorId = 1533 BACnetVendorId_JDRF_ELECTROMAG BACnetVendorId = 1534 BACnetVendorId_REDWIRE_LABS BACnetVendorId = 1535 BACnetVendorId_WECON_TECHNOLOGY_CO_LTD BACnetVendorId = 1536 BACnetVendorId_ACACIA_GREEN_TECHNOLOGIES_LTD BACnetVendorId = 1537 BACnetVendorId_DEGREE_ANALYTICS BACnetVendorId = 1538 BACnetVendorId_ROLTEK_TEKNOLOJIAS BACnetVendorId = 1539 + BACnetVendorId_DIGITAL_CONTROL_TECHNOLOGY_LIMITED BACnetVendorId = 1540 + BACnetVendorId_KENTIMAAB BACnetVendorId = 1541 + BACnetVendorId_PERGAMON_PERCEPTIVE_TECHNOLOGIES BACnetVendorId = 1542 + BACnetVendorId_PREFECT_CONTROLS_LTD BACnetVendorId = 1543 + BACnetVendorId_SEN_TECH_CORPORATION BACnetVendorId = 1544 + BACnetVendorId_SS_REGELTECHNIK_GMBH BACnetVendorId = 1545 + BACnetVendorId_AIR_BOX_INC BACnetVendorId = 1546 + BACnetVendorId_RVE BACnetVendorId = 1547 BACnetVendorId_UNKNOWN_VENDOR BACnetVendorId = 0xFFFF ) @@ -1860,7 +1868,7 @@ func init() { BACnetVendorId_GE_CONSUMER_INDUSTRIAL, BACnetVendorId_FUNCTIONAL_DEVICES_INC, BACnetVendorId_STUDIOSC, - BACnetVendorId_M_SYSTEM_CO_LTD, + BACnetVendorId_MGCOLTD, BACnetVendorId_YOKOTA_CO_LTD, BACnetVendorId_HITRANSE_TECHNOLOGY_COLTD, BACnetVendorId_VIGILENT_CORPORATION, @@ -3104,13 +3112,21 @@ func init() { BACnetVendorId_BUILDING_LOGIX, BACnetVendorId_IFESCA_GMBH, BACnetVendorId_FELLOWES_INC, - BACnetVendorId_BLANK, + BACnetVendorId_CALEFFI_SPA, BACnetVendorId_JDRF_ELECTROMAG, BACnetVendorId_REDWIRE_LABS, BACnetVendorId_WECON_TECHNOLOGY_CO_LTD, BACnetVendorId_ACACIA_GREEN_TECHNOLOGIES_LTD, BACnetVendorId_DEGREE_ANALYTICS, BACnetVendorId_ROLTEK_TEKNOLOJIAS, + BACnetVendorId_DIGITAL_CONTROL_TECHNOLOGY_LIMITED, + BACnetVendorId_KENTIMAAB, + BACnetVendorId_PERGAMON_PERCEPTIVE_TECHNOLOGIES, + BACnetVendorId_PREFECT_CONTROLS_LTD, + BACnetVendorId_SEN_TECH_CORPORATION, + BACnetVendorId_SS_REGELTECHNIK_GMBH, + BACnetVendorId_AIR_BOX_INC, + BACnetVendorId_RVE, BACnetVendorId_UNKNOWN_VENDOR, } } @@ -5517,6 +5533,38 @@ func (e BACnetVendorId) VendorId() uint16 { { /* '154' */ return 154 } + case 1540: + { /* '1540' */ + return 1540 + } + case 1541: + { /* '1541' */ + return 1541 + } + case 1542: + { /* '1542' */ + return 1542 + } + case 1543: + { /* '1543' */ + return 1543 + } + case 1544: + { /* '1544' */ + return 1544 + } + case 1545: + { /* '1545' */ + return 1545 + } + case 1546: + { /* '1546' */ + return 1546 + } + case 1547: + { /* '1547' */ + return 1547 + } case 155: { /* '155' */ return 155 @@ -11629,7 +11677,7 @@ func (e BACnetVendorId) VendorName() string { } case 1533: { /* '1533' */ - return "BLANK" + return "Caleffi S.p.A." } case 1534: { /* '1534' */ @@ -11659,6 +11707,38 @@ func (e BACnetVendorId) VendorName() string { { /* '154' */ return "Unitec Corporation" } + case 1540: + { /* '1540' */ + return "Digital Control Technology Limited" + } + case 1541: + { /* '1541' */ + return "Kentima AB" + } + case 1542: + { /* '1542' */ + return "Pergamon Perceptive Technologies" + } + case 1543: + { /* '1543' */ + return "Prefect Controls Ltd." + } + case 1544: + { /* '1544' */ + return "SenTech Corporation" + } + case 1545: + { /* '1545' */ + return "S+S Regeltechnik GmbH" + } + case 1546: + { /* '1546' */ + return "AirBox, Inc." + } + case 1547: + { /* '1547' */ + return "RVE" + } case 155: { /* '155' */ return "Kanden Engineering Company" @@ -12209,7 +12289,7 @@ func (e BACnetVendorId) VendorName() string { } case 279: { /* '279' */ - return "M-System Co., Ltd." + return "MG CO., LTD." } case 28: { /* '28' */ @@ -16585,7 +16665,7 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) { case 1532: return BACnetVendorId_FELLOWES_INC, true case 1533: - return BACnetVendorId_BLANK, true + return BACnetVendorId_CALEFFI_SPA, true case 1534: return BACnetVendorId_JDRF_ELECTROMAG, true case 1535: @@ -16600,6 +16680,22 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) { return BACnetVendorId_ROLTEK_TEKNOLOJIAS, true case 154: return BACnetVendorId_UNITEC_CORPORATION, true + case 1540: + return BACnetVendorId_DIGITAL_CONTROL_TECHNOLOGY_LIMITED, true + case 1541: + return BACnetVendorId_KENTIMAAB, true + case 1542: + return BACnetVendorId_PERGAMON_PERCEPTIVE_TECHNOLOGIES, true + case 1543: + return BACnetVendorId_PREFECT_CONTROLS_LTD, true + case 1544: + return BACnetVendorId_SEN_TECH_CORPORATION, true + case 1545: + return BACnetVendorId_SS_REGELTECHNIK_GMBH, true + case 1546: + return BACnetVendorId_AIR_BOX_INC, true + case 1547: + return BACnetVendorId_RVE, true case 155: return BACnetVendorId_KANDEN_ENGINEERING_COMPANY, true case 156: @@ -16875,7 +16971,7 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) { case 278: return BACnetVendorId_STUDIOSC, true case 279: - return BACnetVendorId_M_SYSTEM_CO_LTD, true + return BACnetVendorId_MGCOLTD, true case 28: return BACnetVendorId_KMC_CONTROLS_INC, true case 280: @@ -19652,8 +19748,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) { return BACnetVendorId_IFESCA_GMBH, true case "FELLOWES_INC": return BACnetVendorId_FELLOWES_INC, true - case "BLANK": - return BACnetVendorId_BLANK, true + case "CALEFFI_SPA": + return BACnetVendorId_CALEFFI_SPA, true case "JDRF_ELECTROMAG": return BACnetVendorId_JDRF_ELECTROMAG, true case "REDWIRE_LABS": @@ -19668,6 +19764,22 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) { return BACnetVendorId_ROLTEK_TEKNOLOJIAS, true case "UNITEC_CORPORATION": return BACnetVendorId_UNITEC_CORPORATION, true + case "DIGITAL_CONTROL_TECHNOLOGY_LIMITED": + return BACnetVendorId_DIGITAL_CONTROL_TECHNOLOGY_LIMITED, true + case "KENTIMAAB": + return BACnetVendorId_KENTIMAAB, true + case "PERGAMON_PERCEPTIVE_TECHNOLOGIES": + return BACnetVendorId_PERGAMON_PERCEPTIVE_TECHNOLOGIES, true + case "PREFECT_CONTROLS_LTD": + return BACnetVendorId_PREFECT_CONTROLS_LTD, true + case "SEN_TECH_CORPORATION": + return BACnetVendorId_SEN_TECH_CORPORATION, true + case "SS_REGELTECHNIK_GMBH": + return BACnetVendorId_SS_REGELTECHNIK_GMBH, true + case "AIR_BOX_INC": + return BACnetVendorId_AIR_BOX_INC, true + case "RVE": + return BACnetVendorId_RVE, true case "KANDEN_ENGINEERING_COMPANY": return BACnetVendorId_KANDEN_ENGINEERING_COMPANY, true case "MESSNER_GEBUDETECHNIK_GMBH": @@ -19942,8 +20054,8 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) { return BACnetVendorId_FUNCTIONAL_DEVICES_INC, true case "STUDIOSC": return BACnetVendorId_STUDIOSC, true - case "M_SYSTEM_CO_LTD": - return BACnetVendorId_M_SYSTEM_CO_LTD, true + case "MGCOLTD": + return BACnetVendorId_MGCOLTD, true case "KMC_CONTROLS_INC": return BACnetVendorId_KMC_CONTROLS_INC, true case "YOKOTA_CO_LTD": @@ -22792,8 +22904,8 @@ func (e BACnetVendorId) PLC4XEnumName() string { return "IFESCA_GMBH" case BACnetVendorId_FELLOWES_INC: return "FELLOWES_INC" - case BACnetVendorId_BLANK: - return "BLANK" + case BACnetVendorId_CALEFFI_SPA: + return "CALEFFI_SPA" case BACnetVendorId_JDRF_ELECTROMAG: return "JDRF_ELECTROMAG" case BACnetVendorId_REDWIRE_LABS: @@ -22808,6 +22920,22 @@ func (e BACnetVendorId) PLC4XEnumName() string { return "ROLTEK_TEKNOLOJIAS" case BACnetVendorId_UNITEC_CORPORATION: return "UNITEC_CORPORATION" + case BACnetVendorId_DIGITAL_CONTROL_TECHNOLOGY_LIMITED: + return "DIGITAL_CONTROL_TECHNOLOGY_LIMITED" + case BACnetVendorId_KENTIMAAB: + return "KENTIMAAB" + case BACnetVendorId_PERGAMON_PERCEPTIVE_TECHNOLOGIES: + return "PERGAMON_PERCEPTIVE_TECHNOLOGIES" + case BACnetVendorId_PREFECT_CONTROLS_LTD: + return "PREFECT_CONTROLS_LTD" + case BACnetVendorId_SEN_TECH_CORPORATION: + return "SEN_TECH_CORPORATION" + case BACnetVendorId_SS_REGELTECHNIK_GMBH: + return "SS_REGELTECHNIK_GMBH" + case BACnetVendorId_AIR_BOX_INC: + return "AIR_BOX_INC" + case BACnetVendorId_RVE: + return "RVE" case BACnetVendorId_KANDEN_ENGINEERING_COMPANY: return "KANDEN_ENGINEERING_COMPANY" case BACnetVendorId_MESSNER_GEBUDETECHNIK_GMBH: @@ -23082,8 +23210,8 @@ func (e BACnetVendorId) PLC4XEnumName() string { return "FUNCTIONAL_DEVICES_INC" case BACnetVendorId_STUDIOSC: return "STUDIOSC" - case BACnetVendorId_M_SYSTEM_CO_LTD: - return "M_SYSTEM_CO_LTD" + case BACnetVendorId_MGCOLTD: + return "MGCOLTD" case BACnetVendorId_KMC_CONTROLS_INC: return "KMC_CONTROLS_INC" case BACnetVendorId_YOKOTA_CO_LTD: diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go index 0a57c38822..c7c0053d5e 100644 --- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go +++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go @@ -465,7 +465,7 @@ const ( KnxManufacturer_M_ONTROL KnxManufacturer = 419 KnxManufacturer_M_STARNET KnxManufacturer = 420 KnxManufacturer_M_BETA_CAVI KnxManufacturer = 421 - KnxManufacturer_M_EASEMORE KnxManufacturer = 422 + KnxManufacturer_M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_ KnxManufacturer = 422 KnxManufacturer_M_VIVALDI_SRL KnxManufacturer = 423 KnxManufacturer_M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI KnxManufacturer = 424 KnxManufacturer_M_HWISCON KnxManufacturer = 425 @@ -767,8 +767,18 @@ const ( KnxManufacturer_M_ORENDA_ELECTRIC KnxManufacturer = 721 KnxManufacturer_M_ERSE_KABLO KnxManufacturer = 722 KnxManufacturer_M_PRADO_EUROPE_BV KnxManufacturer = 723 - KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 724 - KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 725 + KnxManufacturer_M_E2S_GBR KnxManufacturer = 724 + KnxManufacturer_M_UNITLINK KnxManufacturer = 725 + KnxManufacturer_M_ONNA KnxManufacturer = 726 + KnxManufacturer_M_CENTERSVET_LLC KnxManufacturer = 727 + KnxManufacturer_M_ADVECO_TECHNOLOGY_CO___LTD_ KnxManufacturer = 728 + KnxManufacturer_M_FR__LUERSSEN_WERFT KnxManufacturer = 729 + KnxManufacturer_M_MYLYR KnxManufacturer = 730 + KnxManufacturer_M_HYUNDAI_HT KnxManufacturer = 731 + KnxManufacturer_M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD KnxManufacturer = 732 + KnxManufacturer_M_SMATEK_ELECTRONICS_LIMITED KnxManufacturer = 733 + KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 734 + KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 735 ) var KnxManufacturerValues []KnxManufacturer @@ -1198,7 +1208,7 @@ func init() { KnxManufacturer_M_ONTROL, KnxManufacturer_M_STARNET, KnxManufacturer_M_BETA_CAVI, - KnxManufacturer_M_EASEMORE, + KnxManufacturer_M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_, KnxManufacturer_M_VIVALDI_SRL, KnxManufacturer_M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI, KnxManufacturer_M_HWISCON, @@ -1500,6 +1510,16 @@ func init() { KnxManufacturer_M_ORENDA_ELECTRIC, KnxManufacturer_M_ERSE_KABLO, KnxManufacturer_M_PRADO_EUROPE_BV, + KnxManufacturer_M_E2S_GBR, + KnxManufacturer_M_UNITLINK, + KnxManufacturer_M_ONNA, + KnxManufacturer_M_CENTERSVET_LLC, + KnxManufacturer_M_ADVECO_TECHNOLOGY_CO___LTD_, + KnxManufacturer_M_FR__LUERSSEN_WERFT, + KnxManufacturer_M_MYLYR, + KnxManufacturer_M_HYUNDAI_HT, + KnxManufacturer_M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD, + KnxManufacturer_M_SMATEK_ELECTRONICS_LIMITED, KnxManufacturer_M_ABB___RESERVED, KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, } @@ -4289,16 +4309,56 @@ func (e KnxManufacturer) Number() uint16 { } case 724: { /* '724' */ - return 43954 + return 785 } case 725: { /* '725' */ - return 43959 + return 786 + } + case 726: + { /* '726' */ + return 787 + } + case 727: + { /* '727' */ + return 788 + } + case 728: + { /* '728' */ + return 789 + } + case 729: + { /* '729' */ + return 790 } case 73: { /* '73' */ return 112 } + case 730: + { /* '730' */ + return 791 + } + case 731: + { /* '731' */ + return 792 + } + case 732: + { /* '732' */ + return 793 + } + case 733: + { /* '733' */ + return 794 + } + case 734: + { /* '734' */ + return 43954 + } + case 735: + { /* '735' */ + return 43959 + } case 74: { /* '74' */ return 113 @@ -5871,7 +5931,7 @@ func (e KnxManufacturer) Name() string { } case 422: { /* '422' */ - return "EaseMore" + return "Hangzhou YiYue Technology Co., Ltd." } case 423: { /* '423' */ @@ -7211,16 +7271,56 @@ func (e KnxManufacturer) Name() string { } case 724: { /* '724' */ - return "ABB - reserved" + return "e2s GbR" } case 725: { /* '725' */ - return "Busch-Jaeger Elektro - reserved" + return "UnitLink" + } + case 726: + { /* '726' */ + return "ONNA" + } + case 727: + { /* '727' */ + return "CENTERSVET LLC" + } + case 728: + { /* '728' */ + return "Adveco Technology Co., Ltd." + } + case 729: + { /* '729' */ + return "Fr. Lürssen Werft" } case 73: { /* '73' */ return "AGFEO" } + case 730: + { /* '730' */ + return "mylyr" + } + case 731: + { /* '731' */ + return "HYUNDAI HT" + } + case 732: + { /* '732' */ + return "Guangdong Yuejingrun Technology Co.,Ltd" + } + case 733: + { /* '733' */ + return "SMATEK ELECTRONICS LIMITED" + } + case 734: + { /* '734' */ + return "ABB - reserved" + } + case 735: + { /* '735' */ + return "Busch-Jaeger Elektro - reserved" + } case 74: { /* '74' */ return "Zennio" @@ -8071,7 +8171,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 421: return KnxManufacturer_M_BETA_CAVI, true case 422: - return KnxManufacturer_M_EASEMORE, true + return KnxManufacturer_M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_, true case 423: return KnxManufacturer_M_VIVALDI_SRL, true case 424: @@ -8741,11 +8841,31 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 723: return KnxManufacturer_M_PRADO_EUROPE_BV, true case 724: - return KnxManufacturer_M_ABB___RESERVED, true + return KnxManufacturer_M_E2S_GBR, true case 725: - return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true + return KnxManufacturer_M_UNITLINK, true + case 726: + return KnxManufacturer_M_ONNA, true + case 727: + return KnxManufacturer_M_CENTERSVET_LLC, true + case 728: + return KnxManufacturer_M_ADVECO_TECHNOLOGY_CO___LTD_, true + case 729: + return KnxManufacturer_M_FR__LUERSSEN_WERFT, true case 73: return KnxManufacturer_M_AGFEO, true + case 730: + return KnxManufacturer_M_MYLYR, true + case 731: + return KnxManufacturer_M_HYUNDAI_HT, true + case 732: + return KnxManufacturer_M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD, true + case 733: + return KnxManufacturer_M_SMATEK_ELECTRONICS_LIMITED, true + case 734: + return KnxManufacturer_M_ABB___RESERVED, true + case 735: + return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true case 74: return KnxManufacturer_M_ZENNIO, true case 75: @@ -9528,8 +9648,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_STARNET, true case "M_BETA_CAVI": return KnxManufacturer_M_BETA_CAVI, true - case "M_EASEMORE": - return KnxManufacturer_M_EASEMORE, true + case "M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_": + return KnxManufacturer_M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_, true case "M_VIVALDI_SRL": return KnxManufacturer_M_VIVALDI_SRL, true case "M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI": @@ -10198,12 +10318,32 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_ERSE_KABLO, true case "M_PRADO_EUROPE_BV": return KnxManufacturer_M_PRADO_EUROPE_BV, true + case "M_E2S_GBR": + return KnxManufacturer_M_E2S_GBR, true + case "M_UNITLINK": + return KnxManufacturer_M_UNITLINK, true + case "M_ONNA": + return KnxManufacturer_M_ONNA, true + case "M_CENTERSVET_LLC": + return KnxManufacturer_M_CENTERSVET_LLC, true + case "M_ADVECO_TECHNOLOGY_CO___LTD_": + return KnxManufacturer_M_ADVECO_TECHNOLOGY_CO___LTD_, true + case "M_FR__LUERSSEN_WERFT": + return KnxManufacturer_M_FR__LUERSSEN_WERFT, true + case "M_AGFEO": + return KnxManufacturer_M_AGFEO, true + case "M_MYLYR": + return KnxManufacturer_M_MYLYR, true + case "M_HYUNDAI_HT": + return KnxManufacturer_M_HYUNDAI_HT, true + case "M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD": + return KnxManufacturer_M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD, true + case "M_SMATEK_ELECTRONICS_LIMITED": + return KnxManufacturer_M_SMATEK_ELECTRONICS_LIMITED, 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_AGFEO": - return KnxManufacturer_M_AGFEO, true case "M_ZENNIO": return KnxManufacturer_M_ZENNIO, true case "M_TAPKO_TECHNOLOGIES": @@ -11058,8 +11198,8 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_STARNET" case KnxManufacturer_M_BETA_CAVI: return "M_BETA_CAVI" - case KnxManufacturer_M_EASEMORE: - return "M_EASEMORE" + case KnxManufacturer_M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_: + return "M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_" case KnxManufacturer_M_VIVALDI_SRL: return "M_VIVALDI_SRL" case KnxManufacturer_M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI: @@ -11728,12 +11868,32 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_ERSE_KABLO" case KnxManufacturer_M_PRADO_EUROPE_BV: return "M_PRADO_EUROPE_BV" + case KnxManufacturer_M_E2S_GBR: + return "M_E2S_GBR" + case KnxManufacturer_M_UNITLINK: + return "M_UNITLINK" + case KnxManufacturer_M_ONNA: + return "M_ONNA" + case KnxManufacturer_M_CENTERSVET_LLC: + return "M_CENTERSVET_LLC" + case KnxManufacturer_M_ADVECO_TECHNOLOGY_CO___LTD_: + return "M_ADVECO_TECHNOLOGY_CO___LTD_" + case KnxManufacturer_M_FR__LUERSSEN_WERFT: + return "M_FR__LUERSSEN_WERFT" + case KnxManufacturer_M_AGFEO: + return "M_AGFEO" + case KnxManufacturer_M_MYLYR: + return "M_MYLYR" + case KnxManufacturer_M_HYUNDAI_HT: + return "M_HYUNDAI_HT" + case KnxManufacturer_M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD: + return "M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD" + case KnxManufacturer_M_SMATEK_ELECTRONICS_LIMITED: + return "M_SMATEK_ELECTRONICS_LIMITED" 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_AGFEO: - return "M_AGFEO" case KnxManufacturer_M_ZENNIO: return "M_ZENNIO" case KnxManufacturer_M_TAPKO_TECHNOLOGIES: 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 6614acdb48..5ab13c0774 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 @@ -350,7 +350,7 @@ public enum BACnetVendorId { GE_CONSUMER_INDUSTRIAL((int) 276, (int) 276, (String) "GE Consumer & Industrial"), FUNCTIONAL_DEVICES_INC((int) 277, (int) 277, (String) "Functional Devices, Inc."), STUDIOSC((int) 278, (int) 278, (String) "StudioSC"), - M_SYSTEM_CO_LTD((int) 279, (int) 279, (String) "M-System Co., Ltd."), + MGCOLTD((int) 279, (int) 279, (String) "MG CO., LTD."), YOKOTA_CO_LTD((int) 280, (int) 280, (String) "Yokota Co., Ltd."), HITRANSE_TECHNOLOGY_COLTD((int) 281, (int) 281, (String) "Hitranse Technology Co., LTD"), VIGILENT_CORPORATION((int) 282, (int) 282, (String) "Vigilent Corporation"), @@ -1758,13 +1758,23 @@ public enum BACnetVendorId { BUILDING_LOGIX((int) 1530, (int) 1530, (String) "BuildingLogiX"), IFESCA_GMBH((int) 1531, (int) 1531, (String) "Ifesca GmbH"), FELLOWES_INC((int) 1532, (int) 1532, (String) "Fellowes Inc."), - BLANK((int) 1533, (int) 1533, (String) "BLANK"), + CALEFFI_SPA((int) 1533, (int) 1533, (String) "Caleffi S.p.A."), JDRF_ELECTROMAG((int) 1534, (int) 1534, (String) "JDRF Electromag"), REDWIRE_LABS((int) 1535, (int) 1535, (String) "Redwire Labs"), WECON_TECHNOLOGY_CO_LTD((int) 1536, (int) 1536, (String) "Wecon Technology Co., Ltd."), ACACIA_GREEN_TECHNOLOGIES_LTD((int) 1537, (int) 1537, (String) "Acacia Green Technologies Ltd"), DEGREE_ANALYTICS((int) 1538, (int) 1538, (String) "Degree Analytics"), ROLTEK_TEKNOLOJIAS((int) 1539, (int) 1539, (String) "Roltek Teknoloji A.S."), + DIGITAL_CONTROL_TECHNOLOGY_LIMITED( + (int) 1540, (int) 1540, (String) "Digital Control Technology Limited"), + KENTIMAAB((int) 1541, (int) 1541, (String) "Kentima AB"), + PERGAMON_PERCEPTIVE_TECHNOLOGIES( + (int) 1542, (int) 1542, (String) "Pergamon Perceptive Technologies"), + PREFECT_CONTROLS_LTD((int) 1543, (int) 1543, (String) "Prefect Controls Ltd."), + SEN_TECH_CORPORATION((int) 1544, (int) 1544, (String) "SenTech Corporation"), + SS_REGELTECHNIK_GMBH((int) 1545, (int) 1545, (String) "S+S Regeltechnik GmbH"), + AIR_BOX_INC((int) 1546, (int) 1546, (String) "AirBox, Inc."), + RVE((int) 1547, (int) 1547, (String) "RVE"), 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 95403aa7c5..e3deccaf43 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 @@ -477,7 +477,8 @@ public enum KnxManufacturer { M_ONTROL((int) 419, (int) 471, (String) "Ontrol"), M_STARNET((int) 420, (int) 472, (String) "Starnet"), M_BETA_CAVI((int) 421, (int) 473, (String) "BETA CAVI"), - M_EASEMORE((int) 422, (int) 474, (String) "EaseMore"), + M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_( + (int) 422, (int) 474, (String) "Hangzhou YiYue Technology Co., Ltd."), M_VIVALDI_SRL((int) 423, (int) 475, (String) "Vivaldi srl"), M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI( (int) 424, (int) 476, (String) "Gree Electric Appliances,Inc. of Zhuhai"), @@ -844,9 +845,20 @@ public enum KnxManufacturer { M_ORENDA_ELECTRIC((int) 721, (int) 782, (String) "Orenda Electric"), M_ERSE_KABLO((int) 722, (int) 783, (String) "ERSE KABLO"), M_PRADO_EUROPE_BV((int) 723, (int) 784, (String) "prado europe bv"), - M_ABB___RESERVED((int) 724, (int) 43954, (String) "ABB - reserved"), + M_E2S_GBR((int) 724, (int) 785, (String) "e2s GbR"), + M_UNITLINK((int) 725, (int) 786, (String) "UnitLink"), + M_ONNA((int) 726, (int) 787, (String) "ONNA"), + M_CENTERSVET_LLC((int) 727, (int) 788, (String) "CENTERSVET LLC"), + M_ADVECO_TECHNOLOGY_CO___LTD_((int) 728, (int) 789, (String) "Adveco Technology Co., Ltd."), + M_FR__LUERSSEN_WERFT((int) 729, (int) 790, (String) "Fr. Lürssen Werft"), + M_MYLYR((int) 730, (int) 791, (String) "mylyr"), + M_HYUNDAI_HT((int) 731, (int) 792, (String) "HYUNDAI HT"), + M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD( + (int) 732, (int) 793, (String) "Guangdong Yuejingrun Technology Co.,Ltd"), + M_SMATEK_ELECTRONICS_LIMITED((int) 733, (int) 794, (String) "SMATEK ELECTRONICS LIMITED"), + M_ABB___RESERVED((int) 734, (int) 43954, (String) "ABB - reserved"), M_BUSCH_JAEGER_ELEKTRO___RESERVED( - (int) 725, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); + (int) 735, (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 054a90f5b2..3f6e767e1d 100644 --- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs +++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs @@ -447,7 +447,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model M_ONTROL = 419, M_STARNET = 420, M_BETA_CAVI = 421, - M_EASEMORE = 422, + M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_ = 422, M_VIVALDI_SRL = 423, M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI = 424, M_HWISCON = 425, @@ -749,8 +749,18 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model M_ORENDA_ELECTRIC = 721, M_ERSE_KABLO = 722, M_PRADO_EUROPE_BV = 723, - M_ABB___RESERVED = 724, - M_BUSCH_JAEGER_ELEKTRO___RESERVED = 725, + M_E2S_GBR = 724, + M_UNITLINK = 725, + M_ONNA = 726, + M_CENTERSVET_LLC = 727, + M_ADVECO_TECHNOLOGY_CO___LTD_ = 728, + M_FR__LUERSSEN_WERFT = 729, + M_MYLYR = 730, + M_HYUNDAI_HT = 731, + M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD = 732, + M_SMATEK_ELECTRONICS_LIMITED = 733, + M_ABB___RESERVED = 734, + M_BUSCH_JAEGER_ELEKTRO___RESERVED = 735, } public static class KnxManufacturerInfo @@ -1840,7 +1850,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_BETA_CAVI: { /* '421' */ return 473; } - case KnxManufacturer.M_EASEMORE: { /* '422' */ + case KnxManufacturer.M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_: { /* '422' */ return 474; } case KnxManufacturer.M_VIVALDI_SRL: { /* '423' */ @@ -2845,15 +2855,45 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_PRADO_EUROPE_BV: { /* '723' */ return 784; } - case KnxManufacturer.M_ABB___RESERVED: { /* '724' */ - return 43954; + case KnxManufacturer.M_E2S_GBR: { /* '724' */ + return 785; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '725' */ - return 43959; + case KnxManufacturer.M_UNITLINK: { /* '725' */ + return 786; + } + case KnxManufacturer.M_ONNA: { /* '726' */ + return 787; + } + case KnxManufacturer.M_CENTERSVET_LLC: { /* '727' */ + return 788; + } + case KnxManufacturer.M_ADVECO_TECHNOLOGY_CO___LTD_: { /* '728' */ + return 789; + } + case KnxManufacturer.M_FR__LUERSSEN_WERFT: { /* '729' */ + return 790; } case KnxManufacturer.M_AGFEO: { /* '73' */ return 112; } + case KnxManufacturer.M_MYLYR: { /* '730' */ + return 791; + } + case KnxManufacturer.M_HYUNDAI_HT: { /* '731' */ + return 792; + } + case KnxManufacturer.M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD: { /* '732' */ + return 793; + } + case KnxManufacturer.M_SMATEK_ELECTRONICS_LIMITED: { /* '733' */ + return 794; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '734' */ + return 43954; + } + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '735' */ + return 43959; + } case KnxManufacturer.M_ZENNIO: { /* '74' */ return 113; } @@ -4028,8 +4068,8 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_BETA_CAVI: { /* '421' */ return "BETA CAVI"; } - case KnxManufacturer.M_EASEMORE: { /* '422' */ - return "EaseMore"; + case KnxManufacturer.M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_: { /* '422' */ + return "Hangzhou YiYue Technology Co., Ltd."; } case KnxManufacturer.M_VIVALDI_SRL: { /* '423' */ return "Vivaldi srl"; @@ -5033,15 +5073,45 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_PRADO_EUROPE_BV: { /* '723' */ return "prado europe bv"; } - case KnxManufacturer.M_ABB___RESERVED: { /* '724' */ - return "ABB - reserved"; + case KnxManufacturer.M_E2S_GBR: { /* '724' */ + return "e2s GbR"; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '725' */ - return "Busch-Jaeger Elektro - reserved"; + case KnxManufacturer.M_UNITLINK: { /* '725' */ + return "UnitLink"; + } + case KnxManufacturer.M_ONNA: { /* '726' */ + return "ONNA"; + } + case KnxManufacturer.M_CENTERSVET_LLC: { /* '727' */ + return "CENTERSVET LLC"; + } + case KnxManufacturer.M_ADVECO_TECHNOLOGY_CO___LTD_: { /* '728' */ + return "Adveco Technology Co., Ltd."; + } + case KnxManufacturer.M_FR__LUERSSEN_WERFT: { /* '729' */ + return "Fr. Lürssen Werft"; } case KnxManufacturer.M_AGFEO: { /* '73' */ return "AGFEO"; } + case KnxManufacturer.M_MYLYR: { /* '730' */ + return "mylyr"; + } + case KnxManufacturer.M_HYUNDAI_HT: { /* '731' */ + return "HYUNDAI HT"; + } + case KnxManufacturer.M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD: { /* '732' */ + return "Guangdong Yuejingrun Technology Co.,Ltd"; + } + case KnxManufacturer.M_SMATEK_ELECTRONICS_LIMITED: { /* '733' */ + return "SMATEK ELECTRONICS LIMITED"; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '734' */ + return "ABB - reserved"; + } + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '735' */ + return "Busch-Jaeger Elektro - reserved"; + } case KnxManufacturer.M_ZENNIO: { /* '74' */ return "Zennio"; } 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 c3f2df6616..2232932dc6 100644 --- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec +++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec @@ -300,7 +300,7 @@ ['276' GE_CONSUMER_INDUSTRIAL ['276', '"GE Consumer & Industrial"']] ['277' FUNCTIONAL_DEVICES_INC ['277', '"Functional Devices, Inc."']] ['278' STUDIOSC ['278', '"StudioSC"']] - ['279' M_SYSTEM_CO_LTD ['279', '"M-System Co., Ltd."']] + ['279' MGCOLTD ['279', '"MG CO., LTD."']] ['280' YOKOTA_CO_LTD ['280', '"Yokota Co., Ltd."']] ['281' HITRANSE_TECHNOLOGY_COLTD ['281', '"Hitranse Technology Co., LTD"']] ['282' VIGILENT_CORPORATION ['282', '"Vigilent Corporation"']] @@ -1544,13 +1544,21 @@ ['1530' BUILDING_LOGIX ['1530', '"BuildingLogiX"']] ['1531' IFESCA_GMBH ['1531', '"Ifesca GmbH"']] ['1532' FELLOWES_INC ['1532', '"Fellowes Inc."']] - ['1533' BLANK ['1533', '"BLANK"']] + ['1533' CALEFFI_SPA ['1533', '"Caleffi S.p.A."']] ['1534' JDRF_ELECTROMAG ['1534', '"JDRF Electromag"']] ['1535' REDWIRE_LABS ['1535', '"Redwire Labs"']] ['1536' WECON_TECHNOLOGY_CO_LTD ['1536', '"Wecon Technology Co., Ltd."']] ['1537' ACACIA_GREEN_TECHNOLOGIES_LTD ['1537', '"Acacia Green Technologies Ltd"']] ['1538' DEGREE_ANALYTICS ['1538', '"Degree Analytics"']] ['1539' ROLTEK_TEKNOLOJIAS ['1539', '"Roltek Teknoloji A.S."']] + ['1540' DIGITAL_CONTROL_TECHNOLOGY_LIMITED ['1540', '"Digital Control Technology Limited"']] + ['1541' KENTIMAAB ['1541', '"Kentima AB"']] + ['1542' PERGAMON_PERCEPTIVE_TECHNOLOGIES ['1542', '"Pergamon Perceptive Technologies"']] + ['1543' PREFECT_CONTROLS_LTD ['1543', '"Prefect Controls Ltd."']] + ['1544' SEN_TECH_CORPORATION ['1544', '"SenTech Corporation"']] + ['1545' SS_REGELTECHNIK_GMBH ['1545', '"S+S Regeltechnik GmbH"']] + ['1546' AIR_BOX_INC ['1546', '"AirBox, Inc."']] + ['1547' RVE ['1547', '"RVE"']] ['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 369949c880..d94556ee65 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 @@ -1171,7 +1171,7 @@ ['419' M_ONTROL ['471', '"Ontrol"']] ['420' M_STARNET ['472', '"Starnet"']] ['421' M_BETA_CAVI ['473', '"BETA CAVI"']] - ['422' M_EASEMORE ['474', '"EaseMore"']] + ['422' M_HANGZHOU_YIYUE_TECHNOLOGY_CO___LTD_ ['474', '"Hangzhou YiYue Technology Co., Ltd."']] ['423' M_VIVALDI_SRL ['475', '"Vivaldi srl"']] ['424' M_GREE_ELECTRIC_APPLIANCES_INC__OF_ZHUHAI ['476', '"Gree Electric Appliances,Inc. of Zhuhai"']] ['425' M_HWISCON ['477', '"HWISCON"']] @@ -1473,8 +1473,18 @@ ['721' M_ORENDA_ELECTRIC ['782', '"Orenda Electric"']] ['722' M_ERSE_KABLO ['783', '"ERSE KABLO"']] ['723' M_PRADO_EUROPE_BV ['784', '"prado europe bv"']] - ['724' M_ABB___RESERVED ['43954', '"ABB - reserved"']] - ['725' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] + ['724' M_E2S_GBR ['785', '"e2s GbR"']] + ['725' M_UNITLINK ['786', '"UnitLink"']] + ['726' M_ONNA ['787', '"ONNA"']] + ['727' M_CENTERSVET_LLC ['788', '"CENTERSVET LLC"']] + ['728' M_ADVECO_TECHNOLOGY_CO___LTD_ ['789', '"Adveco Technology Co., Ltd."']] + ['729' M_FR__LUERSSEN_WERFT ['790', '"Fr. Lürssen Werft"']] + ['730' M_MYLYR ['791', '"mylyr"']] + ['731' M_HYUNDAI_HT ['792', '"HYUNDAI HT"']] + ['732' M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD ['793', '"Guangdong Yuejingrun Technology Co.,Ltd"']] + ['733' M_SMATEK_ELECTRONICS_LIMITED ['794', '"SMATEK ELECTRONICS LIMITED"']] + ['734' M_ABB___RESERVED ['43954', '"ABB - reserved"']] + ['735' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] ]
