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

Removed usage of key (analog input 0 is key=0) to determine end of object list.

Browse Source
This commit is contained in:
skarg
2010-06-26 03:51:23 +00:00
parent 79436d1ae0
commit d088bc354c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/epics/main.c
+7 -8
View File
@@ -1134,14 +1134,8 @@ int main(
/* Advance to the next object, as long as it's not the Device object */ /* Advance to the next object, as long as it's not the Device object */
do { do {
Object_List_Index++; Object_List_Index++;
nextKey = Keylist_Key(Object_List, Object_List_Index); if (Object_List_Index < Keylist_Count(Object_List)) {
/* If done with all Objects, signal end of this while loop */ nextKey = Keylist_Key(Object_List, Object_List_Index);
if ((nextKey == 0) ||
(Object_List_Index >= Object_List_Length)) {
/* Closing brace for the last Object */
printf(" } \r\n");
myObject.type = MAX_BACNET_OBJECT_TYPE;
} else {
/* Closing brace for the previous Object */ /* Closing brace for the previous Object */
printf(" }, \r\n"); printf(" }, \r\n");
myObject.type = KEY_DECODE_TYPE(nextKey); myObject.type = KEY_DECODE_TYPE(nextKey);
@@ -1152,6 +1146,11 @@ int main(
if ( myObject.type == OBJECT_STRUCTURED_VIEW ) if ( myObject.type == OBJECT_STRUCTURED_VIEW )
printf( " -- Structured View %d \n", myObject.instance ); printf( " -- Structured View %d \n", myObject.instance );
*/ */
} else {
/* Closing brace for the last Object */
printf(" } \r\n");
/* done with all Objects, signal end of this while loop */
myObject.type = MAX_BACNET_OBJECT_TYPE;
} }
if ( Has_RPM ) if ( Has_RPM )
myState = GET_ALL_REQUEST; myState = GET_ALL_REQUEST;