fix(bacnet): fixed BACnetConfirmedServiceRequestDeviceCommunicationCo…

…ntrol and error codes
apache · Jan 24, 2022 · ce9aa60 · ce9aa60
1 parent f7d0770
commit ce9aa60
Show file tree

Hide file tree

Showing 2 changed files with 366 additions and 14 deletions.
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -318,6 +318,10 @@
         ]
 
         ['0x11' BACnetConfirmedServiceRequestDeviceCommunicationControl
+            [optional BACnetContextTagUnsignedInteger('0', 'BACnetDataType.UNSIGNED_INTEGER')              timeDuration        ]
+            [simple   BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable('1')                    enableDisable       ]
+            [optional BACnetContextTagCharacterString('2', 'BACnetDataType.CHARACTER_STRING')              password            ]
+
         ]
         ['0x12' BACnetConfirmedServiceRequestConfirmedPrivateTransfer
         ]
@@ -362,6 +366,16 @@
     ]
 ]
 
+// TODO: this is a enum so we should build a static call which maps a enum (could be solved by using only the tag header with a length validation and the enum itself)
+[type BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable(uint 8 tagNumber)
+    [optional   BACnetContextTagEnumerated('tagNumber', 'BACnetDataType.ENUMERATED')
+              rawData
+    ]
+    [virtual    bit isEnable            'rawData != null && COUNT(rawData.data) == 1 && rawData.data[0] == 0']
+    [virtual    bit isDisable           'rawData != null && COUNT(rawData.data) == 1 && rawData.data[0] == 1']
+    [virtual    bit isDisableInitiation 'rawData != null && COUNT(rawData.data) == 1 && rawData.data[0] == 2']
+]
+
 [discriminatedType BACnetUnconfirmedServiceRequest(uint 16 len)
     [discriminator uint 8 serviceChoice]
     [typeSwitch serviceChoice
@@ -554,6 +568,8 @@
         ]
         ['0x1A' BACnetErrorReadRange
         ]
+        ['0x11' BACnetErrorDeviceCommunicationProtocol
+        ]
         ['0x12' BACnetErrorConfirmedPrivateTransfer
         ]
         ['0x14' BACnetErrorPasswordFailure