diff --git a/bacnet-stack/bacenum.h b/bacnet-stack/bacenum.h index cc1e9598..1c70ef33 100644 --- a/bacnet-stack/bacenum.h +++ b/bacnet-stack/bacenum.h @@ -13,8 +13,10 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + along with this program; if not, write to: + The Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA. As a special exception, if other files instantiate templates or use macros or inline functions from this file, or you compile @@ -202,7 +204,32 @@ typedef enum PROP_ZONE_MEMBERS = 165, PROP_LIFE_SAFETY_ALARM_VALUES = 166, PROP_MAX_SEGMENTS_ACCEPTED = 167, - PROP_PROFILE_NAME = 168 + PROP_PROFILE_NAME = 168, + PROP_AUTO_SLAVE_DISCOVERY = 169, + PROP_MANUAL_SLAVE_ADDRESS_BINDING = 170, + PROP_SLAVE_ADDRESS_BINDING = 171, + PROP_SLAVE_PROXY_ENABLE = 172, + PROP_LAST_NOTIFY_TIME = 173, + PROP_SCHEDULE_DEFAULT = 174, + PROP_ACCEPTED_MODES = 175, + PROP_ADJUST_VALUE = 176, + PROP_COUNT = 177, + PROP_COUNT_BEFORE_CHANGE = 178, + PROP_COUNT_CHANGE_TIME = 179, + PROP_COV_PERIOD = 180, + PROP_INPUT_REFERENCE = 181, + PROP_LIMIT_MONITORING_INTERVAL = 182, + PROP_LOGGING_DEVICE = 183, + PROP_LOGGING_RECORD = 184, + PROP_PRESCALE = 185, + PROP_PULSE_RATE = 186, + PROP_SCALE = 187, + PROP_SCALE_FACTOR = 188, + PROP_UPDATE_TIME = 189, + PROP_VALUE_BEFORE_CHANGE = 190, + PROP_VALUE_SET = 191, + PROP_VALUE_CHANGE_TIME = 192 + // The special property identifiers all, optional, and required // are reserved for use in the ReadPropertyConditional and // ReadPropertyMultiple services or services not defined in this standard. @@ -251,129 +278,223 @@ typedef enum typedef enum { - //Area - UNITS_SQUARE_METERS = 0, - UNITS_SQUARE_FEET = 1, - //Electrical - UNITS_MILLIAMPERES = 2, - UNITS_AMPERES = 3, - UNITS_OHMS = 4, - UNITS_VOLTS = 5, - UNITS_KILOVOLTS = 6, - UNITS_MEGAVOLTS = 7, - UNITS_VOLT_AMPERES = 8, - UNITS_KILOVOLT_AMPERES = 9, - UNITS_MEGAVOLT_AMPERES = 10, - UNITS_VOLT_AMPERES_REACTIVE = 11, - UNITS_KILOVOLT_AMPERES_REACTIVE = 12, - UNITS_MEGAVOLT_AMPERES_REACTIVE = 13, - UNITS_DEGREES_PHASE = 14, - UNITS_POWER_FACTOR = 15, - //Energy - UNITS_JOULES = 16, - UNITS_KILOJOULES = 17, - UNITS_WATT_HOURS = 18, - UNITS_KILOWATT_HOURS = 19, - UNITS_BTU = 20, - UNITS_THERM = 21, - UNITS_TON_HOR = 22, - //Enthalpy - UNITS_JOULES_PER_KILOGRAM_DRY_AIR = 23, - UNITS_BTU_PER_POUND_DRY_AIR = 24, - //Frecuency - UNITS_CYCLES_PER_HOUR = 25, - UNITS_CYCLES_PER_MINUTE = 26, - UNITS_HERTZ = 27, - //Humidity + /* Acceleration */ + UNITS_METERS_PER_SECOND_PER_SECOND = 166, + /* Area */ + UNITS_SQUARE_METERS = 0, + UNITS_SQUARE_CENTIMETERS = 116, + UNITS_SQUARE_FEET = 1, + UNITS_SQUARE_INCHES = 115, + /* Currency */ + UNITS_CURRENCY1 = 105, + UNITS_CURRENCY2 = 106, + UNITS_CURRENCY3 = 107, + UNITS_CURRENCY4 = 108, + UNITS_CURRENCY5 = 109, + UNITS_CURRENCY6 = 110, + UNITS_CURRENCY7 = 111, + UNITS_CURRENCY8 = 112, + UNITS_CURRENCY9 = 113, + UNITS_CURRENCY10 = 114, + /* Electrical */ + UNITS_MILLIAMPERES = 2, + UNITS_AMPERES = 3, + UNITS_AMPERES_PER_METER = 167, + UNITS_AMPERES_PER_SQUARE_METER = 168, + UNITS_AMPERE_SQUARE_METERS = 169, + UNITS_FARADS = 170, + UNITS_HENRYS = 171, + UNITS_OHMS = 4, + UNITS_OHM_METERS = 172, + UNITS_MILLIOHMS = 145, + UNITS_KILOHMS = 122, + UNITS_MEGOHMS = 123, + UNITS_SIEMENS = 173, /* 1 mho equals 1 siemens */ + UNITS_SIEMENS_PER_METER = 174, + UNITS_TESLAS = 175, + UNITS_VOLTS = 5, + UNITS_MILLIVOLTS = 124, + UNITS_KILOVOLTS = 6, + UNITS_MEGAVOLTS = 7, + UNITS_VOLT_AMPERES = 8, + UNITS_KILOVOLT_AMPERES = 9, + UNITS_MEGAVOLT_AMPERES = 10, + UNITS_VOLT_AMPERES_REACTIVE = 11, + UNITS_KILOVOLT_AMPERES_REACTIVE = 12, + UNITS_MEGAVOLT_AMPERES_REACTIVE = 13, + UNITS_VOLTS_PER_DEGREE_KELVIN = 176, + UNITS_VOLTS_PER_METER = 177, + UNITS_DEGREES_PHASE = 14, + UNITS_POWER_FACTOR = 15, + UNITS_WEBERS = 178, + /* Energy */ + UNITS_JOULES = 16, + UNITS_KILOJOULES = 17, + UNITS_KILOJOULES_PER_KILOGRAM = 125, + UNITS_MEGAJOULES = 126, + UNITS_WATT_HOURS = 18, + UNITS_KILOWATT_HOURS = 19, + UNITS_MEGAWATT_HOURS = 146, + UNITS_BTUS = 20, + UNITS_KILO_BTUS = 147, + UNITS_MEGA_BTUS = 148, + UNITS_THERMS = 21, + UNITS_TON_HOURS = 22, + /* Enthalpy */ + UNITS_JOULES_PER_KILOGRAM_DRY_AIR = 23, + UNITS_KILOJOULES_PER_KILOGRAM_DRY_AIR = 149, + UNITS_MEGAJOULES_PER_KILOGRAM_DRY_AIR = 150, + UNITS_BTUS_PER_POUND_DRY_AIR = 24, + UNITS_BTUS_PER_POUND = 117, + /* Entropy */ + UNITS_JOULES_PER_DEGREE_KELVIN = 127, + UNITS_KILOJOULES_PER_DEGREE_KELVIN = 151, + UNITS_MEGAJOULES_PER_DEGREE_KELVIN = 152, + UNITS_JOULES_PER_KILOGRAM_DEGREE_KELVIN = 128, + /* Force */ + UNITS_NEWTON = 153, + /* Frequency */ + UNITS_CYCLES_PER_HOUR = 25, + UNITS_CYCLES_PER_MINUTE = 26, + UNITS_HERTZ = 27, + UNITS_KILOHERTZ = 129, + UNITS_MEGAHERTZ = 130, + UNITS_PER_HOUR = 131, + /* Humidity */ UNITS_GRAMS_OF_WATER_PER_KILOGRAM_DRY_AIR = 28, - UNITS_PERCENT_RELATIVE_HUMIDITY = 29, - //Length - UNITS_MILLIMETER = 30, - UNITS_METERS = 31, - UNITS_INCH = 32, - UNITS_FEET = 33, - //Light - UNITS_WATTS_PER_SQUARE_FOOT = 34, - UNITS_WATTS_PER_SQUARE_METER = 35, - UNITS_LUMEN = 36, - UNITS_LUX = 37, - UNITS_FOOT_CANDLES = 38, - //Mass - UNITS_KILOGRAMS = 39, - UNITS_POUNDS_MASS = 40, - UNITS_TONS = 41, - //Mass Flow - UNITS_KILOGRAMS_PER_SECOND = 42, - UNITS_KILOGRAMS_PER_MINUTE = 43, - UNITS_KILOGRAMS_PER_HOUR = 44, - UNITS_POUNDS_MASS_PER_MINUTE = 45, - UNITS_POUNDS_MASS_PER_HOUR = 46, - //Power - UNITS_WATTS = 47, - UNITS_KILOWATTS = 48, - UNITS_MEGAWATTS = 49, - UNITS_BTU_PER_HOUR = 50, - UNITS_HORSEPOWER = 51, - UNITS_TONS_REFRIGERATIONS = 52, - //Pressure - UNITS_PASCALS = 53, - UNITS_KILOPASCAL = 54, - UNITS_BAR = 55, + UNITS_PERCENT_RELATIVE_HUMIDITY = 29, + /* Length */ + UNITS_MILLIMETERS = 30, + UNITS_CENTIMETERS = 118, + UNITS_METERS = 31, + UNITS_INCHES = 32, + UNITS_FEET = 33, + /* Light */ + UNITS_CANDELAS = 179, + UNITS_CANDELAS_PER_SQUARE_METER = 180, + UNITS_WATTS_PER_SQUARE_FOOT = 34, + UNITS_WATTS_PER_SQUARE_METER = 35, + UNITS_LUMENS = 36, + UNITS_LUXES = 37, + UNITS_FOOT_CANDLES = 38, + /* Mass */ + UNITS_KILOGRAMS = 39, + UNITS_POUNDS_MASS = 40, + UNITS_TONS = 41, + /* Mass Flow */ + UNITS_GRAMS_PER_SECOND = 154, + UNITS_GRAMS_PER_MINUTE = 155, + UNITS_KILOGRAMS_PER_SECOND = 42, + UNITS_KILOGRAMS_PER_MINUTE = 43, + UNITS_KILOGRAMS_PER_HOUR = 44, + UNITS_POUNDS_MASS_PER_SECOND = 119, + UNITS_POUNDS_MASS_PER_MINUTE = 45, + UNITS_POUNDS_MASS_PER_HOUR = 46, + UNITS_TONS_PER_HOUR = 156, + /* Power */ + UNITS_MILLIWATTS = 132, + UNITS_WATTS = 47, + UNITS_KILOWATTS = 48, + UNITS_MEGAWATTS = 49, + UNITS_BTUS_PER_HOUR = 50, + UNITS_KILO_BTUS_PER_HOUR = 157, + UNITS_HORSEPOWER = 51, + UNITS_TONS_REFRIGERATION = 52, + /* Pressure */ + UNITS_PASCALS = 53, + UNITS_HECTOPASCALS = 133, + UNITS_KILOPASCALS = 54, + UNITS_MILLIBARS = 134, + UNITS_BARS = 55, UNITS_POUNDS_FORCE_PER_SQUARE_INCH = 56, - UNITS_CENTIMETERS_OF_WATER = 57, - UNITS_INCHES_OF_WATER = 58, - UNITS_MILLIMETERS_OF_MERCURY = 59, - UNITS_CENTIMETERS_OF_MERCURY = 60, - UNITS_INCHES_OF_MERCURY = 61, - //Temperature - UNITS_DEGREES_CELSIUS = 62, - UNITS_DEGREES_KELVIN = 63, - UNITS_DEGREES_FAHRENHEIT = 64, - UNITS_DEGREE_DAYS_CELSIUS = 65, - UNITS_DEGREE_DAYS_FAHRENHEIT = 66, - //Time - UNITS_YEAR = 67, - UNITS_MONTH = 68, - UNITS_WEEK = 69, - UNITS_DAY = 70, - UNITS_HOUR = 71, - UNITS_MINUTE = 72, - UNITS_SECOND = 73, - //Velocity - UNITS_METERS_PER_SECOND = 74, - UNITS_KILOMETERS_PER_HOUR = 75, - UNITS_FEET_PER_SECOND = 76, - UNITS_FEET_PER_MINUTE = 77, - UNITS_MILES_PER_HOUR = 78, - //Volume - UNITS_CUBIC_FEET = 79, - UNITS_CUBIC_METERS = 80, - UNITS_IMPERIAL_GALLONS = 81, - UNITS_LITERS = 82, - UNITS_US_GALLONS = 83, - //Volumetric Flow - UNITS_CUBIC_FEET_PER_MINUTE = 84, - UNITS_CUBIC_METERS_PER_SECOND = 85, - UNITS_IMPERIAL_GALLONS_PER_MINUTE = 86, - UNITS_LITERS_PER_SECOND = 87, - UNITS_LITERS_PER_MINUTE = 88, - UNITS_US_GALLONS_PER_MINUTE = 89, - //Others - UNITS_DEGREES_ANGULAR = 90, - UNITS_DEGREES_CELSIUS_PER_HOUR = 91, - UNITS_DEGREES_CELSIUS_PER_MINUTE = 92, - UNITS_DEGREES_FAHRENHEIT_PER_HOUR = 93, - UNITS_DEGREES_FAHRENHEIT_PER_MINUTE = 94, - UNITS_NO_UNITS = 95, - UNITS_PARTS_PER_MILLION = 96, - UNITS_PARTS_PER_BILLION = 97, - UNITS_PERCENT = 98, - UNITS_PERCENT_PER_SECOND = 99, - UNITS_PER_MINUTE = 100, - UNITS_PER_SECOND = 101, - UNITS_PSI_PER_DEGREE_FAHRENHEIT = 102, - UNITS_RADIANS = 103, - UNITS_REVOLUTIONS_PER_MINUTE = 104 + UNITS_CENTIMETERS_OF_WATER = 57, + UNITS_INCHES_OF_WATER = 58, + UNITS_MILLIMETERS_OF_MERCURY = 59, + UNITS_CENTIMETERS_OF_MERCURY = 60, + UNITS_INCHES_OF_MERCURY = 61, + /* Temperature */ + UNITS_DEGREES_CELSIUS = 62, + UNITS_DEGREES_KELVIN = 63, + UNITS_DEGREES_KELVIN_PER_HOUR = 181, + UNITS_DEGREES_KELVIN_PER_MINUTE = 182, + UNITS_DEGREES_FAHRENHEIT = 64, + UNITS_DEGREE_DAYS_CELSIUS = 65, + UNITS_DEGREE_DAYS_FAHRENHEIT = 66, + UNITS_DELTA_DEGREES_FAHRENHEIT = 120, + UNITS_DELTA_DEGREES_KELVIN = 121, + /* Time */ + UNITS_YEARS = 67, + UNITS_MONTHS = 68, + UNITS_WEEKS = 69, + UNITS_DAYS = 70, + UNITS_HOURS = 71, + UNITS_MINUTES = 72, + UNITS_SECONDS = 73, + UNITS_HUNDREDTHS_SECONDS = 158, + UNITS_MILLISECONDS = 159, + /* Torque */ + UNITS_NEWTON_METERS = 160, + /* Velocity */ + UNITS_MILLIMETERS_PER_SECOND = 161, + UNITS_MILLIMETERS_PER_MINUTE = 162, + UNITS_METERS_PER_SECOND = 74, + UNITS_METERS_PER_MINUTE = 163, + UNITS_METERS_PER_HOUR = 164, + UNITS_KILOMETERS_PER_HOUR = 75, + UNITS_FEET_PER_SECOND = 76, + UNITS_FEET_PER_MINUTE = 77, + UNITS_MILES_PER_HOUR = 78, + /* Volume */ + UNITS_CUBIC_FEET = 79, + UNITS_CUBIC_METERS = 80, + UNITS_IMPERIAL_GALLONS = 81, + UNITS_LITERS = 82, + UNITS_US_GALLONS = 83, + /* Volumetric Flow */ + UNITS_CUBIC_FEET_PER_SECOND = 142, + UNITS_CUBIC_FEET_PER_MINUTE = 84, + UNITS_CUBIC_METERS_PER_SECOND = 85, + UNITS_CUBIC_METERS_PER_MINUTE = 165, + UNITS_CUBIC_METERS_PER_HOUR = 135, + UNITS_IMPERIAL_GALLONS_PER_MINUTE = 86, + UNITS_LITERS_PER_SECOND = 87, + UNITS_LITERS_PER_MINUTE = 88, + UNITS_LITERS_PER_HOUR = 136, + UNITS_US_GALLONS_PER_MINUTE = 89, + /* Other */ + UNITS_DEGREES_ANGULAR = 90, + UNITS_DEGREES_CELSIUS_PER_HOUR = 91, + UNITS_DEGREES_CELSIUS_PER_MINUTE = 92, + UNITS_DEGREES_FAHRENHEIT_PER_HOUR = 93, + UNITS_DEGREES_FAHRENHEIT_PER_MINUTE = 94, + UNITS_JOULE_SECONDS = 183, + UNITS_KILOGRAMS_PER_CUBIC_METER = 186, + UNITS_KILOWATT_HOURS_PER_SQUARE_METER = 137, + UNITS_KILOWATT_HOURS_PER_SQUARE_FOOT = 138, + UNITS_MEGAJOULES_PER_SQUARE_METER = 139, + UNITS_MEGAJOULES_PER_SQUARE_FOOT = 140, + UNITS_NO_UNITS = 95, + UNITS_NEWTON_SECONDS = 187, + UNITS_NEWTONS_PER_METER = 188, + UNITS_PARTS_PER_MILLION = 96, + UNITS_PARTS_PER_BILLION = 97, + UNITS_PERCENT = 98, + UNITS_PERCENT_OBSCURATION_PER_FOOT = 143, + UNITS_PERCENT_OBSCURATION_PER_METER = 144, + UNITS_PERCENT_PER_SECOND = 99, + UNITS_PER_MINUTE = 100, + UNITS_PER_SECOND = 101, + UNITS_PSI_PER_DEGREE_FAHRENHEIT = 102, + UNITS_RADIANS = 103, + UNITS_RADIANS_PER_SECOND = 184, + UNITS_REVOLUTIONS_PER_MINUTE = 104, + UNITS_SQUARE_METERS_PER_NEWTON = 185, + UNITS_WATTS_PER_METER_PER_DEGREE_KELVIN = 189, + UNITS_WATTS_PER_SQUARE_METER_DEGREE_KELVIN = 141 + /* 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 189. */ } BACNET_ENGINEERING_UNITS; typedef enum diff --git a/bacnet-stack/bactext.c b/bacnet-stack/bactext.c index e92d3a24..b45ce87f 100644 --- a/bacnet-stack/bactext.c +++ b/bacnet-stack/bactext.c @@ -171,175 +171,175 @@ const char *bactext_object_type_name(int index) INDTEXT_DATA bacnet_property_names[] = { /* FIXME: use the enumerations from bacenum.h */ - { 0, "acked-transitions"}, - { 1, "ack-required"}, - { 2, "action"}, - { 3, "action-text"}, - { 4, "active-text"}, - { 5, "active-vt-sessions"}, - { 6, "alarm-value"}, - { 7, "alarm-values"}, - { 8, "all"}, - { 9, "all-writes-successful"}, - { 10, "apdu-segment-timeout"}, - { 11, "apdu-timeout"}, - { 12, "application-software-version"}, - { 13, "archive"}, - { 14, "bias"}, - { 15, "change-of-state-count"}, - { 16, "change-of-state-time"}, - { 17, "notification-class"}, - { 18, "(deleted in 135-2001)"}, - { 19, "controlled-variable-reference"}, - { 20, "controlled-variable-units"}, - { 21, "controlled-variable-value"}, - { 22, "COV-increment"}, - { 23, "datelist"}, - { 24, "daylight-savings-status"}, - { 25, "deadband"}, - { 26, "derivative-constant"}, - { 27, "derivative-constant-units"}, - { 28, "description"}, - { 29, "description-of-halt"}, - { 30, "device-address-binding"}, - { 31, "device-type"}, - { 32, "effective-period"}, - { 33, "elapsed-active-time"}, - { 34, "error-limit"}, - { 35, "event-enable"}, - { 36, "event-state"}, - { 37, "event-type"}, - { 38, "exception-schedule"}, - { 39, "fault-values"}, - { 40, "feedback-value"}, - { 41, "file-access-method"}, - { 42, "file-size"}, - { 43, "file-type"}, - { 44, "firmware-version"}, - { 45, "high-limit"}, - { 46, "inactive-text"}, - { 47, "in-process"}, - { 48, "instance-of"}, - { 49, "integral-constant"}, - { 50, "integral-constant-units"}, - { 51, "issue-confirmednotifications"}, - { 52, "limit-enable"}, - { 53, "list-of-group-members"}, - { 54, "list-of-object-property-references"}, - { 55, "list-of-session-keys"}, - { 56, "local-date"}, - { 57, "local-time"}, - { 58, "location"}, - { 59, "low-limit"}, - { 60, "manipulated-variable-reference"}, - { 61, "maximum-output"}, - { 62, "max-apdu-length-accepted"}, - { 63, "max-info-frames"}, - { 64, "max-master"}, - { 65, "max-pres-value"}, - { 66, "minimum-off-time"}, - { 67, "minimum-on-time"}, - { 68, "minimum-output"}, - { 69, "min-pres-value"}, - { 70, "model-name"}, - { 71, "modification-date"}, - { 72, "notify-type"}, - { 73, "number-of-APDU-retries"}, - { 74, "number-of-states"}, - { 75, "object-identifier"}, - { 76, "object-list"}, - { 77, "object-name"}, - { 78, "object-property-reference"}, - { 79, "object-type"}, - { 80, "optional"}, - { 81, "out-of-service"}, - { 82, "output-units"}, - { 83, "event-parameters"}, - { 84, "polarity"}, - { 85, "present-value"}, - { 86, "priority"}, - { 87, "priority-array"}, - { 88, "priority-for-writing"}, - { 89, "process-identifier"}, - { 90, "program-change"}, - { 91, "program-location"}, - { 92, "program-state"}, - { 93, "proportional-constant"}, - { 94, "proportional-constant-units"}, - { 95, "protocol-conformance-class"}, - { 96, "protocol-object-types-supported"}, - { 97, "protocol-services-supported"}, - { 98, "protocol-version"}, - { 99, "read-only"}, - { 100, "reason-for-halt"}, - { 101, "recipient"}, - { 102, "recipient-list"}, - { 103, "reliability"}, - { 104, "relinquish-default"}, - { 105, "required"}, - { 106, "resolution"}, - { 107, "segmentation-supported"}, - { 108, "setpoint"}, - { 109, "setpoint-reference"}, - { 110, "state-text"}, - { 111, "status-flags"}, - { 112, "system-status"}, - { 113, "time-delay"}, - { 114, "time-of-active-time-reset"}, - { 115, "time-of-state-count-reset"}, - { 116, "time-synchronization-recipients"}, - { 117, "units"}, - { 118, "update-interval"}, - { 119, "utc-offset"}, - { 120, "vendor-identifier"}, - { 121, "vendor-name"}, - { 122, "vt-classes-supported"}, - { 123, "weekly-schedule"}, - { 124, "attempted-samples"}, - { 125, "average-value"}, - { 126, "buffer-size"}, - { 127, "client-cov-increment"}, - { 128, "cov-resubscription-interval"}, - { 129, "current-notify-time"}, - { 130, "event-time-stamps"}, - { 131, "log-buffer"}, - { 132, "log-device-object-property"}, - { 133, "log-enable"}, - { 134, "log-interval"}, - { 135, "maximum-value"}, - { 136, "minimum-value"}, - { 137, "notification-threshold"}, - { 138, "previous-notify-time"}, - { 139, "protocol-revision"}, - { 140, "records-since-notification"}, - { 141, "record-count"}, - { 142, "start-time"}, - { 143, "stop-time"}, - { 144, "stop-when-full"}, - { 145, "total-record-count"}, - { 146, "valid-samples"}, - { 147, "window-interval"}, - { 148, "window-samples"}, - { 149, "maximum-value-timestamp"}, - { 150, "minimum-value-timestamp"}, - { 151, "variance-value"}, - { 152, "active-cov-subscriptions"}, - { 153, "backup-failure-timeout"}, - { 154, "configuration-files"}, - { 155, "database-revision"}, - { 156, "direct-reading"}, - { 157, "last-restore-time"}, - { 158, "maintenance-required"}, - { 159, "member-of"}, - { 160, "mode"}, - { 161, "operation-expected"}, - { 162, "setting"}, - { 163, "silenced"}, - { 164, "tracking-value"}, - { 165, "zone-members"}, - { 166, "life-safety-alarm-values"}, - { 167, "max-segments-accepted"}, - { 168, "profile-name"}, + { PROP_ACKED_TRANSITIONS, "acked-transitions"}, + { PROP_ACK_REQUIRED, "ack-required"}, + { PROP_ACTION, "action"}, + { PROP_ACTION_TEXT, "action-text"}, + { PROP_ACTIVE_TEXT, "active-text"}, + { PROP_ACTIVE_VT_SESSIONS, "active-vt-sessions"}, + { PROP_ALARM_VALUE, "alarm-value"}, + { PROP_ALARM_VALUES, "alarm-values"}, + { PROP_ALL, "all"}, + { PROP_ALL_WRITES_SUCCESSFUL, "all-writes-successful"}, + { PROP_APDU_SEGMENT_TIMEOUT, "apdu-segment-timeout"}, + { PROP_APDU_TIMEOUT, "apdu-timeout"}, + { PROP_APPLICATION_SOFTWARE_VERSION, "application-software-version"}, + { PROP_ARCHIVE, "archive"}, + { PROP_BIAS, "bias"}, + { PROP_CHANGE_OF_STATE_COUNT, "change-of-state-count"}, + { PROP_CHANGE_OF_STATE_TIME, "change-of-state-time"}, + { PROP_NOTIFICATION_CLASS, "notification-class"}, + { PROP_BLANK_1, "(deleted in 135-2001)"}, + { PROP_CONTROLLED_VARIABLE_REFERENCE, "controlled-variable-reference"}, + { PROP_CONTROLLED_VARIABLE_UNITS, "controlled-variable-units"}, + { PROP_CONTROLLED_VARIABLE_VALUE, "controlled-variable-value"}, + { PROP_COV_INCREMENT, "COV-increment"}, + { PROP_DATE_LIST, "datelist"}, + { PROP_DAYLIGHT_SAVINGS_STATUS, "daylight-savings-status"}, + { PROP_DEADBAND, "deadband"}, + { PROP_DERIVATIVE_CONSTANT, "derivative-constant"}, + { PROP_DERIVATIVE_CONSTANT_UNITS, "derivative-constant-units"}, + { PROP_DESCRIPTION, "description"}, + { PROP_DESCRIPTION_OF_HALT, "description-of-halt"}, + { PROP_DEVICE_ADDRESS_BINDING, "device-address-binding"}, + { PROP_DEVICE_TYPE, "device-type"}, + { PROP_EFFECTIVE_PERIOD, "effective-period"}, + { PROP_ELAPSED_ACTIVE_TIME, "elapsed-active-time"}, + { PROP_ERROR_LIMIT, "error-limit"}, + { PROP_EVENT_ENABLE, "event-enable"}, + { PROP_EVENT_STATE, "event-state"}, + { PROP_EVENT_TYPE, "event-type"}, + { PROP_EXCEPTION_SCHEDULE, "exception-schedule"}, + { PROP_FAULT_VALUES, "fault-values"}, + { PROP_FEEDBACK_VALUE, "feedback-value"}, + { PROP_FILE_ACCESS_METHOD, "file-access-method"}, + { PROP_FILE_SIZE, "file-size"}, + { PROP_FILE_TYPE, "file-type"}, + { PROP_FIRMWARE_REVISION, "firmware-version"}, + { PROP_HIGH_LIMIT, "high-limit"}, + { PROP_INACTIVE_TEXT, "inactive-text"}, + { PROP_IN_PROCESS, "in-process"}, + { PROP_INSTANCE_OF, "instance-of"}, + { PROP_INTEGRAL_CONSTANT, "integral-constant"}, + { PROP_INTEGRAL_CONSTANT_UNITS, "integral-constant-units"}, + { PROP_ISSUE_CONFIRMED_NOTIFICATIONS, "issue-confirmednotifications"}, + { PROP_LIMIT_ENABLE, "limit-enable"}, + { PROP_LIST_OF_GROUP_MEMBERS, "list-of-group-members"}, + { PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES, "list-of-object-property-references"}, + { PROP_LIST_OF_SESSION_KEYS, "list-of-session-keys"}, + { PROP_LOCAL_DATE, "local-date"}, + { PROP_LOCAL_TIME, "local-time"}, + { PROP_LOCATION, "location"}, + { PROP_LOW_LIMIT, "low-limit"}, + { PROP_MANIPULATED_VARIABLE_REFERENCE, "manipulated-variable-reference"}, + { PROP_MAXIMUM_OUTPUT, "maximum-output"}, + { PROP_MAX_APDU_LENGTH_ACCEPTED, "max-apdu-length-accepted"}, + { PROP_MAX_INFO_FRAMES, "max-info-frames"}, + { PROP_MAX_MASTER, "max-master"}, + { PROP_MAX_PRES_VALUE, "max-pres-value"}, + { PROP_MINIMUM_OFF_TIME, "minimum-off-time"}, + { PROP_MINIMUM_ON_TIME, "minimum-on-time"}, + { PROP_MINIMUM_OUTPUT, "minimum-output"}, + { PROP_MIN_PRES_VALUE, "min-pres-value"}, + { PROP_MODEL_NAME, "model-name"}, + { PROP_MODIFICATION_DATE, "modification-date"}, + { PROP_NOTIFY_TYPE, "notify-type"}, + { PROP_NUMBER_OF_APDU_RETRIES, "number-of-APDU-retries"}, + { PROP_NUMBER_OF_STATES, "number-of-states"}, + { PROP_OBJECT_IDENTIFIER, "object-identifier"}, + { PROP_OBJECT_LIST, "object-list"}, + { PROP_OBJECT_NAME, "object-name"}, + { PROP_OBJECT_PROPERTY_REFERENCE, "object-property-reference"}, + { PROP_OBJECT_TYPE, "object-type"}, + { PROP_OPTIONAL, "optional"}, + { PROP_OUT_OF_SERVICE, "out-of-service"}, + { PROP_OUTPUT_UNITS, "output-units"}, + { PROP_EVENT_PARAMETERS, "event-parameters"}, + { PROP_POLARITY, "polarity"}, + { PROP_PRESENT_VALUE, "present-value"}, + { PROP_PRIORITY, "priority"}, + { PROP_PRIORITY_ARRAY, "priority-array"}, + { PROP_PRIORITY_FOR_WRITING, "priority-for-writing"}, + { PROP_PROCESS_IDENTIFIER, "process-identifier"}, + { PROP_PROGRAM_CHANGE, "program-change"}, + { PROP_PROGRAM_LOCATION, "program-location"}, + { PROP_PROGRAM_STATE, "program-state"}, + { PROP_PROPORTIONAL_CONSTANT, "proportional-constant"}, + { PROP_PROPORTIONAL_CONSTANT_UNITS, "proportional-constant-units"}, + { PROP_PROTOCOL_CONFORMANCE_CLASS, "protocol-conformance-class"}, + { PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED, "protocol-object-types-supported"}, + { PROP_PROTOCOL_SERVICES_SUPPORTED, "protocol-services-supported"}, + { PROP_PROTOCOL_VERSION, "protocol-version"}, + { PROP_READ_ONLY, "read-only"}, + { PROP_REASON_FOR_HALT, "reason-for-halt"}, + { PROP_RECIPIENT, "recipient"}, + { PROP_RECIPIENT_LIST, "recipient-list"}, + { PROP_RELIABILITY, "reliability"}, + { PROP_RELINQUISH_DEFAULT, "relinquish-default"}, + { PROP_REQUIRED, "required"}, + { PROP_RESOLUTION, "resolution"}, + { PROP_SEGMENTATION_SUPPORTED, "segmentation-supported"}, + { PROP_SETPOINT, "setpoint"}, + { PROP_SETPOINT_REFERENCE, "setpoint-reference"}, + { PROP_STATE_TEXT, "state-text"}, + { PROP_STATUS_FLAGS, "status-flags"}, + { PROP_SYSTEM_STATUS, "system-status"}, + { PROP_TIME_DELAY, "time-delay"}, + { PROP_TIME_OF_ACTIVE_TIME_RESET, "time-of-active-time-reset"}, + { PROP_TIME_OF_STATE_COUNT_RESET, "time-of-state-count-reset"}, + { PROP_TIME_SYNCHRONIZATION_RECIPIENTS, "time-synchronization-recipients"}, + { PROP_UNITS, "units"}, + { PROP_UPDATE_INTERVAL, "update-interval"}, + { PROP_UTC_OFFSET, "utc-offset"}, + { PROP_VENDOR_IDENTIFIER, "vendor-identifier"}, + { PROP_VENDOR_NAME, "vendor-name"}, + { PROP_VT_CLASSES_SUPPORTED, "vt-classes-supported"}, + { PROP_WEEKLY_SCHEDULE, "weekly-schedule"}, + { PROP_ATTEMPTED_SAMPLES, "attempted-samples"}, + { PROP_AVERAGE_VALUE, "average-value"}, + { PROP_BUFFER_SIZE, "buffer-size"}, + { PROP_CLIENT_COV_INCREMENT, "client-cov-increment"}, + { PROP_COV_RESUBSCRIPTION_INTERVAL, "cov-resubscription-interval"}, + { PROP_CURRENT_NOTIFY_TIME, "current-notify-time"}, + { PROP_EVENT_TIME_STAMPS, "event-time-stamps"}, + { PROP_LOG_BUFFER, "log-buffer"}, + { PROP_LOG_DEVICE_OBJECT, "log-device-object-property"}, + { PROP_LOG_ENABLE, "log-enable"}, + { PROP_LOG_INTERVAL, "log-interval"}, + { PROP_MAXIMUM_VALUE, "maximum-value"}, + { PROP_MINIMUM_VALUE, "minimum-value"}, + { PROP_NOTIFICATION_THRESHOLD, "notification-threshold"}, + { PROP_PREVIOUS_NOTIFY_TIME, "previous-notify-time"}, + { PROP_PROTOCOL_REVISION, "protocol-revision"}, + { PROP_RECORDS_SINCE_NOTIFICATION, "records-since-notification"}, + { PROP_RECORD_COUNT, "record-count"}, + { PROP_START_TIME, "start-time"}, + { PROP_STOP_TIME, "stop-time"}, + { PROP_STOP_WHEN_FULL, "stop-when-full"}, + { PROP_TOTAL_RECORD_COUNT, "total-record-count"}, + { PROP_VALID_SAMPLES, "valid-samples"}, + { PROP_WINDOW_INTERVAL, "window-interval"}, + { PROP_WINDOW_SAMPLES, "window-samples"}, + { PROP_MAXIMUM_VALUE_TIMESTAMP, "maximum-value-timestamp"}, + { PROP_MINIMUM_VALUE_TIMESTAMP, "minimum-value-timestamp"}, + { PROP_VARIANCE_VALUE, "variance-value"}, + { PROP_ACTIVE_COV_SUBSCRIPTIONS, "active-cov-subscriptions"}, + { PROP_BACKUP_FAILURE_TIMEOUT, "backup-failure-timeout"}, + { PROP_CONFIGURATION_FILES, "configuration-files"}, + { PROP_DATABASE_REVISION, "database-revision"}, + { PROP_DIRECT_READING, "direct-reading"}, + { PROP_LAST_RESTORE_TIME, "last-restore-time"}, + { PROP_MAINTENANCE_REQUIRED, "maintenance-required"}, + { PROP_MEMBER_OF, "member-of"}, + { PROP_MODE, "mode"}, + { PROP_OPERATION_EXPECTED, "operation-expected"}, + { PROP_SETTING, "setting"}, + { PROP_SILENCED, "silenced"}, + { PROP_TRACKING_VALUE, "tracking-value"}, + { PROP_ZONE_MEMBERS, "zone-members"}, + { PROP_LIFE_SAFETY_ALARM_VALUES, "life-safety-alarm-values"}, + { PROP_MAX_SEGMENTS_ACCEPTED, "max-segments-accepted"}, + { PROP_PROFILE_NAME, "profile-name"}, { 0, NULL } /* Enumerated values 0-511 are reserved for definition by ASHRAE. Enumerated values 512-4194303 may be used by others subject to the @@ -357,54 +357,197 @@ const char *bactext_property_name(int index) } INDTEXT_DATA bacnet_engineering_unit_names[] = { -/* FIXME: add the first 144 names...*/ -/* FIXME: use the enumerations from bacenum.h */ -{145,"milliohms"}, -{146,"megawatt-hours"}, -{147,"kilo-btus"}, -{148,"mega-btus"}, -{149,"kilojoules-per-kilogram-dry-air"}, -{150,"megajoules-per-kilogram-dry-air"}, -{151,"kilojoules-per-degree-Kelvin"}, -{152,"megajoules-per-degree-Kelvin"}, -{153,"newton"}, -{154,"grams-per-second"}, -{155,"grams-per-minute"}, -{156,"tons-per-hour"}, -{157,"kilo-btus-per-hour"}, -{158,"hundredths-seconds"}, -{159,"milliseconds"}, -{160,"newton-meters"}, -{161,"millimeters-per-second"}, -{162,"millimeters-per-minute"}, -{163,"meters-per-minute"}, -{164,"meters-per-hour"}, -{165,"cubic-meters-per-minute"}, -{166,"meters-per-second-per-second"}, -{167,"amperes-per-meter"}, -{168,"amperes-per-square-meter"}, -{169,"ampere-square-meters"}, -{170,"farads"}, -{171,"henrys"}, -{172,"ohm-meters"}, -{173,"siemens"}, -{174,"siemens-per-meter"}, -{175,"teslas"}, -{176,"volts-per-degree-Kelvin"}, -{177,"volts-per-meter"}, -{178,"webers"}, -{179,"candelas"}, -{180,"candelas-per-square-meter"}, -{181,"degrees-Kelvin-per-hour"}, -{182,"degrees-Kelvin-per-minute"}, -{183,"joule-seconds"}, -{184,"radians-per-second"}, -{185,"square-meters-per-Newton"}, -{186,"kilograms-per-cubic-meter"}, -{187,"newton-seconds"}, -{188,"newtons-per-meter"}, -{189,"watts-per-meter-per-degree-Kelvin"}, -{0,NULL} + { UNITS_SQUARE_METERS , "square-meters"}, + { UNITS_SQUARE_FEET , "square-feet"}, + { UNITS_MILLIAMPERES , "milliamperes"}, + { UNITS_AMPERES, "amperes"}, + { UNITS_OHMS, "ohms"}, + { UNITS_VOLTS, "volts"}, + { UNITS_KILOVOLTS, "kilovolts"}, + { UNITS_MEGAVOLTS, "megavolts"}, + { UNITS_VOLT_AMPERES, "volt-amperes"}, + { UNITS_KILOVOLT_AMPERES, "kilovolt-amperes"}, + { UNITS_MEGAVOLT_AMPERES, "megavolt-amperes"}, + { UNITS_VOLT_AMPERES_REACTIVE, "volt-amperes-reactive"}, + { UNITS_KILOVOLT_AMPERES_REACTIVE, "kilovolt-amperes-reactive"}, + { UNITS_MEGAVOLT_AMPERES_REACTIVE, "megavolt-amperes-reactive"}, + { UNITS_DEGREES_PHASE, "degrees-phase"}, + { UNITS_POWER_FACTOR, "power-factor"}, + { UNITS_JOULES, "joules"}, + { UNITS_KILOJOULES, "kilojoules"}, + { UNITS_WATT_HOURS, "watt-hours"}, + { UNITS_KILOWATT_HOURS, "kilowatt-hours"}, + { UNITS_BTUS, "btus"}, + { UNITS_THERMS, "therms"}, + { UNITS_TON_HOURS, "ton-hours"}, + { UNITS_JOULES_PER_KILOGRAM_DRY_AIR, "joules-per-kilogram-dry-air"}, + { UNITS_BTUS_PER_POUND_DRY_AIR, "btus-per-pound-dry-air"}, + { UNITS_CYCLES_PER_HOUR, "cycles-per-hour"}, + { UNITS_CYCLES_PER_MINUTE, "cycles-per-minute"}, + { UNITS_HERTZ, "hertz"}, + { UNITS_GRAMS_OF_WATER_PER_KILOGRAM_DRY_AIR, "grams-of-water-per-kilogram-dry-air"}, + { UNITS_PERCENT_RELATIVE_HUMIDITY, "percent-relative-humidity"}, + { UNITS_MILLIMETERS, "millimeters"}, + { UNITS_METERS, "meters"}, + { UNITS_INCHES, "inches"}, + { UNITS_FEET, "feet"}, + { UNITS_WATTS_PER_SQUARE_FOOT, "watts-per-square-foot"}, + { UNITS_WATTS_PER_SQUARE_METER, "watts-per-square-meter"}, + { UNITS_LUMENS, "lumens"}, + { UNITS_LUXES, "luxes"}, + { UNITS_FOOT_CANDLES, "foot-candles"}, + { UNITS_KILOGRAMS, "kilograms"}, + { UNITS_POUNDS_MASS, "pounds-mass"}, + { UNITS_TONS, "tons"}, + { UNITS_KILOGRAMS_PER_SECOND, "kilograms-per-second"}, + { UNITS_KILOGRAMS_PER_MINUTE, "kilograms-per-minute"}, + { UNITS_KILOGRAMS_PER_HOUR, "kilograms-per-hour"}, + { UNITS_POUNDS_MASS_PER_MINUTE, "pounds-mass-per-minute"}, + { UNITS_POUNDS_MASS_PER_HOUR, "pounds-mass-per-hour"}, + { UNITS_WATTS, "watts"}, + { UNITS_KILOWATTS, "kilowatts"}, + { UNITS_MEGAWATTS, "megawatts"}, + { UNITS_BTUS_PER_HOUR, "btus-per-hour"}, + { UNITS_HORSEPOWER, "horsepower"}, + { UNITS_TONS_REFRIGERATION, "tons-refrigeration"}, + { UNITS_PASCALS, "pascals"}, + { UNITS_KILOPASCALS, "kilopascals"}, + { UNITS_BARS, "bars"}, + { UNITS_POUNDS_FORCE_PER_SQUARE_INCH, "pounds-force-per-square-inch"}, + { UNITS_CENTIMETERS_OF_WATER, "centimeters-of-water"}, + { UNITS_INCHES_OF_WATER, "inches-of-water"}, + { UNITS_MILLIMETERS_OF_MERCURY, "millimeters-of-mercury"}, + { UNITS_CENTIMETERS_OF_MERCURY, "centimeters-of-mercury"}, + { UNITS_INCHES_OF_MERCURY, "inches-of-mercury"}, + { UNITS_DEGREES_CELSIUS, "degrees-celsius"}, + { UNITS_DEGREES_KELVIN, "degrees-kelvin"}, + { UNITS_DEGREES_FAHRENHEIT, "degrees-fahrenheit"}, + { UNITS_DEGREE_DAYS_CELSIUS, "degree-days-celsius"}, + { UNITS_DEGREE_DAYS_FAHRENHEIT, "degree-days-fahrenheit"}, + { UNITS_YEARS, "years"}, + { UNITS_MONTHS, "months"}, + { UNITS_WEEKS, "weeks"}, + { UNITS_DAYS, "days"}, + { UNITS_HOURS, "hours"}, + { UNITS_MINUTES, "minutes"}, + { UNITS_SECONDS, "secondS"}, + { UNITS_METERS_PER_SECOND, "meters-per-second"}, + { UNITS_KILOMETERS_PER_HOUR, "kilometers-per-hour"}, + { UNITS_FEET_PER_SECOND, "feet-per-second"}, + { UNITS_FEET_PER_MINUTE, "feet-per-minute"}, + { UNITS_MILES_PER_HOUR, "miles-per-hour"}, + { UNITS_CUBIC_FEET, "cubic-feet"}, + { UNITS_CUBIC_METERS, "cubic-meters"}, + { UNITS_IMPERIAL_GALLONS, "imperial-gallons"}, + { UNITS_LITERS, "liters"}, + { UNITS_US_GALLONS, "us-gallons"}, + { UNITS_CUBIC_FEET_PER_MINUTE, "cubic-feet-per-minute"}, + { UNITS_CUBIC_METERS_PER_SECOND, "cubic-meters-per-second"}, + { UNITS_IMPERIAL_GALLONS_PER_MINUTE, "imperial-gallons-per-minute"}, + { UNITS_LITERS_PER_SECOND, "liters-per-second"}, + { UNITS_LITERS_PER_MINUTE, "liters-per-minute"}, + { UNITS_US_GALLONS_PER_MINUTE, "us-gallons-per-minute"}, + { UNITS_DEGREES_ANGULAR, "degrees-angular"}, + { UNITS_DEGREES_CELSIUS_PER_HOUR, "degrees-celsius-per-hour"}, + { UNITS_DEGREES_CELSIUS_PER_MINUTE, "degrees-celsius-per-minute"}, + { UNITS_DEGREES_FAHRENHEIT_PER_HOUR, "degrees-fahrenheit-per-hour"}, + { UNITS_DEGREES_FAHRENHEIT_PER_MINUTE, "degrees-fahrenheit-per-minute"}, + { UNITS_NO_UNITS, "no-units"}, + { UNITS_PARTS_PER_MILLION, "parts-per-million"}, + { UNITS_PARTS_PER_BILLION, "parts-per-billion"}, + { UNITS_PERCENT, "percent"}, + { UNITS_PERCENT_PER_SECOND, "percent-per-second"}, + { UNITS_PER_MINUTE, "per-minute"}, + { UNITS_PER_SECOND, "per-second"}, + { UNITS_PSI_PER_DEGREE_FAHRENHEIT, "psi-per-degree-fahrenheit"}, + { UNITS_RADIANS, "radians"}, + { UNITS_REVOLUTIONS_PER_MINUTE, "revolutions-per-minute"}, + { UNITS_CURRENCY1, "currency1"}, + { UNITS_CURRENCY2, "currency2"}, + { UNITS_CURRENCY3, "currency3"}, + { UNITS_CURRENCY4, "currency4"}, + { UNITS_CURRENCY5, "currency5"}, + { UNITS_CURRENCY6, "currency6"}, + { UNITS_CURRENCY7, "currency7"}, + { UNITS_CURRENCY8, "currency8"}, + { UNITS_CURRENCY9, "currency9"}, + { UNITS_CURRENCY10, "currency10"}, + { UNITS_SQUARE_INCHES, "square-inches"}, + { UNITS_SQUARE_CENTIMETERS, "square-centimeters"}, + { UNITS_BTUS_PER_POUND, "btus_per-pound"}, + { UNITS_CENTIMETERS, "centimeters"}, + { UNITS_POUNDS_MASS_PER_SECOND, "pounds-mass-per-second"}, + { UNITS_DELTA_DEGREES_FAHRENHEIT, "delta-degrees-fahrenheit"}, + { UNITS_DELTA_DEGREES_KELVIN, "delta-degrees-kelvin"}, + { UNITS_KILOHMS, "kilohms"}, + { UNITS_MEGOHMS, "megohms"}, + { UNITS_MILLIVOLTS, "millivolts"}, + { UNITS_KILOJOULES_PER_KILOGRAM, "kilojoules-per-kilogram"}, + { UNITS_MEGAJOULES, "megajoules"}, + { UNITS_JOULES_PER_DEGREE_KELVIN, "joules-per-degree-kelvin"}, + { UNITS_JOULES_PER_KILOGRAM_DEGREE_KELVIN, "joules-per-kilogram-degree-kelvin"}, + { UNITS_KILOHERTZ, "kilohertz"}, + { UNITS_MEGAHERTZ, "megahertz"}, + { UNITS_PER_HOUR, "per-hour"}, + { UNITS_MILLIWATTS, "milliwatts"}, + { UNITS_HECTOPASCALS, "hectopascals"}, + { UNITS_MILLIBARS, "millibars"}, + { UNITS_CUBIC_METERS_PER_HOUR, "cubic-meters-per-hour"}, + { UNITS_LITERS_PER_HOUR, "liters-per-hour"}, + { UNITS_KILOWATT_HOURS_PER_SQUARE_METER, "kilowatt-hours-per-square-meter"}, + { UNITS_KILOWATT_HOURS_PER_SQUARE_FOOT, "kilowatt-hours-per-square-foot"}, + { UNITS_MEGAJOULES_PER_SQUARE_METER, "megajoules-per-square-meter"}, + { UNITS_MEGAJOULES_PER_SQUARE_FOOT, "megajoules-per-square-foot"}, + { UNITS_CUBIC_FEET_PER_SECOND, "cubic-feet-per-second"}, + { UNITS_WATTS_PER_SQUARE_METER_DEGREE_KELVIN, "watts-per-square-meter-degree-kelvin"}, + { UNITS_PERCENT_OBSCURATION_PER_FOOT, "percent-obscuration-per-foot"}, + { UNITS_PERCENT_OBSCURATION_PER_METER, "percent-obscuration-per-meter"}, + { UNITS_MILLIOHMS, "milliohms"}, + { UNITS_MEGAWATT_HOURS, "megawatt-hours"}, + { UNITS_KILO_BTUS, "kilo-btus"}, + { UNITS_MEGA_BTUS, "mega-btus"}, + { UNITS_KILOJOULES_PER_KILOGRAM_DRY_AIR, "kilojoules-per-kilogram-dry-air"}, + { UNITS_MEGAJOULES_PER_KILOGRAM_DRY_AIR, "megajoules-per-kilogram-dry-air"}, + { UNITS_KILOJOULES_PER_DEGREE_KELVIN, "kilojoules-per-degree-Kelvin"}, + { UNITS_MEGAJOULES_PER_DEGREE_KELVIN, "megajoules-per-degree-Kelvin"}, + { UNITS_NEWTON, "newton"}, + { UNITS_GRAMS_PER_SECOND, "grams-per-second"}, + { UNITS_GRAMS_PER_MINUTE, "grams-per-minute"}, + { UNITS_TONS_PER_HOUR, "tons-per-hour"}, + { UNITS_KILO_BTUS_PER_HOUR, "kilo-btus-per-hour"}, + { UNITS_HUNDREDTHS_SECONDS, "hundredths-seconds"}, + { UNITS_MILLISECONDS, "milliseconds"}, + { UNITS_NEWTON_METERS, "newton-meters"}, + { UNITS_MILLIMETERS_PER_SECOND, "millimeters-per-second"}, + { UNITS_MILLIMETERS_PER_MINUTE, "millimeters-per-minute"}, + { UNITS_METERS_PER_MINUTE, "meters-per-minute"}, + { UNITS_METERS_PER_HOUR, "meters-per-hour"}, + { UNITS_CUBIC_METERS_PER_MINUTE, "cubic-meters-per-minute"}, + { UNITS_METERS_PER_SECOND_PER_SECOND, "meters-per-second-per-second"}, + { UNITS_AMPERES_PER_METER, "amperes-per-meter"}, + { UNITS_AMPERES_PER_SQUARE_METER, "amperes-per-square-meter"}, + { UNITS_AMPERE_SQUARE_METERS, "ampere-square-meters"}, + { UNITS_FARADS, "farads"}, + { UNITS_HENRYS, "henrys"}, + { UNITS_OHM_METERS, "ohm-meters"}, + { UNITS_SIEMENS, "siemens"}, + { UNITS_SIEMENS_PER_METER, "siemens-per-meter"}, + { UNITS_TESLAS, "teslas"}, + { UNITS_VOLTS_PER_DEGREE_KELVIN, "volts-per-degree-Kelvin"}, + { UNITS_VOLTS_PER_METER, "volts-per-meter"}, + { UNITS_WEBERS, "webers"}, + { UNITS_CANDELAS, "candelas"}, + { UNITS_CANDELAS_PER_SQUARE_METER, "candelas-per-square-meter"}, + { UNITS_DEGREES_KELVIN_PER_HOUR, "degrees-Kelvin-per-hour"}, + { UNITS_DEGREES_KELVIN_PER_MINUTE, "degrees-Kelvin-per-minute"}, + { UNITS_JOULE_SECONDS, "joule-seconds"}, + { UNITS_RADIANS_PER_SECOND, "radians-per-second"}, + { UNITS_SQUARE_METERS_PER_NEWTON, "square-meters-per-Newton"}, + { UNITS_KILOGRAMS_PER_CUBIC_METER, "kilograms-per-cubic-meter"}, + { UNITS_NEWTON_SECONDS, "newton-seconds"}, + { UNITS_NEWTONS_PER_METER, "newtons-per-meter"}, + { UNITS_WATTS_PER_METER_PER_DEGREE_KELVIN, "watts-per-meter-per-degree-Kelvin"}, + { 0, NULL} /* 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. */ @@ -420,37 +563,45 @@ const char *bactext_engineering_unit_name(int index) Vendor_Proprietary_String); } -#if 0 -/* FIXME: add the value */ -/* FIXME: use the enumerations from bacenum.h */ INDTEXT_DATA bacnet_reject_reason_names[] = { - "Other", - "Buffer Overflow", - "Inconsistent Parameters", - "Invalid Parameter Data Type", - "Invalid Tag", - "Missing Required Parameter", - "Parameter Out of Range", - "Too Many Arguments", - "Undefined Enumeration", - "Unrecognized Service" + {REJECT_REASON_OTHER, "Other"}, + {REJECT_REASON_BUFFER_OVERFLOW, "Buffer Overflow"}, + {REJECT_REASON_INCONSISTENT_PARAMETERS, "Inconsistent Parameters"}, + {REJECT_REASON_INVALID_PARAMETER_DATA_TYPE, "Invalid Parameter Data Type"}, + {REJECT_REASON_INVALID_TAG, "Invalid Tag"}, + {REJECT_REASON_MISSING_REQUIRED_PARAMETER, "Missing Required Parameter"}, + {REJECT_REASON_PARAMETER_OUT_OF_RANGE, "Parameter Out of Range"}, + {REJECT_REASON_TOO_MANY_ARGUMENTS, "Too Many Arguments"}, + {REJECT_REASON_UNDEFINED_ENUMERATION, "Undefined Enumeration"}, + {REJECT_REASON_UNRECOGNIZED_SERVICE, "Unrecognized Service"}, {0,NULL} }; -#endif +const char *bactext_reject_reason_name(int index) +{ + return indtext_by_index_split_default( + bacnet_reject_reason_names, + index, + FIRST_PROPRIETARY_REJECT_REASON, + ASHRAE_Reserved_String, + Vendor_Proprietary_String); +} -#if 0 -/* FIXME: add the value */ -/* FIXME: use the enumerations from bacenum.h */ -INDTEXT_DATA bacnet_abort_reason_name[] = { - "Other", - "Buffer Overflow", - "Invalid APDU in this State", - "Preempted by Higher Priority Task", - "Segmentation Not Supported" +INDTEXT_DATA bacnet_abort_reason_names[] = { + { ABORT_REASON_OTHER, "Other"}, + { ABORT_REASON_BUFFER_OVERFLOW, "Buffer Overflow"}, + { ABORT_REASON_INVALID_APDU_IN_THIS_STATE, "Invalid APDU in this State"}, + { ABORT_REASON_PREEMPTED_BY_HIGHER_PRIORITY_TASK, "Preempted by Higher Priority Task"}, + { ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, "Segmentation Not Supported"}, + {0,NULL} }; -#endif - - - +const char *bactext_abort_reason_name(int index) +{ + return indtext_by_index_split_default( + bacnet_abort_reason_names, + index, + FIRST_PROPRIETARY_ABORT_REASON, + ASHRAE_Reserved_String, + Vendor_Proprietary_String); +}