From b20ca46f89590f30c4fb9dc3c464a09c8ef02be3 Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 14 Oct 2015 19:16:51 +0000 Subject: [PATCH] Updated Max BACnet Services Supported and Max BACnet Object Types through Protocol_Revision 17. --- bacnet-stack/include/bacdef.h | 12 ++++++++++++ bacnet-stack/include/bacenum.h | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bacnet-stack/include/bacdef.h b/bacnet-stack/include/bacdef.h index 2300c41b..3c154fcb 100644 --- a/bacnet-stack/include/bacdef.h +++ b/bacnet-stack/include/bacdef.h @@ -94,6 +94,18 @@ /* 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 */ +#define MAX_ASHRAE_OBJECT_TYPE 56 +#define MAX_BACNET_SERVICES_SUPPORTED 41 +#elif (BACNET_PROTOCOL_REVISION == 17) + /* Addendum 135-2012ai */ +#define MAX_ASHRAE_OBJECT_TYPE 57 +#define MAX_BACNET_SERVICES_SUPPORTED 41 #else #error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined! #endif diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h index 5d810d8b..8cb97938 100644 --- a/bacnet-stack/include/bacenum.h +++ b/bacnet-stack/include/bacenum.h @@ -1050,7 +1050,8 @@ typedef enum { OBJECT_LOAD_CONTROL = 28, OBJECT_STRUCTURED_VIEW = 29, OBJECT_ACCESS_DOOR = 30, - /* 31 was lighting output, but BACnet editor changed it... */ + OBJECT_TIMER = 31, + /* Note: 31 was lighting output, but BACnet editor changed it... */ OBJECT_ACCESS_CREDENTIAL = 32, /* Addendum 2008-j */ OBJECT_ACCESS_POINT = 33, OBJECT_ACCESS_RIGHTS = 34, @@ -1074,6 +1075,8 @@ typedef enum { OBJECT_ALERT_ENROLLMENT = 52, /* Addendum 2010-af */ OBJECT_CHANNEL = 53, /* Addendum 2010-aa */ OBJECT_LIGHTING_OUTPUT = 54, /* Addendum 2010-i */ + OBJECT_BINARY_LIGHTING_OUTPUT = 55, /* Addendum 135-2012az */ + OBJECT_NETWORK_PORT = 56, /* Addendum 135-2012az */ /* Enumerated values 0-127 are reserved for definition by ASHRAE. */ /* Enumerated values 128-1023 may be used by others subject to */ /* the procedures and constraints described in Clause 23. */