diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h index 02342e13..14d3ca62 100644 --- a/bacnet-stack/include/bacenum.h +++ b/bacnet-stack/include/bacenum.h @@ -1435,7 +1435,7 @@ typedef enum { 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_FILE_START_POSITION = 11, ERROR_CODE_INVALID_PARAMETER_DATA_TYPE = 13, ERROR_CODE_INVALID_TIME_STAMP = 14, ERROR_CODE_MISSING_REQUIRED_PARAMETER = 16, @@ -1483,17 +1483,73 @@ typedef enum { ERROR_CODE_NOT_CONFIGURED_FOR_TRIGGERED_LOGGING = 78, ERROR_CODE_UNKNOWN_SUBSCRIPTION = 79, ERROR_CODE_PARAMETER_OUT_OF_RANGE = 80, - ERROR_CODE_UNKNOWN_FILE_SIZE = 81, + ERROR_CODE_LIST_ELEMENT_NOT_FOUND = 81, ERROR_CODE_BUSY = 82, ERROR_CODE_COMMUNICATION_DISABLED = 83, - MAX_BACNET_ERROR_CODE = 84 - /* 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. */ - /* The last enumeration used in this version is 50. */ + ERROR_CODE_SUCCESS = 84, + ERROR_CODE_ACCESS_DENIED = 85, + ERROR_CODE_BAD_DESTINATION_ADDRESS = 86, + ERROR_CODE_BAD_DESTINATION_DEVICE_ID = 87, + ERROR_CODE_BAD_SIGNATURE = 88, + ERROR_CODE_BAD_SOURCE_ADDRESS = 89, + ERROR_CODE_BAD_TIMESTAMP = 90, + ERROR_CODE_CANNOT_USE_KEY = 91, + ERROR_CODE_CANNOT_VERIFY_MESSAGE_ID = 92, + ERROR_CODE_CORRECT_KEY_REVISION = 93, + ERROR_CODE_DESTINATION_DEVICE_ID_REQUIRED = 94, + ERROR_CODE_DUPLICATE_MESSAGE = 95, + ERROR_CODE_ENCRYPTION_NOT_CONFIGURED = 96, + ERROR_CODE_ENCRYPTION_REQUIRED = 97, + ERROR_CODE_INCORRECT_KEY = 98, + ERROR_CODE_INVALID_KEY_DATA = 99, + ERROR_CODE_KEY_UPDATE_IN_PROGRESS = 100, + ERROR_CODE_MALFORMED_MESSAGE = 101, + ERROR_CODE_NOT_KEY_SERVER = 102, + ERROR_CODE_SECURITY_NOT_CONFIGURED = 103, + ERROR_CODE_SOURCE_SECURITY_REQUIRED = 104, + ERROR_CODE_TOO_MANY_KEYS = 105, + ERROR_CODE_UNKNOWN_AUTHENTICATION_TYPE = 106, + ERROR_CODE_UNKNOWN_KEY = 107, + ERROR_CODE_UNKNOWN_KEY_REVISION = 108, + ERROR_CODE_UNKNOWN_SOURCE_MESSAGE = 109, + ERROR_CODE_NOT_ROUTER_TO_DNET = 110, + ERROR_CODE_ROUTER_BUSY = 111, + ERROR_CODE_UNKNOWN_NETWORK_MESSAGE = 112, + ERROR_CODE_MESSAGE_TOO_LONG = 113, + ERROR_CODE_SECURITY_ERROR = 114, + ERROR_CODE_ADDRESSING_ERROR = 115, + ERROR_CODE_WRITE_BDT_FAILED = 116, + ERROR_CODE_READ_BDT_FAILED = 117, + ERROR_CODE_REGISTER_FOREIGN_DEVICE_FAILED = 118, + ERROR_CODE_READ_FDT_FAILED = 119, + ERROR_CODE_DELETE_FDT_ENTRY_FAILED = 120, + ERROR_CODE_DISTRIBUTE_BROADCAST_FAILED = 121, + ERROR_CODE_UNKNOWN_FILE_SIZE = 122, + ERROR_CODE_ABORT_APDU_TOO_LONG = 123, + ERROR_CODE_ABORT_APPLICATION_EXCEEDED_REPLY_TIME = 124, + ERROR_CODE_ABORT_OUT_OF_RESOURCES = 125, + ERROR_CODE_ABORT_TSM_TIMEOUT = 126, + ERROR_CODE_ABORT_WINDOW_SIZE_OUT_OF_RANGE = 127, + ERROR_CODE_FILE_FULL = 128, + ERROR_CODE_INCONSISTENT_CONFIGURATION = 129, + ERROR_CODE_INCONSISTENT_OBJECT_TYPE = 130, + ERROR_CODE_INTERNAL_ERROR = 131, + ERROR_CODE_NOT_CONFIGURED = 132, + ERROR_CODE_OUT_OF_MEMORY = 133, + ERROR_CODE_VALUE_TOO_LONG = 134, + ERROR_CODE_ABORT_INSUFFICIENT_SECURITY = 135, + ERROR_CODE_ABORT_SECURITY_ERROR = 136, + + MAX_BACNET_ERROR_CODE = 137, + + ERROR_CODE_PROPRIETARY_FIRST = 256, + ERROR_CODE_PROPRIETARY_LAST = 65535 + + /* 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. */ + /* The last enumeration used in this version is 50. */ } BACNET_ERROR_CODE; -#define FIRST_PROPRIETARY_ERROR_CODE 256 -#define LAST_PROPRIETARY_ERROR_CODE 65535 typedef enum { BACNET_REINIT_COLDSTART = 0, diff --git a/bacnet-stack/src/bactext.c b/bacnet-stack/src/bactext.c index 0fa0cdb1..d1780cfa 100644 --- a/bacnet-stack/src/bactext.c +++ b/bacnet-stack/src/bactext.c @@ -1581,7 +1581,7 @@ INDTEXT_DATA bacnet_error_code_names[] = { , {ERROR_CODE_INVALID_FILE_ACCESS_METHOD, "invalid-file-access-method"} , - {ERROR_CODE_ERROR_CODE_INVALID_FILE_START_POSITION, + {ERROR_CODE_INVALID_FILE_START_POSITION, "error-code-invalid-file-start-position"} , {ERROR_CODE_INVALID_OPERATOR_NAME, "invalid-operator-name"} @@ -1723,12 +1723,67 @@ INDTEXT_DATA bacnet_error_code_names[] = { , {ERROR_CODE_PARAMETER_OUT_OF_RANGE, "parameter-out-of-range"} , - {ERROR_CODE_UNKNOWN_FILE_SIZE, "unknown-file-size"} + {ERROR_CODE_LIST_ELEMENT_NOT_FOUND, "list-element-not-found"} , {ERROR_CODE_BUSY, "busy"} , {ERROR_CODE_COMMUNICATION_DISABLED, "communication-disabled"} , + {ERROR_CODE_COMMUNICATION_DISABLED, "access-denied"} + , + {ERROR_CODE_SUCCESS, "success"}, + {ERROR_CODE_ACCESS_DENIED, "access-denied"}, + {ERROR_CODE_BAD_DESTINATION_ADDRESS, "bad-destination-address"}, + {ERROR_CODE_BAD_DESTINATION_DEVICE_ID, "bad-destination-device-id"}, + {ERROR_CODE_BAD_SIGNATURE, "bad-signature"}, + {ERROR_CODE_BAD_SOURCE_ADDRESS, "bad-source-address"}, + {ERROR_CODE_BAD_TIMESTAMP, "bad-timestamp"}, + {ERROR_CODE_CANNOT_USE_KEY, "cannot-use-key"}, + {ERROR_CODE_CANNOT_VERIFY_MESSAGE_ID, "cannot-verify-message-id"}, + {ERROR_CODE_CORRECT_KEY_REVISION, "correct-key-revision"}, + {ERROR_CODE_DESTINATION_DEVICE_ID_REQUIRED, "destination-device-id-required"}, + {ERROR_CODE_DUPLICATE_MESSAGE, "duplicate-message"}, + {ERROR_CODE_ENCRYPTION_NOT_CONFIGURED, "encryption-not-configured"}, + {ERROR_CODE_ENCRYPTION_REQUIRED, "encryption-required"}, + {ERROR_CODE_INCORRECT_KEY, "incorrect-key"}, + {ERROR_CODE_INVALID_KEY_DATA, "invalid-key-data"}, + {ERROR_CODE_KEY_UPDATE_IN_PROGRESS, "key-update-in-progress"}, + {ERROR_CODE_MALFORMED_MESSAGE, "malformed-message"}, + {ERROR_CODE_NOT_KEY_SERVER, "not-key-server"}, + {ERROR_CODE_SECURITY_NOT_CONFIGURED, "security-not-configured"}, + {ERROR_CODE_SOURCE_SECURITY_REQUIRED, "source-security-required"}, + {ERROR_CODE_TOO_MANY_KEYS, "too-many-keys"}, + {ERROR_CODE_UNKNOWN_AUTHENTICATION_TYPE, "unknown-authentication-type"}, + {ERROR_CODE_UNKNOWN_KEY, "unknown-key"}, + {ERROR_CODE_UNKNOWN_KEY_REVISION, "unknown-key-revision"}, + {ERROR_CODE_UNKNOWN_SOURCE_MESSAGE, "unknown-source-message"}, + {ERROR_CODE_NOT_ROUTER_TO_DNET, "not-router-to-dnet"}, + {ERROR_CODE_ROUTER_BUSY, "router-busy"}, + {ERROR_CODE_UNKNOWN_NETWORK_MESSAGE, "unknown-network-message"}, + {ERROR_CODE_MESSAGE_TOO_LONG, "message-too-long"}, + {ERROR_CODE_SECURITY_ERROR, "security-error"}, + {ERROR_CODE_ADDRESSING_ERROR, "addressing-error"}, + {ERROR_CODE_WRITE_BDT_FAILED, "write-bdt-failed"}, + {ERROR_CODE_READ_BDT_FAILED, "read-bdt-failed"}, + {ERROR_CODE_REGISTER_FOREIGN_DEVICE_FAILED, "register-foreign-device-failed"}, + {ERROR_CODE_READ_FDT_FAILED, "read-fdt-failed"}, + {ERROR_CODE_DELETE_FDT_ENTRY_FAILED, "delete-fdt-entry-failed"}, + {ERROR_CODE_DISTRIBUTE_BROADCAST_FAILED, "distribute-broadcast-failed"}, + {ERROR_CODE_UNKNOWN_FILE_SIZE, "unknown-file-size"}, + {ERROR_CODE_ABORT_APDU_TOO_LONG, "abort-apdu-too-long"}, + {ERROR_CODE_ABORT_APPLICATION_EXCEEDED_REPLY_TIME, "abort-application-exceeded-reply-time"}, + {ERROR_CODE_ABORT_OUT_OF_RESOURCES, "abort-out-of-resources"}, + {ERROR_CODE_ABORT_TSM_TIMEOUT, "abort-tsm-timeout"}, + {ERROR_CODE_ABORT_WINDOW_SIZE_OUT_OF_RANGE, "abort-window-size-out-of-range"}, + {ERROR_CODE_FILE_FULL, "file-full"}, + {ERROR_CODE_INCONSISTENT_CONFIGURATION, "inconsistent-configuration"}, + {ERROR_CODE_INCONSISTENT_OBJECT_TYPE, "inconsistent-object-type"}, + {ERROR_CODE_INTERNAL_ERROR, "internal-error"}, + {ERROR_CODE_NOT_CONFIGURED, "not-configured"}, + {ERROR_CODE_OUT_OF_MEMORY, "out-of-memory"}, + {ERROR_CODE_VALUE_TOO_LONG, "value-too-long"}, + {ERROR_CODE_ABORT_INSUFFICIENT_SECURITY, "abort-insufficient-security"}, + {ERROR_CODE_ABORT_SECURITY_ERROR, "abort-security-error"}, {0, NULL} };