Merged duplicate and different BACnet Renitialized Device State enumerations.

This commit is contained in:
skarg
2010-02-18 17:25:58 +00:00
parent edd190159d
commit f5bc326061
8 changed files with 21 additions and 31 deletions
+2 -13
View File
@@ -1198,18 +1198,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,
@@ -1388,7 +1376,8 @@ typedef enum {
BACNET_REINIT_STARTRESTORE = 4,
BACNET_REINIT_ENDRESTORE = 5,
BACNET_REINIT_ABORTRESTORE = 6,
MAX_BACNET_REINITIALIZED_STATE = 7
MAX_BACNET_REINITIALIZED_STATE = 7,
BACNET_REINIT_IDLE = 255
} BACNET_REINITIALIZED_STATE;
typedef enum BACnetNodeType {
+2
View File
@@ -72,6 +72,8 @@ extern "C" {
bool Device_Reinitialize(
BACNET_REINITIALIZE_DEVICE_DATA *rd_data);
BACNET_REINITIALIZED_STATE Device_Reinitialized_State(void);
rr_info_function Device_Objects_RR_Info(
BACNET_OBJECT_TYPE object_type);