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

Made the example Binary Input consistent, and made the Polarity property functional.

Browse Source
This commit is contained in:
skarg
2015-02-25 12:28:44 +00:00
parent 6cb014ee64
commit e5384a416c
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/bi.c
+25 -5
View File
@@ -164,6 +164,13 @@ BACNET_BINARY_PV Binary_Input_Present_Value(
index = Binary_Input_Instance_To_Index(object_instance); index = Binary_Input_Instance_To_Index(object_instance);
if (index < MAX_BINARY_INPUTS) { if (index < MAX_BINARY_INPUTS) {
value = Present_Value[index]; value = Present_Value[index];
if (Polarity[index] != POLARITY_NORMAL) {
if (value == BINARY_INACTIVE) {
value = BINARY_ACTIVE;
} else {
value = BINARY_INACTIVE;
}
}
} }
return value; return value;
@@ -265,6 +272,13 @@ bool Binary_Input_Present_Value_Set(
index = Binary_Input_Instance_To_Index(object_instance); index = Binary_Input_Instance_To_Index(object_instance);
if (index < MAX_BINARY_INPUTS) { if (index < MAX_BINARY_INPUTS) {
if (Polarity[index] != POLARITY_NORMAL) {
if (value == BINARY_INACTIVE) {
value = BINARY_ACTIVE;
} else {
value = BINARY_INACTIVE;
}
}
if (Present_Value[index] != value) { if (Present_Value[index] != value) {
Change_Of_Value[index] = true; Change_Of_Value[index] = true;
} }
@@ -298,8 +312,10 @@ bool Binary_Input_Object_Name(
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
bool status = false; bool status = false;
unsigned index = 0;
if (object_instance < MAX_BINARY_INPUTS) { index = Binary_Input_Instance_To_Index(object_instance);
if (index < MAX_BINARY_INPUTS) {
sprintf(text_string, "BINARY INPUT %lu", sprintf(text_string, "BINARY INPUT %lu",
(unsigned long) object_instance); (unsigned long) object_instance);
status = characterstring_init_ansi(object_name, text_string); status = characterstring_init_ansi(object_name, text_string);
@@ -312,9 +328,11 @@ BACNET_POLARITY Binary_Input_Polarity(
uint32_t object_instance) uint32_t object_instance)
{ {
BACNET_POLARITY polarity = POLARITY_NORMAL; BACNET_POLARITY polarity = POLARITY_NORMAL;
unsigned index = 0;
if (object_instance < MAX_BINARY_INPUTS) { index = Binary_Input_Instance_To_Index(object_instance);
polarity = Polarity[object_instance]; if (index < MAX_BINARY_INPUTS) {
polarity = Polarity[index];
} }
return polarity; return polarity;
@@ -325,9 +343,11 @@ bool Binary_Input_Polarity_Set(
BACNET_POLARITY polarity) BACNET_POLARITY polarity)
{ {
bool status = false; bool status = false;
unsigned index = 0;
if (object_instance < MAX_BINARY_INPUTS) { index = Binary_Input_Instance_To_Index(object_instance);
Polarity[object_instance] = polarity; if (index < MAX_BINARY_INPUTS) {
Polarity[index] = polarity;
} }
return status; return status;