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

fixed proprietary min-max error code and class for unit tests.

Browse Source
This commit is contained in:
skarg
2013-08-19 16:16:29 +00:00
parent 8866f38dd9
commit f33cfe79fd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/include/bacenum.h
+5 -5
View File
@@ -1370,10 +1370,10 @@ typedef enum {
/* Enumerated values 0-63 are reserved for definition by ASHRAE. */ /* Enumerated values 0-63 are reserved for definition by ASHRAE. */
/* Enumerated values 64-65535 may be used by others subject to */ /* Enumerated values 64-65535 may be used by others subject to */
/* the procedures and constraints described in Clause 23. */ /* the procedures and constraints described in Clause 23. */
MAX_BACNET_ERROR_CLASS = 8 MAX_BACNET_ERROR_CLASS = 8,
ERROR_CLASS_PROPRIETARY_FIRST = 64,
ERROR_CLASS_PROPRIETARY_LAST = 65535
} BACNET_ERROR_CLASS; } BACNET_ERROR_CLASS;
#define FIRST_PROPRIETARY_ERROR_CLASS 64
#define LAST_PROPRIETARY_ERROR_CLASS 65535
/* These are sorted in the order given in /* These are sorted in the order given in
Clause 18. ERROR, REJECT AND ABORT CODES Clause 18. ERROR, REJECT AND ABORT CODES
@@ -1541,7 +1541,7 @@ typedef enum {
ERROR_CODE_ABORT_SECURITY_ERROR = 136, ERROR_CODE_ABORT_SECURITY_ERROR = 136,
MAX_BACNET_ERROR_CODE = 137, MAX_BACNET_ERROR_CODE = 137,
ERROR_CODE_PROPRIETARY_FIRST = 256, ERROR_CODE_PROPRIETARY_FIRST = 256,
ERROR_CODE_PROPRIETARY_LAST = 65535 ERROR_CODE_PROPRIETARY_LAST = 65535
@@ -1611,7 +1611,7 @@ typedef enum BACnetLightingTransition {
BACNET_LIGHTING_TRANSITION_FADE = 1, BACNET_LIGHTING_TRANSITION_FADE = 1,
BACNET_LIGHTING_TRANSITION_RAMP = 2 BACNET_LIGHTING_TRANSITION_RAMP = 2
} BACNET_LIGHTING_TRANSITION; } BACNET_LIGHTING_TRANSITION;
/* NOTE: BACNET_DAYS_OF_WEEK is different than BACNET_WEEKDAY */ /* NOTE: BACNET_DAYS_OF_WEEK is different than BACNET_WEEKDAY */
/* 0=Monday-6=Sunday */ /* 0=Monday-6=Sunday */
typedef enum BACnetDaysOfWeek { typedef enum BACnetDaysOfWeek {
bacnet-stack/src/bacerror.c
+2 -2
View File
@@ -233,8 +233,8 @@ void testBACError(
/* max boundaries */ /* max boundaries */
service = 255; service = 255;
error_class = LAST_PROPRIETARY_ERROR_CLASS; error_class = ERROR_CLASS_PROPRIETARY_LAST;
error_code = LAST_PROPRIETARY_ERROR_CODE; error_code = ERROR_CODE_PROPRIETARY_LAST;
len = len =
bacerror_encode_apdu(&apdu[0], invoke_id, service, error_class, bacerror_encode_apdu(&apdu[0], invoke_id, service, error_class,
error_code); error_code);