Added new enumerations, text, BACnetARRAY and BACnetList from protocol-revision 30 (#1114)
This commit is contained in:
Steve Karg
+128
-38
@@ -58,37 +58,43 @@ static bool bactext_strtoul_index(
|
||||
}
|
||||
|
||||
INDTEXT_DATA bacnet_confirmed_service_names[] = {
|
||||
{ SERVICE_CONFIRMED_ACKNOWLEDGE_ALARM, "Acknowledge-Alarm" },
|
||||
{ SERVICE_CONFIRMED_COV_NOTIFICATION, "COV-Notification" },
|
||||
{ SERVICE_CONFIRMED_EVENT_NOTIFICATION, "Event-Notification" },
|
||||
{ SERVICE_CONFIRMED_GET_ALARM_SUMMARY, "Get-Alarm-Summary" },
|
||||
{ SERVICE_CONFIRMED_GET_ENROLLMENT_SUMMARY, "Get-Enrollment-Summary" },
|
||||
{ SERVICE_CONFIRMED_SUBSCRIBE_COV, "Subscribe-COV" },
|
||||
{ SERVICE_CONFIRMED_ATOMIC_READ_FILE, "Atomic-Read-File" },
|
||||
{ SERVICE_CONFIRMED_ATOMIC_WRITE_FILE, "Atomic-Write-File" },
|
||||
{ SERVICE_CONFIRMED_ADD_LIST_ELEMENT, "Add-List-Element" },
|
||||
{ SERVICE_CONFIRMED_REMOVE_LIST_ELEMENT, "Remove-List-Element" },
|
||||
{ SERVICE_CONFIRMED_CREATE_OBJECT, "Create-Object" },
|
||||
{ SERVICE_CONFIRMED_DELETE_OBJECT, "Delete-Object" },
|
||||
{ SERVICE_CONFIRMED_READ_PROPERTY, "Read-Property" },
|
||||
{ SERVICE_CONFIRMED_READ_PROP_CONDITIONAL, "Read-Property-Conditional" },
|
||||
{ SERVICE_CONFIRMED_READ_PROP_MULTIPLE, "Read-Property-Multiple" },
|
||||
{ SERVICE_CONFIRMED_WRITE_PROPERTY, "Write-Property" },
|
||||
{ SERVICE_CONFIRMED_WRITE_PROP_MULTIPLE, "Write-Property-Multiple" },
|
||||
{ SERVICE_CONFIRMED_ACKNOWLEDGE_ALARM, "AcknowledgeAlarm" },
|
||||
{ SERVICE_CONFIRMED_COV_NOTIFICATION, "ConfirmedCOVNotification" },
|
||||
{ SERVICE_CONFIRMED_EVENT_NOTIFICATION, "ConfirmedEventNotification" },
|
||||
{ SERVICE_CONFIRMED_GET_ALARM_SUMMARY, "GetAlarmSummary" },
|
||||
{ SERVICE_CONFIRMED_GET_ENROLLMENT_SUMMARY, "GetEnrollmentSummary" },
|
||||
{ SERVICE_CONFIRMED_SUBSCRIBE_COV, "SubscribeCOV" },
|
||||
{ SERVICE_CONFIRMED_ATOMIC_READ_FILE, "AtomicReadFile" },
|
||||
{ SERVICE_CONFIRMED_ATOMIC_WRITE_FILE, "AtomicWriteFile" },
|
||||
{ SERVICE_CONFIRMED_ADD_LIST_ELEMENT, "AddListElement" },
|
||||
{ SERVICE_CONFIRMED_REMOVE_LIST_ELEMENT, "RemoveListElement" },
|
||||
{ SERVICE_CONFIRMED_CREATE_OBJECT, "CreateObject" },
|
||||
{ SERVICE_CONFIRMED_DELETE_OBJECT, "DeleteObject" },
|
||||
{ SERVICE_CONFIRMED_READ_PROPERTY, "ReadProperty" },
|
||||
{ SERVICE_CONFIRMED_READ_PROP_CONDITIONAL, "ReadPropertyConditional" },
|
||||
{ SERVICE_CONFIRMED_READ_PROP_MULTIPLE, "ReadPropertyMultiple" },
|
||||
{ SERVICE_CONFIRMED_WRITE_PROPERTY, "WriteProperty" },
|
||||
{ SERVICE_CONFIRMED_WRITE_PROP_MULTIPLE, "WritePropertyMultiple" },
|
||||
{ SERVICE_CONFIRMED_DEVICE_COMMUNICATION_CONTROL,
|
||||
"Device-Communication-Control" },
|
||||
{ SERVICE_CONFIRMED_PRIVATE_TRANSFER, "Private-Transfer" },
|
||||
{ SERVICE_CONFIRMED_TEXT_MESSAGE, "Text-Message" },
|
||||
{ SERVICE_CONFIRMED_REINITIALIZE_DEVICE, "Reinitialize-Device" },
|
||||
{ SERVICE_CONFIRMED_VT_OPEN, "VT-Open" },
|
||||
{ SERVICE_CONFIRMED_VT_CLOSE, "VT-Close" },
|
||||
{ SERVICE_CONFIRMED_VT_DATA, "VT-Data" },
|
||||
"DeviceCommunicationControl" },
|
||||
{ SERVICE_CONFIRMED_PRIVATE_TRANSFER, "ConfirmedPrivateTransfer" },
|
||||
{ SERVICE_CONFIRMED_TEXT_MESSAGE, "ConfirmedTextMessage" },
|
||||
{ SERVICE_CONFIRMED_REINITIALIZE_DEVICE, "ReinitializeDevice" },
|
||||
{ SERVICE_CONFIRMED_VT_OPEN, "VTOpen" },
|
||||
{ SERVICE_CONFIRMED_VT_CLOSE, "VTClose" },
|
||||
{ SERVICE_CONFIRMED_VT_DATA, "VTData" },
|
||||
{ SERVICE_CONFIRMED_AUTHENTICATE, "Authenticate" },
|
||||
{ SERVICE_CONFIRMED_REQUEST_KEY, "Request-Key" },
|
||||
{ SERVICE_CONFIRMED_READ_RANGE, "Read-Range" },
|
||||
{ SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION, "Life-Safety_Operation" },
|
||||
{ SERVICE_CONFIRMED_SUBSCRIBE_COV_PROPERTY, "Subscribe-COV-Property" },
|
||||
{ SERVICE_CONFIRMED_GET_EVENT_INFORMATION, "Get-Event-Information" },
|
||||
{ SERVICE_CONFIRMED_REQUEST_KEY, "RequestKey" },
|
||||
{ SERVICE_CONFIRMED_READ_RANGE, "ReadRange" },
|
||||
{ SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION, "LifeSafetyOperation" },
|
||||
{ SERVICE_CONFIRMED_SUBSCRIBE_COV_PROPERTY, "SubscribeCOVProperty" },
|
||||
{ SERVICE_CONFIRMED_GET_EVENT_INFORMATION, "GetEventInformation" },
|
||||
{ SERVICE_CONFIRMED_SUBSCRIBE_COV_PROPERTY_MULTIPLE,
|
||||
"SubscribeCOVPropertyMultiple" },
|
||||
{ SERVICE_CONFIRMED_COV_NOTIFICATION_MULTIPLE,
|
||||
"ConfirmedCOVNotificationMultiple" },
|
||||
{ SERVICE_CONFIRMED_AUDIT_NOTIFICATION, "ConfirmedAuditNotification" },
|
||||
{ SERVICE_CONFIRMED_AUTH_REQUEST, "ConfirmedAuthRequest" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@@ -101,16 +107,20 @@ const char *bactext_confirmed_service_name(unsigned index)
|
||||
INDTEXT_DATA bacnet_unconfirmed_service_names[] = {
|
||||
{ SERVICE_UNCONFIRMED_I_AM, "I-Am" },
|
||||
{ SERVICE_UNCONFIRMED_I_HAVE, "I-Have" },
|
||||
{ SERVICE_UNCONFIRMED_COV_NOTIFICATION, "COV-Notification" },
|
||||
{ SERVICE_UNCONFIRMED_EVENT_NOTIFICATION, "Event-Notification" },
|
||||
{ SERVICE_UNCONFIRMED_PRIVATE_TRANSFER, "Private-Transfer" },
|
||||
{ SERVICE_UNCONFIRMED_TEXT_MESSAGE, "Text-Message" },
|
||||
{ SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION, "Time-Synchronization" },
|
||||
{ SERVICE_UNCONFIRMED_COV_NOTIFICATION, "UnconfirmedCOVNotification" },
|
||||
{ SERVICE_UNCONFIRMED_EVENT_NOTIFICATION, "UnconfirmedEventNotification" },
|
||||
{ SERVICE_UNCONFIRMED_PRIVATE_TRANSFER, "UnconfirmedPrivateTransfer" },
|
||||
{ SERVICE_UNCONFIRMED_TEXT_MESSAGE, "UnconfirmedTextMessage" },
|
||||
{ SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION, "TimeSynchronization" },
|
||||
{ SERVICE_UNCONFIRMED_WHO_HAS, "Who-Has" },
|
||||
{ SERVICE_UNCONFIRMED_WHO_IS, "Who-Is" },
|
||||
{ SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION,
|
||||
"UTC-Time-Synchronization" },
|
||||
{ SERVICE_UNCONFIRMED_WRITE_GROUP, "Write-Group" },
|
||||
{ SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION, "UTCTimeSynchronization" },
|
||||
{ SERVICE_UNCONFIRMED_WRITE_GROUP, "WriteGroup" },
|
||||
{ SERVICE_UNCONFIRMED_COV_NOTIFICATION_MULTIPLE,
|
||||
"UnconfirmedCOVNotificationMultiple" },
|
||||
{ SERVICE_UNCONFIRMED_AUDIT_NOTIFICATION, "UnconfirmedAuditNotification" },
|
||||
{ SERVICE_UNCONFIRMED_WHO_AM_I, "Who-Am-I" },
|
||||
{ SERVICE_UNCONFIRMED_YOU_ARE, "You-Are" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@@ -255,6 +265,78 @@ INDTEXT_DATA bacnet_object_type_names[] = {
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
INDTEXT_DATA bacnet_object_type_names_capitalized[] = {
|
||||
{ OBJECT_ANALOG_INPUT, "Analog Input" },
|
||||
{ OBJECT_ANALOG_OUTPUT, "Analog Output" },
|
||||
{ OBJECT_ANALOG_VALUE, "Analog Value" },
|
||||
{ OBJECT_BINARY_INPUT, "Binary Input" },
|
||||
{ OBJECT_BINARY_OUTPUT, "Binary Output" },
|
||||
{ OBJECT_BINARY_VALUE, "Binary Value" },
|
||||
{ OBJECT_CALENDAR, "Calendar" },
|
||||
{ OBJECT_COMMAND, "Command" },
|
||||
{ OBJECT_DEVICE, "Device" },
|
||||
{ OBJECT_EVENT_ENROLLMENT, "Event Enrollment" },
|
||||
{ OBJECT_FILE, "File" },
|
||||
{ OBJECT_GROUP, "Group" },
|
||||
{ OBJECT_LOOP, "Loop" },
|
||||
{ OBJECT_MULTI_STATE_INPUT, "Multi-state Input" },
|
||||
{ OBJECT_MULTI_STATE_OUTPUT, "Multi-state Output" },
|
||||
{ OBJECT_NOTIFICATION_CLASS, "Notification Class" },
|
||||
{ OBJECT_PROGRAM, "Program" },
|
||||
{ OBJECT_SCHEDULE, "Schedule" },
|
||||
{ OBJECT_AVERAGING, "Averaging" },
|
||||
{ OBJECT_MULTI_STATE_VALUE, "Multi-state Value" },
|
||||
{ OBJECT_TRENDLOG, "Trend Log" },
|
||||
{ OBJECT_LIFE_SAFETY_POINT, "Life Safety Point" },
|
||||
{ OBJECT_LIFE_SAFETY_ZONE, "Life Safety Zone" },
|
||||
{ OBJECT_ACCUMULATOR, "Accumulator" },
|
||||
{ OBJECT_PULSE_CONVERTER, "Pulse Converter" },
|
||||
{ OBJECT_EVENT_LOG, "Event Log" },
|
||||
{ OBJECT_GLOBAL_GROUP, "Global Group" },
|
||||
{ OBJECT_TREND_LOG_MULTIPLE, "Trend Log Multiple" },
|
||||
{ OBJECT_LOAD_CONTROL, "Load Control" },
|
||||
{ OBJECT_STRUCTURED_VIEW, "Structured View" },
|
||||
{ OBJECT_ACCESS_DOOR, "Access Door" },
|
||||
{ OBJECT_LIGHTING_OUTPUT, "Lighting Output" },
|
||||
{ OBJECT_ACCESS_CREDENTIAL, "Access Credential" },
|
||||
{ OBJECT_ACCESS_POINT, "Access Point" },
|
||||
{ OBJECT_ACCESS_RIGHTS, "Access Rights" },
|
||||
{ OBJECT_ACCESS_USER, "Access User" },
|
||||
{ OBJECT_ACCESS_ZONE, "Access Zone" },
|
||||
{ OBJECT_CREDENTIAL_DATA_INPUT, "Credential Data Input" },
|
||||
{ OBJECT_NETWORK_SECURITY, "Network Security" },
|
||||
{ OBJECT_BITSTRING_VALUE, "Bitstring Value" },
|
||||
{ OBJECT_CHARACTERSTRING_VALUE, "Characterstring Value" },
|
||||
{ OBJECT_DATE_PATTERN_VALUE, "Date Pattern Value" },
|
||||
{ OBJECT_DATE_VALUE, "Date Value" },
|
||||
{ OBJECT_DATETIME_PATTERN_VALUE, "Datetime Pattern Value" },
|
||||
{ OBJECT_DATETIME_VALUE, "Datetime Value" },
|
||||
{ OBJECT_INTEGER_VALUE, "Integer Value" },
|
||||
{ OBJECT_LARGE_ANALOG_VALUE, "Large Analog Value" },
|
||||
{ OBJECT_OCTETSTRING_VALUE, "Octetstring Value" },
|
||||
{ OBJECT_POSITIVE_INTEGER_VALUE, "Positive Integer Value" },
|
||||
{ OBJECT_TIME_PATTERN_VALUE, "Time Pattern Value" },
|
||||
{ OBJECT_TIME_VALUE, "Time Value" },
|
||||
{ OBJECT_NOTIFICATION_FORWARDER, "Notification Forwarder" },
|
||||
{ OBJECT_ALERT_ENROLLMENT, "Alert Enrollment" },
|
||||
{ OBJECT_CHANNEL, "Channel" },
|
||||
{ OBJECT_LIGHTING_OUTPUT, "Lighting Output" },
|
||||
{ OBJECT_BINARY_LIGHTING_OUTPUT, "Binary Lighting Output" },
|
||||
{ OBJECT_NETWORK_PORT, "Network Port" },
|
||||
{ OBJECT_ELEVATOR_GROUP, "Elevator Group" },
|
||||
{ OBJECT_ESCALATOR, "Escalator" },
|
||||
{ OBJECT_LIFT, "Lift" },
|
||||
{ OBJECT_STAGING, "Staging" },
|
||||
{ OBJECT_AUDIT_LOG, "Audit Log" },
|
||||
{ OBJECT_AUDIT_REPORTER, "Audit Reporter" },
|
||||
{ OBJECT_COLOR, "Color" },
|
||||
{ OBJECT_COLOR_TEMPERATURE, "Color Temperature" },
|
||||
/* Enumerated values 0-127 are reserved for definition by ASHRAE.
|
||||
Enumerated values 128-1023 may be used by others subject to
|
||||
the procedures and constraints described in Clause 23. */
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
const char *bactext_object_type_name(unsigned index)
|
||||
{
|
||||
return indtext_by_index_split_default(
|
||||
@@ -262,6 +344,13 @@ const char *bactext_object_type_name(unsigned index)
|
||||
ASHRAE_Reserved_String, Vendor_Proprietary_String);
|
||||
}
|
||||
|
||||
const char *bactext_object_type_name_capitalized(unsigned index)
|
||||
{
|
||||
return indtext_by_index_split_default(
|
||||
bacnet_object_type_names_capitalized, index, OBJECT_PROPRIETARY_MIN,
|
||||
ASHRAE_Reserved_String, Vendor_Proprietary_String);
|
||||
}
|
||||
|
||||
bool bactext_object_type_index(const char *search_name, unsigned *found_index)
|
||||
{
|
||||
return indtext_by_istring(
|
||||
@@ -299,7 +388,7 @@ INDTEXT_DATA bacnet_property_names[] = {
|
||||
{ PROP_CONTROLLED_VARIABLE_UNITS, "controlled-variable-units" },
|
||||
{ PROP_CONTROLLED_VARIABLE_VALUE, "controlled-variable-value" },
|
||||
{ PROP_COV_INCREMENT, "cov-increment" },
|
||||
{ PROP_DATE_LIST, "datelist" },
|
||||
{ PROP_DATE_LIST, "date-list" },
|
||||
{ PROP_DAYLIGHT_SAVINGS_STATUS, "daylight-savings-status" },
|
||||
{ PROP_DEADBAND, "deadband" },
|
||||
{ PROP_DERIVATIVE_CONSTANT, "derivative-constant" },
|
||||
@@ -475,6 +564,7 @@ INDTEXT_DATA bacnet_property_names[] = {
|
||||
{ PROP_INTERVAL_OFFSET, "interval-offset" },
|
||||
{ PROP_LAST_RESTART_REASON, "last-restart-reason" },
|
||||
{ PROP_LOGGING_TYPE, "logging-type" },
|
||||
{ PROP_RESTART_NOTIFICATION_RECIPIENTS, "restart-notification-recipients" },
|
||||
{ PROP_TIME_OF_DEVICE_RESTART, "time-of-device-restart" },
|
||||
{ PROP_TIME_SYNCHRONIZATION_INTERVAL, "time-synchronization-interval" },
|
||||
{ PROP_TRIGGER, "trigger" },
|
||||
|
||||
Reference in New Issue
Block a user