dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the example channel object for reading the member list. Thanks, David Fisher, for helping me find these bugs at PlugFest!

Browse Source
This commit is contained in:
skarg
2015-10-07 18:56:55 +00:00
parent 2b13503a4d
commit db9ddf6ce8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/channel.c
+2 -1
View File
@@ -1427,7 +1427,7 @@ int Channel_Read_Property(BACNET_READ_PROPERTY_DATA * rpdata)
for (i = 1; i <= count; i++) { for (i = 1; i <= count; i++) {
pMember = Channel_Reference_List_Member_Element( pMember = Channel_Reference_List_Member_Element(
rpdata->object_instance, i); rpdata->object_instance, i);
len += len =
bacapp_encode_device_obj_property_ref(&apdu[apdu_len], bacapp_encode_device_obj_property_ref(&apdu[apdu_len],
pMember); pMember);
/* add it if we have room */ /* add it if we have room */
@@ -1518,6 +1518,7 @@ int Channel_Read_Property(BACNET_READ_PROPERTY_DATA * rpdata)
if ((apdu_len >= 0) if ((apdu_len >= 0)
&& (rpdata->object_property != PROP_PRIORITY_ARRAY) && (rpdata->object_property != PROP_PRIORITY_ARRAY)
&& (rpdata->object_property != PROP_PROPERTY_LIST) && (rpdata->object_property != PROP_PROPERTY_LIST)
&& (rpdata->object_property != PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES)
&& (rpdata->array_index != BACNET_ARRAY_ALL)) { && (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;