feature: updated folder structure

- moved files into folders to match their current namespace
- did not update any namespaces to maintain backward compatibility

.github/workflows/add-issues-to-project.yml

@@ -0,0 +1,37 @@
+name: Add bugs to bugs project
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+      
+jobs:
+  check-secret:
+    runs-on: ubuntu-latest
+    outputs:
+      my-key: ${{ steps.my-key.outputs.defined }}
+    steps:
+        - id: my-key
+          if: "${{ env.MY_KEY != '' }}"
+          run: echo "::set-output name=defined::true"
+          env:
+              MY_KEY: ${{ secrets.PROJECT_URL }}
+  throw-error: 
+    name: Check
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key != 'true'
+    steps:
+      - run: echo "The Project URL Repo Secret is empty"
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key == 'true'
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: ${{ secrets.PROJECT_URL }}
+          github-token: ${{ secrets.GH_PROJECTS_PASSWORD }}
+

.gitignore

@@ -389,4 +389,3 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
-.DS_Store

PepperDash.Essentials.sln

@@ -3,11 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Devices.Common", "src\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj", "{53E204B7-97DD-441D-A96C-721DF014DF82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.Devices.Common", "src\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj", "{53E204B7-97DD-441D-A96C-721DF014DF82}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials", "src\PepperDash.Essentials\PepperDash.Essentials.csproj", "{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.DM", "src\PepperDash.Essentials.DM\PepperDash.Essentials.DM.csproj", "{08EB4B98-9B4D-455A-81E0-4F913E08ADB5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core", "src\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj", "{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials", "src\PepperDash.Essentials\PepperDash.Essentials.csproj", "{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.Core", "src\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj", "{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,6 +21,10 @@ Global
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08EB4B98-9B4D-455A-81E0-4F913E08ADB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08EB4B98-9B4D-455A-81E0-4F913E08ADB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08EB4B98-9B4D-455A-81E0-4F913E08ADB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08EB4B98-9B4D-455A-81E0-4F913E08ADB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/Directory.Build.targets

@@ -19,8 +19,8 @@
   </Target>
   <Target Name="Copy CPZ" AfterTargets="SimplSharpPostProcess" Condition="$(ProjectType) == 'Program'">
     <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).cpz" />
-    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).cpz"/>
+    <Move SourceFiles="$(TargetDir)\$(TargetName).cpz" DestinationFiles="$(TargetDir)\$(TargetName).$(Version).cpz" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).$(Version).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).cpz"/>
   </Target>  
   <Target Name="Clean CPZ" AfterTargets="AfterClean" Condition="$(ProjectType) == 'Program'">
     <Delete Files="$(PackageOutputPath)\$(TargetName).$(Version).cpz"/>

src/PepperDash.Essentials.Core/Bridges/BridgeApi.cs

@@ -0,0 +1,14 @@
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Base class for bridge API variants
+    /// </summary>
+    public abstract class BridgeApi : EssentialsDevice
+    {
+        protected BridgeApi(string key) :
+            base(key)
+        {
+
+        }
+    }
+}

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -1,83 +1,10 @@
 extern alias Full;
-
-using System;
-using System.Collections.Generic;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using Full.Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
-    /// <summary>
-    /// Helper methods for bridges
-    /// </summary>
-    public static class BridgeHelper
-    {
-        public static void PrintJoinMap(string command)
-        {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.Console(0, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.PrintJoinMapForDevice(deviceKey);
-            }
-            else
-            {
-                bridge.PrintJoinMaps();
-            }
-        }
-        public static void JoinmapMarkdown(string command)
-        {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.Console(0, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
-            }
-            else
-            {
-                bridge.MarkdownForBridge(bridgeKey);
-
-            }
-        }
-    }
-
-
     /// <summary>
     /// Base class for all bridge class variants
     /// </summary>
@@ -91,414 +18,4 @@ namespace PepperDash.Essentials.Core.Bridges
 
         }
     }
-
-    /// <summary>
-    /// Base class for bridge API variants
-    /// </summary>
-    public abstract class BridgeApi : EssentialsDevice
-    {
-        protected BridgeApi(string key) :
-            base(key)
-        {
-
-        }
-    }
-
-    /// <summary>
-    /// Bridge API using EISC
-    /// </summary>
-    public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
-    {
-        public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
-
-        public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
-
-        public BasicTriList Eisc { get; private set; }
-
-        public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
-            base(dc.Key)
-        {
-            JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
-
-            PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
-            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
-
-            Eisc = eisc;
-
-            Eisc.SigChange += Eisc_SigChange;
-
-            CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, Eisc, 120000, 300000);
-
-            AddPostActivationAction(LinkDevices);
-            AddPostActivationAction(LinkRooms);
-            AddPostActivationAction(RegisterEisc);
-        }
-
-        public override bool CustomActivate()
-        {
-            CommunicationMonitor.Start();
-            return base.CustomActivate();
-        }
-
-        public override bool Deactivate()
-        {
-            CommunicationMonitor.Stop();
-            return base.Deactivate();
-        }
-
-        private void LinkDevices()
-        {
-            Debug.Console(1, this, "Linking Devices...");
-
-            if (PropertiesConfig.Devices == null)
-            {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No devices linked to this bridge");
-                return;
-            }
-
-            foreach (var d in PropertiesConfig.Devices)
-            {
-                var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                if (device == null)
-                {
-                    continue;
-                }
-
-                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
-
-                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                        device.Key);
-                    continue;
-                }
-
-                var bridge = device as IBridgeAdvanced;
-                if (bridge != null)
-                {
-                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
-                }
-            }
-        }
-
-        private void RegisterEisc()
-        {
-            if (Eisc.Registered)
-            {
-                return;
-            }
-
-            var registerResult = Eisc.Register();
-
-            if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
-            {
-                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
-                return;
-            }
-
-            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
-        }
-
-        public void LinkRooms()
-        {
-            Debug.Console(1, this, "Linking Rooms...");
-
-            if (PropertiesConfig.Rooms == null)
-            {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No rooms linked to this bridge.");
-                return;
-            }
-
-            foreach (var room in PropertiesConfig.Rooms)
-            {
-                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
-
-                if (rm == null)
-                {
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Notice,
-                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
-                    continue;
-                }
-
-                rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
-            }
-        }
-
-        /// <summary>
-        /// Adds a join map
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="joinMap"></param>
-        public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
-        {
-            if (!JoinMaps.ContainsKey(deviceKey))
-            {
-                JoinMaps.Add(deviceKey, joinMap);
-            }
-            else
-            {
-                Debug.Console(2, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
-            }
-        }
-
-        /// <summary>
-        /// Prints all the join maps on this bridge
-        /// </summary>
-        public virtual void PrintJoinMaps()
-        {
-            Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
-
-            foreach (var joinMap in JoinMaps)
-            {
-                Debug.Console(0, "Join map for device '{0}':", joinMap.Key);
-                joinMap.Value.PrintJoinMapInfo();
-            }
-        }
-        /// <summary>
-        /// Generates markdown for all join maps on this bridge
-        /// </summary>
-        public virtual void MarkdownForBridge(string bridgeKey)
-        {
-            Debug.Console(0, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
-
-            foreach (var joinMap in JoinMaps)
-            {
-                Debug.Console(0, "Generating markdown for device '{0}':", joinMap.Key);
-                joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
-            }
-        }
-
-        /// <summary>
-        /// Prints the join map for a device by key
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        public void PrintJoinMapForDevice(string deviceKey)
-        {
-            var joinMap = JoinMaps[deviceKey];
-
-            if (joinMap == null)
-            {
-                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
-                return;
-            }
-
-            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
-            joinMap.PrintJoinMapInfo();
-        }
-        /// <summary>
-        /// Prints the join map for a device by key
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
-        {
-            var joinMap = JoinMaps[deviceKey];
-
-            if (joinMap == null)
-            {
-                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
-                return;
-            }
-
-            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
-            joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
-        }
-
-        /// <summary>
-        /// Used for debugging to trigger an action based on a join number and type
-        /// </summary>
-        /// <param name="join"></param>
-        /// <param name="type"></param>
-        /// <param name="state"></param>
-        public void ExecuteJoinAction(uint join, string type, object state)
-        {
-            try
-            {
-                switch (type.ToLower())
-                {
-                    case "digital":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
-                            if (uo != null)
-                            {
-                                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToBoolean(state));
-                            }
-                            else
-                                Debug.Console(2, this, "User Action is null.  Nothing to Execute");
-                            break;
-                        }
-                    case "analog":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
-                            if (uo != null)
-                            {
-                                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToUInt16(state));
-                            }
-                            else
-                                Debug.Console(2, this, "User Action is null.  Nothing to Execute"); break;
-                        }
-                    case "serial":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
-                            if (uo != null)
-                            {
-                                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToString(state));
-                            }
-                            else
-                                Debug.Console(2, this, "User Action is null.  Nothing to Execute");
-                            break;
-                        }
-                    default:
-                        {
-                            Debug.Console(2, "Unknown join type.  Use digital/serial/analog");
-                            break;
-                        }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error: {0}", e);
-            }
-
-        }
-
-        /// <summary>
-        /// Handles incoming sig changes
-        /// </summary>
-        /// <param name="currentDevice"></param>
-        /// <param name="args"></param>
-        protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
-        {
-            try
-            {
-                if (Debug.Level >= 1)
-                    Debug.Console(1, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-                var uo = args.Sig.UserObject;
-
-                if (uo == null) return;
-
-                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
-                if (uo is Action<bool>)
-                    (uo as Action<bool>)(args.Sig.BoolValue);
-                else if (uo is Action<ushort>)
-                    (uo as Action<ushort>)(args.Sig.UShortValue);
-                else if (uo is Action<string>)
-                    (uo as Action<string>)(args.Sig.StringValue);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
-            }
-        }
-
-        #region Implementation of ICommunicationMonitor
-
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
-
-        #endregion
-    }
-
-    public class EiscApiPropertiesConfig
-    {
-        [JsonProperty("control")]
-        public EssentialsControlPropertiesConfig Control { get; set; }
-
-        [JsonProperty("devices")]
-        public List<ApiDevicePropertiesConfig> Devices { get; set; }
-
-        [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; }
-
-
-        public class ApiDevicePropertiesConfig
-        {
-            [JsonProperty("deviceKey")]
-            public string DeviceKey { get; set; }
-
-            [JsonProperty("joinStart")]
-            public uint JoinStart { get; set; }
-
-            [JsonProperty("joinMapKey")]
-            public string JoinMapKey { get; set; }
-        }
-
-        public class ApiRoomPropertiesConfig
-        {
-            [JsonProperty("roomKey")]
-            public string RoomKey { get; set; }
-
-            [JsonProperty("joinStart")]
-            public uint JoinStart { get; set; }
-
-            [JsonProperty("joinMapKey")]
-            public string JoinMapKey { get; set; }
-        }
-
-    }
-
-    public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
-    {
-        public EiscApiAdvancedFactory()
-        {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new EiscApiAdvanced Device");
-
-            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
-
-            BasicTriList eisc;
-
-            switch (dc.Type.ToLower())
-            {
-                case "eiscapiadv":
-                case "eiscapiadvanced":
-                    {
-                        eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
-                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
-                case "eiscapiadvancedserver":
-                    {
-                        eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                        break;
-                    }
-                case "eiscapiadvancedclient":
-                    {
-                        eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
-                case "vceiscapiadv":
-                case "vceiscapiadvanced":
-                    {
-                        if (string.IsNullOrEmpty(controlProperties.RoomId))
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
-                            eisc = null;
-                            break;
-                        }
-                        eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
-                            Global.ControlSystem);
-                        break;
-                    }
-                default:
-                    eisc = null;
-                    break;
-            }
-
-            if (eisc == null)
-            {
-                return null;
-            }
-
-            return new EiscApiAdvanced(dc, eisc);
-        }
-    }
-
 }

src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs

@@ -0,0 +1,64 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Helper methods for bridges
+    /// </summary>
+    public static class BridgeHelper
+    {
+        public static void PrintJoinMap(string command)
+        {
+            var targets = command.Split(' ');
+
+            var bridgeKey = targets[0].Trim();
+
+            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
+
+            if (bridge == null)
+            {
+                Debug.Console(0, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                var deviceKey = targets[1].Trim();
+
+                if (string.IsNullOrEmpty(deviceKey)) return;
+                bridge.PrintJoinMapForDevice(deviceKey);
+            }
+            else
+            {
+                bridge.PrintJoinMaps();
+            }
+        }
+        public static void JoinmapMarkdown(string command)
+        {
+            var targets = command.Split(' ');
+
+            var bridgeKey = targets[0].Trim();
+
+            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
+
+            if (bridge == null)
+            {
+                Debug.Console(0, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                var deviceKey = targets[1].Trim();
+
+                if (string.IsNullOrEmpty(deviceKey)) return;
+                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
+            }
+            else
+            {
+                bridge.MarkdownForBridge(bridgeKey);
+
+            }
+        }
+    }
+}

src/PepperDash.Essentials.Core/Bridges/EiscApiAdvanced.cs

@@ -0,0 +1,308 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp.Reflection;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Bridge API using EISC
+    /// </summary>
+    public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
+    {
+        public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
+
+        public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
+
+        public BasicTriList Eisc { get; private set; }
+
+        public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
+            base(dc.Key)
+        {
+            JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
+
+            PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
+            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
+
+            Eisc = eisc;
+
+            Eisc.SigChange += Eisc_SigChange;
+
+            CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, Eisc, 120000, 300000);
+
+            AddPostActivationAction(LinkDevices);
+            AddPostActivationAction(LinkRooms);
+            AddPostActivationAction(RegisterEisc);
+        }
+
+        public override bool CustomActivate()
+        {
+            CommunicationMonitor.Start();
+            return base.CustomActivate();
+        }
+
+        public override bool Deactivate()
+        {
+            CommunicationMonitor.Stop();
+            return base.Deactivate();
+        }
+
+        private void LinkDevices()
+        {
+            Debug.Console(1, this, "Linking Devices...");
+
+            if (PropertiesConfig.Devices == null)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No devices linked to this bridge");
+                return;
+            }
+
+            foreach (var d in PropertiesConfig.Devices)
+            {
+                var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
+
+                if (device == null)
+                {
+                    continue;
+                }
+
+                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
+
+                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
+                    continue;
+                }
+
+                var bridge = device as IBridgeAdvanced;
+                if (bridge != null)
+                {
+                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                }
+            }
+        }
+
+        private void RegisterEisc()
+        {
+            if (Eisc.Registered)
+            {
+                return;
+            }
+
+            var registerResult = Eisc.Register();
+
+            if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+            {
+                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
+                return;
+            }
+
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
+        }
+
+        public void LinkRooms()
+        {
+            Debug.Console(1, this, "Linking Rooms...");
+
+            if (PropertiesConfig.Rooms == null)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No rooms linked to this bridge.");
+                return;
+            }
+
+            foreach (var room in PropertiesConfig.Rooms)
+            {
+                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+                if (rm == null)
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Notice,
+                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    continue;
+                }
+
+                rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
+            }
+        }
+
+        /// <summary>
+        /// Adds a join map
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <param name="joinMap"></param>
+        public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
+        {
+            if (!JoinMaps.ContainsKey(deviceKey))
+            {
+                JoinMaps.Add(deviceKey, joinMap);
+            }
+            else
+            {
+                Debug.Console(2, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
+            }
+        }
+
+        /// <summary>
+        /// Prints all the join maps on this bridge
+        /// </summary>
+        public virtual void PrintJoinMaps()
+        {
+            Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
+
+            foreach (var joinMap in JoinMaps)
+            {
+                Debug.Console(0, "Join map for device '{0}':", joinMap.Key);
+                joinMap.Value.PrintJoinMapInfo();
+            }
+        }
+        /// <summary>
+        /// Generates markdown for all join maps on this bridge
+        /// </summary>
+        public virtual void MarkdownForBridge(string bridgeKey)
+        {
+            Debug.Console(0, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
+
+            foreach (var joinMap in JoinMaps)
+            {
+                Debug.Console(0, "Generating markdown for device '{0}':", joinMap.Key);
+                joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
+            }
+        }
+
+        /// <summary>
+        /// Prints the join map for a device by key
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        public void PrintJoinMapForDevice(string deviceKey)
+        {
+            var joinMap = JoinMaps[deviceKey];
+
+            if (joinMap == null)
+            {
+                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                return;
+            }
+
+            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
+            joinMap.PrintJoinMapInfo();
+        }
+        /// <summary>
+        /// Prints the join map for a device by key
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
+        {
+            var joinMap = JoinMaps[deviceKey];
+
+            if (joinMap == null)
+            {
+                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                return;
+            }
+
+            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
+            joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
+        }
+
+        /// <summary>
+        /// Used for debugging to trigger an action based on a join number and type
+        /// </summary>
+        /// <param name="join"></param>
+        /// <param name="type"></param>
+        /// <param name="state"></param>
+        public void ExecuteJoinAction(uint join, string type, object state)
+        {
+            try
+            {
+                switch (type.ToLower())
+                {
+                    case "digital":
+                    {
+                        var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
+                        if (uo != null)
+                        {
+                            Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
+                            uo(Convert.ToBoolean(state));
+                        }
+                        else
+                            Debug.Console(2, this, "User Action is null.  Nothing to Execute");
+                        break;
+                    }
+                    case "analog":
+                    {
+                        var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
+                        if (uo != null)
+                        {
+                            Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
+                            uo(Convert.ToUInt16(state));
+                        }
+                        else
+                            Debug.Console(2, this, "User Action is null.  Nothing to Execute"); break;
+                    }
+                    case "serial":
+                    {
+                        var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
+                        if (uo != null)
+                        {
+                            Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
+                            uo(Convert.ToString(state));
+                        }
+                        else
+                            Debug.Console(2, this, "User Action is null.  Nothing to Execute");
+                        break;
+                    }
+                    default:
+                    {
+                        Debug.Console(2, "Unknown join type.  Use digital/serial/analog");
+                        break;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error: {0}", e);
+            }
+
+        }
+
+        /// <summary>
+        /// Handles incoming sig changes
+        /// </summary>
+        /// <param name="currentDevice"></param>
+        /// <param name="args"></param>
+        protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
+        {
+            try
+            {
+                if (Debug.Level >= 1)
+                    Debug.Console(1, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                var uo = args.Sig.UserObject;
+
+                if (uo == null) return;
+
+                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                if (uo is Action<bool>)
+                    (uo as Action<bool>)(args.Sig.BoolValue);
+                else if (uo is Action<ushort>)
+                    (uo as Action<ushort>)(args.Sig.UShortValue);
+                else if (uo is Action<string>)
+                    (uo as Action<string>)(args.Sig.StringValue);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
+            }
+        }
+
+        #region Implementation of ICommunicationMonitor
+
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+        #endregion
+    }
+}

src/PepperDash.Essentials.Core/Bridges/EiscApiAdvancedFactory.cs

@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
+    {
+        public EiscApiAdvancedFactory()
+        {
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new EiscApiAdvanced Device");
+
+            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
+
+            BasicTriList eisc;
+
+            switch (dc.Type.ToLower())
+            {
+                case "eiscapiadv":
+                case "eiscapiadvanced":
+                {
+                    eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    break;
+                }
+                case "eiscapiadvancedserver":
+                {
+                    eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                    break;
+                }
+                case "eiscapiadvancedclient":
+                {
+                    eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    break;
+                }
+                case "vceiscapiadv":
+                case "vceiscapiadvanced":
+                {
+                    if (string.IsNullOrEmpty(controlProperties.RoomId))
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
+                        eisc = null;
+                        break;
+                    }
+                    eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                        Global.ControlSystem);
+                    break;
+                }
+                default:
+                    eisc = null;
+                    break;
+            }
+
+            if (eisc == null)
+            {
+                return null;
+            }
+
+            return new EiscApiAdvanced(dc, eisc);
+        }
+    }
+}

src/PepperDash.Essentials.Core/Bridges/EiscApiPropertiesConfig.cs

@@ -0,0 +1,44 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class EiscApiPropertiesConfig
+    {
+        [JsonProperty("control")]
+        public EssentialsControlPropertiesConfig Control { get; set; }
+
+        [JsonProperty("devices")]
+        public List<ApiDevicePropertiesConfig> Devices { get; set; }
+
+        [JsonProperty("rooms")]
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
+
+
+        public class ApiDevicePropertiesConfig
+        {
+            [JsonProperty("deviceKey")]
+            public string DeviceKey { get; set; }
+
+            [JsonProperty("joinStart")]
+            public uint JoinStart { get; set; }
+
+            [JsonProperty("joinMapKey")]
+            public string JoinMapKey { get; set; }
+        }
+
+        public class ApiRoomPropertiesConfig
+        {
+            [JsonProperty("roomKey")]
+            public string RoomKey { get; set; }
+
+            [JsonProperty("joinStart")]
+            public uint JoinStart { get; set; }
+
+            [JsonProperty("joinMapKey")]
+            public string JoinMapKey { get; set; }
+        }
+
+    }
+}

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -8,18 +8,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("VideoMuteOn")]
-        public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteOff")]
-        public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteToggle")]
-        public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
         [JoinName("CurrentOutputResolution")]
         public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -48,28 +36,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port1HdcpState")]
-        public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port2HdcpState")]
-        public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdmiInputSync")]
-        public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-
-
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>
@@ -84,8 +50,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="joinStart">Join this join map will start at</param>
         /// <param name="type">Type of the child join map</param>
-        protected DmRmcControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
+        protected DmRmcControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
         {
         }
     }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -64,16 +64,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete VgaContrast = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("Port3HdcpState")]
-        public JoinDataComplete Port3HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 3 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-
-
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>
@@ -88,8 +78,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="joinStart">Join this join map will start at</param>
         /// <param name="type">Type of the child join map</param>
-        protected DmTxControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
+        protected DmTxControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
         {
         }
     }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs

@@ -1,827 +0,0 @@
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
-{
-		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
-		{
-			[JoinName("PLAY")]
-			public JoinDataComplete Play = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 1,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PLAY",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("STOP")]
-			public JoinDataComplete Stop = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 2,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "STOP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("PAUSE")]
-			public JoinDataComplete Pause = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 3,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PAUSE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("FSCAN")]
-			public JoinDataComplete ForwardScan = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 4,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "FSCAN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("RSCAN")]
-			public JoinDataComplete ReverseScan = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 5,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RSCAN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("F_SKIP")]
-			public JoinDataComplete ForwardSkip = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 6,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "F_SKIP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("R_SKIP")]
-			public JoinDataComplete ReverseSkip = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 7,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "R_SKIP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("RECORD")]
-			public JoinDataComplete Record = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 8,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RECORD",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("POWER")]
-			public JoinDataComplete Power = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 9,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("0")]
-			public JoinDataComplete Kp0 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 10,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "0",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("1")]
-			public JoinDataComplete Kp1 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 11,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "1",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("2")]
-			public JoinDataComplete Kp2 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 12,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "2",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("3")]
-			public JoinDataComplete Kp3 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 13,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "3",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("4")]
-			public JoinDataComplete Kp4 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 14,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "4",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("5")]
-			public JoinDataComplete Kp5 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 15,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "5",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("6")]
-			public JoinDataComplete Kp6 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 16,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "6",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("7")]
-			public JoinDataComplete Kp7 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 17,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "7",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("8")]
-			public JoinDataComplete Kp8 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 18,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "8",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("9")]
-			public JoinDataComplete Kp9 = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 19,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "9",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			// [JoinName("+10")]
-			// public JoinDataComplete Kp9 = new JoinDataComplete(
-			// 	new JoinData
-			// 	{
-			// 		JoinNumber = 20,
-			// 		JoinSpan = 1
-			// 	},
-			// 	new JoinMetadata
-			// 	{
-			// 		Description = "+10",
-			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
-			// 		JoinType = eJoinType.Digital
-			// 	});
-			
-			[JoinName("ENTER")]
-			public JoinDataComplete Enter = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 21,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "ENTER",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("CH+")]
-			public JoinDataComplete ChannelUp = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 22,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "CH+",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("CH-")]
-			public JoinDataComplete ChannelDown = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 23,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "CH-",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("*")]
-			public JoinDataComplete KpStar = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 24,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "*",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("#")]
-			public JoinDataComplete KpPound = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 25,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "#",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			// [JoinName(".")]
-			// public JoinDataComplete KpPound = new JoinDataComplete(
-			// 	new JoinData
-			// 	{
-			// 		JoinNumber = 26,
-			// 		JoinSpan = 1
-			// 	},
-			// 	new JoinMetadata
-			// 	{
-			// 		Description = ".",
-			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
-			// 		JoinType = eJoinType.Digital
-			// 	});
-
-			[JoinName("POWER_ON")]
-			public JoinDataComplete PowerOn = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 27,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER_ON",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("POWER_OFF")]
-			public JoinDataComplete PowerOff = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 28,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "POWER_OFF",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("PLAY_PAUSE")]
-			public JoinDataComplete PlayPause = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 29,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PLAY_PAUSE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("LAST")]
-			public JoinDataComplete Last = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 30,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "LAST",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("HOME")]
-			public JoinDataComplete Home = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 40,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "HOME",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("BACK")]
-			public JoinDataComplete Back = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 41,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "BACK",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-
-			[JoinName("GUIDE")]
-			public JoinDataComplete Guide = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 42,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "GUIDE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("INFO")]
-			public JoinDataComplete Info = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 43,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "INFO",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("MENU")]
-			public JoinDataComplete Menu = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 44,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "MENU",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("UP_ARROW")]
-			public JoinDataComplete DpadUp = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 45,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "UP_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("DN_ARROW")]
-			public JoinDataComplete DpadDown = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 46,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "DN_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("LEFT_ARROW")]
-			public JoinDataComplete DpadLeft = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 47,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "LEFT_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("RIGHT_ARROW")]
-			public JoinDataComplete DpadRight = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 48,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RIGHT_ARROW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("SELECT")]
-			public JoinDataComplete DpadSelect = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 49,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "SELECT",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("OPTIONS")]
-			public JoinDataComplete Options = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 50,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "OPTIONS",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("RETURN")]
-			public JoinDataComplete Return = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 51,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RETURN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("DVR")]
-			public JoinDataComplete Dvr = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 52,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "DVR",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-
-			[JoinName("ON_DEMAND")]
-			public JoinDataComplete OnDemand = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 53,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "ON_DEMAND",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-
-			[JoinName("PAGE_UP")]
-			public JoinDataComplete PageUp = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 54,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PAGE_UP",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("PAGE_DOWN")]
-			public JoinDataComplete PageDown = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 55,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "PAGE_DOWN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("F_SRCH")]
-			public JoinDataComplete ForwardSearch = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 56,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "F_SRCH",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("R_SRCH")]
-			public JoinDataComplete ReverseSearch = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 57,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "R_SRCH",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("TRACK+")]
-			public JoinDataComplete TrackPlus = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 58,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "TRACK+",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("TRACK-")]
-			public JoinDataComplete TrackMinus = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 59,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "TRACK-",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-			
-			[JoinName("A")]
-			public JoinDataComplete KpA = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 61,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "A",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("B")]
-			public JoinDataComplete KpB = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 62,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "B",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("C")]
-			public JoinDataComplete KpC = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 63,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "C",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("D")]
-			public JoinDataComplete KpD = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 64,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "D",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("RED")]
-			public JoinDataComplete KpRed = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 65,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "RED",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("GREEN")]
-			public JoinDataComplete KpGreen = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 66,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "GREEN",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("YELLOW")]
-			public JoinDataComplete KpYellow = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 67,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "YELLOW",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			[JoinName("BLUE")]
-			public JoinDataComplete KpBlue = new JoinDataComplete(
-				new JoinData
-				{
-					JoinNumber = 68,
-					JoinSpan = 1
-				},
-				new JoinMetadata
-				{
-					Description = "BLUE",
-					JoinCapabilities = eJoinCapabilities.FromSIMPL,
-					JoinType = eJoinType.Digital
-				});
-
-			public GenericIrControllerJoinMap(uint joinStart)
-				: base(joinStart, typeof(GenericIrControllerJoinMap))
-			{
-			}
-	}
-}

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs

@@ -1,190 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_Core.Bridges
-{
-	public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
-	{
-
-		#region Digital
-
-		[JoinName("EnableAutoRoute")]
-		public JoinDataComplete EnableAutoRoute = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Enable Automatic Routing on Xx1 Switchers",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("InputSync")]
-		public JoinDataComplete InputSync = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 2,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Input Sync",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("EnableInputHdcp")]
-		public JoinDataComplete EnableInputHdcp = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Enable Input Hdcp",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("DisableInputHdcp")]
-		public JoinDataComplete DisableInputHdcp = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 21,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Disnable Input Hdcp",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-
-		[JoinName("IsOnline")]
-		public JoinDataComplete IsOnline = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 30,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Device Onlne",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
-
-		#endregion
-
-
-		#region Analog
-
-		[JoinName("OutputRoute")]
-		public JoinDataComplete OutputRoute = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 2
-			},
-			new JoinMetadata
-			{
-				Description = "Device Output Route Set/Get",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Analog
-			});
-
-		#endregion
-
-
-		#region Serial
-
-		[JoinName("Name")]
-		public JoinDataComplete Name = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Device Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		[JoinName("InputName")]
-		public JoinDataComplete InputName = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 2,
-				JoinSpan = 8
-			},
-			new JoinMetadata
-			{
-				Description = "Device Input Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		[JoinName("OutputName")]
-		public JoinDataComplete OutputName = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 11,
-				JoinSpan = 2
-			},
-			new JoinMetadata
-			{
-				Description = "Device Output Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		[JoinName("OutputRoutedName")]
-		public JoinDataComplete OutputRoutedName = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 16,
-				JoinSpan = 2
-			},
-			new JoinMetadata
-			{
-				Description = "Device Output Route Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
-
-
-		#endregion
-
-		/// <summary>
-		/// Constructor to use when instantiating this join map without inheriting from it
-		/// </summary>
-		/// <param name="joinStart">Join this join map will start at</param>
-		public HdPsXxxControllerJoinMap(uint joinStart)
-			: this(joinStart, typeof(HdPsXxxControllerJoinMap))
-		{
-		}
-
-		/// <summary>
-		/// Constructor to use when extending this Join map
-		/// </summary>
-		/// <param name="joinStart">Join this join map will start at</param>
-		/// <param name="type">Type of the child join map</param>
-		protected HdPsXxxControllerJoinMap(uint joinStart, Type type)
-			: base(joinStart, type)
-		{
-		}
-	}
-}

src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("Online")]
         public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("OutletCount")]
         public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },

src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -47,7 +47,7 @@ namespace PepperDash.Essentials.Core.Bridges
         [JoinName("ProgramOffsetJoin")]
         public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 5 },
             new JoinMetadata { Description = "All Program Data is offset between slots by 5 - First Joins Start at 11", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
-		
+
         [JoinName("ProgramStart")]
         public JoinDataComplete ProgramStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Start / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
@@ -132,23 +132,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete DhcpStatus = new JoinDataComplete(new JoinData { JoinNumber = 86, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Dhcp Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-		[JoinName("ProcessorRebot")]
-		public JoinDataComplete ProcessorReboot = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-			new JoinMetadata { Description = "Reboot processor", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-		[JoinName("IsAppliance")]
-		public JoinDataComplete IsAppliance = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-			new JoinMetadata { Description = "Is appliance Fb", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-		[JoinName("IsServer")]
-		public JoinDataComplete IsServer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-			new JoinMetadata { Description = "Is server Fb", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-		[JoinName("ProgramReset")]
-		public JoinDataComplete ProgramReset = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-			new JoinMetadata { Description = "Resets the program", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>

src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs

@@ -53,52 +53,4 @@ namespace PepperDash.Essentials.Core
             throw new NotImplementedException();
         }
     }
-
-    /// <summary>
-    /// The gist of this converter: The comspec JSON comes in with normal values that need to be converted
-    /// into enum names.  This converter takes the value and applies the appropriate enum's name prefix to the value
-    /// and then returns the enum value using Enum.Parse. NOTE: Does not write
-    /// </summary>
-    public class ComSpecPropsJsonConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(ComPort.eComBaudRates)
-                || objectType == typeof(ComPort.eComDataBits)
-                || objectType == typeof(ComPort.eComParityType)
-                || objectType == typeof(ComPort.eComHardwareHandshakeType)
-                || objectType == typeof(ComPort.eComSoftwareHandshakeType)
-                || objectType == typeof(ComPort.eComProtocolType)
-                || objectType == typeof(ComPort.eComStopBits);
-        }
-
-        public override bool CanRead { get { return true; } }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            //Debug.Console(2, "ReadJson type: " + objectType.Name);
-            if (objectType == typeof(ComPort.eComBaudRates))
-                return Enum.Parse(typeof(ComPort.eComBaudRates), "ComspecBaudRate" + reader.Value, false);
-            else if (objectType == typeof(ComPort.eComDataBits))
-                return Enum.Parse(typeof(ComPort.eComDataBits), "ComspecDataBits" + reader.Value, true);
-            else if (objectType == typeof(ComPort.eComHardwareHandshakeType))
-                return Enum.Parse(typeof(ComPort.eComHardwareHandshakeType), "ComspecHardwareHandshake" + reader.Value, true);
-            else if (objectType == typeof(ComPort.eComParityType))
-                return Enum.Parse(typeof(ComPort.eComParityType), "ComspecParity" + reader.Value, true);
-            else if (objectType == typeof(ComPort.eComProtocolType))
-                return Enum.Parse(typeof(ComPort.eComProtocolType), "ComspecProtocol" + reader.Value, true);
-            else if (objectType == typeof(ComPort.eComSoftwareHandshakeType))
-                return Enum.Parse(typeof(ComPort.eComSoftwareHandshakeType), "ComspecSoftwareHandshake" + reader.Value, true);
-            else if (objectType == typeof(ComPort.eComStopBits))
-                return Enum.Parse(typeof(ComPort.eComStopBits), "ComspecStopBits" + reader.Value, true);
-            return null;
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-
 }

src/PepperDash.Essentials.Core/Comm and IR/ComSpecPropsJsonConverter.cs

@@ -0,0 +1,53 @@
+extern alias Full;
+using System;
+using Crestron.SimplSharpPro;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// The gist of this converter: The comspec JSON comes in with normal values that need to be converted
+    /// into enum names.  This converter takes the value and applies the appropriate enum's name prefix to the value
+    /// and then returns the enum value using Enum.Parse. NOTE: Does not write
+    /// </summary>
+    public class ComSpecPropsJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(ComPort.eComBaudRates)
+                   || objectType == typeof(ComPort.eComDataBits)
+                   || objectType == typeof(ComPort.eComParityType)
+                   || objectType == typeof(ComPort.eComHardwareHandshakeType)
+                   || objectType == typeof(ComPort.eComSoftwareHandshakeType)
+                   || objectType == typeof(ComPort.eComProtocolType)
+                   || objectType == typeof(ComPort.eComStopBits);
+        }
+
+        public override bool CanRead { get { return true; } }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            //Debug.Console(2, "ReadJson type: " + objectType.Name);
+            if (objectType == typeof(ComPort.eComBaudRates))
+                return Enum.Parse(typeof(ComPort.eComBaudRates), "ComspecBaudRate" + reader.Value, false);
+            else if (objectType == typeof(ComPort.eComDataBits))
+                return Enum.Parse(typeof(ComPort.eComDataBits), "ComspecDataBits" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComHardwareHandshakeType))
+                return Enum.Parse(typeof(ComPort.eComHardwareHandshakeType), "ComspecHardwareHandshake" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComParityType))
+                return Enum.Parse(typeof(ComPort.eComParityType), "ComspecParity" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComProtocolType))
+                return Enum.Parse(typeof(ComPort.eComProtocolType), "ComspecProtocol" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComSoftwareHandshakeType))
+                return Enum.Parse(typeof(ComPort.eComSoftwareHandshakeType), "ComspecSoftwareHandshake" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComStopBits))
+                return Enum.Parse(typeof(ComPort.eComStopBits), "ComspecStopBits" + reader.Value, true);
+            return null;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs

@@ -83,15 +83,6 @@ namespace PepperDash.Essentials.Core
                         }
 					case eControlMethod.Telnet:
 						break;
-					case eControlMethod.SecureTcpIp:
-						{
-							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize);
-							secureTcp.AutoReconnect = c.AutoReconnect;
-							if (secureTcp.AutoReconnect)
-								secureTcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = secureTcp;
-							break;
-						}
 					default:
 						break;
 				}				
@@ -126,54 +117,41 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static ICec GetCecPort(ControlPropertiesConfig config)
         {
-	        try
-	        {
-		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+            var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-		        Debug.Console(0, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
-			        ? "is not valid, failed to get cec port"
-			        : "found in device manager, attempting to get cec port");
+            if (dev != null)
+            {
+                if (!String.IsNullOrEmpty(config.ControlPortName))
+                {
 
-		        if (dev == null)
-			        return null;
+                    var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
 
-		        if (String.IsNullOrEmpty(config.ControlPortName))
-		        {
-			        Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
-			        return null;
-		        }
+                    if (inputPort != null)
+                    {
+                        if (inputPort.Port is ICec)
+                            return inputPort.Port as ICec;
+                    }
 
+                    var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
 
-		        var inputsOutputs = dev as IRoutingInputsOutputs;
-		        if (inputsOutputs == null)
-		        {
-					Debug.Console(0, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
-						config.ControlPortDevKey, config.ControlPortName);
+                    if (outputPort != null)
+                    {
+                        if (outputPort.Port is ICec)
+                            return outputPort.Port as ICec;
+                    }
 
-			        return null;
-		        }
+                    else
+                        Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'",
+                            config.ControlPortDevKey, config.ControlPortName);
+                }
+                else
+                {
+                    Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+                }
+            }
+            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
 
-				var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
-		        if (inputPort != null && inputPort.Port is ICec)
-					return inputPort.Port as ICec;
-		        
-
-		        var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
-		        if (outputPort != null && outputPort.Port is ICec)
-					return outputPort.Port as ICec;		        
-	        }
-	        catch (Exception ex)
-	        {
-		        Debug.Console(1, "GetCecPort Exception Message: {0}", ex.Message);
-		        Debug.Console(2, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
-		        if (ex.InnerException != null)
-			        Debug.Console(0, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
-	        }
-
-			Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
-					config.ControlPortDevKey, config.ControlPortName);
-
-			return null;
+            return null;
         }
 
 		/// <summary>
@@ -196,64 +174,4 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 	}
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class EssentialsControlPropertiesConfig : 
-        PepperDash.Core.ControlPropertiesConfig
-    {
-
-        [JsonConverter(typeof(ComSpecJsonConverter))]
-        public ComPort.ComPortSpec ComParams { get; set; }
-
-		public string RoomId { get; set; }
-
-		public string CresnetId { get; set; }
-
-        /// <summary>
-        /// Attempts to provide uint conversion of string CresnetId
-        /// </summary>
-        public uint CresnetIdInt
-        {
-            get
-            {
-                try 
-                {
-                    return Convert.ToUInt32(CresnetId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-                }
-            }
-        }
-
-        public string InfinetId { get; set; }
-
-        /// <summary>
-        /// Attepmts to provide uiont conversion of string InifinetId
-        /// </summary>
-        public uint InfinetIdInt
-        {
-            get
-            {
-                try
-                {
-                    return Convert.ToUInt32(InfinetId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
-                }
-            }
-        }
-    }
-
-    public class IrControlSpec
-    {
-        public string PortDeviceKey { get; set; }
-        public uint PortNumber { get; set; }
-        public string File { get; set; }
-    }
 }

src/PepperDash.Essentials.Core/Comm and IR/ConsoleCommMockDevice.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 
 
 namespace PepperDash.Essentials.Core
@@ -54,33 +52,4 @@ namespace PepperDash.Essentials.Core
 			Communication.SendText(s + LineEnding);
 		}
 	}
-
-	public class ConsoleCommMockDevicePropertiesConfig
-	{
-		public string LineEnding { get; set; }
-		public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
-
-		public ConsoleCommMockDevicePropertiesConfig()
-		{
-			LineEnding = "\x0a";
-		}
-	}
-
-    public class ConsoleCommMockDeviceFactory : EssentialsDeviceFactory<ConsoleCommMockDevice>
-    {
-        public ConsoleCommMockDeviceFactory()
-        {
-            TypeNames = new List<string>() { "commmock" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Comm Mock Device");
-            var comm = CommFactory.CreateCommForDevice(dc);
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ConsoleCommMockDevicePropertiesConfig>(
-                dc.Properties.ToString());
-            return new ConsoleCommMockDevice(dc.Key, dc.Name, props, comm);
-        }
-    }
-
 }

src/PepperDash.Essentials.Core/Comm and IR/ConsoleCommMockDeviceFactory.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    public class ConsoleCommMockDeviceFactory : EssentialsDeviceFactory<ConsoleCommMockDevice>
+    {
+        public ConsoleCommMockDeviceFactory()
+        {
+            TypeNames = new List<string>() { "commmock" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Comm Mock Device");
+            var comm = CommFactory.CreateCommForDevice(dc);
+            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ConsoleCommMockDevicePropertiesConfig>(
+                dc.Properties.ToString());
+            return new ConsoleCommMockDevice(dc.Key, dc.Name, props, comm);
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/ConsoleCommMockDevicePropertiesConfig.cs

@@ -0,0 +1,13 @@
+namespace PepperDash.Essentials.Core
+{
+    public class ConsoleCommMockDevicePropertiesConfig
+    {
+        public string LineEnding { get; set; }
+        public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
+
+        public ConsoleCommMockDevicePropertiesConfig()
+        {
+            LineEnding = "\x0a";
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/EssentialsControlPropertiesConfig.cs

@@ -0,0 +1,60 @@
+extern alias Full;
+using System;
+using Crestron.SimplSharpPro;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsControlPropertiesConfig : 
+        PepperDash.Core.ControlPropertiesConfig
+    {
+
+        [JsonConverter(typeof(ComSpecJsonConverter))]
+        public ComPort.ComPortSpec ComParams { get; set; }
+
+        public string RoomId { get; set; }
+
+        public string CresnetId { get; set; }
+
+        /// <summary>
+        /// Attempts to provide uint conversion of string CresnetId
+        /// </summary>
+        public uint CresnetIdInt
+        {
+            get
+            {
+                try 
+                {
+                    return Convert.ToUInt32(CresnetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                }
+            }
+        }
+
+        public string InfinetId { get; set; }
+
+        /// <summary>
+        /// Attepmts to provide uiont conversion of string InifinetId
+        /// </summary>
+        public uint InfinetIdInt
+        {
+            get
+            {
+                try
+                {
+                    return Convert.ToUInt32(InfinetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
+                }
+            }
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs

@@ -1,7 +1,6 @@
 extern alias Full;
 
 using System;
-using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronSockets;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Full.Newtonsoft.Json;
@@ -127,18 +126,4 @@ namespace PepperDash.Essentials.Core
             });
         }
     }
-
-    public class GenericCommFactory : EssentialsDeviceFactory<GenericComm>
-    {
-        public GenericCommFactory()
-        {
-            TypeNames = new List<string>() { "genericComm" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
-            return new GenericComm(dc);
-        }
-    }
 }

src/PepperDash.Essentials.Core/Comm and IR/GenericCommFactory.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    public class GenericCommFactory : EssentialsDeviceFactory<GenericComm>
+    {
+        public GenericCommFactory()
+        {
+            TypeNames = new List<string>() { "genericComm" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
+            return new GenericComm(dc);
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs

@@ -100,16 +100,4 @@ namespace PepperDash.Essentials.Core
 
 		#endregion
 	}
-	public class GenericHttpClientEventArgs : EventArgs
-	{
-		public string ResponseText { get; private set; }
-		public string RequestPath { get; private set; }
-		public HTTP_CALLBACK_ERROR Error { get; set; }
-		public GenericHttpClientEventArgs(string response, string request, HTTP_CALLBACK_ERROR error)
-		{
-			ResponseText = response;
-			RequestPath = request;
-			Error = error;
-		}
-	}
 }

src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClientEventArgs.cs

@@ -0,0 +1,18 @@
+using System;
+using Crestron.SimplSharp.Net.Http;
+
+namespace PepperDash.Essentials.Core
+{
+    public class GenericHttpClientEventArgs : EventArgs
+    {
+        public string ResponseText { get; private set; }
+        public string RequestPath { get; private set; }
+        public HTTP_CALLBACK_ERROR Error { get; set; }
+        public GenericHttpClientEventArgs(string response, string request, HTTP_CALLBACK_ERROR error)
+        {
+            ResponseText = response;
+            RequestPath  = request;
+            Error        = error;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs

@@ -220,24 +220,4 @@ namespace PepperDash.Essentials.Core
             }
         }*/
 	}
-
-	/// <summary>
-	/// Wrapper to help in IR port creation
-	/// </summary>
-	public class IrOutPortConfig
-	{
-		[JsonProperty("port")]
-		public IROutputPort Port { get; set; }
-		
-		[JsonProperty("fileName")]
-		public string FileName { get; set; }
-
-		[JsonProperty("useBridgeJoinMap")]
-		public bool UseBridgeJoinMap { get; set; }
-
-		public IrOutPortConfig()
-		{
-			FileName = "";			
-		}
-	}
 }

src/PepperDash.Essentials.Core/Comm and IR/IrControlSpec.cs

@@ -0,0 +1,9 @@
+namespace PepperDash.Essentials.Core
+{
+    public class IrControlSpec
+    {
+        public string PortDeviceKey { get; set; }
+        public uint PortNumber { get; set; }
+        public string File { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/IrOutPortConfig.cs

@@ -0,0 +1,18 @@
+using Crestron.SimplSharpPro;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Wrapper to help in IR port creation
+    /// </summary>
+    public class IrOutPortConfig
+    {
+        public IROutputPort Port { get; set; }
+        public string FileName { get; set; }
+
+        public IrOutPortConfig()
+        {
+            FileName = "";
+        }
+    }
+}

src/PepperDash.Essentials.Core/Config/DeviceConfig.cs

@@ -1,6 +1,4 @@
 extern alias Full;
-
-using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
@@ -49,34 +47,4 @@ namespace PepperDash.Essentials.Core.Config
 
         public DeviceConfig() {}
     }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class DevicePropertiesConverter : JsonConverter
-    {
-
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(JToken);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return JToken.ReadFrom(reader);
-        }
-
-        public override bool CanWrite
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            throw new NotImplementedException("SOD OFF HOSER");
-        }
-    }
 }

src/PepperDash.Essentials.Core/Config/DevicePropertiesConverter.cs

@@ -0,0 +1,37 @@
+extern alias Full;
+using System;
+using Full::Newtonsoft.Json;
+using Full::Newtonsoft.Json.Linq;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class DevicePropertiesConverter : JsonConverter
+    {
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(JToken);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            return JToken.ReadFrom(reader);
+        }
+
+        public override bool CanWrite
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException("SOD OFF HOSER");
+        }
+    }
+}

src/PepperDash.Essentials.Core/Config/Essentials/ConfigStatusEventArgs.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    public class ConfigStatusEventArgs : EventArgs
+    {
+        public eUpdateStatus UpdateStatus { get; private set; }
+
+        public ConfigStatusEventArgs(eUpdateStatus status)
+        {
+            UpdateStatus = status;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs

@@ -200,26 +200,4 @@ namespace PepperDash.Essentials.Core.Config
         }
 
     }
-
-        public enum eUpdateStatus
-    {
-        UpdateStarted,
-        ConfigFileReceived,
-        ArchivingConfigs,
-        DeletingLocalConfig,
-        WritingConfigFile,
-        RestartingProgram,
-        UpdateSucceeded,
-        UpdateFailed
-    }
-
-    public class ConfigStatusEventArgs : EventArgs
-    {
-        public eUpdateStatus UpdateStatus { get; private set; }
-
-        public ConfigStatusEventArgs(eUpdateStatus status)
-        {
-            UpdateStatus = status;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs

@@ -61,14 +61,4 @@ namespace PepperDash.Essentials.Core.Config
             Rooms = new List<DeviceConfig>();
         }
 	}
-		
-	/// <summary>
-	/// 
-	/// </summary>
-	public class SystemTemplateConfigs
-	{
-		public EssentialsConfig System { get; set; }
-
-		public EssentialsConfig Template { get; set; }
-	}
 }

src/PepperDash.Essentials.Core/Config/Essentials/SystemTemplateConfigs.cs

@@ -0,0 +1,12 @@
+namespace PepperDash.Essentials.Core.Config
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class SystemTemplateConfigs
+    {
+        public EssentialsConfig System { get; set; }
+
+        public EssentialsConfig Template { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Config/Essentials/eUpdateStatus.cs

@@ -0,0 +1,14 @@
+namespace PepperDash.Essentials.Core.Config
+{
+    public enum eUpdateStatus
+    {
+        UpdateStarted,
+        ConfigFileReceived,
+        ArchivingConfigs,
+        DeletingLocalConfig,
+        WritingConfigFile,
+        RestartingProgram,
+        UpdateSucceeded,
+        UpdateFailed
+    }
+}

src/PepperDash.Essentials.Core/Config/InfoConfig.cs

@@ -1,7 +1,6 @@
 extern alias Full;
 
 using System;
-using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 
@@ -51,61 +50,4 @@ namespace PepperDash.Essentials.Core.Config
             RuntimeInfo = new RuntimeInfo();
 		}
 	}
-
-    
-    /// <summary>
-    /// Represents runtime information about the program/processor
-    /// </summary>
-    public class RuntimeInfo
-    {
-        /// <summary>
-        /// The name of the running application
-        /// </summary>
-        [JsonProperty("appName")]
-        public string AppName {get; set;}
-        //{
-        //    get
-        //    {
-        //        return Assembly.GetExecutingAssembly().GetName().Name;
-        //    }
-        //} 
-
-        /// <summary>
-        /// The Assembly version of the running application
-        /// </summary>
-        [JsonProperty("assemblyVersion")]
-        public string AssemblyVersion {get; set;}
-        //{
-        //    get
-        //    {
-        //        var version = Assembly.GetExecutingAssembly().GetName().Version;
-        //        return string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
-        //    }
-        //} 
-
-        /// <summary>, 
-        /// The OS Version of the processor (Firmware Version)
-        /// </summary>
-        [JsonProperty("osVersion")]
-        public string OsVersion {get; set;}
-		//{
-		//    get
-		//    {
-		//        return Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware;
-		//    }
-		//} 
-
-        /// <summary>
-        /// The information gathered by the processor at runtime about it's NICs and their IP addresses.   
-        /// </summary>
-        [JsonProperty("ipInfo")]
-        public Dictionary<short, EthernetAdapterInfo> IpInfo
-        {
-            get
-            {
-                return Global.EthernetAdapterInfoCollection;
-            }
-        }
-    }
-
 }

src/PepperDash.Essentials.Core/Config/RuntimeInfo.cs

@@ -0,0 +1,61 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    /// <summary>
+    /// Represents runtime information about the program/processor
+    /// </summary>
+    public class RuntimeInfo
+    {
+        /// <summary>
+        /// The name of the running application
+        /// </summary>
+        [JsonProperty("appName")]
+        public string AppName {get; set;}
+        //{
+        //    get
+        //    {
+        //        return Assembly.GetExecutingAssembly().GetName().Name;
+        //    }
+        //} 
+
+        /// <summary>
+        /// The Assembly version of the running application
+        /// </summary>
+        [JsonProperty("assemblyVersion")]
+        public string AssemblyVersion {get; set;}
+        //{
+        //    get
+        //    {
+        //        var version = Assembly.GetExecutingAssembly().GetName().Version;
+        //        return string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
+        //    }
+        //} 
+
+        /// <summary>, 
+        /// The OS Version of the processor (Firmware Version)
+        /// </summary>
+        [JsonProperty("osVersion")]
+        public string OsVersion {get; set;}
+        //{
+        //    get
+        //    {
+        //        return Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware;
+        //    }
+        //} 
+
+        /// <summary>
+        /// The information gathered by the processor at runtime about it's NICs and their IP addresses.   
+        /// </summary>
+        [JsonProperty("ipInfo")]
+        public Dictionary<short, EthernetAdapterInfo> IpInfo
+        {
+            get
+            {
+                return Global.EthernetAdapterInfoCollection;
+            }
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/C2nIo/C2NIoControllerFactory.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2NIoController>
+    {
+        public C2NIoControllerFactory()
+        {
+            TypeNames = new List<string>() { "c2nio" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new C2N-IO Device");
+
+            return new C2NIoController(dc.Key, GetC2NIoDevice, dc);
+        }
+
+        static C2nIo GetC2NIoDevice(DeviceConfig dc)
+        {
+            var control   = CommFactory.GetControlPropertiesConfig(dc);
+            var cresnetId = control.CresnetIdInt;
+            var branchId  = control.ControlPortNumber;
+            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+
+            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
+                return new C2nIo(cresnetId, Global.ControlSystem);
+            }
+            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
+
+            if (cresnetBridge != null)
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
+                return new C2nIo(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+            }
+            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+            return null;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/C2nIo/C2nIoController.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 
@@ -65,42 +63,4 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #endregion
     }
-
-    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2NIoController>
-    {
-        public C2NIoControllerFactory()
-        {
-            TypeNames = new List<string>() { "c2nio" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new C2N-IO Device");
-
-            return new C2NIoController(dc.Key, GetC2NIoDevice, dc);
-        }
-
-        static C2nIo GetC2NIoDevice(DeviceConfig dc)
-        {
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var cresnetId = control.CresnetIdInt;
-            var branchId = control.ControlPortNumber;
-            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
-
-            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
-                return new C2nIo(cresnetId, Global.ControlSystem);
-            }
-            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
-
-            if (cresnetBridge != null)
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
-                return new C2nIo(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Cards/CenCi31Configuration.cs

@@ -0,0 +1,11 @@
+extern alias Full;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.CrestronIO.Cards
+{
+    public class CenCi31Configuration
+    {
+        [JsonProperty("card")]
+        public string Card { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Cards/CenCi31Controller.cs

@@ -3,9 +3,7 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharpPro.ThreeSeriesCards;
-using Full.Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.CrestronIO.Cards
 {
@@ -85,34 +83,4 @@ namespace PepperDash.Essentials.Core.CrestronIO.Cards
             DeviceManager.AddDevice(device);
         }
     }
-
-    public class CenCi31Configuration
-    {
-        [JsonProperty("card")]
-        public string Card { get; set; }
-    }
-
-    public class CenCi31ControllerFactory : EssentialsDeviceFactory<CenCi31Controller>
-    {
-        public CenCi31ControllerFactory()
-        {
-            TypeNames = new List<string> {"cenci31"};
-        }
-        #region Overrides of EssentialsDeviceFactory<CenCi31Controller>
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory attempting to build new CEN-CI-1");
-
-            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
-            var ipId = controlProperties.IpIdInt;
-
-            var cardCage = new CenCi31(ipId, Global.ControlSystem);
-            var config = dc.Properties.ToObject<CenCi31Configuration>();
-
-            return new CenCi31Controller(dc.Key, dc.Name, config, cardCage);
-        }
-
-        #endregion
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Cards/CenCi31ControllerFactory.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.ThreeSeriesCards;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO.Cards
+{
+    public class CenCi31ControllerFactory : EssentialsDeviceFactory<CenCi31Controller>
+    {
+        public CenCi31ControllerFactory()
+        {
+            TypeNames = new List<string> {"cenci31"};
+        }
+        #region Overrides of EssentialsDeviceFactory<CenCi31Controller>
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory attempting to build new CEN-CI-1");
+
+            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
+            var ipId              = controlProperties.IpIdInt;
+
+            var cardCage = new CenCi31(ipId, Global.ControlSystem);
+            var config   = dc.Properties.ToObject<CenCi31Configuration>();
+
+            return new CenCi31Controller(dc.Key, dc.Name, config, cardCage);
+        }
+
+        #endregion
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Cards/CenCi33Configuration.cs

@@ -0,0 +1,12 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.CrestronIO.Cards
+{
+    public class CenCi33Configuration
+    {
+        [JsonProperty("cards")]
+        public Dictionary<uint, string> Cards { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Cards/CenCi33Controller.cs

@@ -3,9 +3,7 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharpPro.ThreeSeriesCards;
-using Full.Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.CrestronIO.Cards
 {
@@ -100,34 +98,4 @@ namespace PepperDash.Essentials.Core.CrestronIO.Cards
             }
         }
     }
-
-    public class CenCi33Configuration
-    {
-        [JsonProperty("cards")]
-        public Dictionary<uint, string> Cards { get; set; }
-    }
-
-    public class CenCi33ControllerFactory : EssentialsDeviceFactory<CenCi33Controller>
-    {
-        public CenCi33ControllerFactory()
-        {
-            TypeNames = new List<string> {"cenci33"};
-        }
-        #region Overrides of EssentialsDeviceFactory<CenCi33Controller>
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory attempting to build new CEN-CI-3");
-
-            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
-            var ipId = controlProperties.IpIdInt;
-
-            var cardCage = new CenCi33(ipId, Global.ControlSystem);
-            var config = dc.Properties.ToObject<CenCi33Configuration>();
-
-            return new CenCi33Controller(dc.Key, dc.Name, config, cardCage);
-        }
-
-        #endregion
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Cards/CenCi33ControllerFactory.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.ThreeSeriesCards;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO.Cards
+{
+    public class CenCi33ControllerFactory : EssentialsDeviceFactory<CenCi33Controller>
+    {
+        public CenCi33ControllerFactory()
+        {
+            TypeNames = new List<string> {"cenci33"};
+        }
+        #region Overrides of EssentialsDeviceFactory<CenCi33Controller>
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory attempting to build new CEN-CI-3");
+
+            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
+            var ipId              = controlProperties.IpIdInt;
+
+            var cardCage = new CenCi33(ipId, Global.ControlSystem);
+            var config   = dc.Properties.ToObject<CenCi33Configuration>();
+
+            return new CenCi33Controller(dc.Key, dc.Name, config, cardCage);
+        }
+
+        #endregion
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Cards/InternalCardCageConfiguration.cs

@@ -0,0 +1,12 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.CrestronIO.Cards
+{
+    public class InternalCardCageConfiguration
+    {
+        [JsonProperty("cards")]
+        public Dictionary<uint, string> Cards { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Cards/InternalCardCageController.cs

@@ -3,9 +3,7 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharpPro.ThreeSeriesCards;
-using Full.Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.CrestronIO.Cards
 {
@@ -108,36 +106,4 @@ namespace PepperDash.Essentials.Core.CrestronIO.Cards
             }
         }
     }
-
-    public class InternalCardCageConfiguration
-    {
-        [JsonProperty("cards")]
-        public Dictionary<uint, string> Cards { get; set; }
-    }
-
-    public class InternalCardCageControllerFactory : EssentialsDeviceFactory<InternalCardCageController>
-    {
-        public InternalCardCageControllerFactory()
-        {
-            TypeNames = new List<string> {"internalcardcage"};
-        }
-        #region Overrides of EssentialsDeviceFactory<InternalCardCageController>
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory attempting to build new Internal Card Cage Controller");
-
-            if (!Global.ControlSystem.SupportsThreeSeriesPlugInCards)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Warning, "Current control system does NOT support 3-Series cards. Everything is NOT awesome.");
-                return null;
-            }
-
-            var config = dc.Properties.ToObject<InternalCardCageConfiguration>();
-
-            return new InternalCardCageController(dc.Key, dc.Name, config);
-        }
-
-        #endregion
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Cards/InternalCardCageControllerFactory.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO.Cards
+{
+    public class InternalCardCageControllerFactory : EssentialsDeviceFactory<InternalCardCageController>
+    {
+        public InternalCardCageControllerFactory()
+        {
+            TypeNames = new List<string> {"internalcardcage"};
+        }
+        #region Overrides of EssentialsDeviceFactory<InternalCardCageController>
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory attempting to build new Internal Card Cage Controller");
+
+            if (!Global.ControlSystem.SupportsThreeSeriesPlugInCards)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Warning, "Current control system does NOT support 3-Series cards. Everything is NOT awesome.");
+                return null;
+            }
+
+            var config = dc.Properties.ToObject<InternalCardCageConfiguration>();
+
+            return new InternalCardCageController(dc.Key, dc.Name, config);
+        }
+
+        #endregion
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/DinIo8/DinIo8Controller.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 
@@ -39,42 +37,4 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
 
     }
-
-    public class DinIo8ControllerFactory : EssentialsDeviceFactory<DinIo8Controller>
-    {
-        public DinIo8ControllerFactory()
-        {
-            TypeNames = new List<string>() { "DinIo8" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new DinIo8 Device");
-
-            return new DinIo8Controller(dc.Key, GetDinIo8Device, dc);
-        }
-
-        static DinIo8 GetDinIo8Device(DeviceConfig dc)
-        {
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var cresnetId = control.CresnetIdInt;
-            var branchId = control.ControlPortNumber;
-            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
-
-            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new DinIo8", parentKey);
-                return new DinIo8(cresnetId, Global.ControlSystem);
-            }
-            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
-
-            if (cresnetBridge != null)
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new DinIo8", parentKey);
-                return new DinIo8(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/DinIo8/DinIo8ControllerFactory.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public class DinIo8ControllerFactory : EssentialsDeviceFactory<DinIo8Controller>
+    {
+        public DinIo8ControllerFactory()
+        {
+            TypeNames = new List<string>() { "DinIo8" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new DinIo8 Device");
+
+            return new DinIo8Controller(dc.Key, GetDinIo8Device, dc);
+        }
+
+        static DinIo8 GetDinIo8Device(DeviceConfig dc)
+        {
+            var control   = CommFactory.GetControlPropertiesConfig(dc);
+            var cresnetId = control.CresnetIdInt;
+            var branchId  = control.ControlPortNumber;
+            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+
+            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new DinIo8", parentKey);
+                return new DinIo8(cresnetId, Global.ControlSystem);
+            }
+            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
+
+            if (cresnetBridge != null)
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new DinIo8", parentKey);
+                return new DinIo8(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+            }
+            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+            return null;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Inputs/CenIoDigIn104Controller.cs

@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Essentials.Core.Config;
-
-
-using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
@@ -40,30 +35,4 @@ namespace PepperDash.Essentials.Core
 
         #endregion
     }
-
-    public class CenIoDigIn104ControllerFactory : EssentialsDeviceFactory<CenIoDigIn104Controller>
-    {
-        public CenIoDigIn104ControllerFactory()
-        {
-            TypeNames = new List<string>() { "ceniodigin104" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new CEN-DIGIN-104 Device");
-
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-	        if (control == null)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-DIGIN-104 Device, control properties not found");
-				return null;
-	        }
-            var ipid = control.IpIdInt;
-			if (ipid != 0) return new CenIoDigIn104Controller(dc.Key, dc.Name, new CenIoDi104(ipid, Global.ControlSystem));
-
-			Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device using IP-ID-{0}", ipid);
-			return null;
-        }
-    }
-
 }

src/PepperDash.Essentials.Core/Crestron IO/Inputs/CenIoDigIn104ControllerFactory.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    public class CenIoDigIn104ControllerFactory : EssentialsDeviceFactory<CenIoDigIn104Controller>
+    {
+        public CenIoDigIn104ControllerFactory()
+        {
+            TypeNames = new List<string>() { "ceniodigin104" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new CEN-DIGIN-104 Device");
+
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+            if (control == null)
+            {
+                Debug.Console(1, "Factory failed to create a new CEN-DIGIN-104 Device, control properties not found");
+                return null;
+            }
+            var ipid = control.IpIdInt;
+            if (ipid != 0) return new CenIoDigIn104Controller(dc.Key, dc.Name, new CenIoDi104(ipid, Global.ControlSystem));
+
+            Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device using IP-ID-{0}", ipid);
+            return null;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Inputs/GenericVersiportAbalogInputDeviceFactory.cs

@@ -0,0 +1,29 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public class GenericVersiportAbalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
+    {
+        public GenericVersiportAbalogInputDeviceFactory()
+        {
+            TypeNames = new List<string>() { "versiportanaloginput" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+
+            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
+
+            if (props == null) return null;
+
+            var portDevice = new GenericVersiportAnalogInputDevice(dc.Key, dc.Name, GenericVersiportAnalogInputDevice.GetVersiportDigitalInput, props);
+
+            return portDevice;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Inputs/GenericVersiportAnalogInputDevice.cs

@@ -1,7 +1,6 @@
 extern alias Full;
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -9,7 +8,6 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
@@ -185,26 +183,4 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         }
     }
-
-
-    public class GenericVersiportAbalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
-    {
-        public GenericVersiportAbalogInputDeviceFactory()
-        {
-            TypeNames = new List<string>() { "versiportanaloginput" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
-
-            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
-
-            if (props == null) return null;
-
-            var portDevice = new GenericVersiportAnalogInputDevice(dc.Key, dc.Name, GenericVersiportAnalogInputDevice.GetVersiportDigitalInput, props);
-
-            return portDevice;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Inputs/GenericVersiportDigitalInputDevice.cs

@@ -1,7 +1,6 @@
 extern alias Full;
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -9,7 +8,6 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
@@ -145,26 +143,4 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         }
     }
-
-
-    public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
-    {
-        public GenericVersiportDigitalInputDeviceFactory()
-        {
-            TypeNames = new List<string>() { "versiportinput" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
-
-            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
-
-            if (props == null) return null;
-
-            var portDevice = new GenericVersiportDigitalInputDevice(dc.Key, dc.Name, GenericVersiportDigitalInputDevice.GetVersiportDigitalInput, props);
-
-            return portDevice;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Inputs/GenericVersiportDigitalInputDeviceFactory.cs

@@ -0,0 +1,29 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
+    {
+        public GenericVersiportDigitalInputDeviceFactory()
+        {
+            TypeNames = new List<string>() { "versiportinput" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+
+            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
+
+            if (props == null) return null;
+
+            var portDevice = new GenericVersiportDigitalInputDevice(dc.Key, dc.Name, GenericVersiportDigitalInputDevice.GetVersiportDigitalInput, props);
+
+            return portDevice;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Ir/CenIoIr104Controller.cs

@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Essentials.Core.Config;
-
-
-using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
@@ -52,42 +47,4 @@ namespace PepperDash.Essentials.Core
 
         #endregion
     }
-
-	/// <summary>
-	/// CEN-IO-IR-104 controller fatory
-	/// </summary>
-    public class CenIoIr104ControllerFactory : EssentialsDeviceFactory<CenIoIr104Controller>
-    {
-		/// <summary>
-		/// Constructor
-		/// </summary>
-        public CenIoIr104ControllerFactory()
-        {
-            TypeNames = new List<string>() { "cenioir104" };
-        }
-
-		/// <summary>
-		/// Build device CEN-IO-IR-104
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new CEN-IO-IR-104 Device");
-
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-			if (control == null)
-			{
-				Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device, control properties not found");
-				return null;
-			}
-
-            var ipid = control.IpIdInt;
-			if(ipid != 0) return new CenIoIr104Controller(dc.Key, dc.Name, new CenIoIr104(ipid, Global.ControlSystem));
-
-			Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device using IP-ID-{0}", ipid);
-			return null;
-        }
-    }
-
 }

src/PepperDash.Essentials.Core/Crestron IO/Ir/CenIoIr104ControllerFactory.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// CEN-IO-IR-104 controller fatory
+    /// </summary>
+    public class CenIoIr104ControllerFactory : EssentialsDeviceFactory<CenIoIr104Controller>
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public CenIoIr104ControllerFactory()
+        {
+            TypeNames = new List<string>() { "cenioir104" };
+        }
+
+        /// <summary>
+        /// Build device CEN-IO-IR-104
+        /// </summary>
+        /// <param name="dc"></param>
+        /// <returns></returns>
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new CEN-IO-IR-104 Device");
+
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+            if (control == null)
+            {
+                Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device, control properties not found");
+                return null;
+            }
+
+            var ipid = control.IpIdInt;
+            if(ipid != 0) return new CenIoIr104Controller(dc.Key, dc.Name, new CenIoIr104(ipid, Global.ControlSystem));
+
+            Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device using IP-ID-{0}", ipid);
+            return null;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Outputs/GenericVersiportDigitalOutputDevice.cs

@@ -1,7 +1,6 @@
 extern alias Full;
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -9,7 +8,6 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
@@ -166,26 +164,4 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         }
     }
-
-
-    public class GenericVersiportDigitalOutputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
-    {
-        public GenericVersiportDigitalOutputDeviceFactory()
-        {
-            TypeNames = new List<string>() { "versiportoutput" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
-
-            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
-
-            if (props == null) return null;
-
-            var portDevice = new GenericVersiportDigitalOutputDevice(dc.Key, dc.Name, GenericVersiportDigitalOutputDevice.GetVersiportDigitalOutput, props);
-
-            return portDevice;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Outputs/GenericVersiportDigitalOutputDeviceFactory.cs

@@ -0,0 +1,29 @@
+extern alias Full;
+using System.Collections.Generic;
+using Full::Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public class GenericVersiportDigitalOutputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
+    {
+        public GenericVersiportDigitalOutputDeviceFactory()
+        {
+            TypeNames = new List<string>() { "versiportoutput" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+
+            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
+
+            if (props == null) return null;
+
+            var portDevice = new GenericVersiportDigitalOutputDevice(dc.Key, dc.Name, GenericVersiportDigitalOutputDevice.GetVersiportDigitalOutput, props);
+
+            return portDevice;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Relay/CenIoRy104Controller.cs

@@ -1,8 +1,5 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core
 {
@@ -42,36 +39,4 @@ namespace PepperDash.Essentials.Core
             get { return _ry104.NumberOfRelayPorts; }
         }        
     }
-
-    /// <summary>
-    /// CEN-IO-RY Controller factory
-    /// </summary>
-    public class CenIoRy104ControllerFactory : EssentialsDeviceFactory<CenIoRy104Controller>
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public CenIoRy104ControllerFactory()
-        {
-            TypeNames = new List<string>() { "ceniory104" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create a new CEN-IO-RY-104 Device");
-
-            var controlPropertiesConfig = CommFactory.GetControlPropertiesConfig(dc);
-            if (controlPropertiesConfig == null)
-            {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device, control properties not found");
-                return null;
-            }
-
-            var ipid = controlPropertiesConfig.IpIdInt;
-            if (ipid != 0) return new CenIoRy104Controller(dc.Key, dc.Name, new CenIoRy104(ipid, Global.ControlSystem));
-            
-            Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device using IP-ID-{0}", ipid);
-            return null;
-        }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Relay/CenIoRy104ControllerFactory.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// CEN-IO-RY Controller factory
+    /// </summary>
+    public class CenIoRy104ControllerFactory : EssentialsDeviceFactory<CenIoRy104Controller>
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public CenIoRy104ControllerFactory()
+        {
+            TypeNames = new List<string>() { "ceniory104" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create a new CEN-IO-RY-104 Device");
+
+            var controlPropertiesConfig = CommFactory.GetControlPropertiesConfig(dc);
+            if (controlPropertiesConfig == null)
+            {
+                Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device, control properties not found");
+                return null;
+            }
+
+            var ipid = controlPropertiesConfig.IpIdInt;
+            if (ipid != 0) return new CenIoRy104Controller(dc.Key, dc.Name, new CenIoRy104(ipid, Global.ControlSystem));
+            
+            Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device using IP-ID-{0}", ipid);
+            return null;
+        }
+    }
+}

src/PepperDash.Essentials.Core/Crestron IO/Relay/ISwitchedOutput.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -18,9 +17,4 @@ namespace PepperDash.Essentials.Core.CrestronIO
         void On();
         void Off();
     }
-
-    public interface ISwitchedOutputCollection
-    {
-        Dictionary<uint, ISwitchedOutput> SwitchedOutputs { get; }
-    }
 }

src/PepperDash.Essentials.Core/Crestron IO/Relay/ISwitchedOutputCollection.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public interface ISwitchedOutputCollection
+    {
+        Dictionary<uint, ISwitchedOutput> SwitchedOutputs { get; }
+    }
+}

src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Linq;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Core.JsonStandardObjects;
-using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
@@ -170,46 +168,6 @@ namespace PepperDash.Essentials.Core
         #endregion
 	}
 
-    public abstract class CrestronGenericBridgeableBaseDevice : CrestronGenericBaseDevice, IBridgeAdvanced
-    {
-        protected CrestronGenericBridgeableBaseDevice(string key, string name, GenericBase hardware) : base(key, name, hardware)
-        {
-        }
 
-        protected CrestronGenericBridgeableBaseDevice(string key, string name)
-            : base(key, name)
-        {
-        }
-
-
-        public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
-    }
-
-
-	//***********************************************************************************
-	public class CrestronGenericBaseDeviceEventIds
-	{
-		public const uint IsOnline = 1;
-		public const uint IpConnectionsText =2;
-	}
-
-	/// <summary>
-	/// Adds logging to Register() failure
-	/// </summary>
-	public static class GenericBaseExtensions
-	{
-		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
-		{
-		    var result = device.Register();
-			var level = result == eDeviceRegistrationUnRegistrationResponse.Success ?
-				Debug.ErrorLogLevel.Notice : Debug.ErrorLogLevel.Error;
-			Debug.Console(0, level, "Register device result: '{0}', type '{1}', result {2}", key, device, result);
-			//if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-			//{
-			//    Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
-			//}
-			return result;
-		}
-
-	}
+    //***********************************************************************************
 }

src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDeviceEventIds.cs

@@ -0,0 +1,8 @@
+namespace PepperDash.Essentials.Core
+{
+    public class CrestronGenericBaseDeviceEventIds
+    {
+        public const uint IsOnline = 1;
+        public const uint IpConnectionsText =2;
+    }
+}

src/PepperDash.Essentials.Core/Crestron/CrestronGenericBridgeableBaseDevice.cs

@@ -0,0 +1,21 @@
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.Core
+{
+    public abstract class CrestronGenericBridgeableBaseDevice : CrestronGenericBaseDevice, IBridgeAdvanced
+    {
+        protected CrestronGenericBridgeableBaseDevice(string key, string name, GenericBase hardware) : base(key, name, hardware)
+        {
+        }
+
+        protected CrestronGenericBridgeableBaseDevice(string key, string name)
+            : base(key, name)
+        {
+        }
+
+
+        public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
+    }
+}

src/PepperDash.Essentials.Core/Crestron/GenericBaseExtensions.cs

@@ -0,0 +1,25 @@
+using Crestron.SimplSharpPro;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Adds logging to Register() failure
+    /// </summary>
+    public static class GenericBaseExtensions
+    {
+        public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
+        {
+            var result = device.Register();
+            var level = result == eDeviceRegistrationUnRegistrationResponse.Success ?
+                Debug.ErrorLogLevel.Notice : Debug.ErrorLogLevel.Error;
+            Debug.Console(0, level, "Register device result: '{0}', type '{1}', result {2}", key, device, result);
+            //if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+            //{
+            //    Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
+            //}
+            return result;
+        }
+
+    }
+}

src/PepperDash.Essentials.Core/Device Info/DeviceInfoChangeHandler.cs

@@ -0,0 +1,6 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.DeviceInfo
+{
+    public delegate void DeviceInfoChangeHandler(IKeyed device, DeviceInfoEventArgs args);
+}

src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs

@@ -11,6 +11,4 @@ namespace PepperDash.Essentials.Core.DeviceInfo
 
         void UpdateDeviceInfo();
     }
-
-    public delegate void DeviceInfoChangeHandler(IKeyed device, DeviceInfoEventArgs args);
 }

src/PepperDash.Essentials.Core/Device Info/NetworkDeviceHelpers.cs

@@ -1,218 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using PepperDash.Core;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.DeviceInfo
-{
-    public static class NetworkDeviceHelpers
-    {
-        /// <summary>
-        /// Event raised when ArpTable changes
-        /// </summary>
-        public static event ArpTableEventHandler ArpTableUpdated;
-
-        /// <summary>
-        /// Delegate called by ArpTableUpdated
-        /// </summary>
-        /// <param name="args">contains the entire ARP table and a bool to note if there was an error in retrieving the data</param>
-        public delegate void ArpTableEventHandler(ArpTableEventArgs args);
-
-        private static readonly char NewLineSplitter = CrestronEnvironment.NewLine.ToCharArray().First();
-        private static readonly string NewLine = CrestronEnvironment.NewLine;
-
-        private static readonly CCriticalSection Lock = new CCriticalSection();
-
-        /// <summary>
-        /// Last resolved ARP table - it is recommended to refresh the arp before using this.
-        /// </summary>
-        public static List<ArpEntry> ArpTable { get; private set; }
-
-        /// <summary>
-        /// Force recheck of ARP table
-        /// </summary>
-        public static void RefreshArp()
-        {
-            var error = false;
-            try
-            {
-                Lock.Enter();
-                var consoleResponse = string.Empty;
-                if (!CrestronConsole.SendControlSystemCommand("showarptable", ref consoleResponse)) return;
-                if (string.IsNullOrEmpty(consoleResponse))
-                {
-                    error = true;
-                    return;
-                }
-                ArpTable.Clear();
-
-                Debug.Console(2, "ConsoleResponse of 'showarptable' : {0}{1}", NewLine, consoleResponse);
-
-                var myLines =
-                    consoleResponse.Split(NewLineSplitter)
-                        .ToList()
-                        .Where(o => (o.Contains(':') && !o.Contains("Type", StringComparison.OrdinalIgnoreCase)))
-                        .ToList();
-                foreach (var line in myLines)
-                {
-                    var item = line;
-                    var seperator = item.Contains('\t') ? '\t' : ' ';
-                    var dataPoints = item.Split(seperator);
-                    if (dataPoints == null || dataPoints.Length < 2) continue;
-                    var ipAddress = SanitizeIpAddress(dataPoints.First().TrimAll());
-                    var macAddress = dataPoints.Last();
-                    ArpTable.Add(new ArpEntry(ipAddress, macAddress));
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, "Exception in \"RefreshArp\" : {0}", ex.Message);
-                error = true;
-            }
-            finally
-            {
-                Lock.Leave();
-                OnArpTableUpdated(new ArpTableEventArgs(ArpTable, error));
-            }
-        }
-
-
-        private static void OnArpTableUpdated(ArpTableEventArgs args)
-        {
-            if (args == null) return;
-            var handler = ArpTableUpdated;
-            if (handler == null) return;
-            handler.Invoke(args);
-        }
-
-        static NetworkDeviceHelpers()
-        {
-            ArpTable = new List<ArpEntry>();
-        }
-
-        /// <summary>
-        /// Removes leading zeros, leading whitespace, and trailing whitespace from an IPAddress string
-        /// </summary>
-        /// <param name="ipAddressIn">Ip Address to Santitize</param>
-        /// <returns>Sanitized Ip Address</returns>
-        public static string SanitizeIpAddress(string ipAddressIn)
-        {
-            try
-            {
-                var ipAddress = IPAddress.Parse(ipAddressIn.TrimStart('0'));
-                return ipAddress.ToString();
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, "Unable to Santize Ip : {0}", ex.Message);
-                return ipAddressIn;
-            }
-        }
-
-        /// <summary>
-        /// Resolves a hostname by IP Address using DNS
-        /// </summary>
-        /// <param name="ipAddress">IP Address to resolve from</param>
-        /// <returns>Resolved Hostname - on failure to determine hostname, will return IP Address</returns>
-        public static string ResolveHostnameFromIp(string ipAddress)
-        {
-            try
-            {
-                var santitizedIp = SanitizeIpAddress(ipAddress);
-                var hostEntry = Dns.GetHostEntry(santitizedIp);
-                return hostEntry == null ? ipAddress : hostEntry.HostName;
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, "Exception Resolving Hostname from IP Address : {0}", ex.Message);
-                return ipAddress;
-            }
-        }
-
-        /// <summary>
-        /// Resolves an IP Address by hostname using DNS
-        /// </summary>
-        /// <param name="hostName">Hostname to resolve from</param>
-        /// <returns>Resolved IP Address - on a failure to determine IP Address, will return hostname</returns>
-        public static string ResolveIpFromHostname(string hostName)
-        {
-            try
-            {
-                var hostEntry = Dns.GetHostEntry(hostName);
-                return hostEntry == null ? hostName : hostEntry.AddressList.First().ToString();
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, "Exception Resolving IP Address from Hostname : {0}", ex.Message);
-                return hostName;
-            }
-        }
-
-    }
-
-    /// <summary>
-    /// Object to hold data about an arp entry
-    /// </summary>
-    public class ArpEntry
-    {
-        public readonly IPAddress IpAddress;
-        public readonly string MacAddress;
-
-        /// <summary>
-        /// Constructs new ArpEntry object
-        /// </summary>
-        /// <param name="ipAddress">string formatted as ipv4 address</param>
-        /// <param name="macAddress">mac address string - format is unimportant</param>
-        public ArpEntry(string ipAddress, string macAddress)
-        {
-            if (string.IsNullOrEmpty(ipAddress))
-            {
-                throw new ArgumentException("\"ipAddress\" cannot be null or empty");
-            }
-            if (string.IsNullOrEmpty(macAddress))
-            {
-                throw new ArgumentException("\"macAddress\" cannot be null or empty");
-            }
-            IpAddress = IPAddress.Parse(ipAddress.TrimStart().TrimStart('0').TrimEnd());
-            MacAddress = macAddress;
-        }
-    }
-
-    /// <summary>
-    /// Arguments passed by the ArpTableUpdated event
-    /// </summary>
-    public class ArpTableEventArgs : EventArgs
-    {
-        /// <summary>
-        /// The retrieved ARP Table
-        /// </summary>
-        public readonly List<ArpEntry> ArpTable;
-        /// <summary>
-        /// True if there was a problem retrieving the ARP Table
-        /// </summary>
-        public readonly bool Error;
-
-        /// <summary>
-        /// Constructor for ArpTableEventArgs
-        /// </summary>
-        /// <param name="arpTable">The entirety of the retrieved ARP table</param>
-        /// <param name="error">True of an error was encountered updating the ARP table</param>
-        public ArpTableEventArgs(List<ArpEntry> arpTable, bool error)
-        {
-            ArpTable = arpTable;
-            Error = error;
-        }
-
-        /// <summary>
-        /// Constructor for ArpTableEventArgs - assumes no error encountered in retrieving ARP Table
-        /// </summary>
-        /// <param name="arpTable">The entirety of the retrieved ARP table</param>
-        public ArpTableEventArgs(List<ArpEntry> arpTable)
-        {
-            ArpTable = arpTable;
-            Error = false;
-        }
-    }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs

@@ -1,6 +1,4 @@
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
@@ -18,30 +16,4 @@ namespace PepperDash.Essentials.Core
 		void Info(bool pressRelease);
 		void Exit(bool pressRelease);
 	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IChannelExtensions
-	{
-		public static void LinkButtons(this IChannel dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(123, dev.ChannelUp);
-			triList.SetBoolSigAction(124, dev.ChannelDown);
-			triList.SetBoolSigAction(125, dev.LastChannel);
-			triList.SetBoolSigAction(137, dev.Guide);
-			triList.SetBoolSigAction(129, dev.Info);
-			triList.SetBoolSigAction(134, dev.Exit);
-		}
-
-		public static void UnlinkButtons(this IChannel dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(123);
-			triList.ClearBoolSigAction(124);
-			triList.ClearBoolSigAction(125);
-			triList.ClearBoolSigAction(137);
-			triList.ClearBoolSigAction(129);
-			triList.ClearBoolSigAction(134);
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannelExtensions.cs

@@ -0,0 +1,30 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class IChannelExtensions
+    {
+        public static void LinkButtons(this IChannel dev, BasicTriList triList)
+        {
+            triList.SetBoolSigAction(123, dev.ChannelUp);
+            triList.SetBoolSigAction(124, dev.ChannelDown);
+            triList.SetBoolSigAction(125, dev.LastChannel);
+            triList.SetBoolSigAction(137, dev.Guide);
+            triList.SetBoolSigAction(129, dev.Info);
+            triList.SetBoolSigAction(134, dev.Exit);
+        }
+
+        public static void UnlinkButtons(this IChannel dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(123);
+            triList.ClearBoolSigAction(124);
+            triList.ClearBoolSigAction(125);
+            triList.ClearBoolSigAction(137);
+            triList.ClearBoolSigAction(129);
+            triList.ClearBoolSigAction(134);
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColor.cs

@@ -0,0 +1,13 @@
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface IColor
+    {
+        void Red(bool pressRelease);
+        void Green(bool pressRelease);
+        void Yellow(bool pressRelease);
+        void Blue(bool pressRelease);
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColorExtensions.cs

@@ -6,18 +6,7 @@ using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface IColor
-	{
-		void Red(bool pressRelease);
-		void Green(bool pressRelease);
-		void Yellow(bool pressRelease);
-		void Blue(bool pressRelease);
-	}
-
-	/// <summary>
+    /// <summary>
 	/// 
 	/// </summary>
 	public static class IColorExtensions

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPad.cs

@@ -1,5 +1,4 @@
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
@@ -19,32 +18,4 @@ namespace PepperDash.Essentials.Core
 		void Menu(bool pressRelease);
 		void Exit(bool pressRelease);
 	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IDPadExtensions
-	{
-		public static void LinkButtons(this IDPad dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(138, dev.Up);
-			triList.SetBoolSigAction(139, dev.Down);
-			triList.SetBoolSigAction(140, dev.Left);
-			triList.SetBoolSigAction(141, dev.Right);
-			triList.SetBoolSigAction(142, dev.Select);
-			triList.SetBoolSigAction(130, dev.Menu);
-			triList.SetBoolSigAction(134, dev.Exit);        
-		}
-
-		public static void UnlinkButtons(this IDPad dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(138);
-			triList.ClearBoolSigAction(139);
-			triList.ClearBoolSigAction(140);
-			triList.ClearBoolSigAction(141);
-			triList.ClearBoolSigAction(142);
-			triList.ClearBoolSigAction(130);
-			triList.ClearBoolSigAction(134);
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPadExtensions.cs

@@ -0,0 +1,32 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class IDPadExtensions
+    {
+        public static void LinkButtons(this IDPad dev, BasicTriList triList)
+        {
+            triList.SetBoolSigAction(138, dev.Up);
+            triList.SetBoolSigAction(139, dev.Down);
+            triList.SetBoolSigAction(140, dev.Left);
+            triList.SetBoolSigAction(141, dev.Right);
+            triList.SetBoolSigAction(142, dev.Select);
+            triList.SetBoolSigAction(130, dev.Menu);
+            triList.SetBoolSigAction(134, dev.Exit);        
+        }
+
+        public static void UnlinkButtons(this IDPad dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(138);
+            triList.ClearBoolSigAction(139);
+            triList.ClearBoolSigAction(140);
+            triList.ClearBoolSigAction(141);
+            triList.ClearBoolSigAction(142);
+            triList.ClearBoolSigAction(130);
+            triList.ClearBoolSigAction(134);
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvr.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
@@ -19,22 +17,4 @@ namespace PepperDash.Essentials.Core
 		void DvrList(bool pressRelease);
 		void Record(bool pressRelease);
 	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IDvrExtensions
-	{
-		public static void LinkButtons(this IDvr dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(136, dev.DvrList);
-			triList.SetBoolSigAction(152, dev.Record);
-		}
-
-		public static void UnlinkButtons(this IDvr dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(136);
-			triList.ClearBoolSigAction(152);
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvrExtensions.cs

@@ -0,0 +1,22 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class IDvrExtensions
+    {
+        public static void LinkButtons(this IDvr dev, BasicTriList triList)
+        {
+            triList.SetBoolSigAction(136, dev.DvrList);
+            triList.SetBoolSigAction(152, dev.Record);
+        }
+
+        public static void UnlinkButtons(this IDvr dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(136);
+            triList.ClearBoolSigAction(152);
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPowerControl.cs

@@ -0,0 +1,12 @@
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Defines the ability to power a device on and off
+    /// </summary>
+    public interface IHasPowerControl
+    {
+        void PowerOn();
+        void PowerOff();
+        void PowerToggle();
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPowerControlExtensions.cs

@@ -0,0 +1,36 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class IHasPowerControlExtensions
+    {
+        public static void LinkButtons(this IHasPowerControl dev, BasicTriList triList)
+        {
+            triList.SetSigFalseAction(101, dev.PowerOn);
+            triList.SetSigFalseAction(102, dev.PowerOff);
+            triList.SetSigFalseAction(103, dev.PowerToggle);
+
+            var fbdev = dev as IHasPowerControlWithFeedback;
+            if (fbdev != null)
+            {
+                fbdev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
+            }
+        }
+
+        public static void UnlinkButtons(this IHasPowerControl dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(101);
+            triList.ClearBoolSigAction(102);
+            triList.ClearBoolSigAction(103);
+
+            var fbdev = dev as IHasPowerControlWithFeedback;
+            if (fbdev != null)
+            {
+                fbdev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
+            }
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPowerControlWithFeedback.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Adds feedback for current power state
+    /// </summary>
+    public interface IHasPowerControlWithFeedback : IHasPowerControl
+    {
+        BoolFeedback PowerIsOnFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs

@@ -1,5 +1,4 @@
-using System;
-using PepperDash.Core;
+using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
@@ -12,34 +11,4 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 
         void LinkSystemMonitorToAppServer();
     }
-
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl3 : IMobileControl
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
-    }
-
-    /// <summary>
-    /// Describes a MobileControl Room Bridge
-    /// </summary>
-    public interface IMobileControlRoomBridge : IKeyed
-    {
-        event EventHandler<EventArgs> UserCodeChanged;
-
-        event EventHandler<EventArgs> UserPromptedForCode;
-
-        event EventHandler<EventArgs> ClientJoined;
-
-        string UserCode { get; }
-
-        string QrCodeUrl { get; }
-
-        string QrCodeChecksum { get; }
-
-        string McServerUrl { get; }
-
-        string RoomName { get; }
-    }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl3.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    /// <summary>
+    /// Describes a MobileSystemController that accepts IEssentialsRoom
+    /// </summary>
+    public interface IMobileControl3 : IMobileControl
+    {
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlRoomBridge.cs

@@ -0,0 +1,27 @@
+using System;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    /// <summary>
+    /// Describes a MobileControl Room Bridge
+    /// </summary>
+    public interface IMobileControlRoomBridge : IKeyed
+    {
+        event EventHandler<EventArgs> UserCodeChanged;
+
+        event EventHandler<EventArgs> UserPromptedForCode;
+
+        event EventHandler<EventArgs> ClientJoined;
+
+        string UserCode { get; }
+
+        string QrCodeUrl { get; }
+
+        string QrCodeChecksum { get; }
+
+        string McServerUrl { get; }
+
+        string RoomName { get; }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumericExtensions.cs

@@ -1,45 +1,10 @@
 using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface INumericKeypad:IKeyed
-	{
-		void Digit0(bool pressRelease);
-		void Digit1(bool pressRelease);
-		void Digit2(bool pressRelease);
-		void Digit3(bool pressRelease);
-		void Digit4(bool pressRelease);
-		void Digit5(bool pressRelease);
-		void Digit6(bool pressRelease);
-		void Digit7(bool pressRelease);
-		void Digit8(bool pressRelease);
-		void Digit9(bool pressRelease);
-
-		/// <summary>
-		/// Used to hide/show the button and/or text on the left-hand keypad button
-		/// </summary>
-		bool HasKeypadAccessoryButton1 { get; }
-		string KeypadAccessoryButton1Label { get; }
-		void KeypadAccessoryButton1(bool pressRelease);
-
-		bool HasKeypadAccessoryButton2 { get; }
-		string KeypadAccessoryButton2Label { get; }
-		void KeypadAccessoryButton2(bool pressRelease);
-	}
-
-	public interface ISetTopBoxNumericKeypad : INumericKeypad
-	{
-		void Dash(bool pressRelease);
-		void KeypadEnter(bool pressRelease);
-	}
-
-	/// <summary>
+    /// <summary>
 	/// 
 	/// </summary>
 	public static class INumericExtensions

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumericKeypad.cs

@@ -0,0 +1,32 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface INumericKeypad:IKeyed
+    {
+        void Digit0(bool pressRelease);
+        void Digit1(bool pressRelease);
+        void Digit2(bool pressRelease);
+        void Digit3(bool pressRelease);
+        void Digit4(bool pressRelease);
+        void Digit5(bool pressRelease);
+        void Digit6(bool pressRelease);
+        void Digit7(bool pressRelease);
+        void Digit8(bool pressRelease);
+        void Digit9(bool pressRelease);
+
+        /// <summary>
+        /// Used to hide/show the button and/or text on the left-hand keypad button
+        /// </summary>
+        bool HasKeypadAccessoryButton1 { get; }
+        string KeypadAccessoryButton1Label { get; }
+        void KeypadAccessoryButton1(bool pressRelease);
+
+        bool HasKeypadAccessoryButton2 { get; }
+        string KeypadAccessoryButton2Label { get; }
+        void KeypadAccessoryButton2(bool pressRelease);
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPasswordPrompt.cs

@@ -22,35 +22,4 @@ namespace PepperDash.Essentials.Core
         /// <param name="password"></param>
         void SubmitPassword(string password);
     }
-
-    public class PasswordPromptEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Indicates if the last submitted password was incorrect
-        /// </summary>
-        public bool LastAttemptWasIncorrect { get; private set; }
-
-        /// <summary>
-        /// Indicates that the login attempt has failed
-        /// </summary>
-        public bool LoginAttemptFailed { get; private set; }
-
-        /// <summary>
-        /// Indicates that the process was cancelled and the prompt should be dismissed
-        /// </summary>
-        public bool LoginAttemptCancelled { get; private set; }
-
-        /// <summary>
-        /// A message to be displayed to the user
-        /// </summary>
-        public string Message { get; private set; }
-
-        public PasswordPromptEventArgs(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
-        {
-            LastAttemptWasIncorrect = lastAttemptIncorrect;
-            LoginAttemptFailed = loginFailed;
-            LoginAttemptCancelled = loginCancelled;
-            Message = message;
-        }
-    }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPower.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Fusion;
 
 using PepperDash.Essentials.Core;
@@ -24,54 +23,4 @@ namespace PepperDash.Essentials.Core
 		void PowerToggle();
         BoolFeedback PowerIsOnFeedback { get; }
 	}
-
-    /// <summary>
-    /// Adds feedback for current power state
-    /// </summary>
-    public interface IHasPowerControlWithFeedback : IHasPowerControl
-    {
-        BoolFeedback PowerIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Defines the ability to power a device on and off
-    /// </summary>
-    public interface IHasPowerControl
-    {
-        void PowerOn();
-        void PowerOff();
-        void PowerToggle();
-    }
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IHasPowerControlExtensions
-	{
-        public static void LinkButtons(this IHasPowerControl dev, BasicTriList triList)
-		{
-			triList.SetSigFalseAction(101, dev.PowerOn);
-			triList.SetSigFalseAction(102, dev.PowerOff);
-			triList.SetSigFalseAction(103, dev.PowerToggle);
-
-            var fbdev = dev as IHasPowerControlWithFeedback;
-            if (fbdev != null)
-            {
-                fbdev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
-            }
-		}
-
-        public static void UnlinkButtons(this IHasPowerControl dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(101);
-			triList.ClearBoolSigAction(102);
-			triList.ClearBoolSigAction(103);
-
-            var fbdev = dev as IHasPowerControlWithFeedback;
-            if (fbdev != null)
-            {
-                fbdev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
-            }
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs

@@ -1,6 +1,4 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core
@@ -37,19 +35,4 @@ namespace PepperDash.Essentials.Core
 		void DvrList(bool pressRelease);
 		void Replay(bool pressRelease);
 	}
-
-	public static class ISetTopBoxControlsExtensions
-	{
-		public static void LinkButtons(this ISetTopBoxControls dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(136, dev.DvrList);
-			triList.SetBoolSigAction(152, dev.Replay);
-		}
-
-		public static void UnlinkButtons(this ISetTopBoxControls dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(136);
-			triList.ClearBoolSigAction(152);
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControlsExtensions.cs

@@ -0,0 +1,19 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    public static class ISetTopBoxControlsExtensions
+    {
+        public static void LinkButtons(this ISetTopBoxControls dev, BasicTriList triList)
+        {
+            triList.SetBoolSigAction(136, dev.DvrList);
+            triList.SetBoolSigAction(152, dev.Replay);
+        }
+
+        public static void UnlinkButtons(this ISetTopBoxControls dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(136);
+            triList.ClearBoolSigAction(152);
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxNumericKeypad.cs

@@ -0,0 +1,8 @@
+namespace PepperDash.Essentials.Core
+{
+    public interface ISetTopBoxNumericKeypad : INumericKeypad
+    {
+        void Dash(bool pressRelease);
+        void KeypadEnter(bool pressRelease);
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITransport.cs

@@ -1,6 +1,4 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
 	/// <summary>
 	/// 
@@ -16,38 +14,4 @@ namespace PepperDash.Essentials.Core
 		void Stop(bool pressRelease);
 		void Record(bool pressRelease);
 	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class ITransportExtensions
-	{
-		/// <summary>
-		/// Attaches to trilist joins: Play:145, Pause:146, Stop:147, ChapPlus:148, ChapMinus:149, Rewind:150, Ffwd:151, Record:154
-		/// 
-		/// </summary>
-		public static void LinkButtons(this ITransport dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(145, dev.Play);
-			triList.SetBoolSigAction(146, dev.Pause);
-			triList.SetBoolSigAction(147, dev.Stop);
-			triList.SetBoolSigAction(148, dev.ChapPlus);
-			triList.SetBoolSigAction(149, dev.ChapMinus);
-			triList.SetBoolSigAction(150, dev.Rewind);
-			triList.SetBoolSigAction(151, dev.FFwd);
-			triList.SetBoolSigAction(154, dev.Record);
-		}
-
-		public static void UnlinkButtons(this ITransport dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(145);
-			triList.ClearBoolSigAction(146);
-			triList.ClearBoolSigAction(147);
-			triList.ClearBoolSigAction(148);
-			triList.ClearBoolSigAction(149);
-			triList.ClearBoolSigAction(150);
-			triList.ClearBoolSigAction(151);
-			triList.ClearBoolSigAction(154);
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITransportExtensions.cs

@@ -0,0 +1,38 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class ITransportExtensions
+    {
+        /// <summary>
+        /// Attaches to trilist joins: Play:145, Pause:146, Stop:147, ChapPlus:148, ChapMinus:149, Rewind:150, Ffwd:151, Record:154
+        /// 
+        /// </summary>
+        public static void LinkButtons(this ITransport dev, BasicTriList triList)
+        {
+            triList.SetBoolSigAction(145, dev.Play);
+            triList.SetBoolSigAction(146, dev.Pause);
+            triList.SetBoolSigAction(147, dev.Stop);
+            triList.SetBoolSigAction(148, dev.ChapPlus);
+            triList.SetBoolSigAction(149, dev.ChapMinus);
+            triList.SetBoolSigAction(150, dev.Rewind);
+            triList.SetBoolSigAction(151, dev.FFwd);
+            triList.SetBoolSigAction(154, dev.Record);
+        }
+
+        public static void UnlinkButtons(this ITransport dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(145);
+            triList.ClearBoolSigAction(146);
+            triList.ClearBoolSigAction(147);
+            triList.ClearBoolSigAction(148);
+            triList.ClearBoolSigAction(149);
+            triList.ClearBoolSigAction(150);
+            triList.ClearBoolSigAction(151);
+            triList.ClearBoolSigAction(154);
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/PasswordPromptEventArgs.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace PepperDash.Essentials.Core
+{
+    public class PasswordPromptEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates if the last submitted password was incorrect
+        /// </summary>
+        public bool LastAttemptWasIncorrect { get; private set; }
+
+        /// <summary>
+        /// Indicates that the login attempt has failed
+        /// </summary>
+        public bool LoginAttemptFailed { get; private set; }
+
+        /// <summary>
+        /// Indicates that the process was cancelled and the prompt should be dismissed
+        /// </summary>
+        public bool LoginAttemptCancelled { get; private set; }
+
+        /// <summary>
+        /// A message to be displayed to the user
+        /// </summary>
+        public string Message { get; private set; }
+
+        public PasswordPromptEventArgs(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
+        {
+            LastAttemptWasIncorrect = lastAttemptIncorrect;
+            LoginAttemptFailed      = loginFailed;
+            LoginAttemptCancelled   = loginCancelled;
+            Message                 = message;
+        }
+    }
+}