2nd pass at changing the error/reject/abort status reporting to improve BTL test compliance. ReadProperty fully done for core and demo objects. Will tackle other services next.

2010-06-07 15:52:33 +00:00
parent b780c7bea6
commit 61bb34d726
21 changed files with 158 additions and 104 deletions
@@ -41,6 +41,9 @@
 extern "C" {
 #endif /* __cplusplus */

+    BACNET_ABORT_REASON abort_convert_error_code(
+        BACNET_ERROR_CODE error_code);
+
    int abort_encode_apdu(
        uint8_t * apdu,
        uint8_t invoke_id,
@@ -99,4 +99,9 @@ typedef struct BACnet_Object_Id {
 #define BACNET_ID_VALUE(bacnet_object_instance, bacnet_object_type) ((((bacnet_object_type) & BACNET_MAX_OBJECT) << BACNET_INSTANCE_BITS) | ((bacnet_object_instance) & BACNET_MAX_INSTANCE))
 #define BACNET_INSTANCE(bacnet_object_id_num) ((bacnet_object_id_num)&BACNET_MAX_INSTANCE)
 #define BACNET_TYPE(bacnet_object_id_num) (((bacnet_object_id_num) >> BACNET_INSTANCE_BITS ) & BACNET_MAX_OBJECT)
+
+#define BACNET_STATUS_ERROR (-1)
+#define BACNET_STATUS_ABORT (-2)
+#define BACNET_STATUS_REJECT (-3)
+
 #endif
@@ -1250,7 +1250,7 @@ typedef enum {
    MAX_BACNET_REJECT_REASON = 10,
    FIRST_PROPRIETARY_REJECT_REASON = 64,
    LAST_PROPRIETARY_REJECT_REASON = 65535
-} BACNET_BACNET_REJECT_REASON;
+} BACNET_REJECT_REASON;

 typedef enum {
    ERROR_CLASS_DEVICE = 0,
@@ -41,6 +41,9 @@
 extern "C" {
 #endif /* __cplusplus */

+    BACNET_REJECT_REASON reject_convert_error_code(
+        BACNET_ERROR_CODE error_code);
+
    int reject_encode_apdu(
        uint8_t * apdu,
        uint8_t invoke_id,