Corrected the NPDU encoding for the demo handlers.

bacnet-stack/bacenum.h

@@ -1040,66 +1040,83 @@ typedef enum {
     LAST_PROPRIETARY_ERROR_CLASS = 65535
 } BACNET_ERROR_CLASS;
 
+/* These are sorted in the order given in
+   Clause 18. ERROR, REJECT AND ABORT CODES
+   The Class and Code pairings are required
+   to be used in accordance with Clause 18. */
 typedef enum {
+    /* valid for all classes */
     ERROR_CODE_OTHER = 0,
-    ERROR_CODE_AUTHENTICATION_FAILED = 1,
-    ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED = 41,
-    ERROR_CODE_CONFIGURATION_IN_PROGRESS = 2,
-    ERROR_CODE_DATATYPE_NOT_SUPPORTED = 47,
+
+    /* Error Class - Device */
     ERROR_CODE_DEVICE_BUSY = 3,
-    ERROR_CODE_DUPLICATE_NAME = 48,
-    ERROR_CODE_DUPLICATE_OBJECT_ID = 49,
+    ERROR_CODE_CONFIGURATION_IN_PROGRESS = 2,
+    ERROR_CODE_OPERATIONAL_PROBLEM = 25,
+
+    /* Error Class - Object */
     ERROR_CODE_DYNAMIC_CREATION_NOT_SUPPORTED = 4,
-    ERROR_CODE_FILE_ACCESS_DENIED = 5,
-    ERROR_CODE_INCOMPATIBLE_SECURITY_LEVELS = 6,
-    ERROR_CODE_INCONSISTENT_PARAMETERS = 7,
+    ERROR_CODE_NO_OBJECTS_OF_SPECIFIED_TYPE = 17,
+    ERROR_CODE_OBJECT_DELETION_NOT_PERMITTED = 23,
+    ERROR_CODE_OBJECT_IDENTIFIER_ALREADY_EXISTS = 24,
+    ERROR_CODE_READ_ACCESS_DENIED = 27,
+    ERROR_CODE_UNKNOWN_OBJECT = 31,
+    ERROR_CODE_UNSUPPORTED_OBJECT_TYPE = 36,
+
+    /* Error Class - Property */
+    ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED = 41,
+    ERROR_CODE_DATATYPE_NOT_SUPPORTED = 47,
     ERROR_CODE_INCONSISTENT_SELECTION_CRITERION = 8,
     ERROR_CODE_INVALID_ARRAY_INDEX = 42,
-    ERROR_CODE_INVALID_CONFIGURATION_DATA = 46,
     ERROR_CODE_INVALID_DATA_TYPE = 9,
-    ERROR_CODE_INVALID_FILE_ACCESS_METHOD = 10,
-    ERROR_CODE_ERROR_CODE_INVALID_FILE_START_POSITION = 11,
-    ERROR_CODE_INVALID_OPERATOR_NAME = 12,
-    ERROR_CODE_INVALID_PARAMETER_DATA_TYPE = 13,
-    ERROR_CODE_INVALID_TIME_STAMP = 14,
-    ERROR_CODE_KEY_GENERATION_ERROR = 15,
-    ERROR_CODE_MISSING_REQUIRED_PARAMETER = 16,
-    ERROR_CODE_NO_OBJECTS_OF_SPECIFIED_TYPE = 17,
+    ERROR_CODE_NOT_COV_PROPERTY = 44,
+    ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED = 45,
+    ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY = 50,
+    /* ERROR_CODE_READ_ACCESS_DENIED = 27, */
+    ERROR_CODE_UNKNOWN_PROPERTY = 32,
+    ERROR_CODE_VALUE_OUT_OF_RANGE = 37,
+    ERROR_CODE_WRITE_ACCESS_DENIED = 40,
+
+    /* Error Class - Resources */
     ERROR_CODE_NO_SPACE_FOR_OBJECT = 18,
     ERROR_CODE_NO_SPACE_TO_ADD_LIST_ELEMENT = 19,
     ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY = 20,
-    ERROR_CODE_NO_VT_SESSIONS_AVAILABLE = 21,
-    ERROR_CODE_OBJECT_DELETION_NOT_PERMITTED = 23,
-    ERROR_CODE_OBJECT_IDENTIFIER_ALREADY_EXISTS = 24,
-    ERROR_CODE_OPERATIONAL_PROBLEM = 25,
-    ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED = 45,
+
+    /* Error Class - Security */
+    ERROR_CODE_AUTHENTICATION_FAILED = 1,
+    /* ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED = 41, */
+    ERROR_CODE_INCOMPATIBLE_SECURITY_LEVELS = 6,
+    ERROR_CODE_INVALID_OPERATOR_NAME = 12,
+    ERROR_CODE_KEY_GENERATION_ERROR = 15,
     ERROR_CODE_PASSWORD_FAILURE = 26,
-    ERROR_CODE_PROPERTY_IS_NOT_A_LIST = 22,
-    ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY = 50,
-    ERROR_CODE_READ_ACCESS_DENIED = 27,
     ERROR_CODE_SECURITY_NOT_SUPPORTED = 28,
-    ERROR_CODE_SERVICE_REQUEST_DENIED = 29,
     ERROR_CODE_TIMEOUT = 30,
-    ERROR_CODE_UNKNOWN_OBJECT = 31,
-    ERROR_CODE_UNKNOWN_PROPERTY = 32,
-    ERROR_CODE_RESERVED1 = 33,
+
+    /* Error Class - Services */
+    /* ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED = 41, */
+    ERROR_CODE_COV_SUBSCRIPTION_FAILED = 43,
+    ERROR_CODE_DUPLICATE_NAME = 48,
+    ERROR_CODE_DUPLICATE_OBJECT_ID = 49,
+    ERROR_CODE_FILE_ACCESS_DENIED = 5,
+    ERROR_CODE_INCONSISTENT_PARAMETERS = 7,
+    ERROR_CODE_INVALID_CONFIGURATION_DATA = 46,
+    ERROR_CODE_INVALID_FILE_ACCESS_METHOD = 10,
+    ERROR_CODE_ERROR_CODE_INVALID_FILE_START_POSITION = 11,
+    ERROR_CODE_INVALID_PARAMETER_DATA_TYPE = 13,
+    ERROR_CODE_INVALID_TIME_STAMP = 14,
+    ERROR_CODE_MISSING_REQUIRED_PARAMETER = 16,
+    /* ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED = 45, */
+    ERROR_CODE_PROPERTY_IS_NOT_A_LIST = 22,
+    ERROR_CODE_SERVICE_REQUEST_DENIED = 29,
+
+    /* Error Class - VT */
     ERROR_CODE_UNKNOWN_VT_CLASS = 34,
     ERROR_CODE_UNKNOWN_VT_SESSION = 35,
-    ERROR_CODE_UNSUPPORTED_OBJECT_TYPE = 36,
-    ERROR_CODE_VALUE_OUT_OF_RANGE = 37,
+    ERROR_CODE_NO_VT_SESSIONS_AVAILABLE = 21,
     ERROR_CODE_VT_SESSION_ALREADY_CLOSED = 38,
     ERROR_CODE_VT_SESSION_TERMINATION_FAILURE = 39,
-    ERROR_CODE_WRITE_ACCESS_DENIED = 40,
-    /* see character-set-not-supported  (41), */
-    /* see invalid-array-index          (42), */
-    ERROR_CODE_COV_SUBSCRIPTION_FAILED = 43,
-    ERROR_CODE_NOT_COV_PROPERTY = 44,
-    /* see optional-functionality-not-supported (45), */
-    /* see invalid-configuration-data (46), */
-    /* see datatype-not-supported   (47), */
-    /* see duplicate-name           (48), */
-    /* see duplicate-object-id      (49), */
-    /* see property-is-not-an-array (50), */
+
+    /* unused */
+    ERROR_CODE_RESERVED1 = 33,
     /* Enumerated values 0-255 are reserved for definition by ASHRAE. */
     /* Enumerated values 256-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */