Updated Lighting Output object. Added Channel object. Not complete and not fully tested.

bacnet-stack/include/bacenum.h

@@ -399,7 +399,7 @@ typedef enum {
     PROP_DEFAULT_FADE_TIME = 374,
     PROP_DEFAULT_RAMP_RATE = 375,
     PROP_DEFAULT_STEP_INCREMENT = 376,
-    PROP_EGRESS_TIMER = 377,
+    PROP_EGRESS_TIME = 377,
     PROP_IN_PROGRESS = 378,
     PROP_INSTANTANEOUS_POWER = 379,
     PROP_LIGHTING_COMMAND = 380,
@@ -1689,7 +1689,12 @@ typedef enum BACnetLightingOperation {
     BACNET_LIGHTS_WARN = 7,
     BACNET_LIGHTS_WARN_OFF = 8,
     BACNET_LIGHTS_WARN_RELINQUISH = 9,
-    BACNET_LIGHTS_STOP = 10
+    BACNET_LIGHTS_STOP = 10,
+    /* 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 */
+    BACNET_LIGHTS_PROPRIETARY_FIRST = 256,
+    BACNET_LIGHTS_PROPRIETARY_LAST = 65535
 } BACNET_LIGHTING_OPERATION;
 
 typedef enum BACnetLightingInProgress {
@@ -1703,7 +1708,12 @@ typedef enum BACnetLightingInProgress {
 typedef enum BACnetLightingTransition {
     BACNET_LIGHTING_TRANSITION_IDLE = 0,
     BACNET_LIGHTING_TRANSITION_FADE = 1,
-    BACNET_LIGHTING_TRANSITION_RAMP = 2
+    BACNET_LIGHTING_TRANSITION_RAMP = 2,
+    /* 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. */
+    BACNET_LIGHTING_TRANSITION_PROPRIETARY_FIRST = 64,
+    BACNET_LIGHTING_TRANSITION_PROPRIETARY_LAST = 255
 } BACNET_LIGHTING_TRANSITION;
 
 /* NOTE: BACNET_DAYS_OF_WEEK is different than BACNET_WEEKDAY */