Added some enum extensions for the lighting output and life safety object. Thank you, Wolfgang!

This commit is contained in:
skarg
2014-07-30 16:34:21 +00:00
parent db224e7f0b
commit 8cdd480cc5
3 changed files with 140 additions and 1 deletions
+4 -1
View File
@@ -1711,6 +1711,7 @@ typedef enum BACnetLightingOperation {
BACNET_LIGHTS_WARN_OFF = 8,
BACNET_LIGHTS_WARN_RELINQUISH = 9,
BACNET_LIGHTS_STOP = 10,
MAX_BACNET_LIGHTING_OPERATION = 11,
/* Enumerated values 0-255 are reserved for definition by ASHRAE.
Enumerated values 256-65535 may be used by others subject to
the procedures and constraints described in Clause 23 */
@@ -1723,13 +1724,15 @@ typedef enum BACnetLightingInProgress {
BACNET_LIGHTING_FADE_ACTIVE = 1,
BACNET_LIGHTING_RAMP_ACTIVE = 2,
BACNET_LIGHTING_NOT_CONTROLLED = 3,
BACNET_LIGHTING_OTHER = 4
BACNET_LIGHTING_OTHER = 4,
MAX_BACNET_LIGHTING_IN_PROGRESS = 5
} BACNET_LIGHTING_IN_PROGRESS;
typedef enum BACnetLightingTransition {
BACNET_LIGHTING_TRANSITION_IDLE = 0,
BACNET_LIGHTING_TRANSITION_FADE = 1,
BACNET_LIGHTING_TRANSITION_RAMP = 2,
MAX_BACNET_LIGHTING_TRANSITION = 3,
/* Enumerated values 0-63 are reserved for definition by ASHRAE.
Enumerated values 64-255 may be used by others subject to
the procedures and constraints described in Clause 23. */
+14
View File
@@ -47,6 +47,9 @@ extern "C" {
unsigned index);
const char *bactext_application_tag_name(
unsigned index);
bool bactext_application_tag_index(
const char *search_name,
unsigned *found_index);
const char *bactext_object_type_name(
unsigned index);
bool bactext_object_type_index(
@@ -100,6 +103,9 @@ extern "C" {
unsigned index);
const char *bactext_segmentation_name(
unsigned index);
bool bactext_segmentation_index(
const char *search_name,
unsigned *found_index);
const char *bactext_node_type_name(
unsigned index);
const char *bactext_character_string_encoding_name(
@@ -119,9 +125,17 @@ extern "C" {
const char *bactext_network_layer_msg_name(
unsigned index);
const char *bactext_life_safety_state_name(
unsigned index);
const char *bactext_lighting_operation_name(
unsigned index);
const char *bactext_lighting_in_progress(
unsigned index);
const char *bactext_lighting_transition(
unsigned index);
#ifdef __cplusplus
}
#endif /* __cplusplus */