From c9fd7c9c19a1f99a3ec65a0c2c680e3790b266ad Mon Sep 17 00:00:00 2001 From: tbrennan3 Date: Sun, 29 Aug 2010 01:53:05 +0000 Subject: [PATCH] Corrected the set of Properties, and their associated text, per the final Addendum j. --- bacnet-stack/include/bacenum.h | 139 +++++++++++++++++---------------- bacnet-stack/src/bactext.c | 47 ++++++----- 2 files changed, 99 insertions(+), 87 deletions(-) diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h index ecd7869e..bc4cffcc 100644 --- a/bacnet-stack/include/bacenum.h +++ b/bacnet-stack/include/bacenum.h @@ -297,84 +297,87 @@ typedef enum { PROP_ACCESS_EVENT_AUTHENTICATION_FACTOR = 248, PROP_ACCESS_EVENT_CREDENTIAL = 249, PROP_ACCESS_EVENT_TIME = 250, - PROP_ACCESS_RULES = 251, - PROP_ACCESS_RULES_ENABLE = 252, - PROP_ACCESS_TRANSACTION_EVENTS = 253, - PROP_ACCOMPANIED = 254, - PROP_ACTIVATION_TIME = 255, - PROP_ACTIVE_AUTHENTICATION_POLICY = 256, - PROP_ASSIGNED_ACCESS_RIGHTS = 257, - PROP_AUTHENTICATION_FACTOR_INPUT_LIST = 258, - PROP_AUTHENTICATION_FACTORS = 259, - PROP_AUTHENTICATION_POLICY_LIST = 260, - PROP_AUTHENTICATION_POLICY_NAMES = 261, - PROP_AUTHORIZATION_MODE = 262, - PROP_BELONGS_TO = 263, - PROP_CREDENTIAL_DISABLE = 264, - PROP_CREDENTIAL_STATUS = 265, - PROP_CREDENTIALS = 266, - PROP_CREDENTIALS_IN_ZONE = 267, - PROP_DAYS_REMAINING = 268, - PROP_ENTRY_POINTS = 269, - PROP_EXIT_POINTS = 270, - PROP_EXPIRY_TIME = 271, - PROP_EXTENDED_TIME_ENABLE = 272, - PROP_FAILED_ATTEMPT_EVENTS = 273, - PROP_FAILED_ATTEMPTS = 274, - PROP_FAILED_ATTEMPTS_TIME = 275, - PROP_FORMAT_CLASS_SUPPORTED = 276, - PROP_FORMAT_TYPE = 277, - PROP_LAST_ACCESS_EVENT = 278, - PROP_LAST_ACCESS_POINT = 279, - PROP_LAST_CREDENTIAL_ADDED = 280, - PROP_LAST_CREDENTIAL_ADDED_TIME = 281, - PROP_LAST_CREDENTIAL_REMOVED = 282, - PROP_LAST_CREDENTIAL_REMOVED_TIME = 283, - PROP_LAST_USE_TIME = 284, - PROP_LOCKDOWN = 285, - PROP_LOCKDOWN_RELINQUISH_TIME = 286, - PROP_MASTER_EXEMPTION = 287, - PROP_MAX_FAILED_ATTEMPTS = 288, - PROP_MEMBERS = 289, - PROP_MASTER_POINT = 290, - PROP_NUMBER_OF_AUTHENTICATION_POLICIES = 291, - PROP_OCCUPANCY_COUNT = 293, - PROP_OCCUPANCY_COUNT_ENABLE = 294, - PROP_OCCUPANCY_COUNT_EXEMPTION = 295, - PROP_OCCUPANCY_LOWER_THRESHOLD = 296, - PROP_OCCUPANCY_LOWER_THRESHOLD_ENFORCED = 297, - PROP_OCCUPANCY_STATE = 298, - PROP_OCCUPANCY_UPPER_LIMIT = 299, - PROP_OCCUPANCY_UPPER_LIMIT_ENFORCED = 300, - PROP_PASSBACK_EXEMPTION = 301, - PROP_PASSBACK_MODE = 302, - PROP_PASSBACK_TIMEOUT = 303, - PROP_POSITIVE_ACCESS_RULES = 304, - PROP_READ_STATUS = 305, - PROP_REASON_FOR_DISABLE = 306, - PROP_THREAT_AUTHORITY = 307, - PROP_THREAT_LEVEL = 308, - PROP_TRACE_FLAG = 309, - PROP_TRANSACTION_NOTIFICATION_CLASS = 310, - PROP_USER_EXTERNAL_IDENTIFIER = 311, + PROP_ACCESS_TRANSACTION_EVENTS = 251, + PROP_ACCOMPANIMENT = 252, + PROP_ACCOMPANIMENT_TIME = 253, + PROP_ACTIVATION_TIME = 254, + PROP_ACTIVE_AUTHENTICATION_POLICY = 255, + PROP_ASSIGNED_ACCESS_RIGHTS = 256, + PROP_AUTHENTICATION_FACTORS = 257, + PROP_AUTHENTICATION_POLICY_LIST = 258, + PROP_AUTHENTICATION_POLICY_NAMES = 259, + PROP_AUTHORIZATION_STATUS = 260, + PROP_AUTHORIZATION_MODE = 261, + PROP_BELONGS_TO = 262, + PROP_CREDENTIAL_DISABLE = 263, + PROP_CREDENTIAL_STATUS = 264, + PROP_CREDENTIALS = 265, + PROP_CREDENTIALS_IN_ZONE = 266, + PROP_DAYS_REMAINING = 267, + PROP_ENTRY_POINTS = 268, + PROP_EXIT_POINTS = 269, + PROP_EXPIRY_TIME = 270, + PROP_EXTENDED_TIME_ENABLE = 271, + PROP_FAILED_ATTEMPT_EVENTS = 272, + PROP_FAILED_ATTEMPTS = 273, + PROP_FAILED_ATTEMPTS_TIME = 274, + PROP_LAST_ACCESS_EVENT = 275, + PROP_LAST_ACCESS_POINT = 276, + PROP_LAST_CREDENTIAL_ADDED = 277, + PROP_LAST_CREDENTIAL_ADDED_TIME = 278, + PROP_LAST_CREDENTIAL_REMOVED = 279, + PROP_LAST_CREDENTIAL_REMOVED_TIME = 280, + PROP_LAST_USE_TIME = 281, + PROP_LOCKOUT = 282, + PROP_LOCKOUT_RELINQUISH_TIME = 283, + PROP_MASTER_EXEMPTION = 284, + PROP_MAX_FAILED_ATTEMPTS = 285, + PROP_MEMBERS = 286, + PROP_MUSTER_POINT = 287, + PROP_NEGATIVE_ACCESS_RULES = 288, + PROP_NUMBER_OF_AUTHENTICATION_POLICIES = 289, + PROP_OCCUPANCY_COUNT = 290, + PROP_OCCUPANCY_COUNT_ADJUST = 291, + PROP_OCCUPANCY_COUNT_ENABLE = 292, + PROP_OCCUPANCY_EXEMPTION = 293, + PROP_OCCUPANCY_LOWER_LIMIT = 294, + PROP_OCCUPANCY_LOWER_LIMIT_ENFORCED = 295, + PROP_OCCUPANCY_STATE = 296, + PROP_OCCUPANCY_UPPER_LIMIT = 297, + PROP_OCCUPANCY_UPPER_LIMIT_ENFORCED = 298, + PROP_PASSBACK_EXEMPTION = 299, + PROP_PASSBACK_MODE = 300, + PROP_PASSBACK_TIMEOUT = 301, + PROP_POSITIVE_ACCESS_RULES = 302, + PROP_REASON_FOR_DISABLE = 303, + PROP_SUPPORTED_FORMATS = 304, + PROP_SUPPORTED_FORMAT_CLASSES = 305, + PROP_THREAT_AUTHORITY = 306, + PROP_THREAT_LEVEL = 307, + PROP_TRACE_FLAG = 308, + PROP_TRANSACTION_NOTIFICATION_CLASS = 309, + PROP_USER_EXTERNAL_IDENTIFIER = 310, + PROP_USER_INFORMATION_REFERENCE = 311, /* enumerations 312-313 are used in Addendum k to ANSI/ASHRAE 135-2004 */ PROP_CHARACTER_SET = 312, PROP_STRICT_CHARACTER_MODE = 313, - /* enumerations 312-313 are used in Addendum k to ANSI/ASHRAE 135-2004 */ + /* enumerations 314-316 are used in Addendum ? */ PROP_BACKUP_AND_RESTORE_STATE = 314, PROP_BACKUP_PREPARATION_TIME = 315, PROP_RESTORE_PREPARATION_TIME = 316, /* enumerations 317-323 are used in Addendum j to ANSI/ASHRAE 135-2004 */ - PROP_USER_INFORMATION_REFERENCE = 317, - PROP_USER_NAME = 318, - PROP_USER_TYPE = 319, - PROP_USES_REMAINING = 320, - PROP_VENDOR_FORMAT_IDENTIFIER = 321, - PROP_ZONE_FROM = 322, - PROP_ZONE_TO = 323, + PROP_USER_NAME = 317, + PROP_USER_TYPE = 318, + PROP_USES_REMAINING = 319, + PROP_ZONE_FROM = 320, + PROP_ZONE_TO = 321, + PROP_ACCESS_EVENT_TAG = 322, + PROP_GLOBAL_IDENTIFIER = 323, /* enumerations 324-325 are used in Addendum i to ANSI/ASHRAE 135-2004 */ PROP_BINARY_ACTIVE_VALUE = 324, PROP_BINARY_INACTIVE_VALUE = 325, + /* enumeration 326 is used in Addendum j to ANSI/ASHRAE 135-2004 */ + PROP_VERIFICATION_TIME = 326, /* enumerations 342-344 are defined in Addendum 2008-w */ PROP_BIT_MASK = 342, PROP_BIT_TEXT = 343, diff --git a/bacnet-stack/src/bactext.c b/bacnet-stack/src/bactext.c index 54952b3c..e29eaeac 100644 --- a/bacnet-stack/src/bactext.c +++ b/bacnet-stack/src/bactext.c @@ -776,6 +776,7 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_SYSTEM_FAILURE_VALUE, "system-failure-value"} , + /* enumerations 244-311 are used in Addendum j to ANSI/ASHRAE 135-2004 */ {PROP_ABSENTEE_LIMIT, "absentee-limit"} , {PROP_ACCESS_ALARM_EVENTS, "access-alarm-events"} @@ -791,13 +792,11 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_ACCESS_EVENT_TIME, "access-event-time"} , - {PROP_ACCESS_RULES, "access-rules"} + {PROP_ACCESS_TRANSACTION_EVENTS, "access-transaction–events"} , - {PROP_ACCESS_RULES_ENABLE, "access-rules-enable"} + {PROP_ACCOMPANIMENT, "accompaniment"} , - {PROP_ACCESS_TRANSACTION_EVENTS, "access-transaction-events"} - , - {PROP_ACCOMPANIED, "accompanied"} + {PROP_ACCOMPANIMENT_TIME, "accompaniment-time"} , {PROP_ACTIVATION_TIME, "activation-time"} , @@ -805,14 +804,14 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_ASSIGNED_ACCESS_RIGHTS, "assigned-access-rights"} , - {PROP_AUTHENTICATION_FACTOR_INPUT_LIST, "authentication-factor-input-list"} - , {PROP_AUTHENTICATION_FACTORS, "authentication-factors"} , {PROP_AUTHENTICATION_POLICY_LIST, "authentication-policy-list"} , {PROP_AUTHENTICATION_POLICY_NAMES, "authentication-policy-names"} , + {PROP_AUTHORIZATION_STATUS, "authentication-status"} + , {PROP_AUTHORIZATION_MODE, "authorization-mode"} , {PROP_BELONGS_TO, "belongs-to"} @@ -841,10 +840,6 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_FAILED_ATTEMPTS_TIME, "failed-attempts-time"} , - {PROP_FORMAT_CLASS_SUPPORTED, "format-class-supported"} - , - {PROP_FORMAT_TYPE, "format-type"} - , {PROP_LAST_ACCESS_EVENT, "last-access-event"} , {PROP_LAST_ACCESS_POINT, "last-access-point"} @@ -859,9 +854,9 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_LAST_USE_TIME, "last-use-time"} , - {PROP_LOCKDOWN, "lockdown"} + {PROP_LOCKOUT, "lockout"} , - {PROP_LOCKDOWN_RELINQUISH_TIME, "lockdown-relinquish-time"} + {PROP_LOCKOUT_RELINQUISH_TIME, "lockout-relinquish-time"} , {PROP_MASTER_EXEMPTION, "master-exemption"} , @@ -869,21 +864,25 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_MEMBERS, "members"} , - {PROP_MASTER_POINT, "muster-point"} + {PROP_MUSTER_POINT, "muster-point"} + , + {PROP_NEGATIVE_ACCESS_RULES, "negative-access-rules"} , {PROP_NUMBER_OF_AUTHENTICATION_POLICIES, "number-of-authentication-policies"} , {PROP_OCCUPANCY_COUNT, "occupancy-count"} , + {PROP_OCCUPANCY_COUNT_ADJUST, "occupancy-count-adjust"} + , {PROP_OCCUPANCY_COUNT_ENABLE, "occupancy-count-enable"} , {PROP_OCCUPANCY_COUNT_EXEMPTION, "occupancy-count-exemption"} , - {PROP_OCCUPANCY_LOWER_THRESHOLD, "occupancy-lower-threshold"} + {PROP_OCCUPANCY_LOWER_LIMIT, "occupancy-lower-limit"} , - {PROP_OCCUPANCY_LOWER_THRESHOLD_ENFORCED, - "occupancy-lower-threshold-enforced"} + {PROP_OCCUPANCY_LOWER_LIMIT_ENFORCED, + "occupancy-lower-limit-enforced"} , {PROP_OCCUPANCY_STATE, "occupancy-state"} , @@ -895,14 +894,18 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_PASSBACK_MODE, "passback-mode"} , + PROP_USER_INFORMATION_REFERENCE = 311, + {PROP_PASSBACK_TIMEOUT, "passback-timeout"} , {PROP_POSITIVE_ACCESS_RULES, "positive-access-rules"} , - {PROP_READ_STATUS, "read-status"} - , {PROP_REASON_FOR_DISABLE, "reason-for-disable"} , + {PROP_SUPPORTED_FORMATS, "supported-formats"} + , + {PROP_SUPPORTED_FORMAT_CLASSES, "supported-format-classes"} + , {PROP_THREAT_AUTHORITY, "threat-authority"} , {PROP_THREAT_LEVEL, "threat-level"} @@ -913,6 +916,9 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_USER_EXTERNAL_IDENTIFIER, "user-external-identifier"} , + {PROP_USER_INFORMATION_REFERENCE, "user-information-reference"} + , + /* enumerations 312-313 are used in Addendum k to ANSI/ASHRAE 135-2004 */ {PROP_CHARACTER_SET, "character-set"} , {PROP_STRICT_CHARACTER_MODE, "strict-character-mode"} @@ -941,6 +947,9 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_BINARY_INACTIVE_VALUE, "binary-inactive-value"} , + /* enumeration 326 is used in Addendum j to ANSI/ASHRAE 135-2004 */ + {PROP_VERIFICATION-TIME, "verification-time"} + , {PROP_BIT_MASK, "bit-mask"} , {PROP_BIT_TEXT, "bit-text"}