diff --git a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs index 3aee1e20..79844ce4 100644 --- a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs +++ b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs @@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Room.Config { return new EssentialsHuddleVtc1Room(roomConfig); } - if (typeName == "ddvc01Bridge") + if (typeName == "ddvc01bridge") { return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing. } @@ -40,7 +40,7 @@ namespace PepperDash.Essentials.Room.Config return new EssentialsDualDisplayRoom(roomConfig); } - return typeName != "techRoom" ? null : new EssentialsTechRoom(roomConfig); + return typeName != "techroom" ? null : new EssentialsTechRoom(roomConfig); } /// diff --git a/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs b/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs index e4b88e96..ccf9ec6d 100644 --- a/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs +++ b/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs @@ -1,22 +1,33 @@ using System.Collections.Generic; +using Newtonsoft.Json; namespace PepperDash.Essentials.Room.Config { public class EssentialsTechRoomConfig { + [JsonProperty("displays")] public List Displays; + + [JsonProperty("tuners")] public List Tuners; - public string ScheduleProviderKey; + + [JsonProperty("userPin")] public string UserPin; + + [JsonProperty("techPin")] public string TechPin; + + [JsonProperty("presetFileName")] public string PresetsFileName; - public List RoomScheduledEvents; + + [JsonProperty("scheduledEvents")] + public List ScheduledEvents; public EssentialsTechRoomConfig() { Displays = new List(); Tuners = new List(); - RoomScheduledEvents = new List(); + ScheduledEvents = new List(); } } } \ No newline at end of file diff --git a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs index cb8ebfa1..c7f474eb 100644 --- a/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs +++ b/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs @@ -74,7 +74,7 @@ namespace PepperDash.Essentials private void CreateOrUpdateScheduledEvents() { - var eventsConfig = _config.RoomScheduledEvents; + var eventsConfig = _config.ScheduledEvents; GetOrCreateScheduleGroup(); @@ -127,11 +127,11 @@ namespace PepperDash.Essentials { //update config based on key of scheduleEvent GetOrCreateScheduleGroup(); - var existingEvent = _config.RoomScheduledEvents.FirstOrDefault(e => e.Key == scheduledEvent.Key); + var existingEvent = _config.ScheduledEvents.FirstOrDefault(e => e.Key == scheduledEvent.Key); if (existingEvent == null) { - _config.RoomScheduledEvents.Add(scheduledEvent); + _config.ScheduledEvents.Add(scheduledEvent); } //create or update event based on config @@ -144,7 +144,7 @@ namespace PepperDash.Essentials OnScheduledEventUpdate(); } - public void OnScheduledEventUpdate() + private void OnScheduledEventUpdate() { var handler = ScheduledEventsChanged; @@ -153,14 +153,14 @@ namespace PepperDash.Essentials return; } - handler(this, new ScheduledEventEventArgs {ScheduledEvents = _config.RoomScheduledEvents}); + handler(this, new ScheduledEventEventArgs {ScheduledEvents = _config.ScheduledEvents}); } public event EventHandler ScheduledEventsChanged; private void HandleScheduledEvent(ScheduledEvent schevent, ScheduledEventCommon.eCallbackReason type) { - var eventConfig = _config.RoomScheduledEvents.FirstOrDefault(e => e.Key == schevent.Name); + var eventConfig = _config.ScheduledEvents.FirstOrDefault(e => e.Key == schevent.Name); if (eventConfig == null) { @@ -221,42 +221,42 @@ namespace PepperDash.Essentials protected override Func IsWarmingFeedbackFunc { - get { throw new NotImplementedException(); } + get { return () => false; } } protected override Func IsCoolingFeedbackFunc { - get { throw new NotImplementedException(); } + get { return () => false; } } protected override Func OnFeedbackFunc { - get { throw new NotImplementedException(); } + get { return () => RoomPowerIsOn; } } protected override void EndShutdown() { - throw new NotImplementedException(); + } public override void SetDefaultLevels() { - throw new NotImplementedException(); + } public override void PowerOnToDefaultOrLastSource() { - throw new NotImplementedException(); + } public override bool RunDefaultPresentRoute() { - throw new NotImplementedException(); + return false; } public override void RoomVacatedForTimeoutPeriod(object o) { - throw new NotImplementedException(); + } #endregion diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs index 64ba57df..6544f1f4 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs @@ -175,13 +175,15 @@ namespace PepperDash.Essentials.Core scheduledEvent.DateAndTime.SetFirstDayOfWeek(ScheduledEventCommon.eFirstDayOfWeek.Sunday); - scheduledEvent.Recurrence.Weekly(config.Days); - var eventTime = DateTime.Parse(config.Time); - if (DateTime.Now < eventTime) eventTime.AddDays(1); + if (DateTime.Now > eventTime) eventTime = eventTime.AddDays(1); scheduledEvent.DateAndTime.SetAbsoluteEventTime(eventTime); + + scheduledEvent.Recurrence.Weekly(config.Days); + + } } } \ No newline at end of file