changes PepperDash.Essentials.Bridges to PepperDash.Essentials.Core.Bridges

PepperDashEssentials/AppServer/Messengers/SIMPLCameraMessenger.cs

@@ -8,7 +8,7 @@ using Crestron.SimplSharpPro.EthernetCommunication;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Bridges;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.AppServer.Messengers

PepperDashEssentials/AppServer/Messengers/SimplMessengerPropertiesConfig.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using PepperDash.Essentials.Bridges;
+using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.DM.AirMedia;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
 	public static class AirMediaControllerApiExtensions
 	{

PepperDashEssentials/Bridges/AppleTvBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.Devices.Common;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class AppleTvApiExtensions
     {

PepperDashEssentials/Bridges/BridgeFactory.cs

@@ -9,7 +9,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Bridges;
+using PepperDash.Essentials.Core.Bridges;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.EthernetCommunication;
 

PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

@@ -4,7 +4,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class C2nRthsControllerApiExtensions
     {

PepperDashEssentials/Bridges/CameraControllerBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.Devices.Common.Cameras;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class CameraControllerApiExtensions
     {

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -10,7 +10,7 @@ using PepperDash.Essentials.Devices.Common;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class DigitalLoggerApiExtensions
     {

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.Devices.Common;
 using Newtonsoft.Json;
 
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
 	public static class DisplayControllerApiExtensions
 	{

PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs

@@ -14,7 +14,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges {
+namespace PepperDash.Essentials.Core.Bridges {
     public static class DmBladeChassisControllerApiExtentions {
         public static void LinkToApi(this DmBladeChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey) {
             DmBladeChassisControllerJoinMap joinMap = new DmBladeChassisControllerJoinMap();

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -15,7 +15,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class DmChassisControllerApiExtentions
     {

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class DmRmcControllerApiExtensions
     {

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

@@ -14,7 +14,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class DmTxControllerApiExtensions
     {

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

@@ -12,7 +12,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class DmpsAudioOutputControllerApiExtensions
     {

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

@@ -12,7 +12,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class DmpsRoutingControllerApiExtentions 
     {

PepperDashEssentials/Bridges/GenericLightingBridge.cs

@@ -10,7 +10,7 @@ using PepperDash.Essentials.Devices.Common;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class GenericLightingApiExtensions
     {

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.Core.CrestronIO;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class GenericRelayDeviceApiExtensions
     {

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

@@ -12,7 +12,7 @@ using PepperDash.Core;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class GlsOccupancySensorBaseControllerApiExtensions
     {

PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs

@@ -14,7 +14,7 @@ using PepperDash.Essentials.DM;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class HdMdxxxCEControllerApiExtensions
     {

PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

@@ -10,7 +10,7 @@ using PepperDash.Essentials.Core;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class IBasicCommunicationApiExtensions
     {

PepperDashEssentials/Bridges/IDigitalInputBridge.cs

@@ -11,7 +11,7 @@ using PepperDash.Essentials.Core.CrestronIO;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class IDigitalInputApiExtenstions
     {

PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

@@ -10,7 +10,7 @@ using PepperDash.Essentials.Devices.Common;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class IRSetTopBoxBaseApiExtensions
     {

PepperDashEssentials/Bridges/StatusSignControllerBridge.cs

@@ -4,7 +4,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class StatusSignDeviceApiExtensions
     {

PepperDashEssentials/Bridges/SystemMonitorBridge.cs

@@ -6,7 +6,7 @@ using PepperDash.Essentials.Core.Monitoring;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public static class SystemMonitorBridge
     {

PepperDashEssentials/ControlSystem.cs

@@ -51,7 +51,7 @@ namespace PepperDash.Essentials
 
             CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(Core.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp.Reflection;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
 using Newtonsoft.Json;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Lighting;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
@@ -90,7 +89,8 @@ namespace PepperDash.Essentials.Core.Bridges
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
 
-            PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
+            PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
+            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
             Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
 
@@ -285,7 +285,7 @@ namespace PepperDash.Essentials.Core.Bridges
                 return;
             }
 
-            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, this.Key); 
+            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key); 
             joinMap.PrintJoinMapInfo();
         }
 
@@ -294,6 +294,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="join"></param>
         /// <param name="type"></param>
+        /// <param name="state"></param>
         public void ExecuteJoinAction(uint join, string type, object state)
         {
             try
@@ -354,23 +355,23 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="currentDevice"></param>
         /// <param name="args"></param>
-        void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
+        void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
                 if (Debug.Level >= 1)
                     Debug.Console(1, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
                 var uo = args.Sig.UserObject;
-                if (uo != null)
+
-                {
+                if (uo == null) return;
-                    Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+
-                    if (uo is Action<bool>)
+                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
-                        (uo as Action<bool>)(args.Sig.BoolValue);
+                if (uo is Action<bool>)
-                    else if (uo is Action<ushort>)
+                    (uo as Action<bool>)(args.Sig.BoolValue);
-                        (uo as Action<ushort>)(args.Sig.UShortValue);
+                else if (uo is Action<ushort>)
-                    else if (uo is Action<string>)
+                    (uo as Action<ushort>)(args.Sig.UShortValue);
-                        (uo as Action<string>)(args.Sig.StringValue);
+                else if (uo is Action<string>)
-                }
+                    (uo as Action<string>)(args.Sig.StringValue);
             }
             catch (Exception e)
             {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class AirMediaControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class AppleTvJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -2,7 +2,7 @@
 using Crestron.SimplSharp.Reflection;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class C2nRthsControllerJoinMap:JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
     /// Join map for CameraBase devices

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DigitalLoggerJoinMap.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class DigitalLoggerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class DisplayControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges {
+namespace PepperDash.Essentials.Core.Bridges {
     public class DmBladeChassisControllerJoinMap : JoinMapBase {
         #region Digital/Analogs
         #endregion

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class DmChassisControllerJoinMap : JoinMapBase
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class DmRmcControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -1,11 +1,4 @@
-using System;
+namespace PepperDash.Essentials.Core.Bridges
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
 {
     public class DmTxControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class DmpsAudioOutputControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class DmpsRoutingControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -7,7 +7,7 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class GenericLightingJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class GenericRelayControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class GlsOccupancySensorBaseJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class HdMdxxxCEControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class IBasicCommunicationJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/IDigitalInputJoinMap.cs

@@ -5,7 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class IDigitalInputJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs

@@ -7,7 +7,7 @@ using PepperDash.Essentials.Core;
 using Crestron.SimplSharp.Reflection;
 
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class SetTopBoxControllerJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/StatusSignControllerJoinMap.cs

@@ -2,7 +2,7 @@
 using Crestron.SimplSharp.Reflection;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class StatusSignControllerJoinMap:JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -1,6 +1,6 @@
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+namespace PepperDash.Essentials.Core.Bridges
 {
     public class SystemMonitorJoinMap : JoinMapBase
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -1,13 +1,6 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
 using PepperDash_Essentials_Core.Devices;
 
 namespace PepperDash.Essentials.Core
@@ -15,7 +8,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// A bridge class to cover the basic features of GenericBase hardware
 	/// </summary>
-	public abstract class CrestronGenericBaseDevice : EssentialsBridgeableDevice, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
+	public abstract class CrestronGenericBaseDevice : EssentialsDevice, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
 	{
 		public virtual GenericBase Hardware { get; protected set; }
 
@@ -34,7 +27,7 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public bool PreventRegistration { get; protected set; }
 
-        public CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
+	    protected CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
             : base(key, name)
         {
             Feedbacks = new FeedbackCollection<Feedback>();
@@ -42,13 +35,7 @@ namespace PepperDash.Essentials.Core
             Hardware = hardware;
             IsOnline = new BoolFeedback("IsOnlineFeedback", () => Hardware.IsOnline);
             IsRegistered = new BoolFeedback("IsRegistered", () => Hardware.Registered);
-            IpConnectionsText = new StringFeedback("IpConnectionsText", () =>
+            IpConnectionsText = new StringFeedback("IpConnectionsText", () => Hardware.ConnectedIpList != null ? string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray()) : string.Empty);
-            {
-                if (Hardware.ConnectedIpList != null)
-                    return string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray());
-                else
-                    return string.Empty;
-            });
             AddToFeedbackList(IsOnline, IpConnectionsText);
 
             CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
@@ -80,7 +67,7 @@ namespace PepperDash.Essentials.Core
                 f.FireUpdate();
             }
 
-            Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
+            Hardware.OnlineStatusChange += Hardware_OnlineStatusChange;
             CommunicationMonitor.Start();    
 
 			return true;
@@ -110,12 +97,11 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var f in newFbs)
             {
-                if (f != null)
+                if (f == null) continue;
+
+                if (!Feedbacks.Contains(f))
                 {
-                    if (!Feedbacks.Contains(f))
+                    Feedbacks.Add(f);
-                    {
-                        Feedbacks.Add(f);
-                    }
                 }
             }
         }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -111,6 +111,29 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Bridges\BridgeBase.cs" />
+    <Compile Include="Bridges\IBridge.cs" />
+    <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DigitalLoggerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DisplayControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericLightingJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericRelayControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\HdMdxxxCEControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
     <Compile Include="Config\Comm and IR\CecPortController.cs" />
     <Compile Include="Config\Comm and IR\GenericComm.cs" />
     <Compile Include="Config\Comm and IR\GenericHttpClient.cs" />
@@ -132,6 +155,7 @@
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
+    <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />

essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs

@@ -5,16 +5,18 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.DeviceSupport.Support;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.AirMedia;
-
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.DM.AirMedia
 {
-    public class AirMediaController : CrestronGenericBaseDevice, IRoutingInputsOutputs, IIROutputPorts, IComPorts
+    public class AirMediaController : CrestronGenericBridgeableBaseDevice, IRoutingInputsOutputs, IIROutputPorts, IComPorts
     {
         public AmX00 AirMedia { get; private set; }
 
@@ -99,6 +101,47 @@ namespace PepperDash.Essentials.DM.AirMedia
             return base.CustomActivate();
         }
 
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge)
+        {
+            var joinMap = new AirMediaControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<AirMediaControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Airmedia: {0}", Name);
+
+            trilist.StringInput[joinMap.Name].StringValue = Name;
+
+            var commMonitor = this as ICommunicationMonitor;
+
+            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+
+            IsInSessionFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsInSession]);
+            HdmiVideoSyncDetectedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiVideoSync]);
+
+            trilist.SetSigTrueAction(joinMap.AutomaticInputRoutingEnabled, AirMedia.DisplayControl.EnableAutomaticRouting);
+            trilist.SetSigFalseAction(joinMap.AutomaticInputRoutingEnabled, AirMedia.DisplayControl.DisableAutomaticRouting);
+            AutomaticInputRoutingEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AutomaticInputRoutingEnabled]);
+
+            trilist.SetUShortSigAction(joinMap.VideoOut, (u) => SelectVideoOut(u));
+
+            VideoOutFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoOut]);
+            ErrorFeedback.LinkInputSig(trilist.UShortInput[joinMap.ErrorFB]);
+            NumberOfUsersConnectedFeedback.LinkInputSig(trilist.UShortInput[joinMap.NumberOfUsersConnectedFB]);
+
+            trilist.SetUShortSigAction(joinMap.LoginCode, (u) => AirMedia.AirMedia.LoginCode.UShortValue = u);
+            LoginCodeFeedback.LinkInputSig(trilist.UShortInput[joinMap.LoginCode]);
+
+            ConnectionAddressFeedback.LinkInputSig(trilist.StringInput[joinMap.ConnectionAddressFB]);
+            HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB]);
+            SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback]);
+        }
+
         void AirMedia_AirMediaChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args)
         {
             if (args.EventId == AirMediaInputSlot.AirMediaStatusFeedbackEventId)