Integrated ReadPropertyMultiple with the demo/server application. Compiles, but untested.

bacnet-stack/demo/object/device.h

@@ -44,6 +44,11 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
+    void Device_Property_Lists(
+        const int **pRequired,
+        const int **pOptional,
+        const int **pProprietary);
+
     uint32_t Device_Object_Instance_Number(void);
     bool Device_Set_Object_Instance_Number(uint32_t object_id);
     bool Device_Valid_Object_Instance_Number(uint32_t object_id);
@@ -76,7 +81,7 @@ extern "C" {
     const char *Device_Location(void);
     bool Device_Set_Location(const char *name, size_t length);
 
-/* some stack-centric constant values - no set methods */
+    /* some stack-centric constant values - no set methods */
     uint8_t Device_Protocol_Version(void);
     uint8_t Device_Protocol_Revision(void);
     uint16_t Device_Max_APDU_Length_Accepted(void);
@@ -104,20 +109,6 @@ extern "C" {
     bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
         BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code);
 
-    /* support for RPM */
-
-    int Device_Special_Property_Count(BACNET_PROPERTY_ID special_property);
-
-    /* returns the property ID given by the index into the list 
-       or MAX_BACNET_PROPERTY_ID if not found or out of bounds */
-    BACNET_PROPERTY_ID Device_Special_Property_By_Index(
-        BACNET_PROPERTY_ID special_property, /* ALL, OPTIONAL, REQUIRED */
-        int index);
-
-    bool Device_Property(uint8 *pIndex, BACNET_PROPERTY_ID *pProperty, 
-        BACNET_PROPERTY_ID special_property);
-    
-
 #ifdef __cplusplus
 }
 #endif                          /* __cplusplus */