pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 04:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bugfix/ecs-535' into bugfix/ecs-541

Browse Source
This commit is contained in:
Neil Dorin
2017-10-19 09:59:59 -06:00
parent 50a6bde4f2 dd5253301b
commit b301df6910
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs
View File

@@ -87,6 +87,8 @@ namespace PepperDash.Essentials.Devices.Displays
void Init() void Init()
{ {
WarmupTime = 10000; WarmupTime = 10000;
CooldownTime = 8000;
CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, StatusGet); CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, StatusGet);
DeviceManager.AddDevice(CommunicationMonitor); DeviceManager.AddDevice(CommunicationMonitor);

27
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -124,7 +124,7 @@ namespace PepperDash.Essentials
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
ModalDialog WarmingCoolingModal; //ModalDialog WarmingCoolingModal;
/// <summary> /// <summary>
/// Represents /// Represents
@@ -1120,14 +1120,16 @@ namespace PepperDash.Essentials
{ {
if (CurrentRoom.IsWarmingUpFeedback.BoolValue) if (CurrentRoom.IsWarmingUpFeedback.BoolValue)
{ {
WarmingCoolingModal = new ModalDialog(TriList); ShowNotificationRibbon("Room is powering on. Please wait...", 0);
WarmingCoolingModal.PresentModalDialog(0, "Powering Up", "Power", "<p>Room is powering up</p><p>Please wait</p>", //WarmingCoolingModal = new ModalDialog(TriList);
"", "", false, false, null); //WarmingCoolingModal.PresentModalDialog(0, "Powering Up", "Power", "<p>Room is powering up</p><p>Please wait</p>",
// "", "", false, false, null);
} }
else else
{ {
if (WarmingCoolingModal != null) ShowNotificationRibbon("Room is powered on. Welcome.", 2000);
WarmingCoolingModal.CancelDialog(); //if (WarmingCoolingModal != null)
// WarmingCoolingModal.CancelDialog();
} }
} }
@@ -1140,14 +1142,17 @@ namespace PepperDash.Essentials
{ {
if (CurrentRoom.IsCoolingDownFeedback.BoolValue) if (CurrentRoom.IsCoolingDownFeedback.BoolValue)
{ {
WarmingCoolingModal = new ModalDialog(TriList); ShowNotificationRibbon("Room is powering off. Please wait.", 0);
WarmingCoolingModal.PresentModalDialog(0, "Shut Down", "Power", "<p>Room is shutting down</p><p>Please wait</p>",
"", "", false, false, null); //WarmingCoolingModal = new ModalDialog(TriList);
//WarmingCoolingModal.PresentModalDialog(0, "Power Off", "Power", "<p>Room is powering off</p><p>Please wait</p>",
// "", "", false, false, null);
} }
else else
{ {
if (WarmingCoolingModal != null) HideNotificationRibbon();
WarmingCoolingModal.CancelDialog(); //if (WarmingCoolingModal != null)
// WarmingCoolingModal.CancelDialog();
} }
} }

BIN
Release Package/PepperDashEssentials.cpz
View File

Binary file not shown.

BIN
Release Package/PepperDashEssentials.dll
View File

Binary file not shown.