From 4415df61f98ca5d5124c0e492ab2a3ba7cb4c1aa Mon Sep 17 00:00:00 2001 From: ekh Date: Mon, 10 Nov 2014 18:29:22 +0000 Subject: [PATCH] Fixups for an issue found during testing COVs --- bacnet-stack/demo/object/bi.c | 3 +++ bacnet-stack/demo/object/mso.c | 2 +- bacnet-stack/demo/object/msv.c | 2 +- bacnet-stack/demo/router/ipmodule.h | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bacnet-stack/demo/object/bi.c b/bacnet-stack/demo/object/bi.c index 3b9e87ff..b5b2f0e1 100644 --- a/bacnet-stack/demo/object/bi.c +++ b/bacnet-stack/demo/object/bi.c @@ -222,6 +222,7 @@ bool Binary_Input_Encode_Value_List( value_list->propertyArrayIndex = BACNET_ARRAY_ALL; value_list->value.context_specific = false; 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 = Binary_Input_Present_Value(object_instance); value_list->priority = BACNET_NO_PRIORITY; @@ -232,6 +233,7 @@ bool Binary_Input_Encode_Value_List( value_list->propertyArrayIndex = BACNET_ARRAY_ALL; value_list->value.context_specific = false; 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_set_bit(&value_list->value.type.Bit_String, STATUS_FLAG_IN_ALARM, false); @@ -247,6 +249,7 @@ bool Binary_Input_Encode_Value_List( STATUS_FLAG_OUT_OF_SERVICE, false); } 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); diff --git a/bacnet-stack/demo/object/mso.c b/bacnet-stack/demo/object/mso.c index f8bd68d0..630b16d1 100644 --- a/bacnet-stack/demo/object/mso.c +++ b/bacnet-stack/demo/object/mso.c @@ -44,7 +44,7 @@ /* When all the priorities are level null, the present value returns */ /* the Relinquish Default value */ -#define MULTISTATE_RELINQUISH_DEFAULT 0 +#define MULTISTATE_RELINQUISH_DEFAULT 1 /* multistates cannot be 0 ! */ /* NULL part of the array */ #define MULTISTATE_NULL (255) diff --git a/bacnet-stack/demo/object/msv.c b/bacnet-stack/demo/object/msv.c index ad40df77..a0d5f874 100644 --- a/bacnet-stack/demo/object/msv.c +++ b/bacnet-stack/demo/object/msv.c @@ -40,7 +40,7 @@ /* number of demo objects */ #ifndef MAX_MULTISTATE_VALUES -#define MAX_MULTISTATE_VALUES 1 +#define MAX_MULTISTATE_VALUES 4 #endif /* how many states? 1 to 254 states - 0 is not allowed. */ diff --git a/bacnet-stack/demo/router/ipmodule.h b/bacnet-stack/demo/router/ipmodule.h index 01af2309..3c3fab84 100644 --- a/bacnet-stack/demo/router/ipmodule.h +++ b/bacnet-stack/demo/router/ipmodule.h @@ -36,7 +36,8 @@ #define MAX_BIP_APDU 1476 #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 { int socket;