From d370564900a674e621b93be61959213a66a86b4f Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 8 Apr 2020 11:35:09 -0600 Subject: [PATCH] makes IDpad explicitly inherit from IKeyed --- PepperDashEssentials/ControlSystem.cs | 9 +++++++-- .../DeviceTypeInterfaces/IDPad.cs | 4 ++-- .../PepperDash_Essentials_Core.csproj | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs index 02a8c079..cffaeca2 100644 --- a/PepperDashEssentials/ControlSystem.cs +++ b/PepperDashEssentials/ControlSystem.cs @@ -264,8 +264,13 @@ namespace PepperDash.Essentials DeviceManager.ActivateAll(); - //LinkSystemMonitorToAppServer(); - } + var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl; + + if (mobileControl == null) return; + + mobileControl.LinkSystemMonitorToAppServer(); + //LinkSystemMonitorToAppServer(); + } //void LinkSystemMonitorToAppServer() //{ diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IDPad.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IDPad.cs index 2e0f3ae7..9d1aef4b 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IDPad.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IDPad.cs @@ -1,6 +1,6 @@ using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; - +using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.SmartObjects; @@ -9,7 +9,7 @@ namespace PepperDash.Essentials.Core /// /// /// - public interface IDPad + public interface IDPad : IKeyed { void Up(bool pressRelease); void Down(bool pressRelease); diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index de778fc5..65176251 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -137,6 +137,7 @@ +