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

Added protocol-revion 20 support

Browse Source
This commit is contained in:
Steve Karg
2020-01-04 12:41:31 -06:00
parent 6c52e5ce2e
commit 35a8c47213
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacdef.h
+4
View File
@@ -107,6 +107,10 @@
/* from 135-2016 version of the BACnet Standard */ /* from 135-2016 version of the BACnet Standard */
#define MAX_ASHRAE_OBJECT_TYPE 60 #define MAX_ASHRAE_OBJECT_TYPE 60
#define MAX_BACNET_SERVICES_SUPPORTED 44 #define MAX_BACNET_SERVICES_SUPPORTED 44
#elif (BACNET_PROTOCOL_REVISION == 20)
/* Addendum 135-2016bd */
#define MAX_ASHRAE_OBJECT_TYPE 61
#define MAX_BACNET_SERVICES_SUPPORTED 44
#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
src/bacnet/bacenum.h
+9
View File
@@ -517,6 +517,11 @@ typedef enum {
PROP_SUBORDINATE_RELATIONSHIPS = 489, PROP_SUBORDINATE_RELATIONSHIPS = 489,
PROP_DEFAULT_SUBORDINATE_RELATIONSHIP = 490, PROP_DEFAULT_SUBORDINATE_RELATIONSHIP = 490,
PROP_REPRESENTS = 491, PROP_REPRESENTS = 491,
PROP_DEFAULT_PRESENT_VALUE = 492,
PROP_PRESENT_STAGE = 493,
PROP_STAGES = 494,
PROP_STAGE_NAMES = 495,
PROP_TARGET_REFERENCES = 496,
/* The special property identifiers all, optional, and required */ /* The special property identifiers all, optional, and required */
/* are reserved for use in the ReadPropertyConditional and */ /* are reserved for use in the ReadPropertyConditional and */
/* ReadPropertyMultiple services or services not defined in this standard. */ /* ReadPropertyMultiple services or services not defined in this standard. */
@@ -1222,6 +1227,10 @@ typedef enum {
OBJECT_LIGHTING_OUTPUT = 54, /* Addendum 2010-i */ OBJECT_LIGHTING_OUTPUT = 54, /* Addendum 2010-i */
OBJECT_BINARY_LIGHTING_OUTPUT = 55, /* Addendum 135-2012az */ OBJECT_BINARY_LIGHTING_OUTPUT = 55, /* Addendum 135-2012az */
OBJECT_NETWORK_PORT = 56, /* Addendum 135-2012az */ OBJECT_NETWORK_PORT = 56, /* Addendum 135-2012az */
OBJECT_ELEVATOR_GROUP = 57, /* Addendum 135-2012aq */
OBJECT_ESCALATOR = 58, /* Addendum 135-2012aq */
OBJECT_LIFT = 59, /* Addendum 135-2012aq */
OBJECT_STAGING = 60, /* Addendum 135-2016bd */
/* 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. */
src/bacnet/bactext.c
+4 -1
View File
@@ -185,7 +185,10 @@ INDTEXT_DATA bacnet_object_type_names[] = {
{ OBJECT_CHANNEL, "channel" }, { OBJECT_CHANNEL, "channel" },
{ OBJECT_LIGHTING_OUTPUT, "lighting-output" }, { OBJECT_LIGHTING_OUTPUT, "lighting-output" },
{ OBJECT_BINARY_LIGHTING_OUTPUT, "binary-lighting-output" }, { OBJECT_BINARY_LIGHTING_OUTPUT, "binary-lighting-output" },
{ OBJECT_NETWORK_PORT, "network-port" }, { 0, NULL } { OBJECT_NETWORK_PORT, "network-port" },
{ OBJECT_ELEVATOR_GROUP, "elevator-group" },
{ OBJECT_ESCALATOR, "escalator" }, { OBJECT_LIFT, "lift" },
{ OBJECT_STAGING, "staging" }, { 0, NULL }
/* 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. */