Added property-list property to Lighting Output and Channel objects (untested). Fixed some compiler warnings.

bacnet-stack/include/proplist.h

@@ -28,10 +28,20 @@
 #include <stdbool.h>
 #include "bacdef.h"
 #include "bacenum.h"
-#include "rpm.h"
+#include "rp.h"
 
 /** @file proplist.h  Library of all required and optional object properties */
 
+struct property_list_t {
+    const int *pList;
+    unsigned count;
+};
+
+struct special_property_list_t {
+    struct property_list_t Required;
+    struct property_list_t Optional;
+    struct property_list_t Proprietary;
+};
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,6 +49,10 @@ extern "C" {
 
     unsigned property_list_count(
         const int *pList);
+    const int * property_list_optional(
+        BACNET_OBJECT_TYPE object_type);
+    const int * property_list_required(
+        BACNET_OBJECT_TYPE object_type);
     void property_list_special(
         BACNET_OBJECT_TYPE object_type,
         struct special_property_list_t *pPropertyList);
@@ -49,6 +63,11 @@ extern "C" {
     unsigned property_list_special_count(
         BACNET_OBJECT_TYPE object_type,
         BACNET_PROPERTY_ID special_property);
+    int property_list_encode(
+        BACNET_READ_PROPERTY_DATA * rpdata,
+        const int *pListRequired,
+        const int *pListOptional,
+        const int *pListProprietary);
 
 #ifdef __cplusplus
 }

bacnet-stack/include/rpm.h

@@ -29,7 +29,7 @@
 #include "bacenum.h"
 #include "bacdef.h"
 #include "bacapp.h"
-
+#include "proplist.h"
 /*
  * Bundle together commonly used data items for convenience when calling
  * rpm helper functions.
@@ -69,17 +69,6 @@ typedef void (
     const int **pOptional,
     const int **pProprietary);
 
-struct property_list_t {
-    const int *pList;
-    unsigned count;
-};
-
-struct special_property_list_t {
-    struct property_list_t Required;
-    struct property_list_t Optional;
-    struct property_list_t Proprietary;
-};
-
 typedef void (
     *rpm_object_property_lists_function) (
     BACNET_OBJECT_TYPE object_type,