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

Updates for protocol-revision 20 through 24 (#258)

Browse Source 
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-05-03 11:59:27 -05:00
committed by GitHub
parent 601e3b80f9
commit 3c64869dca
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacdef.h
+15 -4
View File
@@ -108,10 +108,21 @@
/* 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
#elif (BACNET_PROTOCOL_REVISION == 20) || (BACNET_PROTOCOL_REVISION == 21)
/* Addendum 135-2016bd, 135-2016be, 135-2016bi */
#define MAX_ASHRAE_OBJECT_TYPE 63
#define MAX_BACNET_SERVICES_SUPPORTED 47
#elif (BACNET_PROTOCOL_REVISION == 22)
#define MAX_ASHRAE_OBJECT_TYPE 63
#define MAX_BACNET_SERVICES_SUPPORTED 47
#elif (BACNET_PROTOCOL_REVISION == 23)
/* Addendum 135-2020cd */
#define MAX_ASHRAE_OBJECT_TYPE 63
#define MAX_BACNET_SERVICES_SUPPORTED 47
#elif (BACNET_PROTOCOL_REVISION == 24)
/* Addendum 135-2020ca, 135-2020cc, 135-2020bv */
#define MAX_ASHRAE_OBJECT_TYPE 65
#define MAX_BACNET_SERVICES_SUPPORTED 47
#else
#error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined!
#endif
src/bacnet/bacenum.h
+1 -1
View File
@@ -1913,7 +1913,7 @@ typedef enum {
ERROR_CODE_CERTIFICATE_INVALID = 201,
ERROR_CODE_CERTIFICATE_MALFORMED = 202,
ERROR_CODE_CERTIFICATE_REVOKED = 203,
ERROR_CODE_UNKNOWN_KEY2 = 204,
ERROR_CODE_UNKNOWN_SECURITY_KEY = 204,
ERROR_CODE_REFERENCED_PORT_IN_ERROR = 205,
/* Enumerated values 0-255 are reserved for definition by ASHRAE. */
ERROR_CODE_RESERVED_MAX = 255,
src/bacnet/bactext.c
+1 -1
View File
@@ -1303,7 +1303,7 @@ INDTEXT_DATA bacnet_error_code_names[] = { { ERROR_CODE_OTHER, "other" },
{ ERROR_CODE_CERTIFICATE_INVALID, "certificate-invalid" },
{ ERROR_CODE_CERTIFICATE_MALFORMED, "certificate-malformed" },
{ ERROR_CODE_CERTIFICATE_REVOKED, "certificate-revoked" },
{ ERROR_CODE_UNKNOWN_KEY2, "unknown-key" },
{ ERROR_CODE_UNKNOWN_SECURITY_KEY, "unknown-security-key" },
{ ERROR_CODE_REFERENCED_PORT_IN_ERROR, "referenced-port-in-error" },
/* Enumerated values 256-65535 may be used by others subject to */
/* the procedures and constraints described in Clause 23. */