Renamed and fixed proprietary min-max range defines for units, program-error, restart-reason, reliability, event, life-safety-mode, life-safety-operation, life-safety-state, silenced-state, maintenance, object-type, and vt-class. Updated unit tests and other files affected. The max range must be declared inside of enum so that compilers will allocate adequate sized datatype for enum which is used to store decoded values.

bacnet-stack/src/bacapp.c

@@ -1140,7 +1140,7 @@ int bacapp_snprintf_value(
                         break;
                     case PROP_PRESENT_VALUE:
                     case PROP_RELINQUISH_DEFAULT:
-                        if (object_type < PROPRIETARY_BACNET_OBJECT_TYPE) {
+                        if (object_type < OBJECT_PROPRIETARY_MIN) {
                             ret_val =
                                 snprintf(str, str_len, "%s",
                                 bactext_binary_present_value_name(value->type.

bacnet-stack/src/bacerror.c

@@ -210,9 +210,9 @@ void testBACError(
 
     /* check them all...   */
     for (service = 0; service < MAX_BACNET_CONFIRMED_SERVICE; service++) {
-        for (error_class = 0; error_class < MAX_BACNET_ERROR_CLASS;
+        for (error_class = 0; error_class < ERROR_CLASS_PROPRIETARY_FIRST;
             error_class++) {
-            for (error_code = 0; error_code < MAX_BACNET_ERROR_CODE;
+            for (error_code = 0; error_code < ERROR_CODE_PROPRIETARY_FIRST;
                 error_code++) {
                 len =
                     bacerror_encode_apdu(&apdu[0], invoke_id, service,

bacnet-stack/src/proplist.c

@@ -996,7 +996,7 @@ void testPropList(
     BACNET_PROPERTY_ID property = MAX_BACNET_PROPERTY_ID;
     unsigned object_id = 0, object_name = 0, object_type = 0;
 
-    for (i = 0; i < PROPRIETARY_BACNET_OBJECT_TYPE; i++) {
+    for (i = 0; i < OBJECT_PROPRIETARY_MIN; i++) {
         count = property_list_special_count((BACNET_OBJECT_TYPE)i, PROP_ALL);
         ct_test(pTest, count >= 3);
         object_id = 0;