From 717b9b272c95a39c087b7e8390c892de5e49eefd Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 16 Apr 2020 13:39:42 -0600
Subject: [PATCH] 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
-{
-    /// <summary>
-    /// Defines a device that uses the legacy JoinMapBase for its join map
-    /// </summary>
-    [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
+{
+    /// <summary>
+    /// Defines a device that uses JoinMapBaseAdvanced for its join map
+    /// </summary>
+    public interface IBridgeAdvanced
+    {
+        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge);
+    }
+}
+
+namespace PepperDash.Essentials.Bridges
 {
     /// <summary>
     /// 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);
     }
-
-    /// <summary>
-    /// Defines a device that uses JoinMapBaseAdvanced for its join map
-    /// </summary>
-    public interface IBridgeAdvanced
-    {
-        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge);
-    }
 }
\ No newline at end of file