Added protocol-revion 20 support
This commit is contained in:
@@ -107,6 +107,10 @@
|
||||
/* from 135-2016 version of the BACnet Standard */
|
||||
#define MAX_ASHRAE_OBJECT_TYPE 60
|
||||
#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
|
||||
#error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined!
|
||||
#endif
|
||||
|
||||
@@ -517,6 +517,11 @@ typedef enum {
|
||||
PROP_SUBORDINATE_RELATIONSHIPS = 489,
|
||||
PROP_DEFAULT_SUBORDINATE_RELATIONSHIP = 490,
|
||||
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 */
|
||||
/* are reserved for use in the ReadPropertyConditional and */
|
||||
/* ReadPropertyMultiple services or services not defined in this standard. */
|
||||
@@ -1222,6 +1227,10 @@ typedef enum {
|
||||
OBJECT_LIGHTING_OUTPUT = 54, /* Addendum 2010-i */
|
||||
OBJECT_BINARY_LIGHTING_OUTPUT = 55, /* 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 128-1023 may be used by others subject to */
|
||||
/* the procedures and constraints described in Clause 23. */
|
||||
|
||||
@@ -185,7 +185,10 @@ INDTEXT_DATA bacnet_object_type_names[] = {
|
||||
{ OBJECT_CHANNEL, "channel" },
|
||||
{ OBJECT_LIGHTING_OUTPUT, "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 128-1023 may be used by others subject to
|
||||
the procedures and constraints described in Clause 23. */
|
||||
|
||||
Reference in New Issue
Block a user