Added missing enumeration text for BACnetNodeType, BACnetSilencedState, BACnetLoggingType (#1067)

src/bacnet/bacapp.c

@@ -2417,6 +2417,31 @@ static int bacapp_snprintf_enumerated(
             ret_val = bacapp_snprintf(
                 str, str_len, "%s", bactext_lighting_in_progress(value));
             break;
+        case PROP_LOGGING_TYPE:
+            ret_val = bacapp_snprintf(
+                str, str_len, "%s", bactext_logging_type_name(value));
+            break;
+        case PROP_MODE:
+        case PROP_ACCEPTED_MODES:
+            ret_val = bacapp_snprintf(
+                str, str_len, "%s", bactext_life_safety_mode_name(value));
+            break;
+        case PROP_OPERATION_EXPECTED:
+            ret_val = bacapp_snprintf(
+                str, str_len, "%s", bactext_life_safety_operation_name(value));
+            break;
+        case PROP_TRACKING_VALUE:
+            switch (object_type) {
+                case OBJECT_LIFE_SAFETY_POINT:
+                case OBJECT_LIFE_SAFETY_ZONE:
+                    ret_val = bacapp_snprintf(
+                        str, str_len, "%s",
+                        bactext_life_safety_state_name(value));
+                    break;
+                default:
+                    break;
+            }
+            break;
         default:
             ret_val =
                 bacapp_snprintf(str, str_len, "%lu", (unsigned long)value);

src/bacnet/bactext.c

@@ -1968,6 +1968,16 @@ INDTEXT_DATA bacnet_node_type_names[] = {
     { BACNET_NODE_PROPERTY, "property" },
     { BACNET_NODE_FUNCTIONAL, "functional" },
     { BACNET_NODE_OTHER, "other" },
+    { BACNET_NODE_SUBSYSTEM, "subsystem" },
+    { BACNET_NODE_BUILDING, "building" },
+    { BACNET_NODE_FLOOR, "floor" },
+    { BACNET_NODE_SECTION, "section" },
+    { BACNET_NODE_MODULE, "module" },
+    { BACNET_NODE_TREE, "tree" },
+    { BACNET_NODE_MEMBER, "member" },
+    { BACNET_NODE_PROTOCOL, "protocol" },
+    { BACNET_NODE_ROOM, "room" },
+    { BACNET_NODE_ZONE, "zone" },
     { 0, NULL }
 };
 
@@ -2121,6 +2131,26 @@ const char *bactext_life_safety_state_name(unsigned index)
     }
 }
 
+INDTEXT_DATA bactext_silenced_state_names[] = {
+    { SILENCED_STATE_UNSILENCED, "unsilenced" },
+    { SILENCED_STATE_AUDIBLE_SILENCED, "audible-silenced" },
+    { SILENCED_STATE_VISIBLE_SILENCED, "visible-silenced" },
+    { SILENCED_STATE_ALL_SILENCED, "all-silenced" },
+    { 0, NULL }
+};
+
+const char *bactext_silenced_state_name(unsigned index)
+{
+    if (index < SILENCED_STATE_PROPRIETARY_MIN) {
+        return indtext_by_index_default(
+            bactext_silenced_state_names, index, ASHRAE_Reserved_String);
+    } else if (index <= SILENCED_STATE_PROPRIETARY_MAX) {
+        return Vendor_Proprietary_String;
+    } else {
+        return "Invalid BACnetSilencedState";
+    }
+}
+
 INDTEXT_DATA lighting_in_progress[] = {
     { BACNET_LIGHTING_IDLE, "idle" },
     { BACNET_LIGHTING_FADE_ACTIVE, "fade" },
@@ -2496,3 +2526,15 @@ const char *bactext_success_filter_name(unsigned index)
     return indtext_by_index_default(
         bactext_success_filter_names, index, ASHRAE_Reserved_String);
 }
+
+INDTEXT_DATA bactext_logging_type_names[] = { { LOGGING_TYPE_POLLED, "polled" },
+                                              { LOGGING_TYPE_COV, "cov" },
+                                              { LOGGING_TYPE_TRIGGERED,
+                                                "triggered" },
+                                              { 0, NULL } };
+
+const char *bactext_logging_type_name(unsigned index)
+{
+    return indtext_by_index_default(
+        bactext_logging_type_names, index, ASHRAE_Reserved_String);
+}

src/bacnet/bactext.h

@@ -126,6 +126,8 @@ BACNET_STACK_EXPORT
 const char *bactext_life_safety_operation_name(unsigned index);
 BACNET_STACK_EXPORT
 const char *bactext_life_safety_state_name(unsigned index);
+BACNET_STACK_EXPORT
+const char *bactext_silenced_state_name(unsigned index);
 
 BACNET_STACK_EXPORT
 const char *bactext_device_communications_name(unsigned index);
@@ -184,6 +186,8 @@ BACNET_STACK_EXPORT
 const char *bactext_success_filter_name(unsigned index);
 BACNET_STACK_EXPORT
 const char *bactext_result_flags_name(unsigned index);
+BACNET_STACK_EXPORT
+const char *bactext_logging_type_name(unsigned index);
 
 #ifdef __cplusplus
 }