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

Created a demo Multi-state Output object, and added it to the demo applications.

Browse Source
This commit is contained in:
skarg
2006-08-05 19:36:55 +00:00
parent 73df2e1abb
commit 4d19c82f59
32 changed files with 630 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/device.c
+36
View File
@@ -38,6 +38,7 @@
#include "bo.h" /* object list dependency */
#include "bv.h" /* object list dependency */
#include "lsp.h" /* object list dependency */
#include "mso.h" /* object list dependency */
#include "wp.h" /* write property handling */
#include "device.h" /* me */
#if BACFILE
@@ -329,6 +330,7 @@ unsigned Device_Object_List_Count(void)
count += Analog_Output_Count();
count += Analog_Value_Count();
count += Life_Safety_Point_Count();
count += Multistate_Output_Count();
#if BACFILE
count += bacfile_count();
#endif
@@ -425,6 +427,19 @@ bool Device_Object_List_Identifier(unsigned array_index,
status = true;
}
}
/* multi-state output objects */
if (!status) {
/* normalize the index since
we know it is not the previous objects */
object_index -= object_count;
object_count = Multistate_Output_Count();
/* is it a valid index for this object? */
if (object_index < object_count) {
*object_type = OBJECT_MULTI_STATE_OUTPUT;
*instance = Multistate_Output_Index_To_Instance(object_index);
status = true;
}
}
/* file objects */
#if BACFILE
if (!status) {
@@ -497,6 +512,9 @@ char *Device_Valid_Object_Id(int object_type, uint32_t object_instance)
case OBJECT_LIFE_SAFETY_POINT:
name = Life_Safety_Point_Name(object_instance);
break;
case OBJECT_MULTI_STATE_OUTPUT:
name = Multistate_Output_Name(object_instance);
break;
#if BACFILE
case OBJECT_FILE:
name = bacfile_name(object_instance);
@@ -638,6 +656,8 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
bitstring_set_bit(&bit_string, OBJECT_BINARY_OUTPUT, true);
if (Life_Safety_Point_Count())
bitstring_set_bit(&bit_string, OBJECT_LIFE_SAFETY_POINT, true);
if (Multistate_Output_Count())
bitstring_set_bit(&bit_string, OBJECT_MULTI_STATE_OUTPUT, true);
#if BACFILE
if (bacfile_count())
bitstring_set_bit(&bit_string, OBJECT_FILE, true);
@@ -972,6 +992,22 @@ uint32_t Life_Safety_Point_Index_To_Instance(unsigned index)
return index;
}
char *Multistate_Output_Name(uint32_t object_instance)
{
(void) object_instance;
return "";
}
unsigned Multistate_Output_Count(void)
{
return 0;
}
uint32_t Multistate_Output_Index_To_Instance(unsigned index)
{
return index;
}
uint32_t bacfile_count(void)
{
return 0;