chore: Updated KNX manufacturer ids

apache · Jun 30, 2023 · a7081ae · a7081ae
1 parent 3e87937
commit a7081ae
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
@@ -5945,12 +5945,12 @@ public static IPlcValue StaticParse(ReadBuffer readBuffer, KnxDatapointType data
                     }
                 }
 
-                // Simple Field (validityHeightPosition)
-                var validityHeightPosition = readBuffer.ReadBit("");
-
                 // Simple Field (validitySlatsPosition)
                 var validitySlatsPosition = readBuffer.ReadBit("");
 
+                // Simple Field (validityHeightPosition)
+                var validityHeightPosition = readBuffer.ReadBit("");
+
                 var _map = new Dictionary<string, IPlcValue>();
 
                 return new PlcStruct(_map);
@@ -10468,12 +10468,12 @@ public static WriteBuffer StaticSerialize(IPlcValue _value, KnxDatapointType dat
                 writeBuffer.WriteByte("", 8, (byte) (slatsPosition));
                 // Reserved Field
                 writeBuffer.WriteByte("", 6, (byte) 0x00);
-                // Simple Field (validityHeightPosition)
-                var validityHeightPosition = (bool) _value.GetStruct()["validityHeightPosition"].GetBool();
-                writeBuffer.WriteBit("", (validityHeightPosition));
                 // Simple Field (validitySlatsPosition)
                 var validitySlatsPosition = (bool) _value.GetStruct()["validitySlatsPosition"].GetBool();
                 writeBuffer.WriteBit("", (validitySlatsPosition));
+                // Simple Field (validityHeightPosition)
+                var validityHeightPosition = (bool) _value.GetStruct()["validityHeightPosition"].GetBool();
+                writeBuffer.WriteBit("", (validityHeightPosition));
             return writeBuffer;
         } else if( datapointType == KnxDatapointType.DPT_StatusSAB ) { // Struct
                 var writeBuffer = new WriteBuffer();

diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -658,8 +658,10 @@ public enum KnxManufacturer
         M_PASSIV_ENERGIE_GMBH = 631,
         M_PAYNE_TECHNOLOGIES_LTD = 632,
         M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_ = 633,
-        M_ABB___RESERVED = 634,
-        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 635,
+        M_SEXANKA = 634,
+        M_SECURI_FLEX_LTD = 635,
+        M_ABB___RESERVED = 636,
+        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 637,
     }
 
     public static class KnxManufacturerInfo
@@ -2454,10 +2456,16 @@ public static class KnxManufacturerInfo
                 case KnxManufacturer.M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_: { /* '633' */
                     return 690;
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '634' */
+                case KnxManufacturer.M_SEXANKA: { /* '634' */
+                    return 691;
+                }
+                case KnxManufacturer.M_SECURI_FLEX_LTD: { /* '635' */
+                    return 692;
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '636' */
                     return 43954;
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '635' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '637' */
                     return 43959;
                 }
                 case KnxManufacturer.M_BISCHOFF_ELEKTRONIK: { /* '64' */
@@ -4372,10 +4380,16 @@ public static string Name(this KnxManufacturer value)
                 case KnxManufacturer.M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_: { /* '633' */
                     return "Guangdong Yozewit Intelligent Technology Co.,Ltd.";
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '634' */
+                case KnxManufacturer.M_SEXANKA: { /* '634' */
+                    return "SEXANKA";
+                }
+                case KnxManufacturer.M_SECURI_FLEX_LTD: { /* '635' */
+                    return "Securi-Flex Ltd";
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '636' */
                     return "ABB - reserved";
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '635' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '637' */
                     return "Busch-Jaeger Elektro - reserved";
                 }
                 case KnxManufacturer.M_BISCHOFF_ELEKTRONIK: { /* '64' */