fix(bacnet): fixed BACnetReadAccessProperty

vmpn · Apr 22, 2022 · 97c28ee · 97c28ee
1 parent a761949
commit 97c28ee
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessProperty.go
diff --git a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java
@@ -26,7 +26,7 @@
 public class ManualBacNetDecoder {
 
     public static void main(String[] args) throws Exception {
-        final byte[] bytes = Hex.decodeHex("810a002b01040205790109011c020000142c000002f93a06b24e09552e44434a00002f096f2e8204002f4f");
+        final byte[] bytes = Hex.decodeHex("810a001b010030030e0c020000011e294c39014ec4020000014f1f");
         ReadBuffer readBuffer = new ReadBufferByteBased(bytes);
         final BVLC packet = BVLC.staticParse(readBuffer);
         System.out.println(packet);

diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -213,7 +213,7 @@
             [simple   uint 8    originalInvokeId                        ]
             [optional uint 8    sequenceNumber     'segmentedMessage'   ]
             [optional uint 8    proposedWindowSize 'segmentedMessage'   ]
-            [optional BACnetServiceAck('apduLength - (2 + (segmentedMessage ? 2 : 0))')
+            [optional BACnetServiceAck('apduLength - (3 + (segmentedMessage ? 2 : 0))')
                                 serviceAck         '!segmentedMessage'  ]
             // TODO: maybe we should put this in the discriminated types below
             [optional uint 8    segmentServiceChoice 'segmentedMessage && sequenceNumber != 0']
@@ -639,9 +639,9 @@
 ]
 
 [type BACnetReadAccessProperty(BACnetObjectType objectType)
-    [simple     BACnetContextTagPropertyIdentifier('0', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER')
+    [simple     BACnetContextTagPropertyIdentifier('2', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER')
                     propertyIdentifier              ]
-    [optional   BACnetContextTagUnsignedInteger('1', 'BACnetDataType.UNSIGNED_INTEGER')
+    [optional   BACnetContextTagUnsignedInteger('3', 'BACnetDataType.UNSIGNED_INTEGER')
                     arrayIndex                      ]
     [optional   BACnetConstructedData('4', 'objectType', 'propertyIdentifier')
                     propertyValue                   ]
@@ -1576,7 +1576,7 @@
                                 data
                             terminated
                             'STATIC_CALL("isBACnetConstructedDataClosingTag", readBuffer, false, tagNumber)'    ]
-            [virtual    bit     hasData 'COUNT(data) == 0']
+            [virtual    bit     hasData 'COUNT(data) != 0']
             [optional       BACnetContextTagPropertyIdentifier('0', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER')
                             propertyIdentifier
                             'hasData'                                                                           ]