From 795254ca0c60dded9785d4fbe6b8ae3e7357bc56 Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 13 Oct 2016 21:25:35 +0000 Subject: [PATCH] Updated Protocol_Revision requirements per the 135-2016 BACnet standard. --- bacnet-stack/include/bacdef.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/include/bacdef.h b/bacnet-stack/include/bacdef.h index 3c154fcb..9adb9a4e 100644 --- a/bacnet-stack/include/bacdef.h +++ b/bacnet-stack/include/bacdef.h @@ -90,13 +90,10 @@ #elif (BACNET_PROTOCOL_REVISION == 13) #define MAX_ASHRAE_OBJECT_TYPE 53 #define MAX_BACNET_SERVICES_SUPPORTED 40 -#elif (BACNET_PROTOCOL_REVISION == 14) +#elif (BACNET_PROTOCOL_REVISION == 14) || (BACNET_PROTOCOL_REVISION == 15) /* from 135-2012 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 55 #define MAX_BACNET_SERVICES_SUPPORTED 41 -#elif (BACNET_PROTOCOL_REVISION == 15) -#define MAX_ASHRAE_OBJECT_TYPE 55 -#define MAX_BACNET_SERVICES_SUPPORTED 41 #elif (BACNET_PROTOCOL_REVISION == 16) /* Addendum 135-2012an, 135-2012at, 135-2012au, 135-2012av, 135-2012aw, 135-2012ax, 135-2012az */ @@ -106,6 +103,10 @@ /* Addendum 135-2012ai */ #define MAX_ASHRAE_OBJECT_TYPE 57 #define MAX_BACNET_SERVICES_SUPPORTED 41 +#elif (BACNET_PROTOCOL_REVISION == 18) || (BACNET_PROTOCOL_REVISION == 15) + /* from 135-2016 version of the BACnet Standard */ +#define MAX_ASHRAE_OBJECT_TYPE 60 +#define MAX_BACNET_SERVICES_SUPPORTED 44 #else #error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined! #endif