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

Merged revision(s) 2782 from branches/releases/bacnet-stack-0-8-0:

Browse Source 
Added initial names and descriptions to example multi-state value and multi-state input objects.
........
This commit is contained in:
skarg
2014-11-11 16:54:35 +00:00
parent 5e476c3ffc
commit d53551558a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/ms-input.c
+3 -1
View File
@@ -41,7 +41,7 @@
/* number of demo objects */ /* number of demo objects */
#ifndef MAX_MULTISTATE_INPUTS #ifndef MAX_MULTISTATE_INPUTS
#define MAX_MULTISTATE_INPUTS 1 #define MAX_MULTISTATE_INPUTS 4
#endif #endif
/* how many states? 1 to 254 states - 0 is not allowed. */ /* how many states? 1 to 254 states - 0 is not allowed. */
@@ -103,6 +103,8 @@ void Multistate_Input_Init(
/* initialize all the analog output priority arrays to NULL */ /* initialize all the analog output priority arrays to NULL */
for (i = 0; i < MAX_MULTISTATE_INPUTS; i++) { for (i = 0; i < MAX_MULTISTATE_INPUTS; i++) {
Present_Value[i] = 1; Present_Value[i] = 1;
sprintf(&Object_Name[i][0], "MULTISTATE INPUT %u", i);
sprintf(&Object_Description[i][0], "MULTISTATE INPUT %u", i);
} }
return; return;
bacnet-stack/demo/object/msv.c
+3 -1
View File
@@ -97,11 +97,13 @@ void Multistate_Value_Property_Lists(
void Multistate_Value_Init( void Multistate_Value_Init(
void) void)
{ {
unsigned i; unsigned int i;
/* initialize all the analog output priority arrays to NULL */ /* initialize all the analog output priority arrays to NULL */
for (i = 0; i < MAX_MULTISTATE_VALUES; i++) { for (i = 0; i < MAX_MULTISTATE_VALUES; i++) {
Present_Value[i] = 1; Present_Value[i] = 1;
sprintf(&Object_Name[i][0], "MULTISTATE VALUE %u", i);
sprintf(&Object_Description[i][0], "MULTISTATE VALUE %u", i);
} }
return; return;