From b70739ac4c342a99ab8215dae7aac8c1bca9a4f8 Mon Sep 17 00:00:00 2001 From: Jason T Alborough Date: Thu, 16 Apr 2020 14:54:46 -0400 Subject: [PATCH 1/7] Adds a reference for IBridge back into PepperDash.Essentials.Bridges that inherits from PepperDash.Essentials.Core.Bridges.IBridge for legacy plugins --- PepperDashEssentials/Bridges/IBridge.cs | 16 ++++++++++++++++ PepperDashEssentials/PepperDashEssentials.csproj | 1 + 2 files changed, 17 insertions(+) create mode 100644 PepperDashEssentials/Bridges/IBridge.cs diff --git a/PepperDashEssentials/Bridges/IBridge.cs b/PepperDashEssentials/Bridges/IBridge.cs new file mode 100644 index 00000000..1b539183 --- /dev/null +++ b/PepperDashEssentials/Bridges/IBridge.cs @@ -0,0 +1,16 @@ +using System; +using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Bridges; + +namespace PepperDash.Essentials.Bridges +{ + /// + /// Defines a device that uses the legacy JoinMapBase for its join map + /// + [Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")] + public interface IBridge : PepperDash.Essentials.Core.Bridges.IBridge + { + + } + +} \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 5b500425..c403d1c3 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -125,6 +125,7 @@ + From 717b9b272c95a39c087b7e8390c892de5e49eefd Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 16 Apr 2020 13:39:42 -0600 Subject: [PATCH 2/7] removed the added IBridge and changed... ...the namespace for IBridge in Essentials Core to match the old/existing namespace --- PepperDashEssentials/Bridges/IBridge.cs | 16 ---------------- .../Bridges/BridgeBase.cs | 1 + .../Bridges/IBridge.cs | 19 +++++++++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 PepperDashEssentials/Bridges/IBridge.cs diff --git a/PepperDashEssentials/Bridges/IBridge.cs b/PepperDashEssentials/Bridges/IBridge.cs deleted file mode 100644 index 1b539183..00000000 --- a/PepperDashEssentials/Bridges/IBridge.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Essentials.Core.Bridges; - -namespace PepperDash.Essentials.Bridges -{ - /// - /// Defines a device that uses the legacy JoinMapBase for its join map - /// - [Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")] - public interface IBridge : PepperDash.Essentials.Core.Bridges.IBridge - { - - } - -} \ No newline at end of file diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index c0afb5f9..dc6f0170 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Bridges; //using PepperDash.Essentials.Devices.Common.Cameras; diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs index a4e09c8e..9731b865 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs @@ -2,6 +2,17 @@ using Crestron.SimplSharpPro.DeviceSupport; namespace PepperDash.Essentials.Core.Bridges +{ + /// + /// Defines a device that uses JoinMapBaseAdvanced for its join map + /// + public interface IBridgeAdvanced + { + void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge); + } +} + +namespace PepperDash.Essentials.Bridges { /// /// Defines a device that uses the legacy JoinMapBase for its join map @@ -11,12 +22,4 @@ namespace PepperDash.Essentials.Core.Bridges { void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey); } - - /// - /// Defines a device that uses JoinMapBaseAdvanced for its join map - /// - public interface IBridgeAdvanced - { - void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge); - } } \ No newline at end of file From 5329d7f931b88515b97326c256795770203ffbb8 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 16 Apr 2020 14:23:24 -0600 Subject: [PATCH 3/7] changes to EiscApi loader --- PepperDashEssentials/PepperDashEssentials.csproj | 1 - .../PepperDashEssentialsBase/Bridges/BridgeBase.cs | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index c403d1c3..5b500425 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -125,7 +125,6 @@ - diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index dc6f0170..e7e664be 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -119,11 +119,10 @@ namespace PepperDash.Essentials.Core.Bridges continue; } - if (device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) - { - var bridge = device as IBridgeAdvanced; - if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); - } + if (!device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) continue; + + var bridgeAdvanced = device as IBridgeAdvanced; + if (bridgeAdvanced != null) bridgeAdvanced.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); //if (device is IBridge) // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type. //{ From 65881be81bfcd813bbc6dfe432e2074073489e88 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 16 Apr 2020 15:33:29 -0600 Subject: [PATCH 4/7] moves a version of IBridge back to PepperDash Essentials --- PepperDashEssentials/Bridges/IBridge.cs | 12 ++++++++++++ .../PepperDashEssentialsBase/Bridges/IBridge.cs | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 PepperDashEssentials/Bridges/IBridge.cs diff --git a/PepperDashEssentials/Bridges/IBridge.cs b/PepperDashEssentials/Bridges/IBridge.cs new file mode 100644 index 00000000..a8b0a893 --- /dev/null +++ b/PepperDashEssentials/Bridges/IBridge.cs @@ -0,0 +1,12 @@ +using System; + +namespace PepperDash.Essentials.Bridges +{ + /// + /// Defines a device that uses the legacy JoinMapBase for its join map + /// + [Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")] + public interface IBridge: Core.Bridges.IBridge + { + } +} \ No newline at end of file diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs index 9731b865..0a4450d0 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/IBridge.cs @@ -10,10 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges { void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge); } -} -namespace PepperDash.Essentials.Bridges -{ /// /// Defines a device that uses the legacy JoinMapBase for its join map /// From 20e9ab8cb97ff030652e1f0887fbcb6c725eb9bf Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 16 Apr 2020 15:33:44 -0600 Subject: [PATCH 5/7] fixes issues determining Interface type --- .../Bridges/BridgeBase.cs | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index e7e664be..a2d6d077 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -110,30 +110,37 @@ namespace PepperDash.Essentials.Core.Bridges if (device == null) continue; Debug.Console(1, this, "Linking Device: '{0}'", device.Key); - - if (device.GetType().GetCType().IsAssignableFrom(typeof (IBridge))) + if (device is IBridge) // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type. { - var bridge = device as IBridge; - - if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); - continue; + Debug.Console(2, this, "'{0}' is IBridge", device.Key); + (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); } - - if (!device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) continue; - - var bridgeAdvanced = device as IBridgeAdvanced; - if (bridgeAdvanced != null) bridgeAdvanced.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); - - //if (device is IBridge) // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type. + else if (device is IBridgeAdvanced) + { + Debug.Console(2, this, "'{0}' is IBridgeAdvanced", device.Key); + (device as IBridgeAdvanced).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); + } + //if (device.GetType().GetCType().IsAssignableFrom(typeof (IBridge))) //{ - // (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); + // var bridge = device as IBridge; + + // if (bridge == null) + // continue; + // Debug.Console(2, this, "Linking device {0} as IBridge"); + // bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); // continue; //} - //else if (device is IBridgeAdvanced) - //{ - // Debug.Console(2, this, "'{0}' is IBridgeAdvanced", device.Key); - // (device as IBridgeAdvanced).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); - //} + + //if (!device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) continue; + + //var bridgeAdvanced = device as IBridgeAdvanced; + + //if (bridgeAdvanced == null) continue; + //Debug.Console(2, this, "Linking device {0} as IBridgeAdvanced"); + //bridgeAdvanced.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); + } + Debug.Console(1, this, "Devices Linked."); + // //else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController) //{ // (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); @@ -234,9 +241,9 @@ namespace PepperDash.Essentials.Core.Bridges // (device as C2nRthsController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); // continue; //} - } + //} - Debug.Console(1, this, "Devices Linked."); + }); } From be074b572247ae085884cd209e5cef4b79375422 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 16 Apr 2020 15:52:48 -0600 Subject: [PATCH 6/7] adds iBridge.cs --- PepperDashEssentials/PepperDashEssentials.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 5b500425..c403d1c3 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -125,6 +125,7 @@ + From 31418fd469652ba5cec3555e166f8737531b729a Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 16 Apr 2020 16:16:19 -0600 Subject: [PATCH 7/7] removes bad namespace --- .../PepperDashEssentialsBase/Bridges/BridgeBase.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index a2d6d077..330cb9fb 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -8,7 +8,6 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Config; -using PepperDash.Essentials.Bridges; //using PepperDash.Essentials.Devices.Common.Cameras;