Renamed and fixed proprietary min-max range defines for reject and abort codes.

bacnet-stack/src/abort.c

@@ -63,7 +63,7 @@ BACNET_ABORT_REASON abort_convert_error_code(
             abort_code = ABORT_REASON_SEGMENTATION_NOT_SUPPORTED;
             break;
         case ERROR_CODE_ABORT_PROPRIETARY:
-            abort_code = (BACNET_ABORT_REASON) FIRST_PROPRIETARY_ABORT_REASON;
+            abort_code = ABORT_REASON_PROPRIETARY_FIRST;
             break;
         case ERROR_CODE_ABORT_OTHER:
         default:

bacnet-stack/src/bactext.c

@@ -1483,6 +1483,8 @@ INDTEXT_DATA bacnet_reject_reason_names[] = {
     ,
     {REJECT_REASON_UNRECOGNIZED_SERVICE, "Unrecognized Service"}
     ,
+    {REJECT_REASON_PROPRIETARY_FIRST, "Proprietary"}
+    ,
     {0, NULL}
 };
 
@@ -1490,7 +1492,7 @@ const char *bactext_reject_reason_name(
     unsigned index)
 {
     return indtext_by_index_split_default(bacnet_reject_reason_names, index,
-        FIRST_PROPRIETARY_REJECT_REASON, ASHRAE_Reserved_String,
+        REJECT_REASON_PROPRIETARY_FIRST, ASHRAE_Reserved_String,
         Vendor_Proprietary_String);
 }
 
@@ -1506,6 +1508,8 @@ INDTEXT_DATA bacnet_abort_reason_names[] = {
     ,
     {ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, "Segmentation Not Supported"}
     ,
+    {ABORT_REASON_PROPRIETARY_FIRST, "Proprietary"}
+    ,
     {0, NULL}
 };
 
@@ -1513,7 +1517,7 @@ const char *bactext_abort_reason_name(
     unsigned index)
 {
     return indtext_by_index_split_default(bacnet_abort_reason_names, index,
-        FIRST_PROPRIETARY_ABORT_REASON, ASHRAE_Reserved_String,
+        ABORT_REASON_PROPRIETARY_FIRST, ASHRAE_Reserved_String,
         Vendor_Proprietary_String);
 }
 

bacnet-stack/src/reject.c

@@ -80,8 +80,7 @@ BACNET_REJECT_REASON reject_convert_error_code(
             reject_code = REJECT_REASON_UNRECOGNIZED_SERVICE;
             break;
         case ERROR_CODE_REJECT_PROPRIETARY:
-            reject_code =
-                (BACNET_REJECT_REASON) FIRST_PROPRIETARY_REJECT_REASON;
+            reject_code = REJECT_REASON_PROPRIETARY_FIRST;
             break;
         case ERROR_CODE_REJECT_OTHER:
         default: