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

Fixed Object type list length for protocol-revision 24. (#684)

Browse Source
This commit is contained in:
GauiStori
2024-07-03 20:14:26 +02:00
committed by GitHub
parent cb4f675e39
commit 0634028368
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacdef.h
+1 -1
View File
@@ -109,7 +109,7 @@
#elif (BACNET_PROTOCOL_REVISION == 24) #elif (BACNET_PROTOCOL_REVISION == 24)
/* Addendum 135-2020ca, 135-2020cc, 135-2020bv */ /* Addendum 135-2020ca, 135-2020cc, 135-2020bv */
#define MAX_ASHRAE_OBJECT_TYPE 65 #define MAX_ASHRAE_OBJECT_TYPE 65
#define MAX_BACNET_SERVICES_SUPPORTED 47 #define MAX_BACNET_SERVICES_SUPPORTED 49
#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
+3 -4
View File
@@ -1598,8 +1598,8 @@ typedef enum BACnet_Services_Supported {
SERVICE_SUPPORTED_PRIVATE_TRANSFER = 18, SERVICE_SUPPORTED_PRIVATE_TRANSFER = 18,
SERVICE_SUPPORTED_TEXT_MESSAGE = 19, SERVICE_SUPPORTED_TEXT_MESSAGE = 19,
SERVICE_SUPPORTED_REINITIALIZE_DEVICE = 20, SERVICE_SUPPORTED_REINITIALIZE_DEVICE = 20,
SERVICE_SUPPORTED_WHO_AM_I = 47, SERVICE_SUPPORTED_WHO_AM_I = 47, /* Addendum 135-2016bz */
SERVICE_SUPPORTED_YOU_ARE = 48, SERVICE_SUPPORTED_YOU_ARE = 48, /* Addendum 135-2016bz */
/* Virtual Terminal Services */ /* Virtual Terminal Services */
SERVICE_SUPPORTED_VT_OPEN = 21, SERVICE_SUPPORTED_VT_OPEN = 21,
SERVICE_SUPPORTED_VT_CLOSE = 22, SERVICE_SUPPORTED_VT_CLOSE = 22,
@@ -1619,11 +1619,10 @@ typedef enum BACnet_Services_Supported {
SERVICE_SUPPORTED_UTC_TIME_SYNCHRONIZATION = 36, SERVICE_SUPPORTED_UTC_TIME_SYNCHRONIZATION = 36,
SERVICE_SUPPORTED_WHO_HAS = 33, SERVICE_SUPPORTED_WHO_HAS = 33,
SERVICE_SUPPORTED_WHO_IS = 34, SERVICE_SUPPORTED_WHO_IS = 34,
SERVICE_SUPPORTED_UNCONFIRMED_AUDIT_NOTIFICATION = 46, SERVICE_SUPPORTED_UNCONFIRMED_AUDIT_NOTIFICATION = 46
/* Other services to be added as they are defined. */ /* Other services to be added as they are defined. */
/* All values in this production are reserved */ /* All values in this production are reserved */
/* for definition by ASHRAE. */ /* for definition by ASHRAE. */
BACNET_SERVICES_SUPPORTED_MAX = 47
} BACNET_SERVICES_SUPPORTED; } BACNET_SERVICES_SUPPORTED;
/* Bit String Enumerations */ /* Bit String Enumerations */