Added a parameter to Device_Encode_Property_APDU so that it matched all the ther objects, which required all the demo and ports to modify their device and h_rp files.

2009-08-23 03:48:27 +00:00
parent 967b86721f
commit c304b8b330
10 changed files with 21 additions and 4 deletions
@@ -238,6 +238,7 @@ bool Device_Object_List_Identifier(
 /* return the length of the apdu encoded or -1 for error */
 int Device_Encode_Property_APDU(
    uint8_t * apdu,
+    uint32_t object_instance,
    BACNET_PROPERTY_ID property,
    int32_t array_index,
    BACNET_ERROR_CLASS * error_class,
@@ -254,6 +255,7 @@ int Device_Encode_Property_APDU(
    BACNET_TIME local_time;
    BACNET_DATE local_date;

+    object_instance = object_instance;
    /* FIXME: change the hardcoded names to suit your application */
    switch (property) {
        case PROP_OBJECT_IDENTIFIER:
@@ -66,7 +66,8 @@ int Encode_Property_APDU(
        case OBJECT_DEVICE:
            if (Device_Valid_Object_Instance_Number(object_instance)) {
                apdu_len =
-                    Device_Encode_Property_APDU(&apdu[0], property,
+                    Device_Encode_Property_APDU(&apdu[0], 
+                    object_instance, property,
                    array_index, error_class, error_code);
            }
            break;