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

Fixups for an issue found during testing COVs

Browse Source
This commit is contained in:
ekh
2014-11-10 18:29:22 +00:00
parent b2097a2acc
commit 4415df61f9
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/bi.c
+3
View File
@@ -222,6 +222,7 @@ bool Binary_Input_Encode_Value_List(
value_list->propertyArrayIndex = BACNET_ARRAY_ALL; value_list->propertyArrayIndex = BACNET_ARRAY_ALL;
value_list->value.context_specific = false; value_list->value.context_specific = false;
value_list->value.tag = BACNET_APPLICATION_TAG_ENUMERATED; value_list->value.tag = BACNET_APPLICATION_TAG_ENUMERATED;
value_list->value.next = NULL; /* 2014.09.03 - edward@bac-test.com - added this, lack was causing exceptions under MSVC emulation */
value_list->value.type.Enumerated = value_list->value.type.Enumerated =
Binary_Input_Present_Value(object_instance); Binary_Input_Present_Value(object_instance);
value_list->priority = BACNET_NO_PRIORITY; value_list->priority = BACNET_NO_PRIORITY;
@@ -232,6 +233,7 @@ bool Binary_Input_Encode_Value_List(
value_list->propertyArrayIndex = BACNET_ARRAY_ALL; value_list->propertyArrayIndex = BACNET_ARRAY_ALL;
value_list->value.context_specific = false; value_list->value.context_specific = false;
value_list->value.tag = BACNET_APPLICATION_TAG_BIT_STRING; value_list->value.tag = BACNET_APPLICATION_TAG_BIT_STRING;
value_list->value.next = NULL; /* 2014.09.03 - edward@bac-test.com - added this, lack was causing exceptions under MSVC emulation */
bitstring_init(&value_list->value.type.Bit_String); bitstring_init(&value_list->value.type.Bit_String);
bitstring_set_bit(&value_list->value.type.Bit_String, bitstring_set_bit(&value_list->value.type.Bit_String,
STATUS_FLAG_IN_ALARM, false); STATUS_FLAG_IN_ALARM, false);
@@ -247,6 +249,7 @@ bool Binary_Input_Encode_Value_List(
STATUS_FLAG_OUT_OF_SERVICE, false); STATUS_FLAG_OUT_OF_SERVICE, false);
} }
value_list->priority = BACNET_NO_PRIORITY; value_list->priority = BACNET_NO_PRIORITY;
value_list->next = NULL; /* 2014.09.03 - edward@bac-test.com - added this, lack was causing exceptions under MSVC emulation */
} }
status = Binary_Input_Change_Of_Value(object_instance); status = Binary_Input_Change_Of_Value(object_instance);
bacnet-stack/demo/object/mso.c
+1 -1
View File
@@ -44,7 +44,7 @@
/* When all the priorities are level null, the present value returns */ /* When all the priorities are level null, the present value returns */
/* the Relinquish Default value */ /* the Relinquish Default value */
#define MULTISTATE_RELINQUISH_DEFAULT 0 #define MULTISTATE_RELINQUISH_DEFAULT 1 /* multistates cannot be 0 ! */
/* NULL part of the array */ /* NULL part of the array */
#define MULTISTATE_NULL (255) #define MULTISTATE_NULL (255)
bacnet-stack/demo/object/msv.c
+1 -1
View File
@@ -40,7 +40,7 @@
/* number of demo objects */ /* number of demo objects */
#ifndef MAX_MULTISTATE_VALUES #ifndef MAX_MULTISTATE_VALUES
#define MAX_MULTISTATE_VALUES 1 #define MAX_MULTISTATE_VALUES 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. */
bacnet-stack/demo/router/ipmodule.h
+2 -1
View File
@@ -36,7 +36,8 @@
#define MAX_BIP_APDU 1476 #define MAX_BIP_APDU 1476
#define MAX_BIP_PDU (MAX_NPDU + MAX_BIP_APDU) #define MAX_BIP_PDU (MAX_NPDU + MAX_BIP_APDU)
#define MAX_BIP_MPDU (MAX_HEADER + MAX_BIP_PDU) #define MAX_BIP_MPDU (MAX_HEADER + MAX_BIP_PDU) /* Yes, we know this is longer than an Ethernet Frame, a UDP payload and an IPv6 packet. Grandfathered in from BACnet Ethernet days, */
/* and we can rely on the lower layers of the Ethernet stack to fragment/reassemble the BACnet MPDUs */
typedef struct ip_data { typedef struct ip_data {
int socket; int socket;