diff --git a/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs b/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs index 9c387594..6ed993ef 100644 --- a/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs +++ b/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs @@ -87,6 +87,8 @@ namespace PepperDash.Essentials.Devices.Displays void Init() { WarmupTime = 10000; + CooldownTime = 8000; + CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, StatusGet); DeviceManager.AddDevice(CommunicationMonitor); diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs index b2ee51cc..6286c70d 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs @@ -124,7 +124,7 @@ namespace PepperDash.Essentials /// /// /// - ModalDialog WarmingCoolingModal; + //ModalDialog WarmingCoolingModal; /// /// Represents @@ -1120,14 +1120,16 @@ namespace PepperDash.Essentials { if (CurrentRoom.IsWarmingUpFeedback.BoolValue) { - WarmingCoolingModal = new ModalDialog(TriList); - WarmingCoolingModal.PresentModalDialog(0, "Powering Up", "Power", "

Room is powering up

Please wait

", - "", "", false, false, null); + ShowNotificationRibbon("Room is powering on. Please wait...", 0); + //WarmingCoolingModal = new ModalDialog(TriList); + //WarmingCoolingModal.PresentModalDialog(0, "Powering Up", "Power", "

Room is powering up

Please wait

", + // "", "", false, false, null); } else { - if (WarmingCoolingModal != null) - WarmingCoolingModal.CancelDialog(); + ShowNotificationRibbon("Room is powered on. Welcome.", 2000); + //if (WarmingCoolingModal != null) + // WarmingCoolingModal.CancelDialog(); } } @@ -1140,14 +1142,17 @@ namespace PepperDash.Essentials { if (CurrentRoom.IsCoolingDownFeedback.BoolValue) { - WarmingCoolingModal = new ModalDialog(TriList); - WarmingCoolingModal.PresentModalDialog(0, "Shut Down", "Power", "

Room is shutting down

Please wait

", - "", "", false, false, null); + ShowNotificationRibbon("Room is powering off. Please wait.", 0); + + //WarmingCoolingModal = new ModalDialog(TriList); + //WarmingCoolingModal.PresentModalDialog(0, "Power Off", "Power", "

Room is powering off

Please wait

", + // "", "", false, false, null); } else { - if (WarmingCoolingModal != null) - WarmingCoolingModal.CancelDialog(); + HideNotificationRibbon(); + //if (WarmingCoolingModal != null) + // WarmingCoolingModal.CancelDialog(); } } diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index 567c1f73..80fa09fa 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 1a96ce48..f8a5cb88 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ