diff --git a/bacnet-stack/src/bactext.c b/bacnet-stack/src/bactext.c index 383f51f9..b0801ee9 100644 --- a/bacnet-stack/src/bactext.c +++ b/bacnet-stack/src/bactext.c @@ -282,6 +282,10 @@ INDTEXT_DATA bacnet_object_type_names[] = { , {OBJECT_LIGHTING_OUTPUT, "lighting-output"} , + {OBJECT_BINARY_LIGHTING_OUTPUT, "binary-lighting-output"} + , + {OBJECT_NETWORK_PORT, "network-port"} + , {0, NULL} /* Enumerated values 0-127 are reserved for definition by ASHRAE. Enumerated values 128-1023 may be used by others subject to @@ -1032,8 +1036,111 @@ INDTEXT_DATA bacnet_property_names[] = { , {PROP_TRANSITION, "transition"} , - {PROP_EGRESS_ACTIVE, "egress-active"} - , + {PROP_EGRESS_ACTIVE, "egress-active"}, + {PROP_INTERFACE_VALUE, "inteface-value"}, + {PROP_FAULT_HIGH_LIMIT, "fault-high-limit"}, + {PROP_FAULT_LOW_LIMIT, "fault-low-limit"}, + {PROP_LOW_DIFF_LIMIT, "low-diff-limit"}, + {PROP_STRIKE_COUNT, "strike-count"}, + {PROP_TIME_OF_STRIKE_COUNT_RESET, "strike-count"}, + {PROP_DEFAULT_TIMEOUT, "default-timeout"}, + {PROP_INITIAL_TIMEOUT, "initial-timeout"}, + {PROP_LAST_STATE_CHANGE, "last-state-change"}, + {PROP_STATE_CHANGE_VALUES, "state-change-values"}, + {PROP_TIMER_RUNNING, "timer-running"}, + {PROP_TIMER_STATE, "timer-state"}, + {PROP_APDU_LENGTH, "apdu-length"}, + {PROP_IP_ADDRESS, "ip-address"}, + {PROP_IP_DEFAULT_GATEWAY, "ip-default-gateway"}, + {PROP_IP_DHCP_ENABLE, "ip-dhcp-enable"}, + {PROP_IP_DHCP_LEASE_TIME, "ip-dhcp-lease-time"}, + {PROP_IP_DHCP_LEASE_TIME_REMAINING, "ip-dhcp-lease-time-remaining"}, + {PROP_IP_DHCP_SERVER, "ip-dhcp-server"}, + {PROP_IP_DNS_SERVER, "ip-dns-server"}, + {PROP_BACNET_IP_GLOBAL_ADDRESS, "bacnet-ip-global-address"}, + {PROP_BACNET_IP_MODE, "bacnet-ip-mode"}, + {PROP_BACNET_IP_MULTICAST_ADDRESS, "bacnet-ip-multicast-address"}, + {PROP_BACNET_IP_NAT_TRAVERSAL, "bacnet-ip-nat-traversal"}, + {PROP_IP_SUBNET_MASK, "ip-subnet-mask"}, + {PROP_BACNET_IP_UDP_PORT, "bacnet-ip-udp-port"}, + {PROP_BBMD_ACCEPT_FD_REGISTRATIONS, "bbmd-accept-fd-registrations"}, + {PROP_BBMD_BROADCAST_DISTRIBUTION_TABLE, "bbmd-broadcast-distribution-table"}, + {PROP_BBMD_FOREIGN_DEVICE_TABLE, "bbmd-foreign-device-table"}, + {PROP_CHANGES_PENDING, "changes-pending"}, + {PROP_COMMAND, "command"}, + {PROP_FD_BBMD_ADDRESS, "fd-bbmd-address"}, + {PROP_FD_SUBSCRIPTION_LIFETIME, "fd-subscription-lifetime"}, + {PROP_LINK_SPEED, "link-speed"}, + {PROP_LINK_SPEEDS, "link-speeds"}, + {PROP_LINK_SPEED_AUTONEGOTIATE, "link-speed-autonegotiate"}, + {PROP_MAC_ADDRESS, "mac-address"}, + {PROP_NETWORK_INTERFACE_NAME, "network-interface-name"}, + {PROP_NETWORK_NUMBER, "network-number"}, + {PROP_NETWORK_NUMBER_QUALITY, "network-number-quality"}, + {PROP_NETWORK_TYPE, "network-type"}, + {PROP_ROUTING_TABLE, "routing-table"}, + {PROP_VIRTUAL_MAC_ADDRESS_TABLE, "virtual-mac-address-table"}, + {PROP_COMMAND_TIME_ARRAY, "command-time-array"}, + {PROP_CURRENT_COMMAND_PRIORITY, "current-command-priority"}, + {PROP_LAST_COMMAND_TIME, "last-command-time"}, + {PROP_VALUE_SOURCE, "value-source"}, + {PROP_VALUE_SOURCE_ARRAY, "value-source-array"}, + {PROP_BACNET_IPV6_MODE, "bacnet-ipv6-mode"}, + {PROP_IPV6_ADDRESS, "ipv6-address"}, + {PROP_IPV6_PREFIX_LENGTH, "ipv6-prefix-length"}, + {PROP_BACNET_IPV6_UDP_PORT, "bacnet-ipv6-udp-port"}, + {PROP_IPV6_DEFAULT_GATEWAY, "ipv6-default-gateway"}, + {PROP_BACNET_IPV6_MULTICAST_ADDRESS, "bacnet-ipv6-multicast-address"}, + {PROP_IPV6_DNS_SERVER, "ipv6-dns-server"}, + {PROP_IPV6_AUTO_ADDRESSING_ENABLE, "ipv6-auto-addressing-enable"}, + {PROP_IPV6_DHCP_LEASE_TIME, "ipv6-dhcp-lease-time"}, + {PROP_IPV6_DHCP_LEASE_TIME_REMAINING, "ipv6-dhcp-lease-time-remaining"}, + {PROP_IPV6_DHCP_SERVER, "ipv6-dhcp-server"}, + {PROP_IPV6_ZONE_INDEX, "ipv6-zone-index"}, + {PROP_ASSIGNED_LANDING_CALLS, "assigned-landing-calls"}, + {PROP_CAR_ASSIGNED_DIRECTION, "car-assigned-direction"}, + {PROP_CAR_DOOR_COMMAND, "car-door-command"}, + {PROP_CAR_DOOR_STATUS, "car-door-status"}, + {PROP_CAR_DOOR_TEXT, "car-door-text"}, + {PROP_CAR_DOOR_ZONE, "car-door-zone"}, + {PROP_CAR_DRIVE_STATUS, "car-drive-status"}, + {PROP_CAR_LOAD, "car-load"}, + {PROP_CAR_LOAD_UNITS, "car-load-units"}, + {PROP_CAR_MODE, "car-mode"}, + {PROP_CAR_MOVING_DIRECTION, "car-moving-direction"}, + {PROP_CAR_POSITION, "car-position"}, + {PROP_ELEVATOR_GROUP, "elevator-group"}, + {PROP_ENERGY_METER, "energy-meter"}, + {PROP_ENERGY_METER_REF, "energy-meter-ref"}, + {PROP_ESCALATOR_MODE, "escalator-mode"}, + {PROP_FAULT_SIGNALS, "fault-signals"}, + {PROP_FLOOR_TEXT, "floor-text"}, + {PROP_GROUP_ID, "group-id"}, + {PROP_GROUP_MODE, "group-mode"}, + {PROP_HIGHER_DECK, "higher-deck"}, + {PROP_INSTALLATION_ID, "installation-id"}, + {PROP_LANDING_CALLS, "landing-calls"}, + {PROP_LANDING_CALL_CONTROL, "landing-call-control"}, + {PROP_LANDING_DOOR_STATUS, "landing-door-status"}, + {PROP_LOWER_DECK, "lower-deck"}, + {PROP_MACHINE_ROOM_ID, "machine-room-id"}, + {PROP_MAKING_CAR_CALL, "making-car-call"}, + {PROP_NEXT_STOPPING_FLOOR, "next-stopping-floor"}, + {PROP_OPERATION_DIRECTION, "operation-direction"}, + {PROP_PASSENGER_ALARM, "passenger-alarm"}, + {PROP_POWER_MODE, "power-mode"}, + {PROP_REGISTERED_CAR_CALL, "registered-car-call"}, + {PROP_ACTIVE_COV_MULTIPLE_SUBSCRIPTIONS, "active-cov-multiple-subscriptions"}, + {PROP_PROTOCOL_LEVEL, "protocol-level"}, + {PROP_REFERENCE_PORT, "reference-port"}, + {PROP_DEPLOYED_PROFILE_LOCATION, "deployed-profile-location"}, + {PROP_PROFILE_LOCATION, "profile-location"}, + {PROP_TAGS, "tags"}, + {PROP_SUBORDINATE_NODE_TYPES, "subordinate-node-types"}, + {PROP_SUBORDINATE_TAGS, "subordinate-tags"}, + {PROP_SUBORDINATE_RELATIONSHIPS, "subordinate-relationships"}, + {PROP_DEFAULT_SUBORDINATE_RELATIONSHIP, "default-subordinate-relationship"}, + {PROP_REPRESENTS, "represents"}, {0, NULL} /* Enumerated values 0-511 are reserved for definition by ASHRAE. Enumerated values 512-4194303 may be used by others subject to the @@ -1456,6 +1563,60 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = { {UNITS_WATTS_PER_METER_PER_DEGREE_KELVIN, "watts-per-meter-per-degree-Kelvin"} , + {UNITS_PER_MILLE,"per-mille"}, + {UNITS_GRAMS_PER_GRAM,"grams-per-gram"}, + {UNITS_KILOGRAMS_PER_KILOGRAM,"kilograms-per-kilogram"}, + {UNITS_GRAMS_PER_KILOGRAM,"grams-per-kilogram"}, + {UNITS_MILLIGRAMS_PER_GRAM,"milligrams-per-gram"}, + {UNITS_MILLIGRAMS_PER_KILOGRAM,"milligrams-per-kilogram"}, + {UNITS_GRAMS_PER_MILLILITER,"grams-per-milliliter"}, + {UNITS_GRAMS_PER_LITER,"grams-per-liter"}, + {UNITS_MILLIGRAMS_PER_LITER,"milligrams-per-liter"}, + {UNITS_MICROGRAMS_PER_LITER,"micrograms-per-liter"}, + {UNITS_GRAMS_PER_CUBIC_METER,"grams-per-cubic-meter"}, + {UNITS_MILLIGRAMS_PER_CUBIC_METER,"milligrams-per-cubic-meter"}, + {UNITS_MICROGRAMS_PER_CUBIC_METER,"micrograms-per-cubic-meter"}, + {UNITS_NANOGRAMS_PER_CUBIC_METER,"nanograms-per-cubic-meter"}, + {UNITS_GRAMS_PER_CUBIC_CENTIMETER,"grams-per-cubic-centimeter"}, + {UNITS_BECQUERELS,"becquerels"}, + {UNITS_MEGABECQUERELS,"megabecquerels"}, + {UNITS_GRAY,"gray"}, + {UNITS_MILLIGRAY,"milligray"}, + {UNITS_MICROGRAY,"microgray"}, + {UNITS_SIEVERTS,"sieverts"}, + {UNITS_MILLISIEVERTS,"millisieverts"}, + {UNITS_MICROSIEVERTS,"microsieverts"}, + {UNITS_MICROSIEVERTS_PER_HOUR,"microsieverts-per-hour"}, + {UNITS_DECIBELS_A,"decibels-a"}, + {UNITS_NEPHELOMETRIC_TURBIDITY_UNIT,"nephelometric-turbidity-unit"}, + {UNITS_PH,"pH"}, + {UNITS_GRAMS_PER_SQUARE_METER,"grams-per-square-meter"}, + {UNITS_MINUTES_PER_DEGREE_KELVIN,"minutes-per-degree-kelvin"}, + {UNITS_OHM_METER_SQUARED_PER_METER,"ohm-meter-squared-per-meter"}, + {UNITS_AMPERE_SECONDS,"ampere-seconds"}, + {UNITS_VOLT_AMPERE_HOURS,"volt-ampere-hours"}, + {UNITS_KILOVOLT_AMPERE_HOURS,"kilovolt-ampere-hours"}, + {UNITS_MEGAVOLT_AMPERE_HOURS,"megavolt-ampere-hours"}, + {UNITS_VOLT_AMPERE_HOURS_REACTIVE,"volt-ampere-hours-reactive"}, + {UNITS_KILOVOLT_AMPERE_HOURS_REACTIVE,"kilovolt-ampere-hours-reactive"}, + {UNITS_MEGAVOLT_AMPERE_HOURS_REACTIVE,"megavolt-ampere-hours-reactive"}, + {UNITS_VOLT_SQUARE_HOURS,"volt-square-hours"}, + {UNITS_AMPERE_SQUARE_HOURS,"ampere-square-hours"}, + {UNITS_JOULE_PER_HOURS,"joule-per-hours"}, + {UNITS_CUBIC_FEET_PER_DAY,"cubic-feet-per-day"}, + {UNITS_CUBIC_METERS_PER_DAY,"cubic-meters-per-day"}, + {UNITS_WATT_HOURS_PER_CUBIC_METER,"watt-hours-per-cubic-meter"}, + {UNITS_JOULES_PER_CUBIC_METER,"joules-per-cubic-meter"}, + {UNITS_MOLE_PERCENT,"mole-percent"}, + {UNITS_PASCAL_SECONDS,"pascal-seconds"}, + {UNITS_MILLION_STANDARD_CUBIC_FEET_PER_MINUTE,"million-standard-cubic-feet-per-minute"}, + {UNITS_STANDARD_CUBIC_FEET_PER_DAY,"standard-cubic-feet-per-day"}, + {UNITS_MILLION_STANDARD_CUBIC_FEET_PER_DAY,"million-standard-cubic-feet-per-day"}, + {UNITS_THOUSAND_CUBIC_FEET_PER_DAY,"thousand-cubic-feet-per-day"}, + {UNITS_THOUSAND_STANDARD_CUBIC_FEET_PER_DAY,"thousand-standard-cubic-feet-per-day"}, + {UNITS_POUNDS_MASS_PER_DAY,"pounds-mass-per-day"}, + {UNITS_MILLIREMS,"millirems"}, + {UNITS_MILLIREMS_PER_HOUR,"millirems-per-hour"}, {0, NULL} /* Enumerated values 0-255 are reserved for definition by ASHRAE. Enumerated values 256-65535 may be used by others subject to