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

Updated Max BACnet Services Supported and Max BACnet Object Types through Protocol_Revision 17.

Browse Source
This commit is contained in:
skarg
2015-10-14 19:16:51 +00:00
parent da0476d881
commit b20ca46f89
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/include/bacdef.h
+12
View File
@@ -94,6 +94,18 @@
/* from 135-2012 version of the BACnet Standard */ /* from 135-2012 version of the BACnet Standard */
#define MAX_ASHRAE_OBJECT_TYPE 55 #define MAX_ASHRAE_OBJECT_TYPE 55
#define MAX_BACNET_SERVICES_SUPPORTED 41 #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 #else
#error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined! #error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined!
#endif #endif
bacnet-stack/include/bacenum.h
+4 -1
View File
@@ -1050,7 +1050,8 @@ typedef enum {
OBJECT_LOAD_CONTROL = 28, OBJECT_LOAD_CONTROL = 28,
OBJECT_STRUCTURED_VIEW = 29, OBJECT_STRUCTURED_VIEW = 29,
OBJECT_ACCESS_DOOR = 30, 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_CREDENTIAL = 32, /* Addendum 2008-j */
OBJECT_ACCESS_POINT = 33, OBJECT_ACCESS_POINT = 33,
OBJECT_ACCESS_RIGHTS = 34, OBJECT_ACCESS_RIGHTS = 34,
@@ -1074,6 +1075,8 @@ typedef enum {
OBJECT_ALERT_ENROLLMENT = 52, /* Addendum 2010-af */ OBJECT_ALERT_ENROLLMENT = 52, /* Addendum 2010-af */
OBJECT_CHANNEL = 53, /* Addendum 2010-aa */ OBJECT_CHANNEL = 53, /* Addendum 2010-aa */
OBJECT_LIGHTING_OUTPUT = 54, /* Addendum 2010-i */ 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 0-127 are reserved for definition by ASHRAE. */
/* Enumerated values 128-1023 may be used by others subject to */ /* Enumerated values 128-1023 may be used by others subject to */
/* the procedures and constraints described in Clause 23. */ /* the procedures and constraints described in Clause 23. */