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

Fixed BACNET_REINITIALIZED_STATE enum broken in merge

Browse Source
This commit is contained in:
skarg
2018-12-11 02:39:31 +00:00
parent 55794f7f54
commit 0d53e59369
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/include/bacenum.h
+3 -13
View File
@@ -1580,17 +1580,6 @@ typedef enum {
NETWORK_MESSAGE_INVALID = 0x100
} BACNET_NETWORK_MESSAGE_TYPE;
typedef enum {
REINITIALIZED_STATE_COLD_START = 0,
REINITIALIZED_STATE_WARM_START = 1,
REINITIALIZED_STATE_START_BACKUP = 2,
REINITIALIZED_STATE_END_BACKUP = 3,
REINITIALIZED_STATE_START_RESTORE = 4,
REINITIALIZED_STATE_END_RESTORE = 5,
REINITIALIZED_STATE_ABORT_RESTORE = 6,
REINITIALIZED_STATE_IDLE = 255
} BACNET_REINITIALIZED_STATE_OF_DEVICE;
typedef enum {
ABORT_REASON_OTHER = 0,
ABORT_REASON_BUFFER_OVERFLOW = 1,
@@ -1834,8 +1823,9 @@ typedef enum {
BACNET_REINIT_STARTRESTORE = 4,
BACNET_REINIT_ENDRESTORE = 5,
BACNET_REINIT_ABORTRESTORE = 6,
MAX_BACNET_REINITIALIZED_STATE = 7,
BACNET_REINIT_IDLE = 255
BACNET_REINIT_ACTIVATE_CHANGES = 7,
BACNET_REINIT_IDLE = 255,
BACNET_REINIT_MAX = 255
} BACNET_REINITIALIZED_STATE;
typedef enum BACnetNodeType {