fix(bacnet): fixed opening/closing tag creation

apache · Apr 20, 2022 · 67dcae9 · 67dcae9
1 parent 1fd65f1
commit 67dcae9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
@@ -349,12 +349,28 @@ func CreateBACnetTagHeaderBalanced(isContext bool, id uint8, value uint32) *BACn
 }
 
 func CreateBACnetOpeningTag(tagNum uint8) *BACnetOpeningTag {
-	header := CreateBACnetTagHeaderBalanced(true, tagNum, 0x6)
+	var tagNumber uint8
+	var extTagNumber *uint8
+	if tagNum <= 14 {
+		tagNumber = tagNum
+	} else {
+		tagNumber = 0xF
+		extTagNumber = &tagNum
+	}
+	header := NewBACnetTagHeader(tagNumber, TagClass_APPLICATION_TAGS, 0x6, extTagNumber, nil, nil, nil)
 	return NewBACnetOpeningTag(header, tagNum, 6)
 }
 
 func CreateBACnetClosingTag(tagNum uint8) *BACnetClosingTag {
-	header := CreateBACnetTagHeaderBalanced(true, tagNum, 0x7)
+	var tagNumber uint8
+	var extTagNumber *uint8
+	if tagNum <= 14 {
+		tagNumber = tagNum
+	} else {
+		tagNumber = 0xF
+		extTagNumber = &tagNum
+	}
+	header := NewBACnetTagHeader(tagNumber, TagClass_APPLICATION_TAGS, 0x7, extTagNumber, nil, nil, nil)
 	return NewBACnetClosingTag(header, tagNum, 7)
 }
 

diff --git a/...ers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java b/...ers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
@@ -389,13 +389,29 @@ public static BACnetTagHeader createBACnetTagHeaderBalanced(boolean isContext, s
     }
 
     public static BACnetOpeningTag createBACnetOpeningTag(short tagNum) {
-        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNum, 0x6L);
-        return new BACnetOpeningTag(header, tagNum, 6L);
+        byte tagNumber;
+        Short extTagNumber = null;
+        if (tagNum <= 14) {
+            tagNumber = (byte) tagNum;
+        } else {
+            tagNumber = 0xF;
+            extTagNumber = tagNum;
+        }
+        BACnetTagHeader header = new BACnetTagHeader(tagNumber, TagClass.APPLICATION_TAGS, (byte) 0x6, extTagNumber, null, null, null);
+        return new BACnetOpeningTag(header, tagNum, 0x6L);
     }
 
     public static BACnetClosingTag createBACnetClosingTag(short tagNum) {
-        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNum, 0x7L);
-        return new BACnetClosingTag(header, tagNum, 7L);
+        byte tagNumber;
+        Short extTagNumber = null;
+        if (tagNum <= 14) {
+            tagNumber = (byte) tagNum;
+        } else {
+            tagNumber = 0xF;
+            extTagNumber = tagNum;
+        }
+        BACnetTagHeader header = new BACnetTagHeader(tagNumber, TagClass.APPLICATION_TAGS, (byte) 0x7, extTagNumber, null, null, null);
+        return new BACnetClosingTag(header, tagNum, 0x7L);
     }
 
     public static BACnetApplicationTagObjectIdentifier createBACnetApplicationTagObjectIdentifier(int objectType, long instance) {