You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/12/07 16:05:46 UTC

(plc4x) 01/02: chore: Updated vendor ids

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/s7strings
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit a37195d77e513288b9e142f58738cca1310c9b54
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Thu Dec 7 17:04:14 2023 +0100

    chore: Updated vendor ids
---
 .../bacnetip/readwrite/model/BACnetVendorId.go     | 32 ++++++++++++++++++++++
 .../knxnetip/readwrite/model/KnxManufacturer.go    | 26 ++++++++++++++----
 .../java/bacnetip/readwrite/BACnetVendorId.java    |  2 ++
 .../java/knxnetip/readwrite/KnxManufacturer.java   |  5 ++--
 .../knxnetip/readwrite/model/KnxManufacturer.cs    | 19 +++++++++----
 .../protocols/bacnetip/bacnet-vendorids.mspec      |  2 ++
 .../protocols/knxnetip/knx-master-data.mspec       |  5 ++--
 7 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index fd8fa44de7..5fd5b5f5f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -1491,6 +1491,8 @@ const (
 	BACnetVendorId_GRID_CONNECT_INC                                                             BACnetVendorId = 1454
 	BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD                                                BACnetVendorId = 1455
 	BACnetVendorId_CONTROL_TECLLC                                                               BACnetVendorId = 1456
+	BACnetVendorId_AETERLINK_CORPORATION                                                        BACnetVendorId = 1457
+	BACnetVendorId_ALPHA_EPSILON_AUTOMATION                                                     BACnetVendorId = 1458
 	BACnetVendorId_UNKNOWN_VENDOR                                                               BACnetVendorId = 0xFFFF
 )
 
@@ -2947,6 +2949,8 @@ func init() {
 		BACnetVendorId_GRID_CONNECT_INC,
 		BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD,
 		BACnetVendorId_CONTROL_TECLLC,
+		BACnetVendorId_AETERLINK_CORPORATION,
+		BACnetVendorId_ALPHA_EPSILON_AUTOMATION,
 		BACnetVendorId_UNKNOWN_VENDOR,
 	}
 }
@@ -4985,6 +4989,14 @@ func (e BACnetVendorId) VendorId() uint16 {
 		{ /* '1456' */
 			return 1456
 		}
+	case 1457:
+		{ /* '1457' */
+			return 1457
+		}
+	case 1458:
+		{ /* '1458' */
+			return 1458
+		}
 	case 146:
 		{ /* '146' */
 			return 146
@@ -10799,6 +10811,14 @@ func (e BACnetVendorId) VendorName() string {
 		{ /* '1456' */
 			return "ControlTec, LLC"
 		}
+	case 1457:
+		{ /* '1457' */
+			return "Aeterlink Corporation"
+		}
+	case 1458:
+		{ /* '1458' */
+			return "Alpha Epsilon Automation"
+		}
 	case 146:
 		{ /* '146' */
 			return "Sanyo Electric Co., Ltd."
@@ -15596,6 +15616,10 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD, true
 	case 1456:
 		return BACnetVendorId_CONTROL_TECLLC, true
+	case 1457:
+		return BACnetVendorId_AETERLINK_CORPORATION, true
+	case 1458:
+		return BACnetVendorId_ALPHA_EPSILON_AUTOMATION, true
 	case 146:
 		return BACnetVendorId_SANYO_ELECTRIC_CO_LTD, true
 	case 147:
@@ -18500,6 +18524,10 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_ZIEGLER_INSTRUMENTATIONUK_LTD, true
 	case "CONTROL_TECLLC":
 		return BACnetVendorId_CONTROL_TECLLC, true
+	case "AETERLINK_CORPORATION":
+		return BACnetVendorId_AETERLINK_CORPORATION, true
+	case "ALPHA_EPSILON_AUTOMATION":
+		return BACnetVendorId_ALPHA_EPSILON_AUTOMATION, true
 	case "SANYO_ELECTRIC_CO_LTD":
 		return BACnetVendorId_SANYO_ELECTRIC_CO_LTD, true
 	case "INTEGRATED_INFORMATION_SYSTEMS_INC":
@@ -21465,6 +21493,10 @@ func (e BACnetVendorId) PLC4XEnumName() string {
 		return "ZIEGLER_INSTRUMENTATIONUK_LTD"
 	case BACnetVendorId_CONTROL_TECLLC:
 		return "CONTROL_TECLLC"
+	case BACnetVendorId_AETERLINK_CORPORATION:
+		return "AETERLINK_CORPORATION"
+	case BACnetVendorId_ALPHA_EPSILON_AUTOMATION:
+		return "ALPHA_EPSILON_AUTOMATION"
 	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 5825a6b329..a30185f422 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -697,8 +697,9 @@ const (
 	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
+	KnxManufacturer_M_MICHOI                                             KnxManufacturer = 654
+	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 655
+	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 656
 )
 
 var KnxManufacturerValues []KnxManufacturer
@@ -1360,6 +1361,7 @@ func init() {
 		KnxManufacturer_M_ZIMMEX,
 		KnxManufacturer_M_RHOMBUS_EUROPE,
 		KnxManufacturer_M_TURING_THINK,
+		KnxManufacturer_M_MICHOI,
 		KnxManufacturer_M_ABB___RESERVED,
 		KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
 	}
@@ -3837,10 +3839,14 @@ func (e KnxManufacturer) Number() uint16 {
 		}
 	case 654:
 		{ /* '654' */
-			return 43954
+			return 712
 		}
 	case 655:
 		{ /* '655' */
+			return 43954
+		}
+	case 656:
+		{ /* '656' */
 			return 43959
 		}
 	case 66:
@@ -6479,10 +6485,14 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 654:
 		{ /* '654' */
-			return "ABB - reserved"
+			return "Michoi"
 		}
 	case 655:
 		{ /* '655' */
+			return "ABB - reserved"
+		}
+	case 656:
+		{ /* '656' */
 			return "Busch-Jaeger Elektro - reserved"
 		}
 	case 66:
@@ -7885,8 +7895,10 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 653:
 		return KnxManufacturer_M_TURING_THINK, true
 	case 654:
-		return KnxManufacturer_M_ABB___RESERVED, true
+		return KnxManufacturer_M_MICHOI, true
 	case 655:
+		return KnxManufacturer_M_ABB___RESERVED, true
+	case 656:
 		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
 	case 66:
 		return KnxManufacturer_M_RTS_AUTOMATION, true
@@ -9202,6 +9214,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_RHOMBUS_EUROPE, true
 	case "M_TURING_THINK":
 		return KnxManufacturer_M_TURING_THINK, true
+	case "M_MICHOI":
+		return KnxManufacturer_M_MICHOI, true
 	case "M_ABB___RESERVED":
 		return KnxManufacturer_M_ABB___RESERVED, true
 	case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -10581,6 +10595,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_RHOMBUS_EUROPE"
 	case KnxManufacturer_M_TURING_THINK:
 		return "M_TURING_THINK"
+	case KnxManufacturer_M_MICHOI:
+		return "M_MICHOI"
 	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 2c30a51b67..a6bfd30214 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
@@ -1670,6 +1670,8 @@ public enum BACnetVendorId {
   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"),
+  AETERLINK_CORPORATION((int) 1457, (int) 1457, (String) "Aeterlink Corporation"),
+  ALPHA_EPSILON_AUTOMATION((int) 1458, (int) 1458, (String) "Alpha Epsilon Automation"),
   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 f3a424a3f2..a59fef6703 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
@@ -751,9 +751,10 @@ public enum KnxManufacturer {
   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_MICHOI((int) 654, (int) 712, (String) "Michoi"),
+  M_ABB___RESERVED((int) 655, (int) 43954, (String) "ABB - reserved"),
   M_BUSCH_JAEGER_ELEKTRO___RESERVED(
-      (int) 655, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+      (int) 656, (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 cef84d68cb..6ca79c95bf 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -678,8 +678,9 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
         M_ZIMMEX = 651,
         M_RHOMBUS_EUROPE = 652,
         M_TURING_THINK = 653,
-        M_ABB___RESERVED = 654,
-        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 655,
+        M_MICHOI = 654,
+        M_ABB___RESERVED = 655,
+        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 656,
     }
 
     public static class KnxManufacturerInfo
@@ -2540,10 +2541,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
                 case KnxManufacturer.M_TURING_THINK: { /* '653' */
                     return 711;
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '654' */
+                case KnxManufacturer.M_MICHOI: { /* '654' */
+                    return 712;
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '655' */
                     return 43954;
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '655' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '656' */
                     return 43959;
                 }
                 case KnxManufacturer.M_RTS_AUTOMATION: { /* '66' */
@@ -4518,10 +4522,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
                 case KnxManufacturer.M_TURING_THINK: { /* '653' */
                     return "Turing-Think";
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '654' */
+                case KnxManufacturer.M_MICHOI: { /* '654' */
+                    return "Michoi";
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '655' */
                     return "ABB - reserved";
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '655' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '656' */
                     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 60c5013226..8c1967d3aa 100644
--- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
+++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
@@ -1469,6 +1469,8 @@
   ['1454' GRID_CONNECT_INC ['1454', '"Grid Connect Inc."']]
   ['1455' ZIEGLER_INSTRUMENTATIONUK_LTD ['1455', '"Ziegler Instrumentation UK Ltd"']]
   ['1456' CONTROL_TECLLC ['1456', '"ControlTec, LLC"']]
+  ['1457' AETERLINK_CORPORATION ['1457', '"Aeterlink Corporation"']]
+  ['1458' ALPHA_EPSILON_AUTOMATION ['1458', '"Alpha Epsilon Automation"']]
  
   ['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 ec18977722..ba87b4e661 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
@@ -1402,8 +1402,9 @@
     ['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"']]
+    ['654' M_MICHOI ['712', '"Michoi"']]
+    ['655' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+    ['656' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
     
 ]