Updates from bench testing RoomOnToDefaultSourceWhenOccupied. Now tested and working using config file values.

PepperDashEssentials/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs

@@ -43,19 +43,21 @@ namespace PepperDash.Essentials.Room.Behaviours
         public RoomOnToDefaultSourceWhenOccupied(string key, RoomOnToDefaultSourceWhenOccupiedConfig config) 
             : base(key)
         {
-
-            CrestronConsole.AddNewConsoleCommand((o) => FeatureEventGroup.ClearAllEvents(), "ClearAllEvents", "Clears all scheduled events for this group", ConsoleAccessLevelEnum.AccessAdministrator);
-
             Config = config;
 
             FeatureEventGroup = new ScheduledEventGroup(this.Key);
 
             FeatureEventGroup.RetrieveAllEvents();
 
+            // Add to the global class for tracking
+            //Global.Scheduler.AddEventGroup(FeatureEventGroup);
+
             AddPostActivationAction(() =>
             {
-                if (Room.RoomOccupancy != null)
+                // Subscribe to room event to know when RoomOccupancy is set and ready to be subscribed to
-                    Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(RoomIsOccupiedFeedback_OutputChange);
+                if (Room != null)
+                    Room.RoomOccupancyIsSet += new EventHandler<EventArgs>(RoomOccupancyIsSet);
+
                 else
                     Debug.Console(1, this, "Room has no RoomOccupancy object set");
 
@@ -74,11 +76,6 @@ namespace PepperDash.Essentials.Room.Behaviours
 
             if (Room != null)
             {
- 
-
-                // Creates the event group and adds it to the Global Scheduler list
-                //Global.Scheduler.AddEventGroup(FeatureEventGroup);
-
                 try
                 {
                     FeatureEnabledTime = DateTime.Parse(Config.OccupancyStartTime);
@@ -127,6 +124,21 @@ namespace PepperDash.Essentials.Room.Behaviours
             return base.CustomActivate();
         }
 
+        /// <summary>
+        /// Subscribe to feedback from RoomIsOccupiedFeedback on Room
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void RoomOccupancyIsSet(object sender, EventArgs e)
+        {
+            if (Room.RoomOccupancy != null)
+            {
+                Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange -= RoomIsOccupiedFeedback_OutputChange;
+                Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(RoomIsOccupiedFeedback_OutputChange);
+                Debug.Console(1, this, "Subscribed to RoomOccupancy status from: '{0}'", Room.Key);
+            }
+        }
+
         void FeatureEventGroup_UserGroupCallBack(ScheduledEvent SchEvent, ScheduledEventCommon.eCallbackReason type)
         {
             if (type == ScheduledEventCommon.eCallbackReason.NormalExpiration)
@@ -136,13 +148,13 @@ namespace PepperDash.Essentials.Room.Behaviours
                     if (Config.EnableRoomOnWhenOccupied)
                         FeatureEnabled = true;
 
-                    Debug.Console(1, this, "*****Feature Enabled.*****");
+                    Debug.Console(1, this, "*****Feature Enabled by event.*****");
                 }
                 else if (SchEvent.Name == FeatureDisableEventName)
                 {
                     FeatureEnabled = false;
 
-                    Debug.Console(1, this, "*****Feature Disabled.*****");
+                    Debug.Console(1, this, "*****Feature Disabled by event.*****");
                 }
             }
         }
@@ -159,9 +171,13 @@ namespace PepperDash.Essentials.Room.Behaviours
             {
                 if (DateTime.Now.CompareTo(FeatureEnabledTime) > 0 && FeatureDisabledTime.CompareTo(DateTime.Now) >= 0)
                 {
+                    if (SchedulerUtilities.CheckIfDayOfWeekMatchesRecurrenceDays(DateTime.Now, FeatureEnableEvent.Recurrence.RecurrenceDays))
+                    {
+                        Debug.Console(1, this, "*****Feature Enabled by startup check.*****");
                         enabled = true;
                     }
                 }
+            }
             return enabled;
         }
 
@@ -172,6 +188,7 @@ namespace PepperDash.Essentials.Room.Behaviours
         /// <param name="e"></param>
         void RoomIsOccupiedFeedback_OutputChange(object sender, FeedbackEventArgs e)
         {
+            Debug.Console(1, this, "RoomIsOccupiedFeeback.OutputChange event fired. e.BoolValue: {0}", e.BoolValue);
             if(e.BoolValue)
             {
                 // Occupancy detected
@@ -180,7 +197,10 @@ namespace PepperDash.Essentials.Room.Behaviours
                 {
                     // Check room power state first
                     if (!Room.OnFeedback.BoolValue)
-                        Room.PowerOnToDefaultOrLastSource();
+                    {
+                        Debug.Console(1, this, "Powering Room on to default source");
+                        Room.RunDefaultPresentRoute();
+                    }
                 }
             }
         }
@@ -206,17 +226,34 @@ namespace PepperDash.Essentials.Room.Behaviours
             {
                 schEvent.Description = "Enables the RoomOnToDefaultSourceWhenOccupiedFeature";
 
+                var eventRecurrennce = CalculateDaysOfWeekRecurrence();
+
+                var eventTime = new DateTime();
+
                 // Check to make sure the date for this event is in the future
                 if (DateTime.Now.CompareTo(FeatureEnabledTime) > 0)
-                    schEvent.DateAndTime.SetAbsoluteEventTime(FeatureEnabledTime.AddDays(1));
+                    eventTime = FeatureEnabledTime.AddDays(1);
                 else
-                    schEvent.DateAndTime.SetAbsoluteEventTime(FeatureEnabledTime);
+                    eventTime = FeatureEnabledTime;
+
+                Debug.Console(1, this, "eventTime (before recurrence check): {0}", eventTime);
+
+                // Check day of week against recurrence days and move date ahead as necessary to avoid throwing an exception by trying to set the event
+                // start date on a day of the week that doesn't match teh recurrence values
+                while(!SchedulerUtilities.CheckIfDayOfWeekMatchesRecurrenceDays(eventTime, eventRecurrennce))
+                {
+                    eventTime = eventTime.AddDays(1);
+                    Debug.Console(1, this, "eventTime does not fall on a recurrence weekday.  eventTime: {0}", eventTime);
+                }
+
+                schEvent.DateAndTime.SetAbsoluteEventTime(eventTime);
 
                 Debug.Console(1, this, "Event '{0}' Absolute time set to {1}", schEvent.Name, schEvent.DateAndTime.ToString());
 
                 CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);
 
-                schEvent.Recurrence.Weekly((ScheduledEventCommon.eWeekDays)CalculateDaysEnum());
+                schEvent.Recurrence.Weekly(eventRecurrennce);
+
             }
             else if (schEvent.Name == FeatureDisableEventName)
             {
@@ -236,6 +273,8 @@ namespace PepperDash.Essentials.Room.Behaviours
             }
         }
 
+
+
         void CalculateAndSetAcknowledgeExpirationTimeout(ScheduledEvent schEvent, DateTime time1, DateTime time2)
         {
             Debug.Console(1, this, "time1.Hour = {0}", time1.Hour);
@@ -262,6 +301,40 @@ namespace PepperDash.Essentials.Room.Behaviours
             schEvent.AcknowledgeExpirationTimeout.Minute = (ushort)(ackExpMinutes);
         }
 
+        /// <summary>
+        /// Checks existing event to see if it matches the execution time
+        /// </summary>
+        /// <param name="existingEvent"></param>
+        /// <returns></returns>
+        bool CheckExistingEventTimeForMatch(ScheduledEvent existingEvent, DateTime newTime)
+        {
+            bool isMatch = true;
+
+            // Check to see if hour and minute match
+            if (existingEvent.DateAndTime.Hour != newTime.Hour || existingEvent.DateAndTime.Minute != newTime.Minute)
+                return false;
+
+
+            return isMatch;
+        }
+
+        /// <summary>
+        /// Checks existing event to see if it matches the recurrence days
+        /// </summary>
+        /// <param name="existingEvent"></param>
+        /// <param name="eWeekdays"></param>
+        /// <returns></returns>
+        bool CheckExistingEventRecurrenceForMatch(ScheduledEvent existingEvent, ScheduledEventCommon.eWeekDays eWeekdays)
+        {
+            bool isMatch = true;
+
+            // Check to see if recurrence matches
+            if (eWeekdays != existingEvent.Recurrence.RecurrenceDays)
+                return false;
+
+            return isMatch;
+        }
+
         /// <summary>
         /// Adds the Enable event to the local event group and sets its properties based on config
         /// </summary>
@@ -273,11 +346,21 @@ namespace PepperDash.Essentials.Room.Behaviours
             }
             else
             {
+                // Check if existing event has same time and recurrence as config values
+
                 FeatureEnableEvent = FeatureEventGroup.ScheduledEvents[FeatureEnableEventName];
                 Debug.Console(1, this, "Enable event already found in group");
 
-                // TODO: Check config times and days against DateAndTime of existing event.  If different, may need to remove event and recreate?
+                // Check config times and days against DateAndTime of existing event.  If different, delete existing event and create new event
+                if(!CheckExistingEventTimeForMatch(FeatureEnableEvent, FeatureEnabledTime) || !CheckExistingEventRecurrenceForMatch(FeatureEnableEvent, CalculateDaysOfWeekRecurrence()))
+                {
+                    Debug.Console(1, this, "Existing event does not match new config properties. Deleting exisiting event: '{0}'", FeatureEnableEvent.Name);
+                    FeatureEventGroup.DeleteEvent(FeatureEnableEvent);
 
+                    FeatureEnableEvent = null;
+
+                    CreateEvent(FeatureEnableEvent, FeatureEnableEventName);
+                }
             }
 
         }
@@ -296,34 +379,43 @@ namespace PepperDash.Essentials.Room.Behaviours
                 FeatureDisableEvent = FeatureEventGroup.ScheduledEvents[FeatureDisableEventName];
                 Debug.Console(1, this, "Disable event already found in group");
 
-                // TODO: Check config times and days against DateAndTime of existing event.  If different, may need to remove event and recreate?
+                // Check config times against DateAndTime of existing event.  If different, delete existing event and create new event
-            }
+                if(!CheckExistingEventTimeForMatch(FeatureDisableEvent, FeatureDisabledTime))
+                {
+                    Debug.Console(1, this, "Existing event does not match new config properties. Deleting exisiting event: '{0}'", FeatureDisableEvent.Name);
 
+                    FeatureEventGroup.DeleteEvent(FeatureDisableEvent);
+
+                    FeatureDisableEvent = null;
+
+                    CreateEvent(FeatureDisableEvent, FeatureDisableEventName);
+                }
+            }
         }
 
 
         /// <summary>
-        /// Calculates the correct enum value for the event recurrence based on the config values
+        /// Calculates the correct bitfield enum value for the event recurrence based on the config values
         /// </summary>
         /// <returns></returns>
-        ScheduledEventCommon.eWeekDays CalculateDaysEnum()
+        ScheduledEventCommon.eWeekDays CalculateDaysOfWeekRecurrence()
         {
             ScheduledEventCommon.eWeekDays value = new ScheduledEventCommon.eWeekDays();
 
             if (Config.EnableSunday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Sunday;
+                value = value | ScheduledEventCommon.eWeekDays.Sunday;
             if (Config.EnableMonday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Monday;
+                value = value | ScheduledEventCommon.eWeekDays.Monday;
             if (Config.EnableTuesday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Tuesday;
+                value = value | ScheduledEventCommon.eWeekDays.Tuesday;
             if (Config.EnableWednesday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Wednesday;
+                value = value | ScheduledEventCommon.eWeekDays.Wednesday;
             if (Config.EnableThursday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Thursday;
+                value = value | ScheduledEventCommon.eWeekDays.Thursday;
             if (Config.EnableFriday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Friday;
+                value = value | ScheduledEventCommon.eWeekDays.Friday;
             if (Config.EnableSaturday)
-                value = value + (int)ScheduledEventCommon.eWeekDays.Saturday;
+                value = value | ScheduledEventCommon.eWeekDays.Saturday;
 
             return value;
         }

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -212,10 +212,13 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Routes the default source item, if any
         /// </summary>
-        public bool RunDefaultPresentRoute()
+        public override bool RunDefaultPresentRoute()
         {
             if (DefaultSourceItem == null)
+            {
+                Debug.Console(0, this, "Unable to run default present route, DefaultSourceItem is null.");
                 return false;
+            }
 
             RunRouteAction(DefaultSourceItem);
 			return true;

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -283,10 +283,11 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Routes the default source item, if any. Returns true when default route exists
         /// </summary>
-        public bool RunDefaultPresentRoute()
+        public override bool RunDefaultPresentRoute()
         {
-			//if (DefaultSourceItem != null)
+			if (DefaultSourceItem != null)
                 RunRouteAction(DefaultSourceItem);
+
             return DefaultSourceItem != null;
         }
 

PepperDashEssentials/Room/Types/EssentialsRoomBase.cs

@@ -21,6 +21,11 @@ namespace PepperDash.Essentials
         /// </summary>
         public BoolFeedback OnFeedback { get; private set; }
 
+        /// <summary>
+        /// Fires when the RoomOccupancy object is set
+        /// </summary>
+        public event EventHandler<EventArgs> RoomOccupancyIsSet;
+
         public BoolFeedback IsWarmingUpFeedback { get; private set; }
         public BoolFeedback IsCoolingDownFeedback { get; private set; }
 
@@ -111,6 +116,12 @@ namespace PepperDash.Essentials
 
             IsWarmingUpFeedback = new BoolFeedback(IsWarmingFeedbackFunc);
             IsCoolingDownFeedback = new BoolFeedback(IsCoolingFeedbackFunc);
+
+            AddPostActivationAction(() =>
+            {
+                if (RoomOccupancy != null)
+                    OnRoomOccupancyIsSet();
+            });
         }
 
         void RoomVacancyShutdownPromptTimer_HasFinished(object sender, EventArgs e)
@@ -204,13 +215,31 @@ namespace PepperDash.Essentials
 
             RoomOccupancy = statusProvider;
 
+            OnRoomOccupancyIsSet();
+
+            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange -= RoomIsOccupiedFeedback_OutputChange;
             RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
+
+            Debug.Console(0, this, "Room Occupancy set to device: '{0}'", (statusProvider as Device).Key);
         }
 
+        void OnRoomOccupancyIsSet()
+        {
+            var handler = RoomOccupancyIsSet;
+            if (handler != null)
+                handler(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// To allow base class to power room on to last source
+        /// </summary>
+        public abstract void PowerOnToDefaultOrLastSource();
+
         /// <summary>
         /// To allow base class to power room on to default source
         /// </summary>
-        public abstract void PowerOnToDefaultOrLastSource();
+        /// <returns></returns>
+        public abstract bool RunDefaultPresentRoute();
 
         void RoomIsOccupiedFeedback_OutputChange(object sender, EventArgs e)
         {
@@ -228,14 +257,6 @@ namespace PepperDash.Essentials
             }
         }
 
-        /// <summary>
-        /// Sets up events in the scheduler for the start and end times of the appropriate days to enable and disable the RoomOccupancyPowerOnIsEnabled flag
-        /// </summary>
-        void SetUpOccupancyRoomOnEventsInScheduler()
-        {
-            
-        }
-
         /// <summary>
         /// Executes when RoomVacancyShutdownTimer expires.  Used to trigger specific room actions as needed.  Must nullify the timer object when executed
         /// </summary>

devjson commands.json

@@ -29,3 +29,5 @@ devjson:1 {"deviceKey":"microphonePrivacyController-1", "methodName":"TogglePriv
 devjson:1 {"deviceKey":"room1.InCallFeedback","methodName":"SetTestValue", "params": [ true ]}
 
 devjson:1 {"deviceKey":"room1.InCallFeedback","methodName":"ClearTestValue", "params": []}
+
+devjson:3 {"deviceKey":"room1.RoomOccupancy.RoomIsOccupiedFeedback","methodName":"SetTestValue", "params": [ true ]}