fix: various updates for room combining from testing

Feature 2.0.0/tech password interface

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

@@ -1,37 +0,0 @@
-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 }}
-

.github/workflows/docker.yml

@@ -79,7 +79,7 @@ jobs:
 #            contains(steps.setVersion.outputs.version, '-beta-')
         uses: ncipollo/release-action@v1
         with:
-          artifacts: 'output\*.*(cpz|cplz)'
+          artifacts: 'output\**\*.*(cpz|cplz)'
           generateReleaseNotes: true
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
           tag: ${{ steps.setVersion.outputs.version }}

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           updateRelease: true
-          artifacts: 'output\*.*(cpz|cplz)'          
+          artifacts: 'output\**\*.*(cpz|cplz)'          
           tag: ${{ steps.setVersion.outputs.version }}
       - name: Setup Nuget
         run: | 

.gitignore

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

PepperDash.Essentials.sln

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

src/Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.0.0-local</Version>
+    <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technologies</Authors>
     <Company>PepperDash Technologies</Company>
     <Product>PepperDash Essentials</Product>

src/Directory.Build.targets

@@ -1,28 +1,26 @@
 <Project>
   <ItemGroup>
-    <None Include="$(TargetDir)\$(TargetName).$(Version).cpz" Condition="$(ProjectType) == 'Program'">
+    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
       <Pack>true</Pack>
-      <PackagePath>content;</PackagePath>
+      <PackagePath>build;</PackagePath>
     </None>
-    <None Include="$(PackageOutputPath)\$(TargetName).$(Version).cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
       <Pack>true</Pack>
-      <PackagePath>content;</PackagePath>
+      <PackagePath>build;</PackagePath>
     </None>
   </ItemGroup>
-  <Target Name="Create CPLZ" AfterTargets="Build; Rebuild" Condition="$(ProjectType) == 'ProgramLibrary'">
-    <Message Text="Creating CPLZ"></Message>
-    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))"></MakeDir>
-    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(TargetName).$(Version).cplz" Overwrite="true"/>    
+  <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
+    <Message Text="Creating CPLZ $(TargetDir)"></Message>
+    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
+    <MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
+    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
   </Target>
-  <Target Name="Clean CPLZ" AfterTargets="AfterClean" Condition="$(ProjectType) == 'ProgramLibrary'">
-    <Delete Files="$(PackageOutputPath)\$(TargetName).$(Version).cplz"/>
-  </Target>
-  <Target Name="Copy CPZ" AfterTargets="SimplSharpPostProcess" Condition="$(ProjectType) == 'Program'">
+  <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
     <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"/>
-  </Target>  
-  <Target Name="Clean CPZ" AfterTargets="AfterClean" Condition="$(ProjectType) == 'Program'">
-    <Delete Files="$(PackageOutputPath)\$(TargetName).$(Version).cpz"/>
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  </Target>
+  <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+    <Message Text="Copying CPZ"></Message>
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
   </Target>
 </Project>

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,10 +8,11 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
@@ -32,7 +33,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (bridge == null)
             {
-                Debug.Console(0, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
                 return;
             }
 
@@ -58,7 +59,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (bridge == null)
             {
-                Debug.Console(0, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
                 return;
             }
 
@@ -148,11 +149,11 @@ namespace PepperDash.Essentials.Core.Bridges
 
         private void LinkDevices()
         {
-            Debug.Console(1, this, "Linking Devices...");
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Devices...");
 
             if (PropertiesConfig.Devices == null)
             {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No devices linked to this bridge");
+                Debug.LogMessage(LogEventLevel.Debug, this, "No devices linked to this bridge");
                 return;
             }
 
@@ -165,11 +166,11 @@ namespace PepperDash.Essentials.Core.Bridges
                     continue;
                 }
 
-                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking Device: '{0}'", device.Key);
 
-                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
+                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                 {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                    Debug.LogMessage(LogEventLevel.Information, this,
                         "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
                         device.Key);
                     continue;
@@ -194,20 +195,20 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
             {
-                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Registration result: {0}", registerResult);
                 return;
             }
 
-            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
+            Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
         }
 
         public void LinkRooms()
         {
-            Debug.Console(1, this, "Linking Rooms...");
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
 
             if (PropertiesConfig.Rooms == null)
             {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No rooms linked to this bridge.");
+                Debug.LogMessage(LogEventLevel.Debug, this, "No rooms linked to this bridge.");
                 return;
             }
 
@@ -217,7 +218,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
                 if (rm == null)
                 {
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Notice,
+                    Debug.LogMessage(LogEventLevel.Debug, this,
                         "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
                     continue;
                 }
@@ -239,7 +240,7 @@ namespace PepperDash.Essentials.Core.Bridges
             }
             else
             {
-                Debug.Console(2, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
             }
         }
 
@@ -248,11 +249,11 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public virtual void PrintJoinMaps()
         {
-            Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
+            Debug.LogMessage(LogEventLevel.Information, 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);
+                Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}':", joinMap.Key);
                 joinMap.Value.PrintJoinMapInfo();
             }
         }
@@ -261,11 +262,11 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public virtual void MarkdownForBridge(string bridgeKey)
         {
-            Debug.Console(0, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
+            Debug.LogMessage(LogEventLevel.Information, 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);
+                Debug.LogMessage(LogEventLevel.Information, "Generating markdown for device '{0}':", joinMap.Key);
                 joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
             }
         }
@@ -280,11 +281,11 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (joinMap == null)
             {
-                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Information, 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);
+            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
             joinMap.PrintJoinMapInfo();
         }
         /// <summary>
@@ -297,11 +298,11 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (joinMap == null)
             {
-                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Information, 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);
+            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
             joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
         }
 
@@ -322,11 +323,11 @@ namespace PepperDash.Essentials.Core.Bridges
                             var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
                             if (uo != null)
                             {
-                                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
                                 uo(Convert.ToBoolean(state));
                             }
                             else
-                                Debug.Console(2, this, "User Action is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                             break;
                         }
                     case "analog":
@@ -334,34 +335,34 @@ namespace PepperDash.Essentials.Core.Bridges
                             var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
                             if (uo != null)
                             {
-                                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
                                 uo(Convert.ToUInt16(state));
                             }
                             else
-                                Debug.Console(2, this, "User Action is null.  Nothing to Execute"); break;
+                                Debug.LogMessage(LogEventLevel.Verbose, 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());
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
                                 uo(Convert.ToString(state));
                             }
                             else
-                                Debug.Console(2, this, "User Action is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                             break;
                         }
                     default:
                         {
-                            Debug.Console(2, "Unknown join type.  Use digital/serial/analog");
+                            Debug.LogMessage(LogEventLevel.Verbose, "Unknown join type.  Use digital/serial/analog");
                             break;
                         }
                 }
             }
             catch (Exception e)
             {
-                Debug.Console(1, this, "Error: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
 
         }
@@ -375,13 +376,12 @@ namespace PepperDash.Essentials.Core.Bridges
         {
             try
             {
-                if (Debug.Level >= 1)
-                    Debug.Console(1, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                Debug.LogMessage(LogEventLevel.Verbose, 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());
+                Debug.LogMessage(LogEventLevel.Debug, this, "Executing Action: {0}", uo.ToString());
                 if (uo is Action<bool>)
                     (uo as Action<bool>)(args.Sig.BoolValue);
                 else if (uo is Action<ushort>)
@@ -391,7 +391,7 @@ namespace PepperDash.Essentials.Core.Bridges
             }
             catch (Exception e)
             {
-                Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Error in Eisc_SigChange handler: {0}", e);
             }
         }
 
@@ -411,7 +411,7 @@ namespace PepperDash.Essentials.Core.Bridges
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
         [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
         public class ApiDevicePropertiesConfig
@@ -444,12 +444,12 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
+            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");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
 
             var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
 
@@ -459,34 +459,34 @@ namespace PepperDash.Essentials.Core.Bridges
             {
                 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;
+                        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.LogMessage(LogEventLevel.Information, "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;
                     }
-                    eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
-                        Global.ControlSystem);
-                    break;
-                }
                 default:
                     eisc = null;
                     break;

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

@@ -1,43 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    [Obsolete("This Device will be moved to a plugin in a future update")]
-    public class DigitalLoggerJoinMap : JoinMapBase
-    {
-        public uint IsOnline { get; set; }
-        public uint CircuitNames { get; set; }
-        public uint CircuitState { get; set; }
-        public uint CircuitCycle { get; set; }
-        public uint CircuitIsCritical { get; set; }
-        public uint CircuitOnCmd { get; set; }
-        public uint CircuitOffCmd { get; set; }
-
-        public DigitalLoggerJoinMap()
-        {
-            // Digital
-            IsOnline = 9;
-            CircuitState = 0;
-            CircuitCycle = 0;
-            CircuitIsCritical = 10;
-            CircuitOnCmd = 10;
-            CircuitOffCmd = 20;
-            // Serial
-            CircuitNames = 0;
-            // Analog
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            CircuitNames = CircuitNames + joinOffset;
-            CircuitState = CircuitState + joinOffset;
-            CircuitCycle = CircuitCycle + joinOffset;
-            CircuitIsCritical = CircuitIsCritical + joinOffset;
-            CircuitOnCmd = CircuitOnCmd + joinOffset;
-            CircuitOffCmd = CircuitOffCmd + joinOffset;
-        }
-    }
-}

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

@@ -8,6 +8,18 @@ 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 });
@@ -36,6 +48,28 @@ 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>
@@ -50,7 +84,8 @@ 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,6 +64,16 @@ 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>
@@ -78,7 +88,8 @@ 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

@@ -0,0 +1,827 @@
+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/GlsPartitionSensorJoinMap.cs

@@ -155,146 +155,3 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
         }
     }
 }
-
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    [Obsolete("use PepperDash.Essentials.Core.Bridges.JoinMaps version")]
-	public class GlsPartitionSensorJoinMap:JoinMapBaseAdvanced
-	{
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 1,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Is Online",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 1,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("Enable")]
-        public JoinDataComplete Enable = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 2,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Enable",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("PartitionSensed")]
-        public JoinDataComplete PartitionSensed = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 3,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Partition Sensed",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("PartitionNotSensed")]
-        public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 4,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Partition Not Sensed",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("IncreaseSensitivity")]
-        public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 6,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Increase Sensitivity",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("DecreaseSensitivity")]
-        public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 7,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Decrease Sensitivity",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("Sensitivity")]
-        public JoinDataComplete Sensitivity = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 2,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Sensor Sensitivity",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-        /// <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 GlsPartitionSensorJoinMap(uint joinStart)
-            : this(joinStart, typeof(GlsPartitionSensorJoinMap))
-        {
-
-        }
-
-        /// <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 GlsPartitionSensorJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-
-        }
-	}
-}

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

@@ -0,0 +1,190 @@
+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 = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Online", 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,6 +132,23 @@ 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/CecPortController.cs

@@ -8,6 +8,7 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -49,7 +50,7 @@ namespace PepperDash.Essentials.Core
                 OnDataReceived(cecDevice.Received.StringValue);
             else if (args.EventId == CecEventIds.ErrorFeedbackEventId)
                 if(cecDevice.ErrorFeedback.BoolValue)
-                    Debug.Console(2, this, "CEC NAK Error");
+                    Debug.LogMessage(LogEventLevel.Verbose, this, "CEC NAK Error");
         }
 
         void OnDataReceived(string s)
@@ -59,14 +60,14 @@ namespace PepperDash.Essentials.Core
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
 			if (textHandler != null)
 			{
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.Console(0, this, "Received: '{0}'", s);
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
 				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
 			}
         }
@@ -78,7 +79,7 @@ namespace PepperDash.Essentials.Core
             if (Port == null)
                 return;
 			if (StreamDebugging.TxStreamDebuggingIsEnabled)
-				Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
             Port.StreamCec.Send.StringValue = text;
         }
 
@@ -88,7 +89,7 @@ namespace PepperDash.Essentials.Core
                 return;
             var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
 			if (StreamDebugging.TxStreamDebuggingIsEnabled)
-				Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             Port.StreamCec.Send.StringValue = text;
         }
 

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

@@ -7,6 +7,7 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core
@@ -43,7 +44,7 @@ namespace PepperDash.Essentials.Core
 		{
 			if (port == null)
 			{
-				Debug.Console(0, this,  "ERROR: Invalid com port, continuing but comms will not function");
+				Debug.LogMessage(LogEventLevel.Information, this,  "ERROR: Invalid com port, continuing but comms will not function");
 				return;
 			}
 
@@ -58,7 +59,7 @@ namespace PepperDash.Essentials.Core
 	    {
 	        if (Port == null)
 	        {
-	            Debug.Console(0,this,Debug.ErrorLogLevel.Error, "Configured com Port for this device does not exist.");
+	            Debug.LogMessage(LogEventLevel.Information, this, "Configured com Port for this device does not exist.");
 	            return;
 	        }
             if (Port.Parent is CrestronControlSystem)
@@ -66,7 +67,7 @@ namespace PepperDash.Essentials.Core
                 var result = Port.Register();
                 if (result != eDeviceRegistrationUnRegistrationResponse.Success)
                 {
-                    Debug.Console(0, this, "ERROR: Cannot register Com port: {0}", result);
+                    Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Com port: {0}", result);
                     return; // false
                 }
             }
@@ -74,7 +75,7 @@ namespace PepperDash.Essentials.Core
 	        var specResult = Port.SetComPortSpec(Spec);
 	        if (specResult != 0)
 	        {
-	            Debug.Console(0, this, "WARNING: Cannot set comspec");
+	            Debug.LogMessage(LogEventLevel.Information, this, "WARNING: Cannot set comspec");
 	            return;
 	        }
 	        Port.SerialDataReceived += Port_SerialDataReceived;
@@ -98,14 +99,14 @@ namespace PepperDash.Essentials.Core
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
             if (textHandler != null)
             {
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.Console(0, this, "Received: '{0}'", s);
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
                 textHandler(this, new GenericCommMethodReceiveTextArgs(s));
             }
         }
@@ -123,7 +124,7 @@ namespace PepperDash.Essentials.Core
 				return;
 
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
             Port.Send(text);
 		}
 
@@ -133,7 +134,7 @@ namespace PepperDash.Essentials.Core
 				return;
 			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
 
 			Port.Send(text);
 		}

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,8 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 
@@ -76,7 +76,7 @@ namespace PepperDash.Essentials.Core
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            //Debug.Console(2, "ReadJson type: " + objectType.Name);
+            //Debug.LogMessage(LogEventLevel.Verbose, "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))

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

@@ -1,13 +1,14 @@
-extern alias Full;
+
 
 using System;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -22,12 +23,12 @@ namespace PepperDash.Essentials.Core
 			{
 				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
 					(deviceConfig.Properties["control"].ToString());
-				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
+				//Debug.LogMessage(LogEventLevel.Verbose, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
 			}
 			catch (Exception e)
 			{
 
-				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
+				Debug.LogMessage(LogEventLevel.Information, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
 				return null;
 			}
 		}
@@ -83,13 +84,22 @@ 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;
 				}				
 			}
 			catch (Exception e)
 			{
-				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
+				Debug.LogMessage(LogEventLevel.Information, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
 					deviceConfig.Properties.ToString(), e);
 			}
 
@@ -106,7 +116,7 @@ namespace PepperDash.Essentials.Core
 			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
 			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
 				return dev.ComPorts[config.ControlPortNumber];
-			Debug.Console(0,Debug.ErrorLogLevel.Notice, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			Debug.LogMessage(LogEventLevel.Information, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
 			return null;
 		}
 
@@ -117,41 +127,54 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static ICec GetCecPort(ControlPropertiesConfig config)
         {
-            var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+	        try
+	        {
+		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-            if (dev != null)
-            {
-                if (!String.IsNullOrEmpty(config.ControlPortName))
-                {
+		        Debug.LogMessage(LogEventLevel.Information, "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");
 
-                    var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
+		        if (dev == null)
+			        return null;
 
-                    if (inputPort != null)
-                    {
-                        if (inputPort.Port is ICec)
-                            return inputPort.Port as ICec;
-                    }
+		        if (String.IsNullOrEmpty(config.ControlPortName))
+		        {
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+			        return null;
+		        }
 
-                    var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
 
-                    if (outputPort != null)
-                    {
-                        if (outputPort.Port is ICec)
-                            return outputPort.Port as ICec;
-                    }
+		        var inputsOutputs = dev as IRoutingInputsOutputs;
+		        if (inputsOutputs == null)
+		        {
+					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
+						config.ControlPortDevKey, config.ControlPortName);
 
-                    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);
+			        return null;
+		        }
 
-            return null;
+				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.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
+		        Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
+		        if (ex.InnerException != null)
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
+	        }
+
+			Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
+					config.ControlPortDevKey, config.ControlPortName);
+
+			return null;
         }
 
 		/// <summary>
@@ -169,7 +192,7 @@ namespace PepperDash.Essentials.Core
 			{
 				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
 				if (dev == null)
-					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
+					Debug.LogMessage(LogEventLevel.Information, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
 				return dev;
 			}
 		}
@@ -183,9 +206,7 @@ namespace PepperDash.Essentials.Core
     {
 
         [JsonConverter(typeof(ComSpecJsonConverter))]
-        public ComPort.ComPortSpec ComParams { get; set; }
-
-		public string RoomId { get; set; }
+        public ComPort.ComPortSpec ComParams { get; set; }		
 
 		public string CresnetId { get; set; }
 

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,8 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 

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

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core
@@ -39,7 +40,7 @@ namespace PepperDash.Essentials.Core
 		public override bool CustomActivate()
 		{
 			Communication.Connect();
-			CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+			CommunicationMonitor.StatusChange += (o, a) => { Debug.LogMessage(LogEventLevel.Verbose, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
 			CommunicationMonitor.Start();
 
 			CrestronConsole.AddNewConsoleCommand(SendLine, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
@@ -50,7 +51,7 @@ namespace PepperDash.Essentials.Core
 		void SendLine(string s)
 		{
 			//if (Debug.Level == 2)
-			//    Debug.Console(2, this, "    Send '{0}'", ComTextHelper.GetEscapedText(s));
+			//    Debug.LogMessage(LogEventLevel.Verbose, this, "    Send '{0}'", ComTextHelper.GetEscapedText(s));
 			Communication.SendText(s + LineEnding);
 		}
 	}
@@ -75,7 +76,7 @@ namespace PepperDash.Essentials.Core
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Comm Mock Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Comm Mock Device");
             var comm = CommFactory.CreateCommForDevice(dc);
             var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ConsoleCommMockDevicePropertiesConfig>(
                 dc.Properties.ToString());

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

@@ -1,15 +1,16 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronSockets;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core
@@ -45,7 +46,7 @@ namespace PepperDash.Essentials.Core
 
         public static IKeyed BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Comm Device");
             return new GenericComm(dc);
         }
 
@@ -59,7 +60,7 @@ namespace PepperDash.Essentials.Core
             }
             catch (Exception e)
             {
-                Debug.Console(2, this, "Error deserializing port config: {0}", e);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Error deserializing port config: {0}", e);
             }
         }
 
@@ -85,16 +86,16 @@ namespace PepperDash.Essentials.Core
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             if (CommPort == null)
             {
-                Debug.Console(1, this, "Unable to link device '{0}'.  CommPort is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  CommPort is null", Key);
                 return;
             }
 
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             // this is a permanent event handler. This cannot be -= from event
             CommPort.TextReceived += (s, a) =>
@@ -137,7 +138,7 @@ namespace PepperDash.Essentials.Core
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Comm Device");
             return new GenericComm(dc);
         }
     }

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

@@ -9,6 +9,7 @@ using PepperDash.Core.DebugThings;
 
 namespace PepperDash.Essentials.Core
 {
+	[Obsolete("Please use the builtin HttpClient class instead: https://learn.microsoft.com/en-us/dotnet/fundamentals/networking/http/httpclient-guidelines")]
 	public class GenericHttpClient : Device, IBasicCommunication
 	{
 		public HttpClient Client;

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,10 +6,11 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -40,7 +41,7 @@ namespace PepperDash.Essentials.Core
 				return null;
 			if (control["method"].Value<string>() != "ir")
 			{
-				Debug.Console(0, "IRPortHelper called with non-IR properties");
+				Debug.LogMessage(LogEventLevel.Information, "IRPortHelper called with non-IR properties");
 				return null;
 			}
 
@@ -50,7 +51,7 @@ namespace PepperDash.Essentials.Core
 			var portNum = control.Value<uint>("controlPortNumber");
 			if (portDevKey == null || portNum == 0)
 			{
-				Debug.Console(1, "WARNING: Properties is missing port device or port number");
+				Debug.LogMessage(LogEventLevel.Debug, "WARNING: Properties is missing port device or port number");
 				return port;
 			}
 
@@ -63,7 +64,7 @@ namespace PepperDash.Essentials.Core
 
 			if (irDev == null)
 			{
-				Debug.Console(1, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
+				Debug.LogMessage(LogEventLevel.Debug, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
 				return port;
 			}
 
@@ -76,7 +77,7 @@ namespace PepperDash.Essentials.Core
 			}
 			else
 			{
-				Debug.Console(1, "[Config] Error, device '{0}' IR port {1} out of range",
+				Debug.LogMessage(LogEventLevel.Debug, "[Config] Error, device '{0}' IR port {1} out of range",
 					portDevKey, portNum);
 				return port;
 			}
@@ -87,14 +88,14 @@ namespace PepperDash.Essentials.Core
 	        var irControllerKey = dc.Key + "-ir";
 	        if (dc.Properties == null)
 	        {
-	            Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", dc.Key);
+	            Debug.LogMessage(LogEventLevel.Information, "[{0}] WARNING: Device config does not include properties.  IR will not function.", dc.Key);
 	            return null;
 	        }
 
 	        var control = dc.Properties["control"];
 	        if (control == null)
 	        {
-	            Debug.Console(0,
+	            Debug.LogMessage(LogEventLevel.Information,
 	                "WARNING: Device config does not include control properties.  IR will not function for {0}", dc.Key);
 	            return null;
 	        }
@@ -105,13 +106,13 @@ namespace PepperDash.Essentials.Core
 
 	        if (portDevKey == null)
 	        {
-	            Debug.Console(0, "WARNING: control properties is missing ir device for {0}", dc.Key);
+	            Debug.LogMessage(LogEventLevel.Information, "WARNING: control properties is missing ir device for {0}", dc.Key);
 	            return null;
 	        }
 
 	        if (portNum == 0)
 	        {
-	            Debug.Console(0, "WARNING: control properties is missing ir port number for {0}", dc.Key);
+	            Debug.LogMessage(LogEventLevel.Information, "WARNING: control properties is missing ir port number for {0}", dc.Key);
 	            return null;
 	        }
 
@@ -123,12 +124,12 @@ namespace PepperDash.Essentials.Core
 
 	        if (irDev == null)
 	        {
-	            Debug.Console(0, "WARNING: device with IR ports '{0}' not found", portDevKey);
+	            Debug.LogMessage(LogEventLevel.Information, "WARNING: device with IR ports '{0}' not found", portDevKey);
 	            return null;
 	        }
 	        if (portNum > irDev.NumberOfIROutputPorts)
 	        {
-	            Debug.Console(0, "WARNING: device '{0}' IR port {1} out of range",
+	            Debug.LogMessage(LogEventLevel.Information, "WARNING: device '{0}' IR port {1} out of range",
 	                portDevKey, portNum);
 	            return null;
 	        }
@@ -143,7 +144,7 @@ namespace PepperDash.Essentials.Core
 
 	    public static IrOutputPortController GetIrOutputPortController(DeviceConfig config)
 	    {
-            Debug.Console(1, "Attempting to create new Ir Port Controller");
+            Debug.LogMessage(LogEventLevel.Debug, "Attempting to create new Ir Port Controller");
 
 	        if (config == null)
 	        {
@@ -165,7 +166,7 @@ namespace PepperDash.Essentials.Core
             var irControllerKey = devConf.Key + "-ir";
             if (devConf.Properties == null)
             {
-                Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
+                Debug.LogMessage(LogEventLevel.Information, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
                 return new IrOutputPortController(irControllerKey, null, "");
             }
 
@@ -173,7 +174,7 @@ namespace PepperDash.Essentials.Core
             if (control == null)
             {
                 var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: Device config does not include control properties.  IR will not function");
+                Debug.LogMessage(LogEventLevel.Information, c, "WARNING: Device config does not include control properties.  IR will not function");
                 return c;
             }
 
@@ -184,14 +185,14 @@ namespace PepperDash.Essentials.Core
             if (portDevKey == null)
             {
                 var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: control properties is missing ir device");
+                Debug.LogMessage(LogEventLevel.Information, c, "WARNING: control properties is missing ir device");
                 return c;
             }
 
             if (portNum == 0)
             {
                 var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: control properties is missing ir port number");
+                Debug.LogMessage(LogEventLevel.Information, c, "WARNING: control properties is missing ir port number");
                 return c;
             } 
 
@@ -204,7 +205,7 @@ namespace PepperDash.Essentials.Core
             if (irDev == null)
             {
                 var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
+                Debug.LogMessage(LogEventLevel.Information, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
                 return c;
             }
 
@@ -214,7 +215,7 @@ namespace PepperDash.Essentials.Core
             else
             {
                 var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: device '{0}' IR port {1} out of range",
+                Debug.LogMessage(LogEventLevel.Information, c, "WARNING: device '{0}' IR port {1} out of range",
                     portDevKey, portNum);
                 return c;
             }
@@ -226,12 +227,18 @@ namespace PepperDash.Essentials.Core
 	/// </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 = "";
+			FileName = "";			
 		}
 	}
 }

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

@@ -1,10 +1,10 @@
-extern alias Full;
+
 
 using System.Collections.Generic;
 using System.Linq;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Config
 {

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Config
 {

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 

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

@@ -1,14 +1,15 @@
-extern alias Full;
+
 
 using System;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Core.Config;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -27,7 +28,7 @@ namespace PepperDash.Essentials.Core.Config
 
 		public static bool LoadConfig2()
 		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
+			Debug.LogMessage(LogEventLevel.Information, "Loading unmerged system/template portal configuration file.");
 			try
 			{
                 // Check for local config file first
@@ -35,7 +36,7 @@ namespace PepperDash.Essentials.Core.Config
 
                 bool localConfigFound = false;
 
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
+                Debug.LogMessage(LogEventLevel.Information, "Attempting to load Local config file: '{0}'", filePath);
 
                 // Check for local config directory first
 
@@ -45,7 +46,7 @@ namespace PepperDash.Essentials.Core.Config
                 {
                     if (configFiles.Length > 1)
                     {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                        Debug.LogMessage(LogEventLevel.Information,
                             "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
                         return false;
                     }
@@ -57,7 +58,7 @@ namespace PepperDash.Essentials.Core.Config
                 }
                 else
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                    Debug.LogMessage(LogEventLevel.Information,
                         "Local Configuration file not present.", filePath);
 
                 }
@@ -67,33 +68,33 @@ namespace PepperDash.Essentials.Core.Config
                 {
                     filePath = Global.FilePathPrefix + Global.ConfigFileName;
 
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
+                    Debug.LogMessage(LogEventLevel.Information, "Attempting to load Portal config file: '{0}'", filePath);
 
                     configFiles = GetConfigFiles(filePath);
 
                     if (configFiles != null)
                     {
-                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
+                        Debug.LogMessage(LogEventLevel.Verbose, "{0} config files found matching pattern", configFiles.Length);
 
                         if (configFiles.Length > 1)
                         {
-                            Debug.Console(0, Debug.ErrorLogLevel.Error,
+                            Debug.LogMessage(LogEventLevel.Information,
                                 "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
                             return false;
                         }
                         else if (configFiles.Length == 1)
                         {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
+                            Debug.LogMessage(LogEventLevel.Information, "Found Portal config file: '{0}'", filePath);
                         }
                         else
                         {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
+                            Debug.LogMessage(LogEventLevel.Information, "No config file found.");
                             return false;
                         }
                     }
                     else
                     {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                        Debug.LogMessage(LogEventLevel.Information,
                             "ERROR: Portal Configuration file not present. Please load file and reset program.");
                         return false;
                     }
@@ -111,13 +112,13 @@ namespace PepperDash.Essentials.Core.Config
                 // Read the file
                 using (StreamReader fs = new StreamReader(filePath))
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
+                    Debug.LogMessage(LogEventLevel.Information, "Loading config file: '{0}'", filePath);
 
                     if (localConfigFound)
                     {
                         ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
+                        Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Local Config");
 
                         return true;
                     }
@@ -139,14 +140,14 @@ namespace PepperDash.Essentials.Core.Config
                         }
                     }
 
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
+                    Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Merged Config");
 
                     return true;
                 }
 			}
 			catch (Exception e)
 			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
+                Debug.LogMessage(LogEventLevel.Information, "ERROR: Config load failed: \r{0}", e);
 				return false;
 			}
 		}
@@ -163,20 +164,20 @@ namespace PepperDash.Essentials.Core.Config
 
             if (Directory.Exists(dir))
             {
-                Debug.Console(1, "Searching in Directory '{0}'", dir);
+                Debug.LogMessage(LogEventLevel.Debug, "Searching in Directory '{0}'", dir);
                 // Get the directory info
                 var dirInfo = new DirectoryInfo(dir);
 
                 // Get the file name
                 var fileName = Path.GetFileName(filePath);
-                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
+                Debug.LogMessage(LogEventLevel.Debug, "For Config Files matching: '{0}'", fileName);
 
                 // Get the files that match from the directory
                 return dirInfo.GetFiles(fileName);
             }
             else
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                Debug.LogMessage(LogEventLevel.Information,
                     "Directory not found: ", dir);
 
                 return null;
@@ -248,8 +249,8 @@ namespace PepperDash.Essentials.Core.Config
                 // Line 8
 	            .Append(new string('*', debugStringWidth));
 
-            Debug.Console(2, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
-            Debug.Console(0, newDebugString.ToString());
+            Debug.LogMessage(LogEventLevel.Verbose, "Found Local config file: '{0}'", filePath);
+            Debug.LogMessage(LogEventLevel.Information, newDebugString.ToString());
 	    }
 
 	}

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,12 +6,13 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Crestron.SimplSharp.Net.Http;
 using Crestron.SimplSharpPro.Diagnostics;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -21,7 +22,7 @@ namespace PepperDash.Essentials.Core.Config
 
         public static void GetConfigFromServer(string url)
         {
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to get new config from '{0}'", url);
+            Debug.LogMessage(LogEventLevel.Information, "Attempting to get new config from '{0}'", url);
 
             // HTTP GET 
             var req = new HttpClientRequest();
@@ -51,17 +52,17 @@ namespace PepperDash.Essentials.Core.Config
                             }
                             else
                             {
-                                Debug.Console(0, Debug.ErrorLogLevel.Error, "Config Update Process Stopped. Failed to get config file from server: {0}", r.Code);
+                                Debug.LogMessage(LogEventLevel.Information, "Config Update Process Stopped. Failed to get config file from server: {0}", r.Code);
                                 OnStatusUpdate(eUpdateStatus.UpdateFailed);
                             }
                         }
                         else
-                            Debug.Console(0, Debug.ErrorLogLevel.Error, "Request for config from Server Failed: {0}", e);
+                            Debug.LogMessage(LogEventLevel.Information, "Request for config from Server Failed: {0}", e);
                     });
             }
             catch (Exception e)
             {
-                Debug.Console(1, "Error Getting Config from Server: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, "Error Getting Config from Server: {0}", e);
             }
 
         }
@@ -90,7 +91,7 @@ namespace PepperDash.Essentials.Core.Config
             }
             catch (Exception e)
             {
-                Debug.Console(1, "Error parsing new config: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, "Error parsing new config: {0}", e);
 
                 OnStatusUpdate(eUpdateStatus.UpdateFailed);
             }           
@@ -107,7 +108,7 @@ namespace PepperDash.Essentials.Core.Config
 
             if (configFiles != null)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Existing config files found.  Moving to Archive folder.");
+                Debug.LogMessage(LogEventLevel.Information, "Existing config files found.  Moving to Archive folder.");
 
                 OnStatusUpdate(eUpdateStatus.ArchivingConfigs);
 
@@ -115,7 +116,7 @@ namespace PepperDash.Essentials.Core.Config
             }
             else
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No Existing config files found in '{0}'. Nothing to archive", filePath);
+                Debug.LogMessage(LogEventLevel.Information, "No Existing config files found in '{0}'. Nothing to archive", filePath);
             }
         }
 
@@ -140,12 +141,12 @@ namespace PepperDash.Essentials.Core.Config
 
                 if(archivedConfigFiles != null || archivedConfigFiles.Length > 0)
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "{0} Existing files found in archive folder.  Deleting.", archivedConfigFiles.Length);
+                    Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder.  Deleting.", archivedConfigFiles.Length);
 
                     for (int i = 0; i < archivedConfigFiles.Length; i++ )
                     {
                         var file = archivedConfigFiles[i];
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Deleting archived file: '{0}'", file.FullName);
+                        Debug.LogMessage(LogEventLevel.Information, "Deleting archived file: '{0}'", file.FullName);
                         file.Delete();
                     }
                 }
@@ -155,7 +156,7 @@ namespace PepperDash.Essentials.Core.Config
             // Move any files from the program folder to the archive folder
             foreach (var file in files)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Moving config file '{0}' to archive folder", file.FullName);
+                Debug.LogMessage(LogEventLevel.Information, "Moving config file '{0}' to archive folder", file.FullName);
 
                 // Moves the file and appends the .bak extension
                 var fileDest = archiveDirectoryPath + "/" + file.Name + ".bak";
@@ -164,7 +165,7 @@ namespace PepperDash.Essentials.Core.Config
                   file.MoveTo(fileDest);
                 }
                 else
-                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "Cannot move file to archive folder.  Existing file already exists with same name: '{0}'", fileDest);
+                    Debug.LogMessage(LogEventLevel.Information, "Cannot move file to archive folder.  Existing file already exists with same name: '{0}'", fileDest);
             }
         }
 
@@ -179,7 +180,7 @@ namespace PepperDash.Essentials.Core.Config
             {
                 OnStatusUpdate(eUpdateStatus.DeletingLocalConfig);
                 Directory.Delete(folderPath);
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Local Config Found in '{0}'. Deleting.", folderPath);
+                Debug.LogMessage(LogEventLevel.Information, "Local Config Found in '{0}'. Deleting.", folderPath);
             }
         }
 
@@ -188,7 +189,7 @@ namespace PepperDash.Essentials.Core.Config
         /// </summary>
         static void RestartProgram()
         {
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to Reset Program");
+            Debug.LogMessage(LogEventLevel.Information, "Attempting to Reset Program");
 
             OnStatusUpdate(eUpdateStatus.RestartingProgram);
 
@@ -196,7 +197,7 @@ namespace PepperDash.Essentials.Core.Config
 
             CrestronConsole.SendControlSystemCommand(string.Format("progreset -p:{0}", InitialParametersClass.ApplicationNumber), ref response);
 
-            Debug.Console(1, "Console Response: {0}", response);          
+            Debug.LogMessage(LogEventLevel.Debug, "Console Response: {0}", response);          
         }
 
     }

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,9 +6,10 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -42,7 +43,7 @@ namespace PepperDash.Essentials.Core.Config
                 // Replace the current properties JToken with the new one passed into this method
                 deviceConfig.Properties = properties;
 
-                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Debug, "Updated properties of device: '{0}'", deviceKey);
 
                 success = true;
             }
@@ -62,7 +63,7 @@ namespace PepperDash.Essentials.Core.Config
             {
                 ConfigReader.ConfigObject.Devices[deviceConfigIndex] = config;
 
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+                Debug.LogMessage(LogEventLevel.Debug, "Updated config of device: '{0}'", config.Key);
 
                 success = true;
             }
@@ -82,7 +83,7 @@ namespace PepperDash.Essentials.Core.Config
             {
                 ConfigReader.ConfigObject.Rooms[roomConfigIndex] = config;
 
-                Debug.Console(1, "Updated room of device: '{0}'", config.Key);
+                Debug.LogMessage(LogEventLevel.Debug, "Updated room of device: '{0}'", config.Key);
 
                 success = true;
             }
@@ -102,7 +103,7 @@ namespace PepperDash.Essentials.Core.Config
 
             WriteTimer.Reset(WriteTimeout);
 
-            Debug.Console(1, "Config File write timer has been reset.");
+            Debug.LogMessage(LogEventLevel.Debug, "Config File write timer has been reset.");
         }
 
         /// <summary>
@@ -128,9 +129,9 @@ namespace PepperDash.Essentials.Core.Config
             if (WriteTimer != null)
                 WriteTimer.Stop();
 
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
+            Debug.LogMessage(LogEventLevel.Information, "Writing Configuration to file");
 
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
+            Debug.LogMessage(LogEventLevel.Information, "Attempting to write config file: '{0}'", filePath);
 
             try
             {
@@ -144,12 +145,12 @@ namespace PepperDash.Essentials.Core.Config
                 }
                 else
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
+                    Debug.LogMessage(LogEventLevel.Information, "Unable to enter FileLock");
                 }
             }
             catch (Exception e)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
+                Debug.LogMessage(LogEventLevel.Information, "Error: Config write failed: \r{0}", e);
             }
             finally
             {

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

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 

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

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core
+{
+    public interface ILoadConfig
+    {
+        void GoWithLoad();
+    }
+}

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

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.Config
 {

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

@@ -1,106 +0,0 @@
-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;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class C2NIoController:CrestronGenericBaseDevice, IComPorts, IIROutputPorts, IRelayPorts
-    {
-        private C2nIo _device;
-
-        public C2NIoController(string key, Func<DeviceConfig, C2nIo> preActivationFunc, DeviceConfig config):base(key, config.Name)
-        {
-            AddPreActivationAction(() =>
-            {
-                _device = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_device);
-            });
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _device.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _device.NumberOfComPorts; }
-        }
-
-        #endregion
-
-        #region Implementation of IIROutputPorts
-
-        public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return _device.IROutputPorts; }
-        }
-
-        public int NumberOfIROutputPorts
-        {
-            get { return _device.NumberOfIROutputPorts; }
-        }
-
-        #endregion
-
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _device.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _device.NumberOfRelayPorts; }
-        }
-
-        #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/C2nRts/C2nRthsController.cs

@@ -1,150 +0,0 @@
-extern alias Full;
-
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using Full.Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    [Description("Wrapper class for the C2N-RTHS sensor")]
-    public class C2nRthsController : CrestronGenericBridgeableBaseDevice
-    {
-        private C2nRths _device;
-
-        public IntFeedback TemperatureFeedback { get; private set; }
-        public IntFeedback HumidityFeedback { get; private set; }
-
-        public C2nRthsController(string key, Func<DeviceConfig, C2nRths> preActivationFunc,
-            DeviceConfig config)
-            : base(key, config.Name)
-        {
-
-            AddPreActivationAction(() =>
-            {
-                _device = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_device);
-
-                TemperatureFeedback = new IntFeedback(() => _device.TemperatureFeedback.UShortValue);
-                HumidityFeedback = new IntFeedback(() => _device.HumidityFeedback.UShortValue);
-
-                if (_device != null) _device.BaseEvent += DeviceOnBaseEvent;
-            });
-        }
-
-
-        private void DeviceOnBaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case C2nRths.TemperatureFeedbackEventId:
-                    TemperatureFeedback.FireUpdate();
-                    break;
-                case C2nRths.HumidityFeedbackEventId:
-                    HumidityFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-        public void SetTemperatureFormat(bool setToC)
-        {
-            _device.TemperatureFormat.BoolValue = setToC;
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new C2nRthsControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<C2nRthsControllerJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-
-            trilist.SetBoolSigAction(joinMap.TemperatureFormat.JoinNumber, SetTemperatureFormat);
-
-
-
-            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            TemperatureFeedback.LinkInputSig(trilist.UShortInput[joinMap.Temperature.JoinNumber]);
-            HumidityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Humidity.JoinNumber]);
-
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = Name;
-
-            trilist.OnlineStatusChange += (d, args) =>
-            {
-                if (!args.DeviceOnLine) return;
-
-                UpdateFeedbacksWhenOnline();
-
-                trilist.StringInput[joinMap.Name.JoinNumber].StringValue = Name;
-            };
-        }
-
-        private void UpdateFeedbacksWhenOnline()
-        {
-            IsOnline.FireUpdate();
-            TemperatureFeedback.FireUpdate();
-            HumidityFeedback.FireUpdate();
-        }
-
-        #region PreActivation
-
-        private static C2nRths GetC2nRthsDevice(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 C2nRths", parentKey);
-                return new C2nRths(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 C2nRths", parentKey);
-                return new C2nRths(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-        #endregion
-
-        public class C2nRthsControllerFactory : EssentialsDeviceFactory<C2nRthsController>
-        {
-            public C2nRthsControllerFactory()
-            {
-                TypeNames = new List<string>() { "c2nrths" };
-            }
-
-            public override EssentialsDevice BuildDevice(DeviceConfig dc)
-            {
-                Debug.Console(1, "Factory Attempting to create new C2N-RTHS Device");
-
-                return new C2nRthsController(dc.Key, GetC2nRthsDevice, dc);
-            }
-        }
-    }
-}

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

@@ -1,24 +0,0 @@
-using System;
-using Crestron.SimplSharpProInternal;
-
-namespace PepperDash.Essentials.Core.CrestronIO.Cards
-{
-    public class C3CardControllerBase:CrestronGenericBaseDevice
-    {
-        private readonly C3Card _card;
-
-        public C3CardControllerBase(string key, string name, C3Card hardware) : base(key, name, hardware)
-        {
-            _card = hardware;
-        }
-
-        #region Overrides of Object
-
-        public override string ToString()
-        {
-            return String.Format("{0} {1}", Key, _card.ToString());
-        }
-
-        #endregion
-    }
-}

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

@@ -1,29 +0,0 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.ThreeSeriesCards;
-
-namespace PepperDash.Essentials.Core.CrestronIO.Cards
-{
-    public class C3Com3Controller:C3CardControllerBase, IComPorts
-    {
-        private readonly C3com3 _card;
-
-        public C3Com3Controller(string key, string name, C3com3 hardware) : base(key, name, hardware)
-        {
-            _card = hardware;
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _card.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _card.NumberOfComPorts; }
-        }
-
-        #endregion
-    }
-}

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

@@ -1,29 +0,0 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.ThreeSeriesCards;
-
-namespace PepperDash.Essentials.Core.CrestronIO.Cards
-{
-    public class C3Io16Controller:C3CardControllerBase,IIOPorts
-    {
-        private readonly C3io16 _card;
-
-        public C3Io16Controller(string key, string name, C3io16 hardware) : base(key, name, hardware)
-        {
-            _card = hardware;
-        }
-
-        #region Implementation of IIOPorts
-
-        public CrestronCollection<Versiport> VersiPorts
-        {
-            get { return _card.VersiPorts; }
-        }
-
-        public int NumberOfVersiPorts
-        {
-            get { return _card.NumberOfVersiPorts; }
-        }
-
-        #endregion
-    }
-}

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

@@ -1,29 +0,0 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.ThreeSeriesCards;
-
-namespace PepperDash.Essentials.Core.CrestronIO.Cards
-{
-    public class C3Ir8Controller:C3CardControllerBase, IIROutputPorts
-    {
-        private readonly C3ir8 _card;
-
-        public C3Ir8Controller(string key, string name, C3ir8 hardware) : base(key, name, hardware)
-        {
-            _card = hardware;
-        }
-
-        #region Implementation of IIROutputPorts
-
-        public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return _card.IROutputPorts; }
-        }
-
-        public int NumberOfIROutputPorts
-        {
-            get { return _card.NumberOfIROutputPorts; }
-        }
-
-        #endregion
-    }
-}

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

@@ -1,29 +0,0 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.ThreeSeriesCards;
-
-namespace PepperDash.Essentials.Core.CrestronIO.Cards
-{
-    public class C3Ry16Controller:C3CardControllerBase, IRelayPorts
-    {
-        private readonly C3ry16 _card;
-
-        public C3Ry16Controller(string key, string name, C3ry16 hardware) : base(key, name, hardware)
-        {
-            _card = hardware;
-        }
-
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _card.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _card.NumberOfRelayPorts; }
-        }
-
-        #endregion
-    }
-}

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

@@ -1,29 +0,0 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.ThreeSeriesCards;
-
-namespace PepperDash.Essentials.Core.CrestronIO.Cards
-{
-    public class C3Ry8Controller:C3CardControllerBase, IRelayPorts
-    {
-        private readonly C3ry8 _card;
-
-        public C3Ry8Controller(string key, string name, C3ry8 hardware) : base(key, name, hardware)
-        {
-            _card = hardware;
-        }
-
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _card.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _card.NumberOfRelayPorts; }
-        }
-
-        #endregion
-    }
-}

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

@@ -1,118 +0,0 @@
-extern alias Full;
-
-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
-{
-    [ConfigSnippet("\"properties\":{\"card\":\"c3com3\"}")]
-    public class CenCi31Controller : CrestronGenericBaseDevice
-    {
-        private const string CardKeyTemplate = "{0}-card";
-        private const string CardNameTemplate = "{0}:{1}:{2}";
-        private const uint CardSlot = 1;
-        private readonly CenCi31 _cardCage;
-        private readonly CenCi31Configuration _config;
-
-        private readonly Dictionary<string, Func<CenCi31, uint, C3CardControllerBase>> _cardDict; 
-
-        public CenCi31Controller(string key, string name, CenCi31Configuration config, CenCi31 hardware) : base(key, name, hardware)
-        {
-            _cardCage = hardware;
-
-            _config = config;
-
-            _cardDict = new Dictionary<string, Func<CenCi31, uint, C3CardControllerBase>>
-            {
-                {
-                    "c3com3",
-                    (c, s) =>
-                        new C3Com3Controller(String.Format(CardKeyTemplate, key),
-                            String.Format(CardNameTemplate, key, s, "C3Com3"), new C3com3(_cardCage))
-                },
-                {
-                    "c3io16",
-                    (c, s) =>
-                        new C3Io16Controller(String.Format(CardKeyTemplate, key),
-                            String.Format(CardNameTemplate, key, s,"C3Io16"), new C3io16(_cardCage))
-                },
-                {
-                    "c3ir8",
-                    (c, s) =>
-                        new C3Ir8Controller(String.Format(CardKeyTemplate, key),
-                            String.Format(CardNameTemplate, key, s, "C3Ir8"), new C3ir8(_cardCage))
-                },
-                {
-                    "c3ry16",
-                    (c, s) =>
-                        new C3Ry16Controller(String.Format(CardKeyTemplate, key),
-                            String.Format(CardNameTemplate, key, s, "C3Ry16"), new C3ry16(_cardCage))
-                },
-                {
-                    "c3ry8",
-                    (c, s) =>
-                        new C3Ry8Controller(String.Format(CardKeyTemplate, key),
-                            String.Format(CardNameTemplate, key, s, "C3Ry8"), new C3ry8(_cardCage))
-                },
-
-            };
-
-            GetCards();
-        }
-
-        private void GetCards()
-        {
-            Func<CenCi31, uint, C3CardControllerBase> cardBuilder;
-            
-            if (String.IsNullOrEmpty(_config.Card))
-            {
-                Debug.Console(0, this, "No card specified");
-                return;
-            }
-
-            if (!_cardDict.TryGetValue(_config.Card.ToLower(), out cardBuilder))
-            {
-                Debug.Console(0, "Unable to find factory for 3-Series card type {0}.", _config.Card);
-                return;
-            }
-
-            var device = cardBuilder(_cardCage, CardSlot);
-
-            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/CenCi33Controller.cs

@@ -1,133 +0,0 @@
-extern alias Full;
-
-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
-{
-    [ConfigSnippet("\"properties\":{\"cards\":{\"1\":\"c3com3\",\"2\":\"c3ry16\",\"3\":\"c3ry8\"}}")]
-    public class CenCi33Controller : CrestronGenericBaseDevice
-    {
-        private const string CardKeyTemplate = "{0}-card{1}";
-        private const string CardNameTemplate = "{0}:{1}:{2}";
-        private const uint CardSlots = 3;
-        private readonly CenCi33 _cardCage;
-        private readonly CenCi33Configuration _config;
-
-        private readonly Dictionary<string, Func<CenCi33, uint, C3CardControllerBase>> _cardDict; 
-
-        public CenCi33Controller(string key, string name, CenCi33Configuration config, CenCi33 hardware) : base(key, name, hardware)
-        {
-            _cardCage = hardware;
-
-            _config = config;
-
-            _cardDict = new Dictionary<string, Func<CenCi33, uint, C3CardControllerBase>>
-            {
-                {
-                    "c3com3",
-                    (c, s) =>
-                        new C3Com3Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Com3"), new C3com3(s,_cardCage))
-                },
-                {
-                    "c3io16",
-                    (c, s) =>
-                        new C3Io16Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Io16"), new C3io16(s,_cardCage))
-                },
-                {
-                    "c3ir8",
-                    (c, s) =>
-                        new C3Ir8Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Ir8"), new C3ir8(s,_cardCage))
-                },
-                {
-                    "c3ry16",
-                    (c, s) =>
-                        new C3Ry16Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Ry16"), new C3ry16(s,_cardCage))
-                },
-                {
-                    "c3ry8",
-                    (c, s) =>
-                        new C3Ry8Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Ry8"), new C3ry8(s,_cardCage))
-                },
-
-            };
-
-            GetCards();
-        }
-
-        private void GetCards()
-        {
-            if (_config.Cards == null)
-            {
-                Debug.Console(0, this, "No card configuration for this device found");
-                return;
-            }
-
-            for (uint i = 1; i <= CardSlots; i++)
-            {
-                string cardType;
-                if (!_config.Cards.TryGetValue(i, out cardType))
-                {
-                    Debug.Console(1, this, "No card found for slot {0}", i);
-                    continue;
-                }
-
-                if (String.IsNullOrEmpty(cardType))
-                {
-                    Debug.Console(0, this, "No card specified for slot {0}", i);
-                    return;
-                }
-
-                Func<CenCi33, uint, C3CardControllerBase> cardBuilder;
-                if (!_cardDict.TryGetValue(cardType.ToLower(), out cardBuilder))
-                {
-                    Debug.Console(0, "Unable to find factory for 3-Series card type {0}.", cardType);
-                    return;
-                }
-
-                var device = cardBuilder(_cardCage, i);
-
-                DeviceManager.AddDevice(device);
-            }
-        }
-    }
-
-    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/InternalCardCageController.cs

@@ -1,143 +0,0 @@
-extern alias Full;
-
-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
-{
-    [ConfigSnippet("\"properties\":{\"cards\":{\"1\":\"c3com3\",\"2\":\"c3ry16\",\"3\":\"c3ry8\"}}")]
-    public class InternalCardCageController : EssentialsDevice
-    {
-        private const string CardKeyTemplate = "{0}-card{1}";
-        private const string CardNameTemplate = "{0}:{1}:{2}";
-        private const uint CardSlots = 3;
-    
-        private readonly InternalCardCageConfiguration _config;
-
-        private readonly Dictionary<string, Func<uint, C3CardControllerBase>> _cardDict; 
-
-        public InternalCardCageController(string key, string name, InternalCardCageConfiguration config) : base(key, name)
-        {
-            _config = config;
-
-            _cardDict = new Dictionary<string, Func<uint, C3CardControllerBase>>
-            {
-                {
-                    "c3com3",
-                    (s) =>
-                        new C3Com3Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Com3"), new C3com3(s,Global.ControlSystem))
-                },
-                {
-                    "c3io16",
-                    (s) =>
-                        new C3Io16Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Io16"), new C3io16(s,Global.ControlSystem))
-                },
-                {
-                    "c3ir8",
-                    (s) =>
-                        new C3Ir8Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Ir8"), new C3ir8(s,Global.ControlSystem))
-                },
-                {
-                    "c3ry16",
-                    (s) =>
-                        new C3Ry16Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Ry16"), new C3ry16(s,Global.ControlSystem))
-                },
-                {
-                    "c3ry8",
-                    (s) =>
-                        new C3Ry8Controller(String.Format(CardKeyTemplate, key, s),
-                            String.Format(CardNameTemplate, key, s, "C3Ry8"), new C3ry8(s,Global.ControlSystem))
-                },
-
-            };
-
-            GetCards();
-        }
-
-        private void GetCards()
-        {
-            if (_config.Cards == null)
-            {
-                Debug.Console(0, this, "No card configuration for this device found");
-                return;
-            }
-
-            for (uint i = 1; i <= CardSlots; i++)
-            {
-                string cardType;
-                if (!_config.Cards.TryGetValue(i, out cardType))
-                {
-                    Debug.Console(0, this, "No card found for slot {0}", i);
-                    continue;
-                }
-
-                if (String.IsNullOrEmpty(cardType))
-                {
-                    Debug.Console(0, this, "No card specified for slot {0}", i);
-                    continue;
-                }
-
-                Func<uint, C3CardControllerBase> cardBuilder;
-                if (!_cardDict.TryGetValue(cardType.ToLower(), out cardBuilder))
-                {
-                    Debug.Console(0, "Unable to find factory for 3-Series card type {0}.", cardType);
-                    continue;
-                }
-
-                try
-                {
-                    var device = cardBuilder(i);
-
-
-                    DeviceManager.AddDevice(device);
-                }
-                catch (InvalidOperationException ex)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error,
-                        "Unable to add card {0} to internal card cage.\r\nError Message: {1}\r\nStack Trace: {2}",
-                        cardType, ex.Message, ex.StackTrace);
-                }
-            }
-        }
-    }
-
-    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/DinCenCn/DinCenCnController.cs

@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class DinCenCn2Controller : CrestronGenericBaseDevice, IHasCresnetBranches
-    {
-        private readonly DinCenCn2 _device;
-
-        public CrestronCollection<CresnetBranch> CresnetBranches
-        {
-            get {
-                return _device != null ? _device.Branches : null;
-            }
-        }
-
-        public DinCenCn2Controller(string key, string name, DinCenCn2 device, DeviceConfig config)
-            : base(key, name, device)
-        {
-            _device = device;
-        }
-
-        public class DinCenCn2ControllerFactory : EssentialsDeviceFactory<DinCenCn2Controller>
-        {
-            public DinCenCn2ControllerFactory()
-            {
-                TypeNames = new List<string>() { "dincencn2", "dincencn2poe", "din-cencn2", "din-cencn2-poe" };
-            }
-
-            public override EssentialsDevice BuildDevice(DeviceConfig dc)
-            {
-                Debug.Console(1, "Factory Attempting to create new DIN-CEN-CN2 Device");
-
-                var control = CommFactory.GetControlPropertiesConfig(dc);
-                var ipid = control.IpIdInt;
-
-                if (dc.Type.ToLower().Contains("poe"))
-                {
-                    return new DinCenCn2Controller(dc.Key, dc.Name, new DinCenCn2Poe(ipid, Global.ControlSystem), dc);
-                }
-
-                return new DinCenCn2Controller(dc.Key, dc.Name, new DinCenCn2(ipid, Global.ControlSystem), dc);
-            }
-        }
-    }
-}

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

@@ -1,80 +0,0 @@
-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;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class DinIo8Controller:CrestronGenericBaseDevice, IIOPorts
-    {
-        private DinIo8 _device;
-
-        public DinIo8Controller(string key, Func<DeviceConfig, DinIo8> preActivationFunc, DeviceConfig config):base(key, config.Name)
-        {
-            AddPreActivationAction(() =>
-            {
-                _device = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_device);
-            });
-        }
-
-        #region Implementation of IIOPorts
-
-        public CrestronCollection<Versiport> VersiPorts
-        {
-            get { return _device.VersiPorts; }
-        }
-
-        public int NumberOfVersiPorts
-        {
-            get { return _device.NumberOfVersiPorts; }
-        }
-
-        #endregion
-
-
-    }
-
-    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,69 +0,0 @@
-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
-{
-    /// <summary>
-    /// Wrapper class for CEN-IO-DIGIN-104 digital input module
-    /// </summary>
-    [Description("Wrapper class for the CEN-IO-DIGIN-104 diginal input module")]
-    public class CenIoDigIn104Controller : CrestronGenericBaseDevice, IDigitalInputPorts
-    {
-        public CenIoDi104 Di104 { get; private set; }
-
-        public CenIoDigIn104Controller(string key, string name, CenIoDi104 di104)
-            : base(key, name)
-        {
-            Di104 = di104;
-        }
-
-        #region IDigitalInputPorts Members
-
-        public CrestronCollection<DigitalInput> DigitalInputPorts
-        {
-            get { return Di104.DigitalInputPorts; }
-        }
-
-        public int NumberOfDigitalInputPorts
-        {
-            get { return Di104.NumberOfDigitalInputPorts; }
-        }
-
-        #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/Ir/CenIoIr104Controller.cs

@@ -1,93 +0,0 @@
-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
-{
-    /// <summary>
-    /// Wrapper class for CEN-IO-IR-104 module
-    /// </summary>
-    [Description("Wrapper class for the CEN-IO-IR-104 module")]
-    public class CenIoIr104Controller : CrestronGenericBaseDevice, IIROutputPorts
-    {
-	    private readonly CenIoIr104 _ir104;
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="ir104"></param>
-        public CenIoIr104Controller(string key, string name, CenIoIr104 ir104)
-            : base(key, name, ir104)
-        {
-            _ir104 = ir104;
-        }
-
-        #region IDigitalInputPorts Members
-
-		/// <summary>
-		/// IR port collection
-		/// </summary>
-		public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return _ir104.IROutputPorts; }
-        }
-
-		/// <summary>
-		/// Number of relay ports property
-		/// </summary>
-		public int NumberOfIROutputPorts
-        {
-            get { return _ir104.NumberOfIROutputPorts; }
-        }
-
-        #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/Relay/CenIoRy104Controller.cs

@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Wrapper class for CEN-IO-RY-104 relay module
-    /// </summary>
-    [Description("Wrapper class for the CEN-IO-RY-104 relay module")]
-    public class CenIoRy104Controller : CrestronGenericBaseDevice, IRelayPorts
-    {
-        private readonly CenIoRy104 _ry104;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="ry104"></param>
-        public CenIoRy104Controller(string key, string name, CenIoRy104 ry104)
-            : base(key, name, ry104)
-        {
-            _ry104 = ry104;
-        }
-
-        /// <summary>
-        /// Relay port collection
-        /// </summary>
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _ry104.RelayPorts; }
-        }
-    
-        /// <summary>
-        /// Number of relay ports property
-        /// </summary>
-        public int NumberOfRelayPorts
-        {
-            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/StatusSign/StatusSignController.cs

@@ -1,225 +0,0 @@
-extern alias Full;
-
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using Full.Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    [Description("Wrapper class for the Crestron StatusSign device")]
-    public class StatusSignController : CrestronGenericBridgeableBaseDevice
-    {
-        private StatusSign _device;
-
-        public BoolFeedback RedLedEnabledFeedback { get; private set; }
-        public BoolFeedback GreenLedEnabledFeedback { get; private set; }
-        public BoolFeedback BlueLedEnabledFeedback { get; private set; }
-
-        public IntFeedback RedLedBrightnessFeedback { get; private set; }
-        public IntFeedback GreenLedBrightnessFeedback { get; private set; }
-        public IntFeedback BlueLedBrightnessFeedback { get; private set; }
-
-        public StatusSignController(string key, Func<DeviceConfig, StatusSign> preActivationFunc, DeviceConfig config) : base(key, config.Name)
-        {
-            AddPreActivationAction(() =>
-            {
-                _device = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_device);
-
-                RedLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint)StatusSign.Led.eLedColor.Red]
-                            .ControlFeedback.BoolValue);
-                GreenLedEnabledFeedback =
-                    new BoolFeedback(
-                        () =>
-                            _device.Leds[(uint)StatusSign.Led.eLedColor.Green]
-                                .ControlFeedback.BoolValue);
-                BlueLedEnabledFeedback =
-                    new BoolFeedback(
-                        () =>
-                            _device.Leds[(uint)StatusSign.Led.eLedColor.Blue]
-                                .ControlFeedback.BoolValue);
-
-                RedLedBrightnessFeedback =
-                    new IntFeedback(() => (int)_device.Leds[(uint)StatusSign.Led.eLedColor.Red].BrightnessFeedback);
-                GreenLedBrightnessFeedback =
-                    new IntFeedback(() => (int)_device.Leds[(uint)StatusSign.Led.eLedColor.Green].BrightnessFeedback);
-                BlueLedBrightnessFeedback =
-                    new IntFeedback(() => (int)_device.Leds[(uint)StatusSign.Led.eLedColor.Blue].BrightnessFeedback);
-
-                if (_device != null) _device.BaseEvent += _device_BaseEvent;
-
-            });
-        }
-
-        void _device_BaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case StatusSign.LedBrightnessFeedbackEventId:
-                    RedLedBrightnessFeedback.FireUpdate();
-                    GreenLedBrightnessFeedback.FireUpdate();
-                    BlueLedBrightnessFeedback.FireUpdate();
-                    break;
-                case StatusSign.LedControlFeedbackEventId:
-                    RedLedEnabledFeedback.FireUpdate();
-                    GreenLedEnabledFeedback.FireUpdate();
-                    BlueLedEnabledFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-        public void EnableLedControl(bool red, bool green, bool blue)
-        {
-            _device.Leds[(uint) StatusSign.Led.eLedColor.Red].Control.BoolValue = red;
-            _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Control.BoolValue = green;
-            _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Control.BoolValue = blue;
-        }
-
-        public void SetColor(uint red, uint green, uint blue)
-        {
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Red].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(red);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Red LED brightness. value: {0}", red);
-            }
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(green);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Green LED brightness. value: {0}", green);
-            }
-
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(blue);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Blue LED brightness. value: {0}", blue);
-            }
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new StatusSignControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<StatusSignControllerJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            trilist.SetBoolSigAction(joinMap.RedControl.JoinNumber, b => EnableControl(trilist, joinMap, this));
-            trilist.SetBoolSigAction(joinMap.GreenControl.JoinNumber, b => EnableControl(trilist, joinMap, this));
-            trilist.SetBoolSigAction(joinMap.BlueControl.JoinNumber, b => EnableControl(trilist, joinMap, this));
-
-            trilist.SetUShortSigAction(joinMap.RedLed.JoinNumber, u => SetColor(trilist, joinMap, this));
-            trilist.SetUShortSigAction(joinMap.GreenLed.JoinNumber, u => SetColor(trilist, joinMap, this));
-            trilist.SetUShortSigAction(joinMap.BlueLed.JoinNumber, u => SetColor(trilist, joinMap, this));
-
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = Name;
-
-            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            RedLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RedControl.JoinNumber]);
-            BlueLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.BlueControl.JoinNumber]);
-            GreenLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.GreenControl.JoinNumber]);
-
-            RedLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.RedLed.JoinNumber]);
-            BlueLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.BlueLed.JoinNumber]);
-            GreenLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.GreenLed.JoinNumber]);
-        }
-
-        private static void EnableControl(BasicTriList triList, StatusSignControllerJoinMap joinMap,
-            StatusSignController device)
-        {
-            var redEnable = triList.BooleanOutput[joinMap.RedControl.JoinNumber].BoolValue;
-            var greenEnable = triList.BooleanOutput[joinMap.GreenControl.JoinNumber].BoolValue;
-            var blueEnable = triList.BooleanOutput[joinMap.BlueControl.JoinNumber].BoolValue;
-            device.EnableLedControl(redEnable, greenEnable, blueEnable);
-        }
-
-        private static void SetColor(BasicTriList triList, StatusSignControllerJoinMap joinMap,
-            StatusSignController device)
-        {
-            var redBrightness = triList.UShortOutput[joinMap.RedLed.JoinNumber].UShortValue;
-            var greenBrightness = triList.UShortOutput[joinMap.GreenLed.JoinNumber].UShortValue;
-            var blueBrightness = triList.UShortOutput[joinMap.BlueLed.JoinNumber].UShortValue;
-
-            device.SetColor(redBrightness, greenBrightness, blueBrightness);
-        }
-
-        #region PreActivation
-
-        private static StatusSign GetStatusSignDevice(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 StatusSign", parentKey);
-                return new StatusSign(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 StatusSign", parentKey);
-                return new StatusSign(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-        #endregion
-
-        public class StatusSignControllerFactory : EssentialsDeviceFactory<StatusSignController>
-        {
-            public StatusSignControllerFactory()
-            {
-                TypeNames = new List<string>() { "statussign" };
-            }
-
-            public override EssentialsDevice BuildDevice(DeviceConfig dc)
-            {
-                Debug.Console(1, "Factory Attempting to create new StatusSign Device");
-
-                var control = CommFactory.GetControlPropertiesConfig(dc);
-                var cresnetId = control.CresnetIdInt;
-
-                return new StatusSignController(dc.Key, GetStatusSignDevice, dc);
-            }
-        }
-    }
-
-    
-}

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

@@ -5,12 +5,10 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Core.JsonStandardObjects;
 using PepperDash.Essentials.Core.Bridges;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// A bridge class to cover the basic features of GenericBase hardware
-	/// </summary>
 	public abstract class CrestronGenericBaseDevice : EssentialsDevice, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
 	{
 	    protected GenericBase Hardware;
@@ -68,17 +66,17 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public override bool CustomActivate()
 		{
-            Debug.Console(0, this, "Activating");
+            Debug.LogMessage(LogEventLevel.Information, this, "Activating");
             if (!PreventRegistration)
             {
-                //Debug.Console(1, this, "  Does not require registration. Skipping");
+                //Debug.LogMessage(LogEventLevel.Debug, this, "  Does not require registration. Skipping");
 
                 if (Hardware.Registerable && !Hardware.Registered)
                 {
                     var response = Hardware.RegisterWithLogging(Key);
                     if (response != eDeviceRegistrationUnRegistrationResponse.Success)
                     {
-                        //Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+                        //Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Crestron device: {0}", response);
                         return false;
                     }
                 }
@@ -144,7 +142,7 @@ namespace PepperDash.Essentials.Core
 
 		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
 		{
-            Debug.Console(2, this, "OnlineStatusChange Event.  Online = {0}", args.DeviceOnLine);
+            Debug.LogMessage(LogEventLevel.Verbose, this, "OnlineStatusChange Event.  Online = {0}", args.DeviceOnLine);
 
             if (!Hardware.Registered)
             {
@@ -201,12 +199,11 @@ namespace PepperDash.Essentials.Core
 		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);
+			
+			Debug.LogMessage(LogEventLevel.Information, "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);
+			//    Debug.LogMessage(LogEventLevel.Information, "Cannot register device '{0}': {1}", key, result);
 			//}
 			return result;
 		}

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

@@ -38,16 +38,16 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public override bool CustomActivate()
 		{
-            Debug.Console(0, this, "Activating");
+            Debug.LogMessage(LogEventLevel.Information, this, "Activating");
             var response = Hardware.RegisterWithLogging(Key);
             if (response != eDeviceRegistrationUnRegistrationResponse.Success)
             {
 <<<<<<< HEAD
-				Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+				Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Crestron device: {0}", response);
 				return false;
 			}
 =======
-                Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+                Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Crestron device: {0}", response);
                 return false;
             }
 >>>>>>> origin/feature/ecs-342-neil
@@ -119,7 +119,7 @@ namespace PepperDash.Essentials.Core
 			var result = device.Register();
 			if (result != eDeviceRegistrationUnRegistrationResponse.Success)
 			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
+				Debug.LogMessage(LogEventLevel.Information, "Cannot register device '{0}': {1}", key, result);
 			}
 			return result;
 		}

src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,10 +7,11 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core.CrestronIO
@@ -67,7 +68,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsDigitalInput)
                 {
-                    Debug.Console(0, "GetDigitalInput: Processor does not support Digital Inputs");
+                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Processor does not support Digital Inputs");
                     return null;
                 }
                 ioPortDevice = Global.ControlSystem;
@@ -77,20 +78,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IDigitalInputPorts;
                 if (ioPortDev == null)
                 {
-                    Debug.Console(0, "GetDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
                     return null;
                 }
                 ioPortDevice = ioPortDev;
             }
             if (ioPortDevice == null)
             {
-                Debug.Console(0, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
+                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfDigitalInputPorts)
             {
-                Debug.Console(0, "GetDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             }
 
             return ioPortDevice.DigitalInputPorts[dc.PortNumber];
@@ -117,20 +118,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.Console(1, this, "Error: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -147,7 +148,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new Generic Digital Input Device");
+                Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,10 +7,11 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
@@ -48,7 +49,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
                 if (RelayOutput == null)
                 {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Unable to get parent relay device for device key {0} and port {1}", config.PortDeviceKey, config.PortNumber);
+                    Debug.LogMessage(LogEventLevel.Information, this, "Unable to get parent relay device for device key {0} and port {1}", config.PortDeviceKey, config.PortNumber);
                     return;
                 }
 
@@ -69,7 +70,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsRelay)
                 {
-                    Debug.Console(0, "Processor does not support relays");
+                    Debug.LogMessage(LogEventLevel.Information, "Processor does not support relays");
                     return null;
                 }
                 relayDevice = Global.ControlSystem;
@@ -80,7 +81,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             var essentialsDevice = DeviceManager.GetDeviceForKey(dc.PortDeviceKey);
             if (essentialsDevice == null)
             {
-                Debug.Console(0, "Device {0} was not found in Device Manager. Check configuration or for errors with device.", dc.PortDeviceKey);
+                Debug.LogMessage(LogEventLevel.Information, "Device {0} was not found in Device Manager. Check configuration or for errors with device.", dc.PortDeviceKey);
                 return null;
             }
 
@@ -88,7 +89,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             
             if (relayDevice == null)
             {
-                Debug.Console(0, "Device {0} is not a valid relay parent. Please check configuration.", dc.PortDeviceKey);
+                Debug.LogMessage(LogEventLevel.Information, "Device {0} is not a valid relay parent. Please check configuration.", dc.PortDeviceKey);
                 return null;
             }
 
@@ -97,7 +98,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 return relayDevice.RelayPorts[dc.PortNumber];
             }
 
-            Debug.Console(0, "Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+            Debug.LogMessage(LogEventLevel.Information, "Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             return null;
         }
 
@@ -165,16 +166,16 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             if (RelayOutput == null)
             {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Relay is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Relay is null", Key);
                 return;
             }
 
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             trilist.SetBoolSigAction(joinMap.Relay.JoinNumber, b =>
             {
@@ -202,7 +203,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new Generic Relay Device");
+                Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Relay Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,8 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
@@ -59,7 +60,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
                 InputPort.VersiportChange += InputPort_VersiportChange;
 
-                Debug.Console(1, this, "Created GenericVersiportAnalogInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportAnalogInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
 
             });
 
@@ -76,7 +77,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.Console(1, this, "Versiport change: {0}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
             if(args.Event == eVersiportEvent.AnalogInChange)
                 InputValueFeedback.FireUpdate();
@@ -102,12 +103,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputValueFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputValue.JoinNumber]);
@@ -117,8 +118,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.Console(1, this, "Error: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
 
             trilist.OnlineStatusChange += (d, args) =>
@@ -147,7 +148,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.Console(0, "GetVersiportAnalogInput: Processor does not support Versiports");
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Processor does not support Versiports");
                     return null;
                 }
                 ioPortDevice = Global.ControlSystem;
@@ -157,25 +158,25 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
                 if (ioPortDev == null)
                 {
-                    Debug.Console(0, "GetVersiportAnalogInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} is not a valid device", dc.PortDeviceKey);
                     return null;
                 }
                 ioPortDevice = ioPortDev;
             }
             if (ioPortDevice == null)
             {
-                Debug.Console(0, "GetVersiportAnalogInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.Console(0, "GetVersiportAnalogInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
             if(!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
             {
-                Debug.Console(0, "GetVersiportAnalogInput: Device {0} does not support AnalogInput on port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not support AnalogInput on port {1}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
 
@@ -196,7 +197,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,8 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
@@ -53,7 +54,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
 
 
-                Debug.Console(1, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
 
             });
 
@@ -61,7 +62,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.Console(1, this, "Versiport change: {0}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
             if(args.Event == eVersiportEvent.DigitalInChange)
                 InputStateFeedback.FireUpdate();
@@ -85,20 +86,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.Console(1, this, "Error: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -114,7 +115,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.Console(0, "GetVersiportDigitalInput: Processor does not support Versiports");
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Processor does not support Versiports");
                     return null;
                 }
                 ioPortDevice = Global.ControlSystem;
@@ -124,20 +125,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
                 if (ioPortDev == null)
                 {
-                    Debug.Console(0, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
                     return null;
                 }
                 ioPortDevice = ioPortDev;
             }
             if (ioPortDevice == null)
             {
-                Debug.Console(0, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.Console(0, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             }
 
             return ioPortDevice.VersiPorts[dc.PortNumber];
@@ -156,7 +157,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,8 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
@@ -48,7 +49,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
                 if (!OutputPort.SupportsDigitalOutput)
                 {
-                    Debug.Console(0, this, "Device does not support configuration as a Digital Output");
+                    Debug.LogMessage(LogEventLevel.Information, this, "Device does not support configuration as a Digital Output");
                     return;
                 }
 
@@ -63,7 +64,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         void OutputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.Console(1, this, "Versiport change: {0}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
             if(args.Event == eVersiportEvent.DigitalOutChange)
                 OutputStateFeedback.FireUpdate();
@@ -77,14 +78,14 @@ namespace PepperDash.Essentials.Core.CrestronIO
         {
                 if (OutputPort.SupportsDigitalOutput)
                 {
-                    Debug.Console(0, this, "Passed the Check");
+                    Debug.LogMessage(LogEventLevel.Information, this, "Passed the Check");
 
                     OutputPort.DigitalOut = state;
 
                 }
                 else
                 {
-                    Debug.Console(0, this, "Versiport does not support Digital Output Mode");
+                    Debug.LogMessage(LogEventLevel.Information, this, "Versiport does not support Digital Output Mode");
                 }
 
         }
@@ -106,12 +107,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 OutputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OutputState.JoinNumber]);
@@ -119,8 +120,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.Console(1, this, "Error: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -136,7 +137,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 {
                     if (!Global.ControlSystem.SupportsVersiport)
                     {
-                        Debug.Console(0, "GetVersiportDigitalOuptut: Processor does not support Versiports");
+                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Processor does not support Versiports");
                         return null;
                     }
                     ioPortDevice = Global.ControlSystem;
@@ -146,20 +147,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
                     var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
                     if (ioPortDev == null)
                     {
-                        Debug.Console(0, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
+                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
                         return null;
                     }
                     ioPortDevice = ioPortDev;
                 }
                 if (ioPortDevice == null)
                 {
-                    Debug.Console(0, "GetVersiportDigitalOuptut: Device '0' is not a valid IOPorts Device", dc.PortDeviceKey);
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device '0' is not a valid IOPorts Device", dc.PortDeviceKey);
                     return null;
                 }
 
                 if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
                 {
-                    Debug.Console(0, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
                 }
                 var port = ioPortDevice.VersiPorts[dc.PortNumber];
                 return port;
@@ -177,7 +178,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

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

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using PepperDash.Core;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+using Serilog.Events;
+
+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.LogMessage(LogEventLevel.Verbose, "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.LogMessage(LogEventLevel.Information, "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.LogMessage(LogEventLevel.Information, "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.LogMessage(LogEventLevel.Information, "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.LogMessage(LogEventLevel.Information, "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/IHasBranding.cs

@@ -7,14 +7,4 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         bool BrandingEnabled { get; }
         void InitializeBranding(string roomKey);
     }
-}
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
-    public interface IHasBranding
-    {
-        bool BrandingEnabled { get; }
-        void InitializeBranding(string roomKey);
-    }
 }

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

@@ -0,0 +1,22 @@
+using PepperDash.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+
+    /// <summary>
+    /// Describes a device that has selectable inputs
+    /// </summary>
+    /// <typeparam name="TKey">the type to use as the key for each input item. Most likely an enum or string</typeparam>\
+    /// <example>
+    /// See MockDisplay for example implemntation
+    /// </example>
+    public interface IHasInputs<T, TSelector>: IKeyName
+    {
+        ISelectableItems<T> Inputs { get; }
+    }
+}

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

@@ -12,18 +12,4 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         void EndPhoneCall();
         void SendDtmfToPhone(string digit);
     }
-}
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
-    public interface IHasPhoneDialing
-    {
-        BoolFeedback PhoneOffHookFeedback { get; }
-        StringFeedback CallerIdNameFeedback { get; }
-        StringFeedback CallerIdNumberFeedback { get; }
-        void DialPhoneCall(string number);
-        void EndPhoneCall();
-        void SendDtmfToPhone(string digit);
-    }
 }

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

@@ -0,0 +1,20 @@
+using PepperDash.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    /// <summary>
+    /// Describes a device that has selectable surround sound modes
+    /// </summary>
+    /// <typeparam name="TKey">the type to use as the key for each input item. Most likely an enum or string</typeparam>
+    public interface IHasSurroundSoundModes<TKey, TSelector>: IKeyName
+    {
+        ISelectableItems<TKey> SurroundSoundModes { get; }
+
+        void SetSurroundSoundMode(TSelector selector);
+    }
+}

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

@@ -16,20 +16,3 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         List<LanguageLabel> RoomNames { get; set; } 
     }
 }
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
-    public interface ILanguageDefinition
-    {
-        string LocaleName { get; set; }
-        string FriendlyName { get; set; }
-        bool Enable { get; set; }
-        List<LanguageLabel> UiLabels { get; set; }
-        List<LanguageLabel> Sources { get; set; }
-        List<LanguageLabel> Destinations { get; set; }
-        List<LanguageLabel> SourceGroupNames { get; set; }
-        List<LanguageLabel> DestinationGroupNames { get; set; }
-        List<LanguageLabel> RoomNames { get; set; }
-    }
-}

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

@@ -11,15 +11,3 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     }
 
 }
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
-    public interface ILanguageProvider
-    {
-        ILanguageDefinition CurrentLanguage { get; set; }
-
-        event EventHandler CurrentLanguageChanged;
-    }
-
-}

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

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface ILevelControls
+    {
+        Dictionary<string, IBasicVolumeWithFeedback> LevelControlPoints { get; }
+    }
+}

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

@@ -1,9 +1,18 @@
 using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
+    /// Use this interface on a device or room if it uses custom Mobile Control messengers
+    /// </summary>
+    public interface ICustomMobileControl : IKeyed
+    {
+    }
+
+    /*/// <summary>
     /// Describes a MobileControlSystemController
     /// </summary>
     public interface IMobileControl : IKeyed
@@ -11,20 +20,61 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
-    }
+    }*/
 
     /// <summary>
     /// Describes a MobileSystemController that accepts IEssentialsRoom
     /// </summary>
-    public interface IMobileControl3 : IMobileControl
+    public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+        string Host { get; }
+
+        string ClientAppUrl { get; }
+
+        string SystemUuid { get; }
+
+        BoolFeedback ApiOnlineAndAuthorized { get;}
+
+        void SendMessageObject(IMobileControlMessage o);
+
+        void AddAction<T>(T messenger, Action<string, string, JToken> action) where T:IMobileControlMessenger;
+
+        void RemoveAction(string key);
+
+        void AddDeviceMessenger(IMobileControlMessenger messenger);
+
+        bool CheckForDeviceMessenger(string key);
+    }
+
+    /// <summary>
+    /// Describes a mobile control messenger
+    /// </summary>
+    public interface IMobileControlMessenger: IKeyed
+    {
+        IMobileControl AppServerController { get; }
+        string MessagePath { get; }
+
+        string DeviceKey { get; }
+        void RegisterWithAppServer(IMobileControl appServerController);
+    }
+
+    public interface IMobileControlMessage
+    {
+        [JsonProperty("type")]
+        string Type { get; }
+
+        [JsonProperty("clientId", NullValueHandling = NullValueHandling.Ignore)]
+        string ClientId { get; }
+
+        [JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
+        JToken Content { get; }
+
     }
 
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>
-    public interface IMobileControlRoomBridge : IKeyed
+    public interface IMobileControlRoomMessenger : IKeyed
     {
         event EventHandler<EventArgs> UserCodeChanged;
 
@@ -32,6 +82,8 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 
         event EventHandler<EventArgs> ClientJoined;
 
+        event EventHandler<EventArgs> AppUrlChanged;
+
         string UserCode { get; }
 
         string QrCodeUrl { get; }
@@ -41,5 +93,24 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         string McServerUrl { get; }
 
         string RoomName { get; }
+
+        string AppUrl { get; }
+
+        void UpdateAppUrl(string url);
+    }
+
+    public interface IMobileControlAction
+    {
+       IMobileControlMessenger Messenger { get; }
+
+       Action<string,string, JToken> Action { get; }
+    }
+
+    public interface IMobileControlTouchpanelController : IKeyed
+    {
+        string DefaultRoomKey { get; }
+        void SetAppUrl(string url);
+        bool UseDirectServer { get; }
+        bool ZoomRoomController { get; }
     }
 }

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

@@ -13,17 +13,6 @@ using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// Defines the ability to power a device on and off
-	/// </summary>
-    [Obsolete("Will be replaced by IHasPowerControlWithFeedback")]
-	public interface IPower
-	{
-		void PowerOn();
-		void PowerOff();
-		void PowerToggle();
-        BoolFeedback PowerIsOnFeedback { get; }
-	}
 
     /// <summary>
     /// Adds feedback for current power state

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

@@ -0,0 +1,27 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+	/// <summary>
+	/// Defines a class that has warm up and cool down
+	/// </summary>
+	public interface IProjectorScreenLiftControl
+	{
+		void Raise();
+		void Lower();
+		BoolFeedback IsInUpPosition { get; }
+		bool InUpPosition { get; }
+		event EventHandler<EventArgs> PositionChanged;
+		string DisplayDeviceKey { get; }
+		eScreenLiftControlType Type { get; } // screen/lift
+	}
+
+	public enum eScreenLiftControlType
+	{
+		lift,
+		screen
+	}
+}

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

@@ -0,0 +1,19 @@
+using System;
+using Newtonsoft.Json;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+
+    /// <summary>
+    /// Describes an item that can be selected
+    /// </summary>
+    public interface ISelectableItem : IKeyName
+    {
+        event EventHandler ItemUpdated;
+
+        [JsonProperty("isSelected")]
+        bool IsSelected { get; set;  }
+        void Select();
+    }
+}

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

@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    /// <summary>
+    /// Describes a collection of items that can be selected
+    /// </summary>
+    /// <typeparam name="TKey">type for the keys in the collection.  Probably a string or enum</typeparam>
+    public interface ISelectableItems<TKey>
+    {
+        event EventHandler ItemsUpdated;
+        event EventHandler CurrentItemChanged;
+
+        [JsonProperty("items")]
+        Dictionary<TKey, ISelectableItem> Items { get; set; }
+
+        [JsonProperty("currentItem")]
+        TKey CurrentItem { get; set; }
+    }
+}

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

@@ -10,16 +10,4 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         public string DisplayText { get; set; }
         public uint JoinNumber { get; set; }
     }
-}
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
-    public class LanguageLabel
-    {
-        public string Key { get; set; }
-        public string Description { get; set; }
-        public string DisplayText { get; set; }
-        public uint JoinNumber { get; set; }
-    }
 }

src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.CrestronIO;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Devices
 {
@@ -45,7 +46,7 @@ namespace PepperDash.Essentials.Core.Devices
             }
             catch (Exception e)
             {
-                Debug.Console(1, this, "Error Getting Relays from processor:\n '{0}'", e);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error Getting Relays from processor:\n '{0}'", e);
             }
         }
     }

src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs

@@ -1,6 +1,6 @@
-extern alias Full;
+
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core
@@ -52,5 +52,11 @@ namespace PepperDash.Essentials.Core
 
         [JsonProperty("sinkType")]
         public eRoutingSignalType SinkType { get; set; }
+
+        [JsonProperty("isCodecContentDestination")]
+        public bool isCodecContentDestination { get; set; }
+
+        [JsonProperty("isProgramAudioDestination")]
+        public bool isProgramAudioDestination { get; set; }
     }
 }

src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections;
@@ -7,9 +7,10 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core
@@ -147,7 +148,7 @@ namespace PepperDash.Essentials.Core
             }
             else
             {
-                Debug.Console(1, "Unable to find Property: {0} on Device with path: {1}", propertyName, deviceObjectPath);
+                Debug.LogMessage(LogEventLevel.Debug, "Unable to find Property: {0} on Device with path: {1}", propertyName, deviceObjectPath);
                 return null;
             }
         }
@@ -198,7 +199,7 @@ namespace PepperDash.Essentials.Core
 			var dev = DeviceManager.GetDeviceForKey(path[0]);
 			if (dev == null)
 			{
-				Debug.Console(0, "Device {0} not found", path[0]);
+				Debug.LogMessage(LogEventLevel.Information, "Device {0} not found", path[0]);
 				return null;
 			}
 
@@ -216,20 +217,20 @@ namespace PepperDash.Essentials.Core
 						var indexClose = objName.IndexOf(']');
 						if (indexClose == -1)
 						{
-							Debug.Console(0, dev, "ERROR Unmatched index brackets");
+							Debug.LogMessage(LogEventLevel.Information, dev, "ERROR Unmatched index brackets");
 							return null;
 						}
 						// Get the index and strip quotes if any
 						indexStr = objName.Substring(indexOpen + 1, indexClose - indexOpen - 1).Replace("\"", "");
 						objName = objName.Substring(0, indexOpen);
-						Debug.Console(0, dev, "  Checking for collection '{0}', index '{1}'", objName, indexStr);
+						Debug.LogMessage(LogEventLevel.Information, dev, "  Checking for collection '{0}', index '{1}'", objName, indexStr);
 					}
 
 					CType oType = obj.GetType();
 					var prop = oType.GetProperty(objName);
 					if (prop == null)
 					{
-						Debug.Console(0, dev, "Property {0} not found on {1}", objName, path[i - 1]);
+						Debug.LogMessage(LogEventLevel.Information, dev, "Property {0} not found on {1}", objName, path[i - 1]);
 						return null;
 					}
 					// if there's an index, try to get the property
@@ -237,7 +238,7 @@ namespace PepperDash.Essentials.Core
 					{
 						if (!typeof(ICollection).IsAssignableFrom(prop.PropertyType))
 						{
-							Debug.Console(0, dev, "Property {0} is not collection", objName);
+							Debug.LogMessage(LogEventLevel.Information, dev, "Property {0} is not collection", objName);
 							return null;
 						}
 						var collection = prop.GetValue(obj, null) as ICollection;
@@ -247,7 +248,7 @@ namespace PepperDash.Essentials.Core
 						var indexParams = indexedPropInfo.GetIndexParameters();
 						if (indexParams.Length > 0)
 						{
-							Debug.Console(0, "  Indexed, param type: {0}", indexParams[0].ParameterType.Name);
+							Debug.LogMessage(LogEventLevel.Information, "  Indexed, param type: {0}", indexParams[0].ParameterType.Name);
 							var properParam = Convert.ChangeType(indexStr, indexParams[0].ParameterType,
 								System.Globalization.CultureInfo.InvariantCulture);
 							try
@@ -258,9 +259,9 @@ namespace PepperDash.Essentials.Core
 							catch (Crestron.SimplSharp.Reflection.TargetInvocationException e)
 							{
 								if (e.InnerException is ArgumentOutOfRangeException)
-									Debug.Console(0, "  Index Out of range");
+									Debug.LogMessage(LogEventLevel.Information, "  Index Out of range");
 								else if (e.InnerException is KeyNotFoundException)
-									Debug.Console(0, "  Key not found");
+									Debug.LogMessage(LogEventLevel.Information, "  Key not found");
 								return null;
 							}
 						}

src/PepperDash.Essentials.Core/Devices/DeviceManager.cs

@@ -7,6 +7,7 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core
@@ -63,7 +64,7 @@ namespace PepperDash.Essentials.Core
 		        DeviceCriticalSection.Enter();
                 AddDeviceEnabled = false;
 		        // PreActivate all devices
-                Debug.Console(0,"****PreActivation starting...****");
+                Debug.LogMessage(LogEventLevel.Information,"****PreActivation starting...****");
 		        foreach (var d in Devices.Values)
 		        {
 		            try
@@ -73,12 +74,12 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-                        Debug.Console(0, d, "ERROR: Device {1} PreActivation failure: {0}", e.Message, d.Key);
-                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+                        Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} PreActivation failure: {0}", e.Message, d.Key);
+                        Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
 		            }
 		        }
-                Debug.Console(0, "****PreActivation complete****");
-		        Debug.Console(0, "****Activation starting...****");
+                Debug.LogMessage(LogEventLevel.Information, "****PreActivation complete****");
+		        Debug.LogMessage(LogEventLevel.Information, "****Activation starting...****");
 
 		        // Activate all devices
 		        foreach (var d in Devices.Values)
@@ -90,13 +91,13 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-                        Debug.Console(0, d, "ERROR: Device {1} Activation failure: {0}", e.Message, d.Key);
-                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+                        Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} Activation failure: {0}", e.Message, d.Key);
+                        Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
 		            }
 		        }
 
-                Debug.Console(0, "****Activation complete****");
-                Debug.Console(0, "****PostActivation starting...****");
+                Debug.LogMessage(LogEventLevel.Information, "****Activation complete****");
+                Debug.LogMessage(LogEventLevel.Information, "****PostActivation starting...****");
 
 		        // PostActivate all devices
 		        foreach (var d in Devices.Values)
@@ -108,12 +109,12 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-		                Debug.Console(0, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
-		                Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
+		                Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
 		            }
 		        }
 
-                Debug.Console(0, "****PostActivation complete****");
+                Debug.LogMessage(LogEventLevel.Information, "****PostActivation complete****");
 
                 OnAllDevicesActivated();
 		    }
@@ -183,14 +184,14 @@ namespace PepperDash.Essentials.Core
 
 	    private static void ListDevices(string s)
 	    {
-	        Debug.Console(0, "{0} Devices registered with Device Manager:", Devices.Count);
+	        Debug.LogMessage(LogEventLevel.Information, "{0} Devices registered with Device Manager:", Devices.Count);
 	        var sorted = Devices.Values.ToList();
 	        sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
 
 	        foreach (var d in sorted)
 	        {
 	            var name = d is IKeyName ? (d as IKeyName).Name : "---";
-	            Debug.Console(0, "  [{0}] {1}", d.Key, name);
+	            Debug.LogMessage(LogEventLevel.Information, "  [{0}] {1}", d.Key, name);
 	        }
 	    }
 
@@ -199,13 +200,13 @@ namespace PepperDash.Essentials.Core
 	        var dev = GetDeviceForKey(devKey);
 	        if (dev == null)
 	        {
-	            Debug.Console(0, "Device '{0}' not found", devKey);
+	            Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
 	            return;
 	        }
 	        var statusDev = dev as IHasFeedback;
 	        if (statusDev == null)
 	        {
-	            Debug.Console(0, "Device '{0}' does not have visible feedbacks", devKey);
+	            Debug.LogMessage(LogEventLevel.Information, "Device '{0}' does not have visible feedbacks", devKey);
 	            return;
 	        }
 	        statusDev.DumpFeedbacksToConsole(true);
@@ -216,10 +217,10 @@ namespace PepperDash.Essentials.Core
         //    var dev = GetDeviceForKey(devKey);
         //    if (dev == null)
         //    {
-        //        Debug.Console(0, "Device '{0}' not found", devKey);
+        //        Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
         //        return;
         //    }
-        //    Debug.Console(0, "This needs to be reworked.  Stay tuned.", devKey);
+        //    Debug.LogMessage(LogEventLevel.Information, "This needs to be reworked.  Stay tuned.", devKey);
         //}
 
 	    private static void ListDeviceCommStatuses(string input)
@@ -236,7 +237,7 @@ namespace PepperDash.Essentials.Core
 
 	    //static void DoDeviceCommand(string command)
         //{
-        //    Debug.Console(0, "Not yet implemented.  Stay tuned");
+        //    Debug.LogMessage(LogEventLevel.Information, "Not yet implemented.  Stay tuned");
         //}
 
 		public static void AddDevice(IKeyed newDev)
@@ -245,7 +246,7 @@ namespace PepperDash.Essentials.Core
 		    {
 		        if (!DeviceCriticalSection.TryEnter())
 		        {
-		            Debug.Console(0, Debug.ErrorLogLevel.Error, "Currently unable to add devices to Device Manager. Please try again");
+		            Debug.LogMessage(LogEventLevel.Information, "Currently unable to add devices to Device Manager. Please try again");
 		            return;
 		        }
 		        // Check for device with same key
@@ -255,13 +256,13 @@ namespace PepperDash.Essentials.Core
 
 		        if (!AddDeviceEnabled)
 		        {
-		            Debug.Console(0, Debug.ErrorLogLevel.Error, "All devices have been activated. Adding new devices is not allowed.");
+		            Debug.LogMessage(LogEventLevel.Information, "All devices have been activated. Adding new devices is not allowed.");
 		            return;
 		        }
 
 		        if (Devices.ContainsKey(newDev.Key))
 		        {
-		            Debug.Console(0, newDev, "WARNING: A device with this key already exists.  Not added to manager");
+		            Debug.LogMessage(LogEventLevel.Information, newDev, "WARNING: A device with this key already exists.  Not added to manager");
 		            return;
 		        }
 		        Devices.Add(newDev.Key, newDev);
@@ -280,13 +281,13 @@ namespace PepperDash.Essentials.Core
 	        {
 	            if (!DeviceCriticalSection.TryEnter())
 	            {
-	                Debug.Console(0, Debug.ErrorLogLevel.Error,
+	                Debug.LogMessage(LogEventLevel.Information,
 	                    "Currently unable to add devices to Device Manager. Please try again");
 	                return;
 	            }
 	            if (!AddDeviceEnabled)
 	            {
-	                Debug.Console(0, Debug.ErrorLogLevel.Error,
+	                Debug.LogMessage(LogEventLevel.Information,
 	                    "All devices have been activated. Adding new devices is not allowed.");
 	                return;
 	            }
@@ -299,7 +300,7 @@ namespace PepperDash.Essentials.Core
 	                }
 	                catch (ArgumentException ex)
 	                {
-	                    Debug.Console(0, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
+	                    Debug.LogMessage(LogEventLevel.Information, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
 	                        dev.Key, ex.Message, ex.StackTrace);
 	                }
 	            }
@@ -322,7 +323,7 @@ namespace PepperDash.Essentials.Core
 		            //if (_Devices.Contains(newDev))
 		            //    _Devices.Remove(newDev);
 		        else
-		            Debug.Console(0, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
+		            Debug.LogMessage(LogEventLevel.Information, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
 		    }
 		    finally
 		    {
@@ -364,7 +365,7 @@ namespace PepperDash.Essentials.Core
                 CrestronConsole.ConsoleCommandResponse("  Format: devsimreceive:P <device key> <string to send>");
                 return;
             }
-            //Debug.Console(2, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
+            //Debug.LogMessage(LogEventLevel.Verbose, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
 
             var com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
             if (com == null)
@@ -379,30 +380,28 @@ namespace PepperDash.Essentials.Core
         /// Prints a list of routing inputs and outputs by device key.
         /// </summary>
         /// <param name="s">Device key from which to report data</param>
-	    public static void GetRoutingPorts(string s)
-	    {
-	        var device = GetDeviceForKey(s);
+        public static void GetRoutingPorts(string s)
+        {
+            var device = GetDeviceForKey(s);
 
             if (device == null) return;
             var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
             var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
-	        if (inputPorts != null)
-	        {
-	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
-	            foreach (var routingInputPort in inputPorts)
-	            {
-	                Debug.Console(0, "{0}", routingInputPort.Key);
-	            }
-	        }
-	        if (outputPorts != null)
-	        {
-	            Debug.Console(0, "Device {0} has {1} Output Ports:", s, outputPorts.Count);
-	            foreach (var routingOutputPort in outputPorts)
-	            {
-	                Debug.Console(0, "{0}", routingOutputPort.Key);
-	            }
-	        }
-	    }
+            if (inputPorts != null)
+            {
+                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:{2}", s, inputPorts.Count, CrestronEnvironment.NewLine);
+                foreach (var routingInputPort in inputPorts)
+                {
+                    CrestronConsole.ConsoleCommandResponse("{0}{1}", routingInputPort.Key, CrestronEnvironment.NewLine);
+                }
+            }
+            if (outputPorts == null) return;
+            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:{2}", s, outputPorts.Count, CrestronEnvironment.NewLine);
+            foreach (var routingOutputPort in outputPorts)
+            {
+                CrestronConsole.ConsoleCommandResponse("{0}{1}", routingOutputPort.Key, CrestronEnvironment.NewLine);
+            }
+        }
 
         /// <summary>
         /// Attempts to set the debug level of a device
@@ -435,7 +434,7 @@ namespace PepperDash.Essentials.Core
 
             if (device == null)
             {
-                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
+                CrestronConsole.ConsoleCommandResponse("Unable to get device with key: {0}", deviceKey);
                 return;
             }
 
@@ -447,7 +446,7 @@ namespace PepperDash.Essentials.Core
             }
             catch
             {
-                Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
+                CrestronConsole.ConsoleCommandResponse("Unable to convert setting value.  Please use off/rx/tx/both");
                 return;
             }
 
@@ -458,18 +457,18 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
+                    CrestronConsole.ConsoleCommandResponse("Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
+                    CrestronConsole.ConsoleCommandResponse("Unable to convert minutes or settings value.  Please use an integer value for minutes. Error: {0}", e);
                 }
             }
             else
             {
                 device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                Debug.Console(0, "Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
+                CrestronConsole.ConsoleCommandResponse("Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs

@@ -7,6 +7,7 @@ using Crestron.SimplSharp.Reflection;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -43,11 +44,25 @@ namespace PepperDash.Essentials.Core
                 }
                 catch (Exception ex)
                 {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Exception initializing device: {0}", ex.Message);
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stack Trace: {0}", ex.StackTrace);
+                    Debug.LogMessage(LogEventLevel.Error, this, "Exception initializing device: {0}", ex.Message);
+                    Debug.LogMessage(LogEventLevel.Debug, this, "Stack Trace: {0}", ex.StackTrace);
                 }
             });
         }
+
+        public override bool CustomActivate()
+        {
+            CreateMobileControlMessengers();
+
+            return base.CustomActivate();
+        }
+
+        /// <summary>
+        /// Override this method to build and create custom Mobile Control Messengers during the Activation phase
+        /// </summary>
+        protected virtual void CreateMobileControlMessengers() {
+           
+        }
     }
 
     [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
@@ -57,7 +72,7 @@ namespace PepperDash.Essentials.Core
 
         public DescriptionAttribute(string description)
         {
-            //Debug.Console(2, "Setting Description: {0}", description);
+            //Debug.LogMessage(LogEventLevel.Verbose, "Setting Description: {0}", description);
             _Description = description;
         }
 
@@ -74,7 +89,7 @@ namespace PepperDash.Essentials.Core
 
         public ConfigSnippetAttribute(string configSnippet)
         {
-            //Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            //Debug.LogMessage(LogEventLevel.Verbose, "Setting Config Snippet {0}", configSnippet);
             _ConfigSnippet = configSnippet;
         }
 
@@ -103,7 +118,7 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var typeName in TypeNames)
             {
-                //Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                //Debug.LogMessage(LogEventLevel.Verbose, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
                 var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
                 string description = descriptionAttribute[0].Description;
                 var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
@@ -121,6 +136,41 @@ namespace PepperDash.Essentials.Core
         #endregion
     }
 
+    public abstract class ProcessorExtensionDeviceFactory<T> : IProcessorExtensionDeviceFactory where T: EssentialsDevice
+    {
+        #region IProcessorExtensionDeviceFactory Members
+
+        /// <summary>
+        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
+        /// </summary>
+        public List<string> TypeNames { get; protected set; }
+
+        /// <summary>
+        /// Loads an item to the ProcessorExtensionDeviceFactory.ProcessorExtensionFactoryMethods dictionary for each entry in the TypeNames list
+        /// </summary>
+        public void LoadFactories()
+        {
+            foreach (var typeName in TypeNames)
+            {
+                //Debug.LogMessage(LogEventLevel.Verbose, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
+                string description = descriptionAttribute[0].Description;
+                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
+                ProcessorExtensionDeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
+            }
+        }
+
+        /// <summary>
+        /// The method that will build the device
+        /// </summary>
+        /// <param name="dc">The device config</param>
+        /// <returns>An instance of the device</returns>
+        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
+
+        #endregion
+
+    }
+
     /// <summary>
     /// Devices the basic needs for a Device Factory
     /// </summary>

src/PepperDash.Essentials.Core/Devices/GenericIRController.cs

@@ -1,13 +1,15 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges.JoinMaps;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Devices
 {
@@ -21,15 +23,14 @@ namespace PepperDash.Essentials.Core.Devices
 
         private readonly IrOutputPortController _port; 
 
-        public string[] IrCommands {get { return _port.IrFileCommands; }}
+        public string[] IrCommands {get { return _port.IrFileCommands; }}	    
 
         public GenericIrController(string key, string name, IrOutputPortController irPort) : base(key, name)
         {
             _port = irPort;
-
             if (_port == null)
             {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "IR Port is null, device will not function");
+                Debug.LogMessage(LogEventLevel.Information, this, "IR Port is null, device will not function");
                 return;
             }
             DeviceManager.AddDevice(_port);
@@ -73,23 +74,65 @@ namespace PepperDash.Essentials.Core.Devices
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericIrControllerJoinMap>(joinMapSerialized);
 
-            for (uint i = 0; i < _port.IrFileCommands.Length; i++)
-            {
-                var cmd = _port.IrFileCommands[i];
-                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i, JoinSpan = 1},
-                    new JoinMetadata
-                    {
-                        Description = cmd,
-                        JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                        JoinType = eJoinType.Digital
-                    });
+	        if (_port.UseBridgeJoinMap)
+	        {
+				Debug.LogMessage(LogEventLevel.Information, this, "Using new IR bridge join map");
 
-                joinData.SetJoinOffset(joinStart);
+		        var bridgeJoins = joinMap.Joins.Where((kv) => _port.IrFileCommands.Any(cmd => cmd == kv.Key)).ToDictionary(kv => kv.Key);
+		        if (bridgeJoins == null)
+		        {
+					Debug.LogMessage(LogEventLevel.Information, this, "Failed to link new IR bridge join map");
+			        return;
+		        }
 
-                joinMap.Joins.Add(cmd,joinData);
+				joinMap.Joins.Clear();
 
-                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
-            }
+		        foreach (var bridgeJoin in bridgeJoins)
+		        {
+			        var key = bridgeJoin.Key;
+			        var joinDataKey = bridgeJoin.Value.Key;
+			        var joinDataValue = bridgeJoin.Value.Value;
+			        var joinNumber = bridgeJoin.Value.Value.JoinNumber;					
+
+					Debug.LogMessage(LogEventLevel.Verbose, this, @"bridgeJoin: Key-'{0}'
+Value.Key-'{1}'
+Value.JoinNumber-'{2}'
+Value.Metadata.Description-'{3}'", 
+						key,
+						joinDataKey,
+						joinNumber,
+						joinDataValue.Metadata.Description);
+
+
+					joinMap.Joins.Add(key, joinDataValue);
+
+			        trilist.SetBoolSigAction(joinNumber, (b) => Press(key, b));
+		        }
+	        }
+	        else
+	        {
+				Debug.LogMessage(LogEventLevel.Information, this, "Using legacy IR join mapping based on available IR commands");
+
+				joinMap.Joins.Clear();
+
+				for (uint i = 0; i < _port.IrFileCommands.Length; i++)
+				{
+					var cmd = _port.IrFileCommands[i];
+					var joinData = new JoinDataComplete(new JoinData { JoinNumber = i, JoinSpan = 1 },
+						new JoinMetadata
+						{
+							Description = cmd,
+							JoinCapabilities = eJoinCapabilities.FromSIMPL,
+							JoinType = eJoinType.Digital
+						});
+
+					joinData.SetJoinOffset(joinStart);
+
+					joinMap.Joins.Add(cmd, joinData);
+
+					trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
+				}   
+	        }            
 
             joinMap.PrintJoinMapInfo();
 
@@ -99,7 +142,7 @@ namespace PepperDash.Essentials.Core.Devices
             }
             else
             {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
         }
 
@@ -111,13 +154,6 @@ namespace PepperDash.Essentials.Core.Devices
         }
     }
 
-    public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
-    {
-        public GenericIrControllerJoinMap(uint joinStart) : base(joinStart)
-        {
-        }
-    }
-
     public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIrController>
     {
         public GenericIrControllerFactory()
@@ -128,7 +164,7 @@ namespace PepperDash.Essentials.Core.Devices
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Generic IR Controller Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic IR Controller Device");
 
             var irPort = IRPortHelper.GetIrOutputPortController(dc);
 

src/PepperDash.Essentials.Core/Devices/GenericMonitoredTcpDevice.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core.Devices
@@ -25,7 +26,7 @@ namespace PepperDash.Essentials.Core.Devices
 			// ------------------------------------------------------DELETE THIS
 			CommunicationMonitor.StatusChange += (o, a) =>
 			{
-				Debug.Console(2, this, "Communication monitor status change: {0}", a.Status);
+				Debug.LogMessage(LogEventLevel.Verbose, this, "Communication monitor status change: {0}", a.Status);
 			};
 
 		}
@@ -35,35 +36,6 @@ namespace PepperDash.Essentials.Core.Devices
 		{
 		}
 
-
-		/// <summary>
-		/// Generic monitor for TCP reachability.  Default with 30s poll, 120s warning and 300s error times
-		/// </summary>
-		[Obsolete]
-		public GenericCommunicationMonitoredDevice(string key, string name, string hostname, int port, string pollString)
-			: this(key, name, hostname, port, pollString, 30000, 120000, 300000)
-		{
-		}
-
-		/// <summary>
-		/// Monitor for TCP reachability
-		/// </summary>
-		[Obsolete]
-		public GenericCommunicationMonitoredDevice(string key, string name, string hostname, int port, string pollString, 
-			long pollTime, long warningTime, long errorTime)
-			: base(key, name)
-		{
-			Client = new GenericTcpIpClient(key + "-tcp", hostname, port, 512);
-			CommunicationMonitor = new GenericCommunicationMonitor(this, Client, pollTime, warningTime, errorTime, pollString);
-
-			// ------------------------------------------------------DELETE THIS
-			CommunicationMonitor.StatusChange += (o, a) =>
-			{
-				Debug.Console(2, this, "Communication monitor status change: {0}", a.Status);
-			};
-		}
-
-
 		public override bool CustomActivate()
 		{
 			CommunicationMonitor.Start();

src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs

@@ -4,6 +4,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharp.Reflection;
 
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -29,7 +30,7 @@ namespace PepperDash.Essentials.Core
 			var feedbacks = source.Feedbacks;
 			if (feedbacks != null)
 			{
-				Debug.Console(0, source, "\n\nAvailable feedbacks:");
+				Debug.LogMessage(LogEventLevel.Information, source, "\n\nAvailable feedbacks:");
 				foreach (var f in feedbacks)
 				{
 					string val = "";
@@ -52,12 +53,12 @@ namespace PepperDash.Essentials.Core
                             type = "string";
                         }
 					}
-					Debug.Console(0, "{0,-12} {1, -25} {2}", type,
+					Debug.LogMessage(LogEventLevel.Information, "{0,-12} {1, -25} {2}", type,
 						(string.IsNullOrEmpty(f.Key) ? "-no key-" : f.Key), val);
 				}
 			}
 			else
-				Debug.Console(0, source, "No available outputs:");
+				Debug.LogMessage(LogEventLevel.Information, source, "No available outputs:");
 		}
 	}
 }

src/PepperDash.Essentials.Core/Devices/IUsageTracking.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -84,14 +85,14 @@ namespace PepperDash.Essentials.Core
 
                     if (handler != null)
                     {
-                        Debug.Console(1, "Device Usage Ended for: {0} at {1}.  In use for {2} minutes.", Parent.Name, UsageEndTime, timeUsed.Minutes);
+                        Debug.LogMessage(LogEventLevel.Debug, "Device Usage Ended for: {0} at {1}.  In use for {2} minutes.", Parent.Name, UsageEndTime, timeUsed.Minutes);
                         handler(this, new DeviceUsageEventArgs() { UsageEndTime = UsageEndTime, MinutesUsed = timeUsed.Minutes });
                     }
                 }
             }
             catch (Exception e)
             {
-                Debug.Console(1, "Error ending device usage: {0}", e);
+                Debug.LogMessage(LogEventLevel.Debug, "Error ending device usage: {0}", e);
             }
         }
     }

src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs

@@ -64,6 +64,24 @@ namespace PepperDash.Essentials.Core
 		IntFeedback VolumeLevelFeedback { get; }
 	}
 
+	/// <summary>
+	/// Adds the ability to display a raw volume level and the units of that level
+	/// </summary>
+	public interface IBasicVolumeWithFeedbackAdvanced : IBasicVolumeWithFeedback
+	{
+		int RawVolumeLevel { get; }
+
+		eVolumeLevelUnits Units { get; }
+	}
+
+    public enum eVolumeLevelUnits
+    {
+        Decibels,
+        Percent,
+        Relative,
+        Absolute
+    }
+
     /// <summary>
     /// A class that implements this contains a reference to a current IBasicVolumeControls device.
     /// The class may have multiple IBasicVolumeControls.
@@ -72,6 +90,10 @@ namespace PepperDash.Essentials.Core
     {
         IBasicVolumeControls CurrentVolumeControls { get; }
 		event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+
+        void SetDefaultLevels();
+
+        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
 	}
 
 

src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,11 +6,12 @@ using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Essentials.Core.Config;
 
 
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
@@ -31,6 +32,8 @@ namespace PepperDash.Essentials.Core
 
         public string[] IrFileCommands { get { return IrPort.AvailableStandardIRCmds(IrPortUid); } }
 
+		public bool UseBridgeJoinMap { get; private set; }
+
 		/// <summary>
 		/// Constructor for IrDevice base class.  If a null port is provided, this class will 
 		/// still function without trying to talk to a port.
@@ -44,7 +47,7 @@ namespace PepperDash.Essentials.Core
 			IrPort = port;
 			if (port == null)
 			{
-				Debug.Console(0, this, "WARNING No valid IR Port assigned to controller. IR will not function");
+				Debug.LogMessage(LogEventLevel.Information, this, "WARNING No valid IR Port assigned to controller. IR will not function");
 				return;
 			}
 			LoadDriver(irDriverFilepath);
@@ -55,31 +58,32 @@ namespace PepperDash.Essentials.Core
 	        : base(key)
 	    {
             DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
+			UseBridgeJoinMap = config.Properties["control"].Value<bool>("useBridgeJoinMap");
             AddPostActivationAction(() =>
             {
-                IrPort = postActivationFunc(config);
+	            IrPort = postActivationFunc(config);
 
                 if (IrPort == null)
                 {
-                    Debug.Console(0, this, "WARNING No valid IR Port assigned to controller. IR will not function");
+                    Debug.LogMessage(LogEventLevel.Information, this, "WARNING No valid IR Port assigned to controller. IR will not function");
                     return;
                 }
                 
                 var filePath = Global.FilePathPrefix + "ir" + Global.DirectorySeparator + config.Properties["control"]["irFile"].Value<string>();
-                Debug.Console(1, "*************Attempting to load IR file: {0}***************", filePath);
+                Debug.LogMessage(LogEventLevel.Debug, "*************Attempting to load IR file: {0}***************", filePath);
 
                 LoadDriver(filePath);
-                    
-                PrintAvailableCommands();
+                
+				PrintAvailableCommands();
             });
 	    }
 
 	    public void PrintAvailableCommands()
 	    {
-            Debug.Console(2, this, "Available IR Commands in IR File {0}", IrPortUid);
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Available IR Commands in IR File {0}", IrPortUid);
             foreach (var cmd in IrPort.AvailableIRCmds())
             {
-                Debug.Console(2, this, "{0}", cmd);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "{0}", cmd);
             }
 	    }
 	    
@@ -90,7 +94,7 @@ namespace PepperDash.Essentials.Core
 		/// <param name="path"></param>
 		public void LoadDriver(string path)
 		{
-            Debug.Console(2, this, "***Loading IR File***");
+            Debug.LogMessage(LogEventLevel.Verbose, this, "***Loading IR File***");
 			if (string.IsNullOrEmpty(path)) path = DriverFilepath;
 	        try
 	        {
@@ -105,7 +109,7 @@ namespace PepperDash.Essentials.Core
 			{
 				DriverIsLoaded = false;
 				var message = string.Format("WARNING IR Driver '{0}' failed to load", path);
-				Debug.Console(0, this, Debug.ErrorLogLevel.Error, message);
+				Debug.LogMessage(LogEventLevel.Information, this, message);
                 DriverLoaded.FireUpdate();
 			}
 		}
@@ -116,15 +120,15 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public virtual void PressRelease(string command, bool state)
 		{
-			Debug.Console(2, this, "IR:'{0}'={1}", command, state);
+			Debug.LogMessage(LogEventLevel.Verbose, this, "IR:'{0}'={1}", command, state);
 			if (IrPort == null)
 			{
-				Debug.Console(2, this, "WARNING No IR Port assigned to controller");
+				Debug.LogMessage(LogEventLevel.Verbose, this, "WARNING No IR Port assigned to controller");
 				return;
 			} 
 			if (!DriverIsLoaded)
 			{
-				Debug.Console(2, this, "WARNING IR driver is not loaded");
+				Debug.LogMessage(LogEventLevel.Verbose, this, "WARNING IR driver is not loaded");
 				return;
 			}
 			if (state)
@@ -145,12 +149,12 @@ namespace PepperDash.Essentials.Core
 		{
 			if (IrPort == null)
 			{
-				Debug.Console(2, this, "WARNING No IR Port assigned to controller");
+				Debug.LogMessage(LogEventLevel.Verbose, this, "WARNING No IR Port assigned to controller");
 				return;
 			} 
 			if (!DriverIsLoaded)
 			{
-				Debug.Console(2, this, "WARNING IR driver is not loaded");
+				Debug.LogMessage(LogEventLevel.Verbose, this, "WARNING IR driver is not loaded");
 				return;
 			}
 			if (IrPort.IsIRCommandAvailable(IrPortUid, command))
@@ -164,7 +168,7 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		protected void NoIrCommandError(string command)
 		{
-			Debug.Console(2, this, "Device {0}: IR Driver {1} does not contain command {2}",
+			Debug.LogMessage(LogEventLevel.Verbose, this, "Device {0}: IR Driver {1} does not contain command {2}",
 				Key, IrPort.IRDriverFileNameByIRDriverId(IrPortUid), command);
 		}
 	}

src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs

@@ -7,12 +7,11 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Devices
 {
-	/// <summary>
-	/// This DVD class should cover most IR, one-way DVD and Bluray fuctions
-	/// </summary>
+	[Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
 	public class InRoomPc : EssentialsDevice, IHasFeedback, IRoutingOutputs, IAttachVideoStatus, IUiDisplayInfo, IUsageTracking
 	{
 		public uint DisplayUiType { get { return DisplayUiConstants.TypeLaptop; } }
@@ -65,6 +64,7 @@ namespace PepperDash.Essentials.Core.Devices
         #endregion
 	}
 
+    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
     public class InRoomPcFactory : EssentialsDeviceFactory<InRoomPc>
     {
         public InRoomPcFactory()
@@ -74,7 +74,7 @@ namespace PepperDash.Essentials.Core.Devices
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new InRoomPc Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new InRoomPc Device");
             return new InRoomPc(dc.Key, dc.Name);
         }
     }

src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs

@@ -7,13 +7,13 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Devices
 {
-	/// <summary>
-	/// This DVD class should cover most IR, one-way DVD and Bluray fuctions
-	/// </summary>
-	public class Laptop : EssentialsDevice, IHasFeedback, IRoutingOutputs, IAttachVideoStatus, IUiDisplayInfo, IUsageTracking
+
+    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
+    public class Laptop : EssentialsDevice, IHasFeedback, IRoutingOutputs, IAttachVideoStatus, IUiDisplayInfo, IUsageTracking
 	{
 		public uint DisplayUiType { get { return DisplayUiConstants.TypeLaptop; } }
 		public string IconName { get; set; }
@@ -65,6 +65,7 @@ namespace PepperDash.Essentials.Core.Devices
         #endregion
 	}
 
+    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
     public class LaptopFactory : EssentialsDeviceFactory<Laptop>
     {
         public LaptopFactory()
@@ -74,7 +75,7 @@ namespace PepperDash.Essentials.Core.Devices
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new Laptop Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Laptop Device");
             return new Core.Devices.Laptop(dc.Key, dc.Name);
         }
     }

src/PepperDash.Essentials.Core/Devices/PduInterfaces.cs

@@ -1,13 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core.Devices
+namespace PepperDash.Essentials.Core.Devices
 {
     /// <summary>
     /// Interface for any device that is able to control it'spower and has a configurable reboot time
-    /// </summary>
+    /// </summary>    
     public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
     {
         /// <summary>
@@ -23,7 +24,7 @@ namespace PepperDash_Essentials_Core.Devices
 
     /// <summary>
     /// Interface for any device that contains a collection of IHasPowerReboot Devices
-    /// </summary>
+    /// </summary>    
     public interface IHasControlledPowerOutlets : IKeyName
     {
         /// <summary>

src/PepperDash.Essentials.Core/Devices/PowerInterfaces.cs

@@ -0,0 +1,87 @@
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Interface for any device that has a battery that can be monitored
+    /// </summary>
+    public interface IHasBatteryStats : IKeyName
+    {
+        int BatteryPercentage { get; }
+        int BatteryCautionThresholdPercentage { get;  }
+        int BatteryWarningThresholdPercentage { get; }
+        BoolFeedback BatteryIsWarningFeedback { get; }
+        BoolFeedback BatteryIsCautionFeedback { get; }
+        BoolFeedback BatteryIsOkFeedback { get; }
+        IntFeedback BatteryPercentageFeedback { get; }
+    }
+
+    /// <summary>
+    /// Interface for any device that has a battery that can be monitored and the ability to charge and discharge
+    /// </summary>
+    public interface IHasBatteryCharging : IHasBatteryStats
+    {
+        BoolFeedback BatteryIsCharging { get; }
+    }
+
+    /// <summary>
+    /// Interface for any device that has multiple batteries that can be monitored
+    /// </summary>
+    public interface IHasBatteries : IKeyName
+    {
+        ReadOnlyDictionary<string, IHasBatteryStats> Batteries { get; }   
+    }
+
+    public interface IHasBatteryStatsExtended : IHasBatteryStats
+    {
+        int InputVoltage { get; }
+        int OutputVoltage { get; }
+        int InptuCurrent { get; }
+        int OutputCurrent { get; }
+
+        IntFeedback InputVoltageFeedback { get; }
+        IntFeedback OutputVoltageFeedback { get; }
+        IntFeedback InputCurrentFeedback { get; }
+        IntFeedback OutputCurrentFeedback { get; }
+    }
+
+    /// <summary>
+    /// Interface for any device that is able to control its power, has a configurable reboot time, and has batteries that can be monitored
+    /// </summary>
+    public interface IHasPowerCycleWithBattery : IHasPowerCycle, IHasBatteryStats
+    {
+        
+    }
+
+    /// <summary>
+    /// Interface for any device that is able to control it's power and has a configurable reboot time
+    /// </summary>
+    public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
+    {
+        /// <summary>
+        /// Delay between power off and power on for reboot
+        /// </summary>
+        int PowerCycleTimeMs { get; }
+
+        /// <summary>
+        /// Reboot outlet
+        /// </summary>
+        void PowerCycle();
+    }
+
+    /// <summary>
+    /// Interface for any device that contains a collection of IHasPowerReboot Devices
+    /// </summary>
+    public interface IHasControlledPowerOutlets : IKeyName
+    {
+        /// <summary>
+        /// Collection of IPduOutlets
+        /// </summary>
+        ReadOnlyDictionary<int, IHasPowerCycle> PduOutlets { get; }
+
+    }
+
+
+
+}

src/PepperDash.Essentials.Core/Devices/PresentationDeviceType.cs

@@ -9,18 +9,6 @@ using Crestron.SimplSharpPro.UI;
 
 namespace PepperDash.Essentials.Core
 {
-	//[Obsolete]
-	//public class PresentationDeviceType
-	//{
-	//    public const ushort Default = 1;
-	//    public const ushort CableSetTopBox = 2;
-	//    public const ushort SatelliteSetTopBox = 3;
-	//    public const ushort Dvd = 4;
-	//    public const ushort Bluray = 5;
-	//    public const ushort PC = 9;
-	//    public const ushort Laptop = 10;
-	//}
-
 	public enum PresentationSourceType
 	{
 		None, Dvd, Laptop, PC, SetTopBox, VCR

src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -9,8 +9,8 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Devices
 {

src/PepperDash.Essentials.Core/Devices/SourceListItem.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,9 +6,9 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/Display/BasicIrDisplay.cs

@@ -11,18 +11,16 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Routing;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-    [Description("Wrapper class for a Basic IR Display")]
+	[Obsolete("Please use PepperDash.Essentials.Device.Common, this will be removed in 2.1")]
     public class BasicIrDisplay : DisplayBase, IBasicVolumeControls, IBridgeAdvanced
 	{
 		public IrOutputPortController IrPort { get; private set; }
 		public ushort IrPulseTime { get; set; }
 
-        [Obsolete("This property will be removed in version 2.0.0")]
-        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
-
         protected Func<bool> PowerIsOnFeedbackFunc
         {
             get { return () => _PowerIsOn; }
@@ -46,16 +44,8 @@ namespace PepperDash.Essentials.Core
 			IrPort = new IrOutputPortController(key + "-ir", port, irDriverFilepath);
 			DeviceManager.AddDevice(IrPort);
 
-            PowerIsOnFeedback = new BoolFeedback(PowerIsOnFeedbackFunc);
-
-            PowerIsOnFeedback.OutputChange += (o, a) =>
-            {
-                Debug.Console(2, this, "Power on={0}", _PowerIsOn);
-                if (_PowerIsOn) StartWarmingTimer();
-                else StartCoolingTimer();
-            };
-			IsWarmingUpFeedback.OutputChange += (o, a) => Debug.Console(2, this, "Warming up={0}", _IsWarmingUp);
-			IsCoolingDownFeedback.OutputChange += (o, a) => Debug.Console(2, this, "Cooling down={0}", _IsCoolingDown);
+			IsWarmingUpFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Verbose, this, "Warming up={0}", _IsWarmingUp);
+			IsCoolingDownFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Verbose, this, "Cooling down={0}", _IsCoolingDown);
 
 			InputPorts.AddRange(new RoutingPortCollection<RoutingInputPort>
 			{
@@ -117,20 +107,17 @@ namespace PepperDash.Essentials.Core
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_ON, IrPulseTime);
             _PowerIsOn = true;
-            PowerIsOnFeedback.FireUpdate();
 		}
 
 		public override void PowerOff()
 		{
             _PowerIsOn = false;
-            PowerIsOnFeedback.FireUpdate();
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_OFF, IrPulseTime);
 		}
 
 		public override void PowerToggle()
 		{
             _PowerIsOn = false;
-            PowerIsOnFeedback.FireUpdate();
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER, IrPulseTime);
 		}
 
@@ -184,7 +171,7 @@ namespace PepperDash.Essentials.Core
 		/// <param name="inputSelector">A delegate containing the input selector method to call</param>
 		public override void ExecuteSwitch(object inputSelector)
 		{
-            Debug.Console(2, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
 
 			Action finishSwitch = () =>
 				{
@@ -193,7 +180,7 @@ namespace PepperDash.Essentials.Core
 						action();
 				};
 
-			if (!PowerIsOnFeedback.BoolValue)
+			if (!_PowerIsOn)
 			{
 				PowerOn();
 				EventHandler<FeedbackEventArgs> oneTimer = null;
@@ -217,6 +204,7 @@ namespace PepperDash.Essentials.Core
 	    }
 	}
 
+    [Obsolete("Please use PepperDash.Essentials.Device.Common, this will be removed in 2.1")]
     public class BasicIrDisplayFactory : EssentialsDeviceFactory<BasicIrDisplay>
     {
         public BasicIrDisplayFactory()
@@ -226,7 +214,7 @@ namespace PepperDash.Essentials.Core
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.Console(1, "Factory Attempting to create new BasicIrDisplay Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new BasicIrDisplay Device");
             var ir = IRPortHelper.GetIrPort(dc.Properties);
             if (ir != null)
             {

src/PepperDash.Essentials.Core/Display/DisplayBase.cs

@@ -1,26 +1,23 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Endpoints;
 using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// 
-	/// </summary>
-    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking, IPower
+	[Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
+    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking
 	{
         public event SourceInfoChangeHandler CurrentSourceChange;
 
@@ -51,9 +48,6 @@ namespace PepperDash.Essentials.Core
 		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
 		public BoolFeedback IsWarmingUpFeedback { get; private set; }
 
-        [Obsolete("This property will be removed in version 2.0.0")]
-        public abstract BoolFeedback PowerIsOnFeedback { get; protected set; }
-
         public UsageTracking UsageTracker { get; set; }
 
 		public uint WarmupTime { get; set; }
@@ -120,7 +114,7 @@ namespace PepperDash.Essentials.Core
 	        }
 	        else
 	        {
-	            Debug.Console(0,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+	            Debug.LogMessage(LogEventLevel.Information,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
 	        }
 
 			LinkDisplayToApi(displayDevice, trilist, joinMap);
@@ -128,8 +122,8 @@ namespace PepperDash.Essentials.Core
 
 		protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
 		{
-			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
+			Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			Debug.LogMessage(LogEventLevel.Information, "Linking to Display: {0}", displayDevice.Name);
 
 			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
 
@@ -151,7 +145,7 @@ namespace PepperDash.Essentials.Core
 			{
 				trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
 
-				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
+				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Information, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
 
 
 				inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
@@ -205,16 +199,16 @@ namespace PepperDash.Essentials.Core
 					var tempKey = inputKeys.ElementAt(i);
 					trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
 						() => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
-					Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
+					Debug.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
 						joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
 					trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
 				}
 				else
-					Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
+					Debug.LogMessage(LogEventLevel.Information, displayDevice, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
 						displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
 			}
 
-			Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
+			Debug.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
 			trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
 			{
 				if (a == 0)
@@ -260,16 +254,14 @@ namespace PepperDash.Essentials.Core
 
     }
 
-	/// <summary>
-	/// 
-	/// </summary>
+	[Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
     public abstract class TwoWayDisplayBase : DisplayBase, IRoutingFeedback, IHasPowerControlWithFeedback
 	{
         public StringFeedback CurrentInputFeedback { get; private set; }
 
         abstract protected Func<string> CurrentInputFeedbackFunc { get; }
 
-        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
+        public BoolFeedback PowerIsOnFeedback { get; protected set; }
 
         abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
 

src/PepperDash.Essentials.Core/Display/MockDisplay.cs

@@ -13,13 +13,12 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// 
-	/// </summary>
-	public class MockDisplay : TwoWayDisplayBase, IBasicVolumeWithFeedback, IBridgeAdvanced
+    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
+    public class MockDisplay : TwoWayDisplayBase, IBasicVolumeWithFeedback, IBridgeAdvanced
 
 	{
 		public RoutingInputPort HdmiIn1 { get; private set; }
@@ -38,7 +37,7 @@ namespace PepperDash.Essentials.Core
             {
                 return () =>
                     {
-                        Debug.Console(2, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
+                        Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
                         return _PowerIsOn;
                     };
         } }
@@ -48,7 +47,7 @@ namespace PepperDash.Essentials.Core
             {
                 return () =>
                 {
-                    Debug.Console(2, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
+                    Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
                     return _IsCoolingDown;
                 };
             }
@@ -59,7 +58,7 @@ namespace PepperDash.Essentials.Core
             {
                 return () =>
                 {
-                    Debug.Console(2, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
+                    Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
                     return _IsWarmingUp;
                 };
             }
@@ -121,7 +120,7 @@ namespace PepperDash.Essentials.Core
 				// Fake cool-down cycle
 				CooldownTimer = new CTimer(o =>
 					{
-						Debug.Console(2, this, "Cooldown timer ending");
+						Debug.LogMessage(LogEventLevel.Verbose, this, "Cooldown timer ending");
 						_IsCoolingDown = false;
 						IsCoolingDownFeedback.InvokeFireUpdate();
                         _PowerIsOn = false;
@@ -140,7 +139,7 @@ namespace PepperDash.Essentials.Core
 
 		public override void ExecuteSwitch(object selector)
 		{
-			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
+			Debug.LogMessage(LogEventLevel.Verbose, this, "ExecuteSwitch: {0}", selector);
 
 		    if (!_PowerIsOn)
 		    {
@@ -182,7 +181,7 @@ namespace PepperDash.Essentials.Core
 		{
             //while (pressRelease)
             //{
-                Debug.Console(2, this, "Volume Down {0}", pressRelease);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Down {0}", pressRelease);
                 if (pressRelease)
                 {
                     var newLevel = _FakeVolumeLevel + VolumeInterval;
@@ -196,7 +195,7 @@ namespace PepperDash.Essentials.Core
 		{
             //while (pressRelease)
             //{
-                Debug.Console(2, this, "Volume Up {0}", pressRelease);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Up {0}", pressRelease);
                 if (pressRelease)
                 {
                     var newLevel = _FakeVolumeLevel - VolumeInterval;
@@ -220,18 +219,6 @@ namespace PepperDash.Essentials.Core
 	    }
 	}
 
-    public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
-    {
-        public MockDisplayFactory()
-        {
-            TypeNames = new List<string>() { "mockdisplay" };
-        }
 
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Mock Display Device");
-            return new MockDisplay(dc.Key, dc.Name);
-        }
-    }
 
 }