Changed Device_Objects_Property_List() function to pass the object instance so that objects of the same type can have different optional or proprietary properties.

bacnet-stack/demo/object/device.c

@@ -521,10 +521,12 @@ rr_info_function Device_Objects_RR_Info(
  */
 void Device_Objects_Property_List(
     BACNET_OBJECT_TYPE object_type,
+    uint32_t object_instance,
     struct special_property_list_t *pPropertyList)
 {
     struct object_functions *pObject = NULL;
 
+    (void)object_instance;
     pPropertyList->Required.pList = NULL;
     pPropertyList->Optional.pList = NULL;
     pPropertyList->Proprietary.pList = NULL;
@@ -1644,6 +1646,7 @@ int Device_Read_Property(
                 if ((int)rpdata->object_property == PROP_PROPERTY_LIST) {
                     Device_Objects_Property_List(
                         rpdata->object_type,
+                        rpdata->object_instance,
                         &property_list);
                     apdu_len = property_list_encode(
                         rpdata,

bacnet-stack/demo/object/device.h

@@ -250,6 +250,7 @@ extern "C" {
         const int **pProprietary);
     void Device_Objects_Property_List(
         BACNET_OBJECT_TYPE object_type,
+        uint32_t object_instance,
         struct special_property_list_t *pPropertyList);
     /* functions to support COV */
     bool Device_Encode_Value_List(