fix(knx): Fixed the typed for knx datatypes PDT_BITSET8 and PDT_BITSET16

apache · Feb 6, 2024 · fc89f78 · fc89f78
1 parent fb33c7b
commit fc89f78
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go b/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
diff --git a/...ers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java b/...ers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java
@@ -339,12 +339,12 @@ public static PlcValue staticParse(
 
       boolean value = readSimpleField("value", readBoolean(readBuffer));
       return new PlcBOOL(value);
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // WORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // BYTE
       short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
-      return new PlcWORD(value);
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // DWORD
+      return new PlcBYTE(value);
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // WORD
       int value = readSimpleField("value", readUnsignedInt(readBuffer, 16));
-      return new PlcDWORD(value);
+      return new PlcWORD(value);
     } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_ENUM8)) { // USINT
       short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
       return new PlcUSINT(value);
@@ -686,10 +686,10 @@ public static int getLengthInBits(
 
       // Simple field (value)
       lengthInBits += 1;
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // WORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // BYTE
       // Simple field (value)
       lengthInBits += 8;
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // DWORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // WORD
       // Simple field (value)
       lengthInBits += 16;
     } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_ENUM8)) { // USINT
@@ -861,10 +861,10 @@ public static void staticSerialize(
 
       // Simple Field (value)
       writeSimpleField("value", (boolean) _value.getBoolean(), writeBoolean(writeBuffer));
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // WORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET8)) { // BYTE
       // Simple Field (value)
       writeSimpleField("value", (short) _value.getShort(), writeUnsignedShort(writeBuffer, 8));
-    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // DWORD
+    } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_BITSET16)) { // WORD
       // Simple Field (value)
       writeSimpleField("value", (int) _value.getInteger(), writeUnsignedInt(writeBuffer, 16));
     } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_ENUM8)) { // USINT

diff --git a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
@@ -987,10 +987,10 @@
             [reserved uint 7        '0x00']
             [simple   bit           value]
         ]
-        ['PDT_BITSET8' WORD
+        ['PDT_BITSET8' BYTE
             [simple   uint 8        value]
         ]
-        ['PDT_BITSET16' DWORD
+        ['PDT_BITSET16' WORD
             [simple   uint 16        value]
         ]
         ['PDT_ENUM8' USINT