Added test for array options on RP and RPM to all object properties that are not arrays.

This commit is contained in:
skarg
2009-11-05 15:39:46 +00:00
parent 2c2fbdeeef
commit edc7c6c577
36 changed files with 278 additions and 66 deletions
+13
View File
@@ -25,6 +25,11 @@
/* Lighting Output Objects - customize for your use */
/* WARNING! This object is still BACnet DRAFT status!
If you need to implement in a real product, you will
need to modify the new OBJECT type and properties to
be in the proprietrary range to be BACnet compliant */
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
@@ -501,6 +506,14 @@ int Lighting_Output_Encode_Property_APDU(
apdu_len = -1;
break;
}
/* only array properties can have array options */
if ((apdu_len >= 0) &&
(property != PROP_PRIORITY_ARRAY) &&
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1;
}
return apdu_len;
}