feat(bacnet): added null context tag

apache · Apr 20, 2022 · 1e426c2 · 1e426c2
1 parent 3cb822b
commit 1e426c2
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 0 deletions.
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNull.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNull.go
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
@@ -348,6 +348,16 @@ func CreateBACnetTagHeaderBalanced(isContext bool, id uint8, value uint32) *BACn
 	return NewBACnetTagHeader(tagNumber, tagClass, lengthValueType, extTagNumber, extLength, extExtLength, extExtExtLength)
 }
 
+func CreateBACnetApplicationTagNull() *BACnetApplicationTagNull {
+	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_NULL), 0)
+	return NewBACnetApplicationTagNull(header)
+}
+
+func CreateBACnetContextTagNull(tagNumber uint8) *BACnetContextTagNull {
+	header := CreateBACnetTagHeaderBalanced(true, tagNumber, 0)
+	return NewBACnetContextTagNull(header, tagNumber, true)
+}
+
 func CreateBACnetOpeningTag(tagNum uint8) *BACnetOpeningTag {
 	var tagNumber uint8
 	var extTagNumber *uint8

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
@@ -390,6 +390,16 @@ public static BACnetTagHeader createBACnetTagHeaderBalanced(boolean isContext, s
         return new BACnetTagHeader(tagNumber, tagClass, lengthValueType, extTagNumber, extLength, extExtLength, extExtExtLength);
     }
 
+    public static BACnetApplicationTagNull createBACnetApplicationTagNull() {
+        BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.NULL.getValue(), 0);
+        return new BACnetApplicationTagNull(header);
+    }
+
+    public static BACnetContextTagNull createBACnetContextTagNull(byte tagNumber) {
+        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 0);
+        return new BACnetContextTagNull(header, (short) tagNumber, true);
+    }
+
     public static BACnetOpeningTag createBACnetOpeningTag(short tagNum) {
         byte tagNumber;
         Short extTagNumber = null;

diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -1179,6 +1179,10 @@
     [virtual       uint 32  actualLength  'header.actualLength'                                                         ]
     [virtual       bit      isNotOpeningOrClosingTag    'header.lengthValueType != 6 && header.lengthValueType != 7'    ]
     [typeSwitch dataType
+        ['NULL' BACnetContextTagNull(bit isNotOpeningOrClosingTag, BACnetTagHeader header)
+            [validation 'isNotOpeningOrClosingTag' "length 6 and 7 reserved for opening and closing tag"                ]
+            [validation 'header.actualLength == 0' "length field should be 0"                                           ]
+        ]
         ['BOOLEAN' BACnetContextTagBoolean(bit isNotOpeningOrClosingTag, BACnetTagHeader header)
             [validation 'isNotOpeningOrClosingTag' "length 6 and 7 reserved for opening and closing tag"                ]
             [validation 'header.actualLength == 1' "length field should be 1"                                           ]