From bd31831a9b23f0103b343abb993ff81a7bf76452 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 8 Oct 2018 13:18:50 -0600 Subject: [PATCH] Fixes issue with TimeoutMinutes property being mispelled in EssentialsRoomConfig. Adds additional debug messages to assist with vacancy timeout testing --- PepperDashEssentials/Properties/AssemblyInfo.cs | 2 +- PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs | 8 ++++---- PepperDashEssentials/Room/Types/EssentialsRoomBase.cs | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index f846e2f5..4cd22c15 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.2.8.*")] +[assembly: AssemblyVersion("1.2.11.*")] diff --git a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs index 049c15dc..aa45514e 100644 --- a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs +++ b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs @@ -32,7 +32,7 @@ namespace PepperDash.Essentials.Room.Config if (props.Occupancy != null) huddle.SetRoomOccupancy(DeviceManager.GetDeviceForKey(props.Occupancy.DeviceKey) as - PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, props.Occupancy.TimoutMinutes); + PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, props.Occupancy.TimeoutMinutes); huddle.LogoUrl = props.Logo.GetUrl(); huddle.SourceListKey = props.SourceListKey; huddle.DefaultSourceItem = props.DefaultSourceItem; @@ -72,7 +72,7 @@ namespace PepperDash.Essentials.Room.Config if (props.Occupancy != null) rm.SetRoomOccupancy(DeviceManager.GetDeviceForKey(props.Occupancy.DeviceKey) as - PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, props.Occupancy.TimoutMinutes); + PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, props.Occupancy.TimeoutMinutes); rm.LogoUrl = props.Logo.GetUrl(); rm.SourceListKey = props.SourceListKey; rm.DefaultSourceItem = props.DefaultSourceItem; @@ -322,8 +322,8 @@ namespace PepperDash.Essentials.Room.Config [JsonProperty("deviceKey")] public string DeviceKey { get; set; } - [JsonProperty("timoutMinutes")] - public int TimoutMinutes { get; set; } + [JsonProperty("timeoutMinutes")] + public int TimeoutMinutes { get; set; } } public class EssentialsRoomTechConfig diff --git a/PepperDashEssentials/Room/Types/EssentialsRoomBase.cs b/PepperDashEssentials/Room/Types/EssentialsRoomBase.cs index a364fa23..15bc650a 100644 --- a/PepperDashEssentials/Room/Types/EssentialsRoomBase.cs +++ b/PepperDashEssentials/Room/Types/EssentialsRoomBase.cs @@ -159,6 +159,8 @@ namespace PepperDash.Essentials ShutdownPromptTimer.SecondsToCount = ShutdownVacancySeconds; ShutdownType = type; ShutdownPromptTimer.Start(); + + Debug.Console(0, this, "ShutdwonPromptTimer Started. Type: {0}. Seconds: {1}", ShutdownType, ShutdownPromptTimer.SecondsToCount); } public void StartRoomVacancyTimer(eVacancyMode mode) @@ -170,7 +172,7 @@ namespace PepperDash.Essentials VacancyMode = mode; RoomVacancyShutdownTimer.Start(); - Debug.Console(0, this, "Vacancy Timer Started."); + Debug.Console(0, this, "Vacancy Timer Started. Mode: {0}. Seconds: {1}", VacancyMode, RoomVacancyShutdownTimer.SecondsToCount); } /// @@ -213,6 +215,8 @@ namespace PepperDash.Essentials if(timeoutMinutes > 0) RoomVacancyShutdownSeconds = timeoutMinutes * 60; + Debug.Console(1, this, "RoomVacancyShutdownSeconds set to {0}", RoomVacancyShutdownSeconds); + RoomOccupancy = statusProvider; OnRoomOccupancyIsSet();