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 4254f28928ccbb66a7c3e61e6dd3df686c3b9b16 Author: Christofer Dutz <[email protected]> AuthorDate: Sun Dec 3 14:06:57 2023 +0100 chore: Updated vendor ids --- .../bacnetip/readwrite/model/BACnetVendorId.go | 48 ++++++++++++++++++ .../knxnetip/readwrite/model/KnxManufacturer.go | 58 ++++++++++++++++++++-- .../java/bacnetip/readwrite/BACnetVendorId.java | 3 ++ .../java/knxnetip/readwrite/KnxManufacturer.java | 7 ++- .../knxnetip/readwrite/model/KnxManufacturer.cs | 33 +++++++++--- .../protocols/bacnetip/bacnet-vendorids.mspec | 3 ++ .../protocols/knxnetip/knx-master-data.mspec | 7 ++- 7 files changed, 144 insertions(+), 15 deletions(-) diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go index 41a9938da1..ab91380426 100644 --- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go +++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go @@ -1488,6 +1488,9 @@ const ( BACnetVendorId_RYOBI_LIMITED BACnetVendorId = 1451 BACnetVendorId_EKKO_SENSE_LTD BACnetVendorId = 1452 BACnetVendorId_CLIMA_COOL BACnetVendorId = 1453 + BACnetVendorId_GRID_CONNECT_INC BACnetVendorId = 1454 + BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD BACnetVendorId = 1455 + BACnetVendorId_CONTROL_TECLLC BACnetVendorId = 1456 BACnetVendorId_UNKNOWN_VENDOR BACnetVendorId = 0xFFFF ) @@ -2941,6 +2944,9 @@ func init() { BACnetVendorId_RYOBI_LIMITED, BACnetVendorId_EKKO_SENSE_LTD, BACnetVendorId_CLIMA_COOL, + BACnetVendorId_GRID_CONNECT_INC, + BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD, + BACnetVendorId_CONTROL_TECLLC, BACnetVendorId_UNKNOWN_VENDOR, } } @@ -4967,6 +4973,18 @@ func (e BACnetVendorId) VendorId() uint16 { { /* '1453' */ return 1453 } + case 1454: + { /* '1454' */ + return 1454 + } + case 1455: + { /* '1455' */ + return 1455 + } + case 1456: + { /* '1456' */ + return 1456 + } case 146: { /* '146' */ return 146 @@ -10769,6 +10787,18 @@ func (e BACnetVendorId) VendorName() string { { /* '1453' */ return "ClimaCool" } + case 1454: + { /* '1454' */ + return "Grid Connect Inc." + } + case 1455: + { /* '1455' */ + return "Ziegler Instrumentation UK Ltd" + } + case 1456: + { /* '1456' */ + return "ControlTec, LLC" + } case 146: { /* '146' */ return "Sanyo Electric Co., Ltd." @@ -15560,6 +15590,12 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) { return BACnetVendorId_EKKO_SENSE_LTD, true case 1453: return BACnetVendorId_CLIMA_COOL, true + case 1454: + return BACnetVendorId_GRID_CONNECT_INC, true + case 1455: + return BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD, true + case 1456: + return BACnetVendorId_CONTROL_TECLLC, true case 146: return BACnetVendorId_SANYO_ELECTRIC_CO_LTD, true case 147: @@ -18458,6 +18494,12 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) { return BACnetVendorId_EKKO_SENSE_LTD, true case "CLIMA_COOL": return BACnetVendorId_CLIMA_COOL, true + case "GRID_CONNECT_INC": + return BACnetVendorId_GRID_CONNECT_INC, true + case "ZIEGLER_INSTRUMENTATIONUK_LTD": + return BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD, true + case "CONTROL_TECLLC": + return BACnetVendorId_CONTROL_TECLLC, true case "SANYO_ELECTRIC_CO_LTD": return BACnetVendorId_SANYO_ELECTRIC_CO_LTD, true case "INTEGRATED_INFORMATION_SYSTEMS_INC": @@ -21417,6 +21459,12 @@ func (e BACnetVendorId) PLC4XEnumName() string { return "EKKO_SENSE_LTD" case BACnetVendorId_CLIMA_COOL: return "CLIMA_COOL" + case BACnetVendorId_GRID_CONNECT_INC: + return "GRID_CONNECT_INC" + case BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD: + return "ZIEGLER_INSTRUMENTATIONUK_LTD" + case BACnetVendorId_CONTROL_TECLLC: + return "CONTROL_TECLLC" case BACnetVendorId_SANYO_ELECTRIC_CO_LTD: return "SANYO_ELECTRIC_CO_LTD" case BACnetVendorId_INTEGRATED_INFORMATION_SYSTEMS_INC: diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go index 0dd6a3d9f9..2a7509e17f 100644 --- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go +++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go @@ -694,8 +694,11 @@ const ( KnxManufacturer_M_ATOUCH KnxManufacturer = 648 KnxManufacturer_M_PANASONIC_LIFE_SOLUTIONS_INDIA_PVT__LTD KnxManufacturer = 649 KnxManufacturer_M_WALLYONS KnxManufacturer = 650 - KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 651 - KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 652 + KnxManufacturer_M_ZIMMEX KnxManufacturer = 651 + KnxManufacturer_M_RHOMBUS_EUROPE KnxManufacturer = 652 + KnxManufacturer_M_TURING_THINK KnxManufacturer = 653 + KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 654 + KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 655 ) var KnxManufacturerValues []KnxManufacturer @@ -1354,6 +1357,9 @@ func init() { KnxManufacturer_M_ATOUCH, KnxManufacturer_M_PANASONIC_LIFE_SOLUTIONS_INDIA_PVT__LTD, KnxManufacturer_M_WALLYONS, + KnxManufacturer_M_ZIMMEX, + KnxManufacturer_M_RHOMBUS_EUROPE, + KnxManufacturer_M_TURING_THINK, KnxManufacturer_M_ABB___RESERVED, KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, } @@ -3819,10 +3825,22 @@ func (e KnxManufacturer) Number() uint16 { } case 651: { /* '651' */ - return 43954 + return 709 } case 652: { /* '652' */ + return 710 + } + case 653: + { /* '653' */ + return 711 + } + case 654: + { /* '654' */ + return 43954 + } + case 655: + { /* '655' */ return 43959 } case 66: @@ -6449,10 +6467,22 @@ func (e KnxManufacturer) Name() string { } case 651: { /* '651' */ - return "ABB - reserved" + return "Zimmex" } case 652: { /* '652' */ + return "Rhombus Europe" + } + case 653: + { /* '653' */ + return "Turing-Think" + } + case 654: + { /* '654' */ + return "ABB - reserved" + } + case 655: + { /* '655' */ return "Busch-Jaeger Elektro - reserved" } case 66: @@ -7849,8 +7879,14 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) { case 650: return KnxManufacturer_M_WALLYONS, true case 651: - return KnxManufacturer_M_ABB___RESERVED, true + return KnxManufacturer_M_ZIMMEX, true case 652: + return KnxManufacturer_M_RHOMBUS_EUROPE, true + case 653: + return KnxManufacturer_M_TURING_THINK, true + case 654: + return KnxManufacturer_M_ABB___RESERVED, true + case 655: return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true case 66: return KnxManufacturer_M_RTS_AUTOMATION, true @@ -9160,6 +9196,12 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) { return KnxManufacturer_M_JEPAZ, true case "M_WALLYONS": return KnxManufacturer_M_WALLYONS, true + case "M_ZIMMEX": + return KnxManufacturer_M_ZIMMEX, true + case "M_RHOMBUS_EUROPE": + return KnxManufacturer_M_RHOMBUS_EUROPE, true + case "M_TURING_THINK": + return KnxManufacturer_M_TURING_THINK, true case "M_ABB___RESERVED": return KnxManufacturer_M_ABB___RESERVED, true case "M_BUSCH_JAEGER_ELEKTRO___RESERVED": @@ -10533,6 +10575,12 @@ func (e KnxManufacturer) PLC4XEnumName() string { return "M_JEPAZ" case KnxManufacturer_M_WALLYONS: return "M_WALLYONS" + case KnxManufacturer_M_ZIMMEX: + return "M_ZIMMEX" + case KnxManufacturer_M_RHOMBUS_EUROPE: + return "M_RHOMBUS_EUROPE" + case KnxManufacturer_M_TURING_THINK: + return "M_TURING_THINK" case KnxManufacturer_M_ABB___RESERVED: return "M_ABB___RESERVED" case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED: 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 9b3ef672cf..2c30a51b67 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 @@ -1667,6 +1667,9 @@ public enum BACnetVendorId { RYOBI_LIMITED((int) 1451, (int) 1451, (String) "Ryobi Limited"), EKKO_SENSE_LTD((int) 1452, (int) 1452, (String) "EkkoSense Ltd"), CLIMA_COOL((int) 1453, (int) 1453, (String) "ClimaCool"), + GRID_CONNECT_INC((int) 1454, (int) 1454, (String) "Grid Connect Inc."), + ZIEGLER_INSTRUMENTATIONUK_LTD((int) 1455, (int) 1455, (String) "Ziegler Instrumentation UK Ltd"), + CONTROL_TECLLC((int) 1456, (int) 1456, (String) "ControlTec, LLC"), 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 d5c00a5f0a..f3a424a3f2 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 @@ -748,9 +748,12 @@ public enum KnxManufacturer { M_PANASONIC_LIFE_SOLUTIONS_INDIA_PVT__LTD( (int) 649, (int) 707, (String) "Panasonic Life Solutions India Pvt. Ltd"), M_WALLYONS((int) 650, (int) 708, (String) "WallYons"), - M_ABB___RESERVED((int) 651, (int) 43954, (String) "ABB - reserved"), + M_ZIMMEX((int) 651, (int) 709, (String) "Zimmex"), + M_RHOMBUS_EUROPE((int) 652, (int) 710, (String) "Rhombus Europe"), + M_TURING_THINK((int) 653, (int) 711, (String) "Turing-Think"), + M_ABB___RESERVED((int) 654, (int) 43954, (String) "ABB - reserved"), M_BUSCH_JAEGER_ELEKTRO___RESERVED( - (int) 652, (int) 43959, (String) "Busch-Jaeger Elektro - reserved"); + (int) 655, (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 ffb0c312d7..cef84d68cb 100644 --- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs +++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs @@ -675,8 +675,11 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model M_ATOUCH = 648, M_PANASONIC_LIFE_SOLUTIONS_INDIA_PVT__LTD = 649, M_WALLYONS = 650, - M_ABB___RESERVED = 651, - M_BUSCH_JAEGER_ELEKTRO___RESERVED = 652, + M_ZIMMEX = 651, + M_RHOMBUS_EUROPE = 652, + M_TURING_THINK = 653, + M_ABB___RESERVED = 654, + M_BUSCH_JAEGER_ELEKTRO___RESERVED = 655, } public static class KnxManufacturerInfo @@ -2528,10 +2531,19 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_WALLYONS: { /* '650' */ return 708; } - case KnxManufacturer.M_ABB___RESERVED: { /* '651' */ + case KnxManufacturer.M_ZIMMEX: { /* '651' */ + return 709; + } + case KnxManufacturer.M_RHOMBUS_EUROPE: { /* '652' */ + return 710; + } + case KnxManufacturer.M_TURING_THINK: { /* '653' */ + return 711; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '654' */ return 43954; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '652' */ + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '655' */ return 43959; } case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */ @@ -4497,10 +4509,19 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model case KnxManufacturer.M_WALLYONS: { /* '650' */ return "WallYons"; } - case KnxManufacturer.M_ABB___RESERVED: { /* '651' */ + case KnxManufacturer.M_ZIMMEX: { /* '651' */ + return "Zimmex"; + } + case KnxManufacturer.M_RHOMBUS_EUROPE: { /* '652' */ + return "Rhombus Europe"; + } + case KnxManufacturer.M_TURING_THINK: { /* '653' */ + return "Turing-Think"; + } + case KnxManufacturer.M_ABB___RESERVED: { /* '654' */ return "ABB - reserved"; } - case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '652' */ + case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '655' */ return "Busch-Jaeger Elektro - reserved"; } case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */ 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 931ea40961..60c5013226 100644 --- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec +++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec @@ -1466,6 +1466,9 @@ ['1451' RYOBI_LIMITED ['1451', '"Ryobi Limited"']] ['1452' EKKO_SENSE_LTD ['1452', '"EkkoSense Ltd"']] ['1453' CLIMA_COOL ['1453', '"ClimaCool"']] + ['1454' GRID_CONNECT_INC ['1454', '"Grid Connect Inc."']] + ['1455' ZIEGLER_INSTRUMENTATIONUK_LTD ['1455', '"Ziegler Instrumentation UK Ltd"']] + ['1456' CONTROL_TECLLC ['1456', '"ControlTec, LLC"']] ['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 3a8ca262de..ec18977722 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 @@ -1399,8 +1399,11 @@ ['648' M_ATOUCH ['706', '"Atouch"']] ['649' M_PANASONIC_LIFE_SOLUTIONS_INDIA_PVT__LTD ['707', '"Panasonic Life Solutions India Pvt. Ltd"']] ['650' M_WALLYONS ['708', '"WallYons"']] - ['651' M_ABB___RESERVED ['43954', '"ABB - reserved"']] - ['652' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] + ['651' M_ZIMMEX ['709', '"Zimmex"']] + ['652' M_RHOMBUS_EUROPE ['710', '"Rhombus Europe"']] + ['653' M_TURING_THINK ['711', '"Turing-Think"']] + ['654' M_ABB___RESERVED ['43954', '"ABB - reserved"']] + ['655' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']] ]
