Merge pull request #1367 from PepperDash/maintenance-1x-pdtcore-version

feat: updates core version with latest updates to genericTcpSocket

.github/scripts/GenerateVersionNumber-2.0.0.ps1

@@ -1,23 +0,0 @@
-$latestVersion = [version]"2.0.0"
-
-$newVersion = [version]$latestVersion
-$phase = ""
-$newVersionString = ""
-
-switch -regex ($Env:GITHUB_REF) {
-  '^refs\/pull\/*.' {
-    $phase = 'beta';
-    $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-  }
-  '^refs\/heads\/feature-2.0.0\/*.' {
-    $phase = 'alpha'
-    $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-  }
-  'development-2.0.0' {
-    $phase = 'beta'
-    $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-  }  
-}
-
-
-Write-Output $newVersionString

.github/workflows/EssentialsPlugins-builds-3-series-caller.yml

@@ -0,0 +1,21 @@
+name: Build Essentials 1.X
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  getVersion:
+    uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-getversion.yml@main
+    secrets: inherit
+  build-3Series:
+    uses: PepperDash/workflow-templates/.github/workflows/essentials-3Series-builds.yml@main
+    secrets: inherit
+    needs: getVersion
+    if: needs.getVersion.outputs.newVersion == 'true'
+    with:
+      newVersion: ${{ needs.getVersion.outputs.newVersion }}
+      version: ${{ needs.getVersion.outputs.version }}
+      tag: ${{ needs.getVersion.outputs.tag }}
+      channel: ${{ needs.getVersion.outputs.channel }}

.github/workflows/docker.yml

@@ -1,94 +0,0 @@
-name: Branch Build Using Docker
-
-on:
-  push:
-    branches:
-      - feature-2.0.0/*
-      - hotfix-2.0.0/*
-      - release-2.0.0/*
-      - development-2.0.0
-
-env:
-  # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
-  SOLUTION_PATH: .
-  SOLUTION_FILE: PepperDash.Essentials
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Debug
-  # Defaults to main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project_4-Series:
-    runs-on: windows-latest
-    steps:      
-      - uses: actions/checkout@v3
-      - name: Set Version Number
-        id: setVersion
-        shell: powershell
-        run: |
-          $latestVersion = [version]"2.0.0"
-
-          $newVersion = [version]$latestVersion
-          $phase = ""
-          $newVersionString = ""
-
-          switch -regex ($Env:GITHUB_REF) {
-            '^refs\/pull\/*.' {
-              $phase = 'beta';
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/hotfix-2.0.0\/*.' {
-              $phase = 'hotfix'
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/release-2.0.0\/*.' {
-              $splitRef = $Env:GITHUB_REF -split "/"
-              $version = [version]($splitRef[-1] -replace "v", "")
-              $phase = 'rc'
-              $newVersionString = "{0}-{1}-{2}" -f $version, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/feature-2.0.0\/*.' {
-              $phase = 'alpha'
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            'development-2.0.0' {
-              $phase = 'beta'
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }  
-          }          
-          echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append      
-      - name: Setup MS Build
-        uses: microsoft/setup-msbuild@v1.1
-      - name: restore Nuget Packages
-        run: nuget restore .\$($Env:SOLUTION_FILE).sln
-      # Build the solutions in the docker image
-      - name: Build Solution        
-        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m
-      - name: Create tag for non-rc builds
-        if: contains(steps.setVersion.outputs.version, 'alpha')
-        run: |
-          git tag ${{ steps.setVersion.outputs.version }}
-          git push --tags origin
-      # Create the release on the source repo
-      - name: Create Release
-        id: create_release
-#        if: contains(steps.setVersion.outputs.version,'-rc-') ||
-#            contains(steps.setVersion.outputs.version,'-hotfix-') ||
-#            contains(steps.setVersion.outputs.version, '-beta-')
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: 'output\**\*.*(cpz|cplz)'
-          generateReleaseNotes: true
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
-          tag: ${{ steps.setVersion.outputs.version }}
-      - name: Setup Nuget
-        run: | 
-          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-          nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
-          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json          
-      - name: Publish to Nuget
-        run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
-      - name: Publish to Github Nuget
-        run: nuget push .\output\*.nupkg -Source github

.github/workflows/main.yml

@@ -1,55 +0,0 @@
-name: main Build using Docker
-
-on:
-  release:
-    types:
-      - published
-    branches:
-      - main-2.0.0
-env:
-  # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
-  SOLUTION_PATH: PepperDashEssentials
-  SOLUTION_FILE: PepperDashEssentials
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Release
-  # Defaults to main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project:
-    runs-on: windows-2019
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v3
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        id: setVersion
-        env:
-          TAG_NAME: ${{ github.event.release.tag_name }}
-        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-      - name: Setup MS Build
-        uses: microsoft/setup-msbuild@v1.1
-      - name: restore Nuget Packages
-        run: nuget restore .\$($Env:SOLUTION_FILE).sln
-      - name: Build Solution        
-        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m      
-      - name: Upload Release
-        id: create_release
-        uses: ncipollo/release-action@v1
-        with:
-          updateRelease: true
-          artifacts: 'output\**\*.*(cpz|cplz)'          
-          tag: ${{ steps.setVersion.outputs.version }}
-      - name: Setup Nuget
-        run: | 
-          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-          nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
-          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json          
-      - name: Publish to Nuget
-        run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
-      - name: Publish to Github Nuget
-        run: nuget push .\output\*.nupkg -Source github

.gitignore

@@ -390,5 +390,3 @@ MigrationBackup/
 FodyWeavers.xsd
 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
 .DS_Store
-/._PepperDash.Essentials.sln
-.vscode/settings.json

.releaserc.json

@@ -0,0 +1,34 @@
+{
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "releaseRules": [
+          { "scope": "force-patch", "release": "patch" },
+          { "scope": "no-release", "release": false }
+        ]
+      }
+    ],
+    "@semantic-release/release-notes-generator",    
+    ["@semantic-release/changelog", 
+      {
+        "changelogFile": "CHANGELOG.md"
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "verifyReleaseCmd": "echo \"newVersion=true\" >> $GITHUB_OUTPUT",
+        "publishCmd": "echo \"version=${nextRelease.version}\" >> $GITHUB_OUTPUT && echo \"tag=${nextRelease.gitTag}\" >> $GITHUB_OUTPUT && echo \"type=${nextRelease.type}\" >> $GITHUB_OUTPUT && echo \"channel=${nextRelease.channel}\" >> $GITHUB_OUTPUT"
+      }
+    ]
+  ],  
+  "branches": [
+    "maintenance-1x",    
+    {
+      "name": "replace-me-feature-branch",
+      "prerelease": "replace-me-prerelease",
+      "channel": "replace-me-prerelease"
+    }
+  ]
+}

CONTRIBUTING.md

@@ -91,8 +91,8 @@ we receive and the availability of resources to evaluate contributions, we antic
   project remains dynamic and relevant.  This may  affect our responsiveness and ability to accept pull requests 
   quickly.  This does not mean we are ignoring them.
 - Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community.        
-  There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own 
-  repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we 
+  There may be times when we recommend that you just share your code for some enhancement to Essentials from your own 
+  repository. As we identify and recognize extensions that are of general interest to Essentials, we 
   may seek to incorporate them with our baseline.
 
 ## Legal

PepperDash.Essentials.sln

@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33213.308
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Devices.Common", "src\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj", "{53E204B7-97DD-441D-A96C-721DF014DF82}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials", "src\PepperDash.Essentials\PepperDash.Essentials.csproj", "{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}"
-EndProject
-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
-		{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
-		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}
-	EndGlobalSection
-EndGlobal

PepperDashEssentials.3Series.sln

@@ -0,0 +1,49 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", "src\PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{892B761C-E479-44CE-BD74-243E9214AF13} = {892B761C-E479-44CE-BD74-243E9214AF13}
+		{9199CE8A-0C9F-4952-8672-3EED798B284F} = {9199CE8A-0C9F-4952-8672-3EED798B284F}
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", "src\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", "src\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_DM", "src\essentials-framework\Essentials DM\Essentials_DM\PepperDash_Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

packages.config

@@ -0,0 +1,3 @@
+<packages>
+	<package id="PepperDashCore" version="1.4.3" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+</packages>

src/Directory.Build.props

@@ -1,21 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Version>2.0.0-local</Version>
-    <InformationalVersion>$(Version)</InformationalVersion>
-    <Authors>PepperDash Technologies</Authors>
-    <Company>PepperDash Technologies</Company>
-    <Product>PepperDash Essentials</Product>
-    <Copyright>Copyright ©  2023</Copyright>
-    <RepositoryUrl>https://github.com/PepperDash/Essentials</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>Crestron; 4series</PackageTags>
-    <PackageOutputPath>../../output</PackageOutputPath>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
-    <None Include="..\..\README.md" Pack="true" PackagePath=""/>
-  </ItemGroup>
-</Project>

src/Directory.Build.targets

@@ -1,26 +0,0 @@
-<Project>
-  <ItemGroup>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
-      <Pack>true</Pack>
-      <PackagePath>build;</PackagePath>
-    </None>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
-      <Pack>true</Pack>
-      <PackagePath>build;</PackagePath>
-    </None>
-  </ItemGroup>
-  <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="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="$(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/Config/AudioControlPointListItem.cs

@@ -1,19 +0,0 @@
-using Crestron.SimplSharpPro;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Config
-{
-    public class AudioControlPointListItem
-    {
-        [JsonProperty("levelControls")]
-        public Dictionary<string, LevelControlListItem> LevelControls { get; set; }
-
-        [JsonProperty("presets")]
-        public Dictionary<string, PresetListItem> Presets { get; set; }
-    }
-}

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

@@ -1,13 +0,0 @@
-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/DeviceTypeInterfaces/IHasBranding.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-    public interface IHasBranding
-    {
-        bool BrandingEnabled { get; }
-        void InitializeBranding(string roomKey);
-    }
-}

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

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

@@ -1,15 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace 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

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

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace 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

@@ -1,13 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-   
-    public interface ILanguageProvider
-    {
-        ILanguageDefinition CurrentLanguage { get; set; }
-
-        event EventHandler CurrentLanguageChanged;
-    }
-
-}

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

@@ -1,13 +0,0 @@
-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,119 +0,0 @@
-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
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
-
-        void LinkSystemMonitorToAppServer();
-    }*/
-
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl : IKeyed
-    {
-        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);
-
-		IMobileControlRoomMessenger GetRoomMessenger(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 IMobileControlRoomMessenger : IKeyed
-    {
-        event EventHandler<EventArgs> UserCodeChanged;
-
-        event EventHandler<EventArgs> UserPromptedForCode;
-
-        event EventHandler<EventArgs> ClientJoined;
-
-        event EventHandler<EventArgs> AppUrlChanged;
-
-        string UserCode { get; }
-
-        string QrCodeUrl { get; }
-
-        string QrCodeChecksum { get; }
-
-        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/IProjectorScreenLiftControl.cs

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

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

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

@@ -1,13 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace 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/AudioControlListItemBase.cs

@@ -1,36 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core
-{
-    public abstract class AudioControlListItemBase
-    {
-        [JsonProperty("parentDeviceKey")]
-        public string ParentDeviceKey { get; set; }
-
-        [JsonProperty("itemKey")]
-        public string ItemKey { get; set; }
-
-        /// <summary>
-        /// A name that will override the items's name on the UI
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Indicates if the item should be included in the user accessible list
-        /// </summary>
-        [JsonProperty("includeInUserList")]
-        public bool IncludeInUserList { get; set; }
-
-        /// <summary>
-        /// Used to specify the order of the items in the source list when displayed
-        /// </summary>
-        [JsonProperty("order")]
-        public int Order { get; set; }
-    }
-}

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

@@ -1,12 +0,0 @@
-using PepperDash.Core;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IDspPresets
-    {
-        Dictionary<string, IKeyName> Presets { get; }
-
-        void RecallPreset(string key);
-    }
-}

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

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Devices;
-
-namespace PepperDash.Essentials.Core
-{
-    public class LevelControlListItem : AudioControlListItemBase
-    {
-
-
-        [JsonIgnore]
-        public IBasicVolumeWithFeedback LevelControl
-        {
-            get
-            {
-                if (_levelControl == null)
-                    _levelControl = DeviceManager.GetDeviceForKey(ParentDeviceKey) as IBasicVolumeWithFeedback;
-                return _levelControl;
-            }
-        }
-        IBasicVolumeWithFeedback _levelControl;
-
-        /// <summary>
-        /// Gets the name from the device if it implements IKeyName or else returns the Name property
-        /// </summary>
-        [JsonProperty("preferredName")]
-        public string PreferredName
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(Name)) return Name;
-                else
-                {
-                    if (LevelControl is IKeyName namedLevelControl)
-                    {
-                        if (namedLevelControl == null)
-                            return "---";
-                        return namedLevelControl.Name;
-                    }
-                    else return "---";
-                }
-            }
-        }
-
-        /// <summary>
-        /// Indicates if the item is a level, mute , or both
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-        public eLevelControlType Type { get; set; }
-    }
-
-    [Flags]
-    public enum eLevelControlType
-    {
-        Level = 0,
-        Mute = 1,
-        LevelAndMute = Level | Mute,
-    }
-}

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

@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro;
-
-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
-{
-	[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; } }
-		public string IconName { get; set; }
-		public BoolFeedback HasPowerOnFeedback { get; private set; }
-
-		public RoutingOutputPort AnyVideoOut { get; private set; }
-
-		#region IRoutingOutputs Members
-
-		/// <summary>
-		/// Options: hdmi
-		/// </summary>
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-		#endregion
-
-		public InRoomPc(string key, string name)
-			: base(key, name)
-		{
-			IconName = "PC";
-			HasPowerOnFeedback = new BoolFeedback("HasPowerFeedback", 
-				() => this.GetVideoStatuses() != VideoStatusOutputs.NoStatus);
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-			OutputPorts.Add(AnyVideoOut = new RoutingOutputPort(RoutingPortNames.AnyVideoOut, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-				eRoutingPortConnectionType.None, 0, this));
-		}
-
-		#region IHasFeedback Members
-
-		/// <summary>
-		/// Passes through the VideoStatuses list
-		/// </summary>
-        public FeedbackCollection<Feedback> Feedbacks
-		{
-			get 
-            {
-                var newList = new FeedbackCollection<Feedback>();
-                newList.AddRange(this.GetVideoStatuses().ToList());
-                return newList;
-            }
-		}
-
-		#endregion
-
-        #region IUsageTracking Members
-
-        public UsageTracking UsageTracker { get; set; }
-
-        #endregion
-	}
-
-    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
-    public class InRoomPcFactory : EssentialsDeviceFactory<InRoomPc>
-    {
-        public InRoomPcFactory()
-        {
-            TypeNames = new List<string>() { "inroompc" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new InRoomPc Device");
-            return new InRoomPc(dc.Key, dc.Name);
-        }
-    }
-
-}

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

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class PresetListItem : AudioControlListItemBase
-    {
-        [JsonIgnore]
-        public IKeyName Preset
-        {
-            get
-            {
-                if (_preset == null)
-                {
-                    var parent = DeviceManager.GetDeviceForKey(ParentDeviceKey) as IDspPresets;
-                    if (parent == null || !parent.Presets.ContainsKey(ItemKey))
-                        return null;
-                    _preset = parent.Presets[ItemKey];
-                }
-                return _preset;
-            }
-        }
-        private IKeyName _preset;
-
-        /// <summary>
-        /// Gets the name from the device if it implements IKeyName or else returns the Name property
-        /// </summary>
-        [JsonProperty("preferredName")]
-        public string PreferredName
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(Name)) return Name;
-
-                else return Preset.Name;
-            }
-        }
-    }
-}

src/PepperDash.Essentials.Core/Factory/IProcessorExtensionDeviceFactory.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IProcessorExtensionDeviceFactory
-    {
-        /// <summary>
-        /// Loads all the extension factories to the ProcessorExtensionDeviceFactory
-        /// </summary>
-        void LoadFactories();
-    }
-}

src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs

@@ -1,154 +0,0 @@
-
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PepperDash.Essentials.Core
-{
-
-    public class ProcessorExtensionDeviceFactory
-    {
-        public ProcessorExtensionDeviceFactory() {
-            var assy = Assembly.GetExecutingAssembly();
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
-            var extensions = assy.GetTypes().Where(ct => typeof(IProcessorExtensionDeviceFactory)
-                .IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-
-            if (extensions != null )
-            {
-                foreach ( var extension in extensions )
-                {
-                    try
-                    {
-                        var factory = (IProcessorExtensionDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(extension);
-                        factory.LoadFactories();
-                    }
-                    catch( Exception e )
-                    {
-                        Debug.LogMessage(LogEventLevel.Information, "Unable to load extension device: '{1}' ProcessorExtensionDeviceFactory: {0}", e, extension.Name);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// A dictionary of factory methods, keyed by config types, added by plugins.
-        /// These methods are looked up and called by GetDevice in this class.
-        /// </summary>
-        static Dictionary<string, DeviceFactoryWrapper> ProcessorExtensionFactoryMethods =
-            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
-
-
-        /// <summary>
-        /// Adds a plugin factory method
-        /// </summary>
-        /// <param name="dc"></param>
-        /// <returns></returns>
-        public static void AddFactoryForType(string extensionName, Func<DeviceConfig, IKeyed> method)
-        {
-            //Debug.LogMessage(LogEventLevel.Debug, "Adding factory method for type '{0}'", typeName);
-            ProcessorExtensionDeviceFactory.ProcessorExtensionFactoryMethods.Add(extensionName, new DeviceFactoryWrapper() { FactoryMethod = method });
-        }
-
-        public static void AddFactoryForType(string extensionName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
-        {
-            //Debug.LogMessage(LogEventLevel.Debug, "Adding factory method for type '{0}'", typeName);
-
-            if (ProcessorExtensionFactoryMethods.ContainsKey(extensionName))
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to add extension device: '{0}'.  Already exists in ProcessorExtensionDeviceFactory", extensionName);
-                return;
-            }
-
-            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
-            ProcessorExtensionDeviceFactory.ProcessorExtensionFactoryMethods.Add(extensionName, wrapper);
-        }
-
-        private static void CheckForSecrets(IEnumerable<Newtonsoft.Json.Linq.JProperty> obj)
-        {
-            foreach (var prop in obj.Where(prop => prop.Value as Newtonsoft.Json.Linq.JObject != null))
-            {
-                if (prop.Name.ToLower() == "secret")
-                {
-                    var secret = GetSecret(prop.Children().First().ToObject<SecretsPropertiesConfig>());
-                    //var secret = GetSecret(JsonConvert.DeserializeObject<SecretsPropertiesConfig>(prop.Children().First().ToString()));
-                    prop.Parent.Replace(secret);
-                }
-                var recurseProp = prop.Value as Newtonsoft.Json.Linq.JObject;
-                if (recurseProp == null) return;
-                CheckForSecrets(recurseProp.Properties());
-            }
-        }
-
-        private static string GetSecret(SecretsPropertiesConfig data)
-        {
-            var secretProvider = SecretsManager.GetSecretProviderByKey(data.Provider);
-            if (secretProvider == null) return null;
-            var secret = secretProvider.GetSecret(data.Key);
-            if (secret != null) return (string)secret.Value;
-            Debug.LogMessage(LogEventLevel.Debug,
-                "Unable to retrieve secret {0}{1} - Make sure you've added it to the secrets provider",
-                data.Provider, data.Key);
-            return String.Empty;
-        }
-
-        /// <summary>
-        /// The factory method for processor extension devices. Also iterates the Factory methods that have
-        /// been loaded from plugins
-        /// </summary>
-        /// <param name="dc"></param>
-        /// <returns></returns>
-        public static IKeyed GetExtensionDevice(DeviceConfig dc)
-        {
-            try
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Loading '{0}' from Essentials Core", dc.Type);
-
-                var localDc = new DeviceConfig(dc);
-
-                var key = localDc.Key;
-                var name = localDc.Name;
-                var type = localDc.Type;
-                var properties = localDc.Properties;
-                //var propRecurse = properties;
-
-                var typeName = localDc.Type.ToLower();
-
-                var jObject = properties as Newtonsoft.Json.Linq.JObject;
-                if (jObject != null)
-                {
-                    var jProp = jObject.Properties();
-
-                    CheckForSecrets(jProp);
-                }
-
-                Debug.LogMessage(LogEventLevel.Verbose, "typeName = {0}", typeName);
-                // Check for types that have been added by plugin dlls. 
-                return !ProcessorExtensionFactoryMethods.ContainsKey(typeName) ? null : ProcessorExtensionFactoryMethods[typeName].FactoryMethod(localDc);
-            }
-            catch (Exception ex)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
-
-                Debug.LogMessage(LogEventLevel.Verbose, "{0}", ex.StackTrace);
-
-                if (ex.InnerException == null)
-                {
-                    return null;
-                }
-
-                Debug.LogMessage(LogEventLevel.Information, "Inner exception while creating device {0}: {1}", dc.Key,
-                    ex.InnerException.Message);
-                Debug.LogMessage(LogEventLevel.Verbose, "{0}", ex.InnerException.StackTrace);
-                return null;
-            }
-        }
-
-    }
-
-}

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectType>ProgramLibrary</ProjectType>
-    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
-    <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
-    <Title>PepperDash Essentials Core</Title>
-    <PackageId>PepperDash.Essentials.Core</PackageId>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 4.7.2|AnyCPU'">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-419" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />
-  </ItemGroup>
-</Project>

src/PepperDash.Essentials.Core/Queues/ComsMessage.cs

@@ -1,73 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Queues
-{
-    /// <summary>
-    /// IBasicCommunication Message for IQueue
-    /// </summary>
-    public class ComsMessage : IQueueMessage
-    {
-        private readonly byte[] _bytes;
-        private readonly IBasicCommunication _coms;
-        private readonly string _string;
-        private readonly bool _isByteMessage;
-
-        /// <summary>
-        /// Constructor for a string message
-        /// </summary>
-        /// <param name="coms">IBasicCommunication to send the message</param>
-        /// <param name="message">Message to send</param>
-        public ComsMessage(IBasicCommunication coms, string message)
-        {
-            Validate(coms, message);
-            _coms = coms;
-            _string = message;
-        }
-
-        /// <summary>
-        /// Constructor for a byte message
-        /// </summary>
-        /// <param name="coms">IBasicCommunication to send the message</param>
-        /// <param name="message">Message to send</param>
-        public ComsMessage(IBasicCommunication coms, byte[] message)
-        {
-            Validate(coms, message);
-            _coms = coms;
-            _bytes = message;
-            _isByteMessage = true;
-        }
-
-        private void Validate(IBasicCommunication coms, object message)
-        {
-            if (coms == null)
-                throw new ArgumentNullException("coms");
-
-            if (message == null)
-                throw new ArgumentNullException("message");
-        }
-
-        /// <summary>
-        /// Dispatchs the string/byte[] to the IBasicCommunication specified
-        /// </summary>
-        public void Dispatch()
-        {
-            if (_isByteMessage)
-            {
-                _coms.SendBytes(_bytes);
-            }
-            else
-            {
-                _coms.SendText(_string);
-            }
-        }
-
-        /// <summary>
-        /// Shows either the byte[] or string to be sent
-        /// </summary>
-        public override string ToString()
-        {
-            return _bytes != null ? _bytes.ToString() : _string;
-        }
-    }
-}

src/PepperDash.Essentials.Core/Queues/GenericQueue.cs

@@ -1,270 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-using Serilog.Events;
-using Thread = Crestron.SimplSharpPro.CrestronThread.Thread;
-
-namespace PepperDash.Essentials.Core.Queues
-{
-    /// <summary>
-    /// Threadsafe processing of queued items with pacing if required
-    /// </summary>
-    public class GenericQueue : IQueue<IQueueMessage>
-    {
-        private readonly string _key;
-        protected readonly ConcurrentQueue<IQueueMessage> _queue;
-        protected readonly Thread _worker;
-        protected readonly CEvent _waitHandle = new CEvent();
-
-        private bool _delayEnabled;
-        private int _delayTime;
-
-        private const Thread.eThreadPriority _defaultPriority = Thread.eThreadPriority.MediumPriority;
-
-        /// <summary>
-        /// If the instance has been disposed.
-        /// </summary>
-        public bool Disposed { get; private set; }
-
-        /// <summary>
-        /// Returns the capacity of the CrestronQueue (fixed Size property)
-        /// </summary>
-        public int QueueCapacity
-        {
-            get
-            {
-                return int.MaxValue;
-            }
-        }
-
-        /// <summary>
-        /// Returns the number of elements currently in the CrestronQueue
-        /// </summary>    
-        public int QueueCount
-        {
-            get
-            {
-                return _queue.Count;
-            }
-        }
-
-        /// <summary>
-        /// Constructor with no thread priority
-        /// </summary>
-        /// <param name="key"></param>
-        public GenericQueue(string key)
-            : this(key, _defaultPriority, 0, 0)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with queue size
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="capacity">Fixed size for the queue to hold</param>
-        public GenericQueue(string key, int capacity)
-            : this(key, _defaultPriority, capacity, 0)
-        {
-        }
-
-        /// <summary>
-        /// Constructor for generic queue with no pacing
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="pacing">Pacing in ms between actions</param>
-        public GenericQueue(int pacing, string key)
-            : this(key, _defaultPriority, 0, pacing)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with pacing and capacity
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="pacing"></param>
-        /// <param name="capacity"></param>
-        public GenericQueue(string key, int pacing, int capacity)
-            : this(key, _defaultPriority, capacity, pacing)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with pacing and priority
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="pacing"></param>
-        /// <param name="priority"></param>
-        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority)
-            : this(key, priority, 0, pacing)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with pacing, priority and capacity
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="priority"></param>
-        /// <param name="capacity"></param>
-        public GenericQueue(string key, Thread.eThreadPriority priority, int capacity)
-            : this(key, priority, capacity, 0)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with pacing, priority and capacity
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="pacing"></param>
-        /// <param name="priority"></param>
-        /// <param name="capacity"></param>
-        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority, int capacity)
-            : this(key, priority, capacity, pacing)
-        {           
-        }
-
-        /// <summary>
-        /// Constructor for generic queue with no pacing
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="priority"></param>
-        /// <param name="capacity"></param>
-        /// <param name="pacing"></param>
-        protected GenericQueue(string key, Thread.eThreadPriority priority, int capacity, int pacing)
-        {
-            _key = key;
-            int cap = 25; // sets default
-            if (capacity > 0)
-            {
-                cap = capacity; // overrides default
-            }
-
-            _queue = new ConcurrentQueue<IQueueMessage>();
-            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
-            {
-                Priority = priority,
-                Name = _key
-            };
-
-            SetDelayValues(pacing);
-        }
-
-        private void SetDelayValues(int pacing)
-        {
-            _delayEnabled = pacing > 0;
-            _delayTime = pacing;
-
-            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
-            {
-                if (programEvent != eProgramStatusEventType.Stopping)
-                    return;
-
-                Dispose(true);
-            };
-        }
-
-        /// <summary>
-        /// Thread callback
-        /// </summary>
-        /// <param name="obj">The action used to process dequeued items</param>
-        /// <returns>Null when the thread is exited</returns>
-        private object ProcessQueue(object obj)
-        {
-            while (true)
-            {
-                if (_queue.TryDequeue(out var item) && item == null)
-                    break;
-
-                if (item != null)
-                {
-                    try
-                    {
-                        //Debug.LogMessage(LogEventLevel.Verbose, this, "Processing queue item: '{0}'", item.ToString());
-                        item.Dispatch();
-
-                        if (_delayEnabled)
-                            Thread.Sleep(_delayTime);
-                    }
-                    catch (ThreadAbortException)
-                    {
-                        //swallowing this exception, as it should only happen on shut down
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.LogMessage(LogEventLevel.Information, this, "Caught an exception in the Queue: {1}:{0}", ex.Message, ex);
-                        Debug.LogMessage(LogEventLevel.Verbose, this, "Stack Trace: {0}", ex.StackTrace);
-
-                        if (ex.InnerException != null)
-                        {
-                            Debug.LogMessage(LogEventLevel.Information, this, "---\r\n{0}", ex.InnerException.Message);
-                            Debug.LogMessage(LogEventLevel.Verbose, this, "Stack Trace: {0}", ex.InnerException.StackTrace);
-                        }
-                    }
-                }
-                else _waitHandle.Wait();
-            }
-
-            return null;
-        }
-
-        public void Enqueue(IQueueMessage item)
-        {
-            if (Disposed)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Queue has been disposed. Enqueuing messages not allowed while program is stopping.");
-                return;
-            }
-
-            _queue.Enqueue(item);
-            _waitHandle.Set();
-        }
-
-        /// <summary>
-        /// Disposes the thread and cleans up resources.  Thread cannot be restarted once
-        /// disposed.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            CrestronEnvironment.GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Actually does the disposing.  If you override this method, be sure to either call the base implementation 
-        /// or clean up all the resources yourself.
-        /// </summary>
-        /// <param name="disposing">set to true unless called from finalizer</param>
-        protected void Dispose(bool disposing)
-        {
-            if (Disposed)
-                return;
-
-            if (disposing)
-            {
-                using (_waitHandle)
-                {
-                    Debug.LogMessage(LogEventLevel.Verbose, this, "Disposing...");
-                    _queue.Enqueue(null);
-                    _waitHandle.Set();
-                    _worker.Join();
-                }
-            }
-
-            Disposed = true;
-        }
-
-        ~GenericQueue()
-        {
-            Dispose(true);
-        }
-
-        /// <summary>
-        /// Key
-        /// </summary>
-        public string Key
-        {
-            get { return _key; }
-        }
-    }
-}

src/PepperDash.Essentials.Core/Queues/IQueue.cs

@@ -1,11 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Queues
-{
-    public interface IQueue<T> : IKeyed, IDisposable where T : class 
-    {
-        void Enqueue(T item);
-        bool Disposed { get; }
-    }
-}

src/PepperDash.Essentials.Core/Queues/IQueueMessage.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Queues
-{
-    public interface IQueueMessage
-    {
-        void Dispatch();
-    }
-}

src/PepperDash.Essentials.Core/Queues/ProcessStringMessage.cs

@@ -1,44 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Queues
-{
-    /// <summary>
-    /// Message class for processing strings via an IQueue
-    /// </summary>
-    public class ProcessStringMessage : IQueueMessage
-    {
-        private readonly Action<string> _action;
-        private readonly string _message;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="message">Message to be processed</param>
-        /// <param name="action">Action to invoke on the message</param>
-        public ProcessStringMessage(string message, Action<string> action)
-        {
-            _message = message;
-            _action = action;
-        }
-
-        /// <summary>
-        /// Processes the string with the given action
-        /// </summary>
-        public void Dispatch()
-        {
-            if (_action == null || String.IsNullOrEmpty(_message))
-                return;
-
-            _action(_message);
-        }
-
-        /// <summary>
-        /// To string
-        /// </summary>
-        /// <returns>The current message</returns>
-        public override string ToString()
-        {
-            return _message ?? String.Empty;
-        }
-    }
-}

src/PepperDash.Essentials.Core/Room/IRoomEventSchedule.cs

@@ -1,20 +0,0 @@
-using PepperDash.Essentials.Room.Config;
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IRoomEventSchedule
-    {
-        void AddOrUpdateScheduledEvent(ScheduledEventConfig eventConfig);
-
-        List<ScheduledEventConfig> GetScheduledEvents();
-
-        event EventHandler<ScheduledEventEventArgs> ScheduledEventsChanged;
-    }
-
-    public class ScheduledEventEventArgs : EventArgs
-    {
-        public List<ScheduledEventConfig> ScheduledEvents;
-    }
-}

src/PepperDash.Essentials.Core/Routing/IInputSync.cs

@@ -1,16 +0,0 @@
-using PepperDash.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Routing
-{
-    public interface IVideoSync: IKeyed
-    {
-        bool VideoSyncDetected { get; }
-
-        event EventHandler VideoSyncChanged;
-    }
-}

src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core.Routing
-{
-    public interface IMatrixRouting
-    {
-        Dictionary<string, IRoutingInputSlot> InputSlots { get; }
-        Dictionary<string, IRoutingOutputSlot> OutputSlots { get; }
-
-        void Route(string inputSlotKey, string outputSlotKey, eRoutingSignalType type);
-    }
-}

src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs

@@ -1,7 +0,0 @@
-namespace PepperDash.Essentials.Core.Routing
-{
-    public interface IRoutingInputSlot: IRoutingSlot, IOnline, IVideoSync
-    {
-        string TxDeviceKey { get; }
-    }
-}

src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core.Routing
-{
-    public interface IRoutingOutputSlot : IRoutingSlot
-    {
-        event EventHandler OutputSlotChanged;
-
-        string RxDeviceKey { get; }
-
-        Dictionary<eRoutingSignalType, IRoutingInputSlot> CurrentRoutes { get; }
-    }    
-}

src/PepperDash.Essentials.Core/Routing/IRoutingSlot.cs

@@ -1,16 +0,0 @@
-using PepperDash.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Routing
-{
-    public interface IRoutingSlot:IKeyName
-    {
-        int SlotNumber { get; }
-
-        eRoutingSignalType SupportedSignalTypes { get; }
-    }
-}

src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs

@@ -1,264 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.WebScripting;
-using PepperDash.Core;
-using PepperDash.Core.Web;
-using PepperDash.Essentials.Core.Web.RequestHandlers;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Core.Web
-{
-	public class EssentialsWebApi : EssentialsDevice
-	{
-		private readonly WebApiServer _server;        
-
-		///<example>
-		/// http(s)://{ipaddress}/cws/{basePath}
-		/// http(s)://{ipaddress}/VirtualControl/Rooms/{roomId}/cws/{basePath}
-		/// </example>
-		private readonly string _defaultBasePath = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance 
-			? string.Format("/app{0:00}/api", InitialParametersClass.ApplicationNumber) 
-			: "/api";
-
-		private const int DebugTrace = 0;
-		private const int DebugInfo = 1;
-		private const int DebugVerbose = 2;
-
-		/// <summary>
-		/// CWS base path
-		/// </summary>
-		public string BasePath { get; private set; }
-
-		/// <summary>
-		/// Tracks if CWS is registered
-		/// </summary>
-		public bool IsRegistered
-		{
-			get { return _server.IsRegistered; }
-		}
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>		
-		public EssentialsWebApi(string key, string name)
-			: this(key, name, null)
-		{
-		}
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="config"></param>
-		public EssentialsWebApi(string key, string name, EssentialsWebApiPropertiesConfig config)
-			: base(key, name)
-		{
-			Key = key;
-
-			if (config == null)
-				BasePath = _defaultBasePath;
-			else
-				BasePath = string.IsNullOrEmpty(config.BasePath) ? _defaultBasePath : config.BasePath;
-
-			_server = new WebApiServer(Key, Name, BasePath);
-
-			SetupRoutes();
-		}
-
-		private void SetupRoutes()
-		{
-            var routes = new List<HttpCwsRoute>
-            {
-                new HttpCwsRoute("versions")
-                {
-                    Name = "ReportVersions",
-                    RouteHandler = new ReportVersionsRequestHandler()
-                },
-                new HttpCwsRoute("appdebug")
-                {
-                    Name = "AppDebug",
-                    RouteHandler = new AppDebugRequestHandler()
-                },
-                new HttpCwsRoute("devices")
-                {
-                    Name = "DevList",
-                    RouteHandler = new DevListRequestHandler()
-                },
-                new HttpCwsRoute("deviceCommands")
-                {
-                    Name = "DevJson",
-                    RouteHandler = new DevJsonRequestHandler()
-                },
-                new HttpCwsRoute("deviceProperties/{deviceKey}")
-                {
-                    Name = "DevProps",
-                    RouteHandler = new DevPropsRequestHandler()
-                },
-                new HttpCwsRoute("deviceMethods/{deviceKey}")
-                {
-                    Name = "DevMethods",
-                    RouteHandler = new DevMethodsRequestHandler()
-                },
-                new HttpCwsRoute("deviceFeedbacks/{deviceKey}")
-                {
-                    Name = "GetFeedbacksForDeviceKey",
-                    RouteHandler = new GetFeedbacksForDeviceRequestHandler()
-                },
-                new HttpCwsRoute("deviceStreamDebug")
-                {
-                    Name = "SetDeviceStreamDebug",
-                    RouteHandler = new SetDeviceStreamDebugRequestHandler()
-                },
-                new HttpCwsRoute("disableAllStreamDebug")
-                {
-                    Name = "DisableAllStreamDebug",
-                    RouteHandler = new DisableAllStreamDebugRequestHandler()
-                },
-                new HttpCwsRoute("config")
-                {
-                    Name = "ShowConfig",
-                    RouteHandler = new ShowConfigRequestHandler()
-                },
-                new HttpCwsRoute("types")
-                {
-                    Name = "GetTypes",
-                    RouteHandler = new GetTypesRequestHandler()
-                },
-                new HttpCwsRoute("types/{filter}")
-                {
-                    Name = "GetTypesByFilter",
-                    RouteHandler = new GetTypesByFilterRequestHandler()
-                },
-                new HttpCwsRoute("joinMap/{bridgeKey}")
-                {
-                    Name = "GetJoinMapsForBridgeKey",
-                    RouteHandler = new GetJoinMapForBridgeKeyRequestHandler()
-                },
-                new HttpCwsRoute("joinMap/{bridgeKey}/{deviceKey}")
-                {
-                    Name = "GetJoinMapsForDeviceKey",
-                    RouteHandler = new GetJoinMapForDeviceKeyRequestHandler()
-                },
-				new HttpCwsRoute("debugSession")
-				{
-					Name = "DebugSession",
-					RouteHandler = new DebugSessionRequestHandler()
-				},
-				new HttpCwsRoute("doNotLoadConfigOnNextBoot")
-				{
-					Name = "DoNotLoadConfigOnNextBoot",
-					RouteHandler = new DoNotLoadConfigOnNextBootRequestHandler()
-				},
-				new HttpCwsRoute("restartProgram")
-                {
-                    Name = "Restart Program",
-                    RouteHandler = new RestartProgramRequestHandler()
-                },
-                new HttpCwsRoute("loadConfig")
-                {
-                    Name = "Load Config",
-                    RouteHandler = new LoadConfigRequestHandler()
-                }
-
-            };
-
-            AddRoute(routes);
-        }
-
-        /// <summary>
-        /// Add a single route to the API. MUST be done during the activation phase
-        /// </summary>
-        /// <param name="route"></param>
-        public void AddRoute(HttpCwsRoute route)
-        {
-            _server.AddRoute(route);
-        }
-
-        /// <summary>
-        /// Add a collection of routes to the API. MUST be done during the activation phase
-        /// </summary>
-        /// <param name="routes"></param>
-        public void AddRoute(List<HttpCwsRoute> routes)
-        {
-            foreach (var route in routes)
-            {
-                AddRoute(route);
-            }
-        }
-
-		/// <summary>
-		/// Initializes the CWS class
-		/// </summary>
-		public override void Initialize()
-		{
-			// If running on an appliance
-			if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
-			{
-				/*
-					WEBSERVER [ON | OFF | TIMEOUT <VALUE IN SECONDS> | MAXSESSIONSPERUSER <Number of sessions>]
-				*/
-				var response = string.Empty;
-				CrestronConsole.SendControlSystemCommand("webserver", ref response);
-				if (response.Contains("OFF")) return;
-
-				var is4Series = eCrestronSeries.Series4 == (Global.ProcessorSeries & eCrestronSeries.Series4);
-				Debug.LogMessage(LogEventLevel.Verbose, "Starting Essentials Web API on {0} Appliance", is4Series ? "4-series" : "3-series");
-
-				_server.Start();
-
-				GetPaths();
-
-				return;
-			}
-
-			// Automatically start CWS when running on a server (Linux OS, Virtual Control)
-			Debug.LogMessage(LogEventLevel.Verbose, "Starting Essentials Web API on Virtual Control Server");
-
-			_server.Start();
-
-			GetPaths();
-		}
-
-		/// <summary>
-		/// Print the available pahts
-		/// </summary>
-		/// <example>
-		/// http(s)://{ipaddress}/cws/{basePath}
-		/// http(s)://{ipaddress}/VirtualControl/Rooms/{roomId}/cws/{basePath}
-		/// </example>
-		public void GetPaths()
-		{
-			Debug.LogMessage(LogEventLevel.Verbose, this, "{0}", new String('-', 50));
-
-			var currentIp = CrestronEthernetHelper.GetEthernetParameter(
-				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
-			
-			var hostname = CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0);
-			
-			var path = CrestronEnvironment.DevicePlatform == eDevicePlatform.Server 
-				? string.Format("http(s)://{0}/VirtualControl/Rooms/{1}/cws{2}", hostname, InitialParametersClass.RoomId, BasePath)
-				: string.Format("http(s)://{0}/cws{1}", currentIp, BasePath);
-			
-			Debug.LogMessage(LogEventLevel.Verbose, this, "Server:{0}", path);
-
-			var routeCollection = _server.GetRouteCollection();
-			if (routeCollection == null)
-			{
-				Debug.LogMessage(LogEventLevel.Verbose, this, "Server route collection is null");
-				return;
-			}
-			Debug.LogMessage(LogEventLevel.Verbose, this, "Configured Routes:");
-			foreach (var route in routeCollection)
-			{
-				Debug.LogMessage(LogEventLevel.Verbose, this, "{0}: {1}/{2}", route.Name, path, route.Url);
-			}
-			Debug.LogMessage(LogEventLevel.Verbose, this, "{0}", new String('-', 50));
-		}
-	}
-}

src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs

@@ -1,97 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.WebScripting;
-using Crestron.SimplSharpPro.EthernetCommunication;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Web.RequestHandlers;
-using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-    public class DebugSessionRequestHandler : WebApiBaseRequestHandler
-    {    
-        public DebugSessionRequestHandler()
-            : base(true)
-        {
-        }
-
-        /// <summary>
-        /// Gets details for a debug session
-        /// </summary>
-        /// <param name="context"></param>
-        protected override void HandleGet(Crestron.SimplSharp.WebScripting.HttpCwsContext context)
-        {
-            var routeData = context.Request.RouteData;
-            if (routeData == null)
-            {
-                context.Response.StatusCode = 400;
-                context.Response.StatusDescription = "Bad Request";
-                context.Response.End();
-
-                return;
-            }
-
-            try
-            {
-                var ip = CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
-
-                var port = 0;
-
-                if (!Debug.WebsocketSink.IsRunning)
-                {
-                    Debug.LogMessage(LogEventLevel.Information, "Starting WS Server");
-                    // Generate a random port within a specified range
-                    port = new Random().Next(65435, 65535);
-                    // Start the WS Server
-                    Debug.WebsocketSink.StartServerAndSetPort(port);
-                    Debug.SetWebSocketMinimumDebugLevel(Serilog.Events.LogEventLevel.Verbose);
-                }
-
-                var url = Debug.WebsocketSink.Url;
-
-                object data = new
-                {
-                    url = Debug.WebsocketSink.Url
-                };
-
-                Debug.LogMessage(LogEventLevel.Information, "Debug Session URL: {0}", url);
-
-                // Return the port number with the full url of the WS Server
-                var res = JsonConvert.SerializeObject(data);
-
-                context.Response.ContentType = "application/json";
-                context.Response.ContentEncoding = Encoding.UTF8;
-                context.Response.StatusCode = 200;
-                context.Response.StatusDescription = "OK";
-                context.Response.Write(res, false);
-                context.Response.End();
-            }
-            catch (Exception e)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Error: {0}", e);
-            }
-        }
-
-        /// <summary>
-        /// Stops a debug session
-        /// </summary>
-        /// <param name="context"></param>
-        protected override void HandlePost(HttpCwsContext context)
-        {
-            Debug.WebsocketSink.StopServer();
-
-            context.Response.StatusCode = 200;
-            context.Response.StatusDescription = "OK";
-            context.Response.End();
-
-            Debug.LogMessage(LogEventLevel.Information, "Websocket Debug Session Stopped");
-        }
-
-    }
-}

src/PepperDash.Essentials.Core/Web/RequestHandlers/DevMethodsRequestHandler.cs

@@ -1,76 +0,0 @@
-using System.Text;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class DevMethodsRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public DevMethodsRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <summary>
-		/// Handles GET method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandleGet(HttpCwsContext context)
-		{
-            var routeData = context.Request.RouteData;
-            if (routeData == null)
-            {
-                context.Response.StatusCode = 400;
-                context.Response.StatusDescription = "Bad Request";
-                context.Response.End();
-
-                return;
-            }
-
-            object deviceObj;
-			if (!routeData.Values.TryGetValue("deviceKey", out deviceObj))
-			{
-				context.Response.StatusCode = 400;
-				context.Response.StatusDescription = "Bad Request";
-				context.Response.End();
-
-				return;
-			}
-
-			var device = DeviceManager.GetDeviceForKey(deviceObj.ToString());
-
-			if (device == null)
-			{
-				context.Response.StatusCode = 404;
-                context.Response.StatusDescription = "Device Not Found";
-                context.Response.End();
-
-                return;
-			}
-
-            var deviceMethods = DeviceJsonApi.GetMethods(device.Key);
-			if (deviceMethods == null || deviceMethods.ToLower().Contains("no device"))
-			{
-				context.Response.StatusCode = 404;
-				context.Response.StatusDescription = "Not Found";
-				context.Response.End();
-
-				return;
-			}
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";			
-			context.Response.ContentType = "application/json";
-			context.Response.ContentEncoding = Encoding.UTF8;
-			context.Response.Write(deviceMethods, false);
-			context.Response.End();
-		}
-	}
-}

src/PepperDash.Essentials.Core/Web/RequestHandlers/DevPropsRequestHandler.cs

@@ -1,76 +0,0 @@
-using System.Text;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class DevPropsRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public DevPropsRequestHandler()
-			: base(true)
-		{
-		}
-
-        /// <summary>
-        /// Handles GET method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected override void HandleGet(HttpCwsContext context)
-        {
-            var routeData = context.Request.RouteData;
-            if (routeData == null)
-            {
-                context.Response.StatusCode = 400;
-                context.Response.StatusDescription = "Bad Request";
-                context.Response.End();
-
-                return;
-            }
-
-            object deviceObj;
-            if (!routeData.Values.TryGetValue("deviceKey", out deviceObj))
-            {
-                context.Response.StatusCode = 400;
-                context.Response.StatusDescription = "Bad Request";
-                context.Response.End();
-
-                return;
-            }
-
-            var device = DeviceManager.GetDeviceForKey(deviceObj.ToString());
-
-            if (device == null)
-            {
-                context.Response.StatusCode = 404;
-                context.Response.StatusDescription = "Device Not Found";
-                context.Response.End();
-
-                return;
-            }
-
-            var deviceProperties = DeviceJsonApi.GetProperties(device.Key);
-            if (deviceProperties == null || deviceProperties.ToLower().Contains("no device"))
-            {
-                context.Response.StatusCode = 404;
-                context.Response.StatusDescription = "Not Found";
-                context.Response.End();
-
-                return;
-            }
-
-            context.Response.StatusCode = 200;
-            context.Response.StatusDescription = "OK";
-            context.Response.ContentType = "application/json";
-            context.Response.ContentEncoding = Encoding.UTF8;
-            context.Response.Write(deviceProperties, false);
-            context.Response.End();
-        }
-    }
-}

src/PepperDash.Essentials.Core/Web/RequestHandlers/DoNotLoadConfigOnNextBootRequestHandler.cs

@@ -1,84 +0,0 @@
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class DoNotLoadConfigOnNextBootRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>		
-		public DoNotLoadConfigOnNextBootRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <summary>
-		/// Handles GET method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandleGet(HttpCwsContext context)
-		{
-			var data = new Data
-			{
-				DoNotLoadConfigOnNextBoot = Debug.DoNotLoadConfigOnNextBoot
-            };
-
-			var body = JsonConvert.SerializeObject(data, Formatting.Indented);
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";
-			context.Response.Write(body, false);
-			context.Response.End();
-		}
-		
-		/// <summary>
-		/// Handles POST method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandlePost(HttpCwsContext context)
-		{
-			if (context.Request.ContentLength < 0)
-			{
-				context.Response.StatusCode = 400;
-				context.Response.StatusDescription = "Bad Request";
-				context.Response.End();
-
-				return;
-			}
-
-			var data = EssentialsWebApiHelpers.GetRequestBody(context.Request);
-			if (string.IsNullOrEmpty(data))
-			{
-				context.Response.StatusCode = 400;
-				context.Response.StatusDescription = "Bad Request";
-				context.Response.End();
-
-				return;
-			}
-
-			var d = new Data();
-			var requestBody = JsonConvert.DeserializeAnonymousType(data, d);
-
-			Debug.SetDoNotLoadConfigOnNextBoot(requestBody.DoNotLoadConfigOnNextBoot);
-
-			var responseBody = JsonConvert.SerializeObject(d, Formatting.Indented);
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";
-			context.Response.Write(responseBody, false);
-			context.Response.End();
-		}
-	}
-
-	public class Data
-	{
-		[JsonProperty("doNotLoadConfigOnNextBoot", NullValueHandling = NullValueHandling.Ignore)]
-		public bool DoNotLoadConfigOnNextBoot { get; set; }
-	}
-}

src/PepperDash.Essentials.Core/Web/RequestHandlers/LoadConfigRequestHandler.cs

@@ -1,39 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class LoadConfigRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>		
-		public LoadConfigRequestHandler()
-			: base(true)
-		{
-		}
-		
-		/// <summary>
-		/// Handles POST method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandlePost(HttpCwsContext context)
-		{
-			var message = "";
-			var cs = Global.ControlSystem as ILoadConfig;
-			if(cs != null)
-                cs.GoWithLoad();
-            
-            context.Response.StatusCode = 200;
-            context.Response.StatusDescription = "OK";
-			context.Response.Write(message, false);
-            context.Response.End();
-        }
-	}
-}

src/PepperDash.Essentials.Core/Web/RequestHandlers/RestartProgramRequestHandler.cs

@@ -1,38 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class RestartProgramRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>		
-		public RestartProgramRequestHandler()
-			: base(true)
-		{
-		}
-		
-		/// <summary>
-		/// Handles POST method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandlePost(HttpCwsContext context)
-		{
-			var message = "";
-			if(CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
-				CrestronConsole.SendControlSystemCommand($"progres -p:{InitialParametersClass.ApplicationNumber}", ref message);
-			
-            context.Response.StatusCode = 200;
-            context.Response.StatusDescription = "OK";
-			context.Response.Write(message, false);
-            context.Response.End();
-        }
-	}
-}

src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-
-namespace PepperDash.Essentials.Devices.Common.DSP
-{
-	public abstract class DspBase : EssentialsDevice, ILevelControls
-	{
-		public Dictionary<string,IBasicVolumeWithFeedback> LevelControlPoints { get; private set; }
-
-        public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
-
-        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
-
-	    public DspBase(string key, string name) :
-	        base(key, name)
-	    {
-	    }
-
-
-		// in audio call feedback
-
-		// VOIP
-		// Phone dialer
-
-	}
-
-	// Fusion
-	// Privacy state
-	// Online state
-	// level/mutes ?
-	
-	// AC Log call stats
-	
-		// Typical presets:
-		// call default preset to restore levels and mutes
-
-	public abstract class DspControlPoint :IKeyed
-	{
-        public string Key { get; }
-
-        protected DspControlPoint(string key) => Key = key;
-	}
-
-    public abstract class DspLevelControlPoint :DspControlPoint, IBasicVolumeWithFeedback
-    {
-        public BoolFeedback MuteFeedback { get; }
-        public IntFeedback VolumeLevelFeedback { get; }
-
-        protected DspLevelControlPoint(string key, Func<bool> muteFeedbackFunc, Func<int> volumeLevelFeedbackFunc) : base(key)
-        {
-            MuteFeedback = new BoolFeedback(muteFeedbackFunc);
-            VolumeLevelFeedback = new IntFeedback(volumeLevelFeedbackFunc);
-        }
-
-        public abstract void MuteOff();
-        public abstract void MuteOn();
-        public abstract void MuteToggle();
-        public abstract void SetVolume(ushort level);
-        public abstract void VolumeDown(bool pressRelease);
-        public abstract void VolumeUp(bool pressRelease);
-    }
-
-
-    public abstract class DspDialerBase:DspControlPoint
-	{
-        protected DspDialerBase(string key) : base(key) { }
-	}
-
-
-	// Main program 
-	// VTC 
-	// ATC
-	// Mics, unusual
-
-}

src/PepperDash.Essentials.Devices.Common/Displays/BasicIrDisplay.cs

@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Displays
-{
-    public class BasicIrDisplay : DisplayBase, IBasicVolumeControls, IBridgeAdvanced
-	{
-		public IrOutputPortController IrPort { get; private set; }
-		public ushort IrPulseTime { get; set; }
-
-        protected Func<bool> PowerIsOnFeedbackFunc
-        {
-            get { return () => _PowerIsOn; }
-        }
-		protected override Func<bool> IsCoolingDownFeedbackFunc
-		{
-			get { return () => _IsCoolingDown; }
-		}
-		protected override Func<bool> IsWarmingUpFeedbackFunc
-		{
-			get { return () => _IsWarmingUp; }
-		}
-
-        bool _PowerIsOn;
-		bool _IsWarmingUp;
-		bool _IsCoolingDown;
-
-		public BasicIrDisplay(string key, string name, IROutputPort port, string irDriverFilepath)
-			: base(key, name)
-		{
-			IrPort = new IrOutputPortController(key + "-ir", port, irDriverFilepath);
-			DeviceManager.AddDevice(IrPort);
-
-			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>
-			{
-				new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Hdmi1), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Hdmi2), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Hdmi3), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Hdmi4), this, false),
-				new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Component1), this, false),
-				new RoutingInputPort(RoutingPortNames.CompositeIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Video1), this, false),
-				new RoutingInputPort(RoutingPortNames.AntennaIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-					eRoutingPortConnectionType.Hdmi, new Action(Antenna), this, false),
-			});
-		}
-
-		public void Hdmi1()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_1, IrPulseTime);
-		}
-
-		public void Hdmi2()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_2, IrPulseTime);
-		}
-
-		public void Hdmi3()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_3, IrPulseTime);
-		}
-
-		public void Hdmi4()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_4, IrPulseTime);
-		}
-
-		public void Component1()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_COMPONENT_1, IrPulseTime);
-		}
-
-		public void Video1()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_VIDEO_1, IrPulseTime);
-		}
-
-		public void Antenna()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_ANTENNA, IrPulseTime);
-		}
-
-		#region IPower Members
-
-		public override void PowerOn()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_ON, IrPulseTime);
-            _PowerIsOn = true;
-		}
-
-		public override void PowerOff()
-		{
-            _PowerIsOn = false;
-			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_OFF, IrPulseTime);
-		}
-
-		public override void PowerToggle()
-		{
-            _PowerIsOn = false;
-			IrPort.Pulse(IROutputStandardCommands.IROut_POWER, IrPulseTime);
-		}
-
-		#endregion
-
-		#region IBasicVolumeControls Members
-
-		public void VolumeUp(bool pressRelease)
-		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_VOL_PLUS, pressRelease);
-		}
-
-		public void VolumeDown(bool pressRelease)
-		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_VOL_MINUS, pressRelease);
-		}
-
-		public void MuteToggle()
-		{
-			IrPort.Pulse(IROutputStandardCommands.IROut_MUTE, 200);
-		}
-
-		#endregion
-
-		void StartWarmingTimer()
-		{
-			_IsWarmingUp = true;
-			IsWarmingUpFeedback.FireUpdate();
-			new CTimer(o => {
-				_IsWarmingUp = false;
-				IsWarmingUpFeedback.FireUpdate();
-			}, 10000);
-		}
-
-		void StartCoolingTimer()
-		{
-			_IsCoolingDown = true;
-			IsCoolingDownFeedback.FireUpdate();
-			new CTimer(o =>
-			{
-				_IsCoolingDown = false;
-				IsCoolingDownFeedback.FireUpdate();
-			}, 7000);
-		}
-
-		#region IRoutingSink Members
-
-		/// <summary>
-		/// Typically called by the discovery routing algorithm.
-		/// </summary>
-		/// <param name="inputSelector">A delegate containing the input selector method to call</param>
-		public override void ExecuteSwitch(object inputSelector)
-		{
-            Debug.LogMessage(LogEventLevel.Verbose, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
-
-			Action finishSwitch = () =>
-				{
-					var action = inputSelector as Action;
-					if (action != null)
-						action();
-				};
-
-			if (!_PowerIsOn)
-			{
-				PowerOn();
-				EventHandler<FeedbackEventArgs> oneTimer = null;
-				oneTimer = (o, a) =>
-					 {
-						 if (IsWarmingUpFeedback.BoolValue) return; // Only catch done warming
-						 IsWarmingUpFeedback.OutputChange -= oneTimer;
-						 finishSwitch();
-					 };
-				IsWarmingUpFeedback.OutputChange += oneTimer;
-			}
-			else // Do it!
-				finishSwitch();
-		}
-
-		#endregion
-
-	    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-	    {
-	        LinkDisplayToApi(this, trilist, joinStart, joinMapKey, bridge);
-	    }
-	}
-
-    public class BasicIrDisplayFactory : EssentialsDeviceFactory<BasicIrDisplay>
-    {
-        public BasicIrDisplayFactory()
-        {
-            TypeNames = new List<string>() { "basicirdisplay" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new BasicIrDisplay Device");
-            var ir = IRPortHelper.GetIrPort(dc.Properties);
-            if (ir != null)
-            {
-                var display = new BasicIrDisplay(dc.Key, dc.Name, ir.Port, ir.FileName);
-                display.IrPulseTime = 200;       // Set default pulse time for IR commands.
-                return display;
-            }
-
-            return null;
-        }
-    }
-
-}

src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs

@@ -1,320 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using Feedback = PepperDash.Essentials.Core.Feedback;
-using Newtonsoft.Json;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Displays
-{
-    public abstract class DisplayBase : EssentialsDevice
-        , IHasFeedback
-        , IRoutingSinkWithSwitching
-        , IHasPowerControl
-        , IWarmingCooling
-        , IUsageTracking
-	{
-        public event SourceInfoChangeHandler CurrentSourceChange;
-
-        public string CurrentSourceInfoKey { get; set; }
-        public SourceListItem CurrentSourceInfo
-        {
-            get
-            {
-                return _CurrentSourceInfo;
-            }
-            set
-            {
-                if (value == _CurrentSourceInfo) return;
-
-                var handler = CurrentSourceChange;
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.WillChange);
-
-                _CurrentSourceInfo = value;
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-            }
-        }
-        SourceListItem _CurrentSourceInfo;
-
-		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
-		public BoolFeedback IsWarmingUpFeedback { get; private set; }
-
-        public UsageTracking UsageTracker { get; set; }
-
-		public uint WarmupTime { get; set; }
-		public uint CooldownTime { get; set; }
-
-		/// <summary>
-		/// Bool Func that will provide a value for the PowerIsOn Output. Must be implemented
-		/// by concrete sub-classes
-		/// </summary>
-		abstract protected Func<bool> IsCoolingDownFeedbackFunc { get; }
-		abstract protected Func<bool> IsWarmingUpFeedbackFunc { get; }
-        
-
-		protected CTimer WarmupTimer;
-		protected CTimer CooldownTimer;
-
-		#region IRoutingInputs Members
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-		#endregion
-
-	    protected DisplayBase(string key, string name)
-			: base(key, name)
-		{
-			IsCoolingDownFeedback = new BoolFeedback("IsCoolingDown", IsCoolingDownFeedbackFunc);
-			IsWarmingUpFeedback = new BoolFeedback("IsWarmingUp", IsWarmingUpFeedbackFunc);
-
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-
-		}
-
-		public abstract void PowerOn();
-		public abstract void PowerOff();
-		public abstract void PowerToggle();
-
-        public virtual FeedbackCollection<Feedback> Feedbacks
-		{
-			get
-			{
-                return new FeedbackCollection<Feedback>
-				{
-					IsCoolingDownFeedback,
-					IsWarmingUpFeedback
-				};
-			}
-		}
-
-	    public abstract void ExecuteSwitch(object selector);
-
-	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
-	        EiscApiAdvanced bridge)
-	    {
-            var joinMap = new DisplayControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);
-
-	        if (bridge != null)
-	        {
-	            bridge.AddJoinMap(Key, joinMap);
-	        }
-	        else
-	        {
-	            Debug.LogMessage(LogEventLevel.Information,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-	        }
-
-			LinkDisplayToApi(displayDevice, trilist, joinMap);
-	    }
-
-		protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
-		{
-			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;
-
-			var commMonitor = displayDevice as ICommunicationMonitor;
-			if (commMonitor != null)
-			{
-				commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			}
-
-			var inputNumber = 0;
-			var inputKeys = new List<string>();
-
-			var inputNumberFeedback = new IntFeedback(() => inputNumber);
-
-			// Two way feedbacks
-			var twoWayDisplay = displayDevice as TwoWayDisplayBase;
-
-			if (twoWayDisplay != null)
-			{
-				trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
-
-				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Information, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
-
-
-				inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
-			}
-
-			// Power Off
-			trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
-			{
-				inputNumber = 102;
-				inputNumberFeedback.FireUpdate();
-				displayDevice.PowerOff();
-			});
-
-			var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
-			if (twoWayDisplayDevice != null)
-			{
-				twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
-				{
-					if (!a.BoolValue)
-					{
-						inputNumber = 102;
-						inputNumberFeedback.FireUpdate();
-
-					}
-					else
-					{
-						inputNumber = 0;
-						inputNumberFeedback.FireUpdate();
-					}
-				};
-
-				twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
-				twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
-			}
-
-			// PowerOn
-			trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
-			{
-				inputNumber = 0;
-				inputNumberFeedback.FireUpdate();
-				displayDevice.PowerOn();
-			});
-
-
-
-			for (int i = 0; i < displayDevice.InputPorts.Count; i++)
-			{
-				if (i < joinMap.InputNamesOffset.JoinSpan)
-				{
-					inputKeys.Add(displayDevice.InputPorts[i].Key);
-					var tempKey = inputKeys.ElementAt(i);
-					trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
-						() => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
-					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.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.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
-			trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
-			{
-				if (a == 0)
-				{
-					displayDevice.PowerOff();
-					inputNumber = 0;
-				}
-				else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
-				{
-					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-					inputNumber = a;
-				}
-				else if (a == 102)
-				{
-					displayDevice.PowerToggle();
-
-				}
-				if (twoWayDisplay != null)
-					inputNumberFeedback.FireUpdate();
-			});
-
-
-			var volumeDisplay = displayDevice as IBasicVolumeControls;
-			if (volumeDisplay == null) return;
-
-			trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
-			trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
-			trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
-
-			var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
-
-			if (volumeDisplayWithFeedback == null) return;
-			trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
-			trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
-
-
-			trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
-			volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
-			volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
-			volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
-			volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
-		}
-
-    }
-
-    public abstract class TwoWayDisplayBase : DisplayBase, IRoutingFeedback, IHasPowerControlWithFeedback
-	{
-        public StringFeedback CurrentInputFeedback { get; private set; }
-
-        abstract protected Func<string> CurrentInputFeedbackFunc { get; }
-
-        public BoolFeedback PowerIsOnFeedback { get; protected set; }
-
-        abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
-
-
-        public static MockDisplay DefaultDisplay
-        { 
-			get 
-			{
-				if (_DefaultDisplay == null)
-					_DefaultDisplay = new MockDisplay("default", "Default Display");
-				return _DefaultDisplay;
-			} 
-		}
-		static MockDisplay _DefaultDisplay;
-
-		public TwoWayDisplayBase(string key, string name)
-			: base(key, name)
-		{
-            CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
-
-			WarmupTime = 7000;
-			CooldownTime = 15000;
-
-            PowerIsOnFeedback = new BoolFeedback("PowerOnFeedback", PowerIsOnFeedbackFunc);
-
-            Feedbacks.Add(CurrentInputFeedback);
-            Feedbacks.Add(PowerIsOnFeedback);
-
-            PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
-
-		}
-
-        void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
-        {
-            if (UsageTracker != null)
-            {
-                if (PowerIsOnFeedback.BoolValue)
-                    UsageTracker.StartDeviceUsage();
-                else
-                    UsageTracker.EndDeviceUsage();
-            }
-        }
-
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        protected void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-	}
-}

src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs

@@ -1,242 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Displays
-{
-    public class MockDisplay : TwoWayDisplayBase, IBasicVolumeWithFeedback, IBridgeAdvanced, IHasInputs<string, string>
-	{
-        public ISelectableItems<string> Inputs { get; private set; }
-
-		bool _PowerIsOn;
-		bool _IsWarmingUp;
-		bool _IsCoolingDown;
-
-        protected override Func<bool> PowerIsOnFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                    {
-                        return _PowerIsOn;
-                    };
-        } }
-		protected override Func<bool> IsCoolingDownFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    return _IsCoolingDown;
-                };
-            }
-        }
-		protected override Func<bool> IsWarmingUpFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    return _IsWarmingUp;
-                };
-            }
-        }
-        protected override Func<string> CurrentInputFeedbackFunc { get { return () => Inputs.CurrentItem; } }
-
-        int VolumeHeldRepeatInterval = 200;
-        ushort VolumeInterval = 655;
-		ushort _FakeVolumeLevel = 31768;
-		bool _IsMuted;
-
-		public MockDisplay(string key, string name)
-			: base(key, name)
-		{
-            Inputs = new MockDisplayInputs
-            {
-                Items = new Dictionary<string, ISelectableItem>
-				{
-					{ "HDMI1", new MockDisplayInput ( "HDMI1", "HDMI 1",this ) },
-					{ "HDMI2", new MockDisplayInput ("HDMI2", "HDMI 2",this ) },
-					{ "HDMI3", new MockDisplayInput ("HDMI3", "HDMI 3",this ) },
-					{ "HDMI4", new MockDisplayInput ("HDMI4", "HDMI 4",this )},
-					{ "DP", new MockDisplayInput ("DP", "DisplayPort", this ) }
-				}
-            };
-
-			Inputs.CurrentItemChanged += (o, a) => CurrentInputFeedback.FireUpdate();
-           
-            var hdmiIn1 = new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.Hdmi, "HDMI1", this);
-			var hdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.Hdmi, "HDMI2", this);
-			var hdmiIn3 = new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.Hdmi, "HDMI3", this);
-			var hdmiIn4 = new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.Hdmi, "HDMI4", this);
-			var dpIn = new RoutingInputPort(RoutingPortNames.DisplayPortIn, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.DisplayPort, "DP", this);
-			InputPorts.AddRange(new[] { hdmiIn1, hdmiIn2, hdmiIn3, hdmiIn4, dpIn });
-
-			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
-			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
-
-            WarmupTime = 10000;
-            CooldownTime = 10000;
-		}
-
-		public override void PowerOn()
-		{
-			if (!PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-			{
-				_IsWarmingUp = true;
-				IsWarmingUpFeedback.InvokeFireUpdate();
-				// Fake power-up cycle
-				WarmupTimer = new CTimer(o =>
-					{
-						_IsWarmingUp = false;
-						_PowerIsOn = true;
-						IsWarmingUpFeedback.InvokeFireUpdate();
-						PowerIsOnFeedback.InvokeFireUpdate();
-					}, WarmupTime);
-			}
-		}
-
-		public override void PowerOff()
-		{
-			// If a display has unreliable-power off feedback, just override this and
-			// remove this check.
-			if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-			{
-				_IsCoolingDown = true;
-				IsCoolingDownFeedback.InvokeFireUpdate();
-				// Fake cool-down cycle
-				CooldownTimer = new CTimer(o =>
-					{
-						Debug.LogMessage(LogEventLevel.Verbose, "Cooldown timer ending", this);
-						_IsCoolingDown = false;
-						IsCoolingDownFeedback.InvokeFireUpdate();
-                        _PowerIsOn = false;
-                        PowerIsOnFeedback.InvokeFireUpdate();
-					}, CooldownTime);
-			}
-		}		
-		
-		public override void PowerToggle()
-		{
-			if (PowerIsOnFeedback.BoolValue && !IsWarmingUpFeedback.BoolValue)
-				PowerOff();
-			else if (!PowerIsOnFeedback.BoolValue && !IsCoolingDownFeedback.BoolValue)
-				PowerOn();
-		}
-
-		public override void ExecuteSwitch(object selector)
-		{
-			Debug.LogMessage(LogEventLevel.Verbose, this, "ExecuteSwitch: {0}", selector);
-
-			if (!_PowerIsOn)
-			{
-				PowerOn();
-			}
-
-			if (!Inputs.Items.TryGetValue(selector.ToString(), out var input))
-				return;
-
-			input.Select();
-		}
-
-
-        #region IBasicVolumeWithFeedback Members
-
-        public IntFeedback VolumeLevelFeedback { get; private set; }
-
-		public void SetVolume(ushort level)
-		{
-			_FakeVolumeLevel = level;
-			VolumeLevelFeedback.InvokeFireUpdate();
-		}
-
-		public void MuteOn()
-		{
-			_IsMuted = true;
-			MuteFeedback.InvokeFireUpdate();
-		}
-
-		public void MuteOff()
-		{
-			_IsMuted = false;
-			MuteFeedback.InvokeFireUpdate();
-		}
-
-		public BoolFeedback MuteFeedback { get; private set; }
-
-
-        #endregion
-
-        #region IBasicVolumeControls Members
-
-        public void VolumeUp(bool pressRelease)
-		{
-            //while (pressRelease)
-            //{
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Down {0}", pressRelease);
-                if (pressRelease)
-                {
-                    var newLevel = _FakeVolumeLevel + VolumeInterval;
-                    SetVolume((ushort)newLevel);
-                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
-                }
-            //}
-		}
-
-		public void VolumeDown(bool pressRelease)
-		{
-            //while (pressRelease)
-            //{
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Up {0}", pressRelease);
-                if (pressRelease)
-                {
-                    var newLevel = _FakeVolumeLevel - VolumeInterval;
-                    SetVolume((ushort)newLevel);
-                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
-                }
-            //}
-		}
-
-		public void MuteToggle()
-		{
-			_IsMuted = !_IsMuted;
-			MuteFeedback.InvokeFireUpdate();
-		}
-
-		#endregion
-
-	    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-	    {
-	        LinkDisplayToApi(this, trilist, joinStart, joinMapKey, bridge);
-	    }
-
-
-    }
-	public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
-	{
-		public MockDisplayFactory()
-		{
-			TypeNames = new List<string>() { "mockdisplay" };
-		}
-
-		public override EssentialsDevice BuildDevice(DeviceConfig dc)
-		{
-			Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Mock Display Device");
-			return new MockDisplay(dc.Key, dc.Name);
-		}
-	}
-}

src/PepperDash.Essentials.Devices.Common/Displays/MockDisplayInputs.cs

@@ -1,101 +0,0 @@
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.Displays
-{
-    public class MockDisplayInputs : ISelectableItems<string>
-    {
-        private Dictionary<string, ISelectableItem> _items;
-
-        public Dictionary<string, ISelectableItem> Items
-        {
-            get
-            {
-                return _items;
-            }
-            set
-            {
-                if (_items == value)
-                    return;
-
-                _items = value;
-
-                ItemsUpdated?.Invoke(this, null);
-            }
-        }
-
-        private string _currentItem;
-
-        public string CurrentItem
-        { 
-            get
-            {
-                return _currentItem;
-            }
-            set
-            {
-                if (_currentItem == value)
-                    return;
-
-                _currentItem = value;
-
-                CurrentItemChanged?.Invoke(this, null);
-            }
-        }
-
-        public event EventHandler ItemsUpdated;
-        public event EventHandler CurrentItemChanged;
-    }
-
-    public class MockDisplayInput : ISelectableItem
-    {
-        private MockDisplay _parent;
-
-        private bool _isSelected;
-        
-        public bool IsSelected
-        {
-            get
-            {
-                return _isSelected;
-            }
-            set
-            {
-                if (_isSelected == value)
-                    return;
-
-                _isSelected = value;
-
-                ItemUpdated?.Invoke(this, null);
-            }
-        }
-
-        public string Name { get; set; }
-
-        public string Key { get; set; }
-
-        public event EventHandler ItemUpdated;
-
-        public MockDisplayInput(string key, string name, MockDisplay parent)
-        {
-            Key = key;
-            Name = name;
-            _parent = parent;
-        }
-
-        public void Select()
-        {
-            if (!_parent.PowerIsOnFeedback.BoolValue) _parent.PowerOn();
-
-            foreach(var input in _parent.Inputs.Items)
-            {
-                input.Value.IsSelected = input.Key == this.Key;
-            }
-        }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs

@@ -1,266 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Devices.Common;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Shades
-{
-    /// <summary>
-    /// Controls a single shade using three relays
-    /// </summary>
-    public class ScreenLiftController : EssentialsDevice, IProjectorScreenLiftControl
-    {
-        readonly ScreenLiftControllerConfigProperties Config;
-        readonly ScreenLiftRelaysConfig RaiseRelayConfig;
-        readonly ScreenLiftRelaysConfig LowerRelayConfig;
-        readonly ScreenLiftRelaysConfig LatchedRelayConfig;
-
-        Displays.DisplayBase DisplayDevice;
-        ISwitchedOutput RaiseRelay;
-        ISwitchedOutput LowerRelay;
-        ISwitchedOutput LatchedRelay;
-
-        public bool InUpPosition
-        {
-            get { return _isInUpPosition; }
-            set
-            {
-                if (value == _isInUpPosition) return;
-                _isInUpPosition = value;
-                IsInUpPosition.FireUpdate();
-                PositionChanged?.Invoke(this, new EventArgs());
-            }
-        }
-
-        private bool _isInUpPosition { get; set; }
-        public eScreenLiftControlType Type { get; private set; }
-        public eScreenLiftControlMode Mode { get; private set; }
-
-        public string DisplayDeviceKey { get; private set; }
-        public BoolFeedback IsInUpPosition { get; private set; }
-
-        public event EventHandler<EventArgs> PositionChanged;
-
-        public ScreenLiftController(string key, string name, ScreenLiftControllerConfigProperties config)
-            : base(key, name)
-        {
-            Config = config;
-            DisplayDeviceKey = Config.DisplayDeviceKey;
-            Mode = Config.Mode;
-            Type = Config.Type;
-
-            IsInUpPosition = new BoolFeedback(() => _isInUpPosition);
-
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        RaiseRelayConfig = Config.Relays["raise"];
-                        LowerRelayConfig = Config.Relays["lower"];
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        LatchedRelayConfig = Config.Relays["latched"];
-                        break;
-                    }
-            }
-        }
-
-        private void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            if (!DisplayDevice.IsCoolingDownFeedback.BoolValue && Type == eScreenLiftControlType.lift)
-            {
-                Raise();
-                return;
-            }
-            if (DisplayDevice.IsCoolingDownFeedback.BoolValue && Type == eScreenLiftControlType.screen)
-            {
-                Raise();
-                return;
-            }
-        }
-
-        private void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            if (DisplayDevice.IsWarmingUpFeedback.BoolValue)
-            {
-                Lower();
-            }
-        }
-
-        public override bool CustomActivate()
-        {
-            //Create ISwitchedOutput objects based on props
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        Debug.LogMessage(LogEventLevel.Debug, this, $"Getting relays for {Mode}");
-                        RaiseRelay = GetSwitchedOutputFromDevice(RaiseRelayConfig.DeviceKey);
-                        LowerRelay = GetSwitchedOutputFromDevice(LowerRelayConfig.DeviceKey);
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        Debug.LogMessage(LogEventLevel.Debug, this, $"Getting relays for {Mode}");
-                        LatchedRelay = GetSwitchedOutputFromDevice(LatchedRelayConfig.DeviceKey);
-                        break;
-                    }
-            }
-
-            Debug.LogMessage(LogEventLevel.Debug, this, $"Getting display with key {DisplayDeviceKey}");
-            DisplayDevice = GetDisplayBaseFromDevice(DisplayDeviceKey);
-
-            if (DisplayDevice != null)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, $"Subscribing to {DisplayDeviceKey} feedbacks");
-
-                DisplayDevice.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-                DisplayDevice.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
-            }
-
-            return base.CustomActivate();
-        }
-
-        public void Raise()
-        {
-            if (RaiseRelay == null && LatchedRelay == null) return;
-
-            Debug.LogMessage(LogEventLevel.Debug, this, $"Raising {Type}");
-
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        PulseOutput(RaiseRelay, RaiseRelayConfig.PulseTimeInMs);
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        LatchedRelay.Off();
-                        break;
-                    }
-            }
-            InUpPosition = true;
-        }
-
-        public void Lower()
-        {
-            if (LowerRelay == null && LatchedRelay == null) return;
-
-            Debug.LogMessage(LogEventLevel.Debug, this, $"Lowering {Type}");
-
-            switch (Mode)
-            {
-                case eScreenLiftControlMode.momentary:
-                    {
-                        PulseOutput(LowerRelay, LowerRelayConfig.PulseTimeInMs);
-                        break;
-                    }
-                case eScreenLiftControlMode.latched:
-                    {
-                        LatchedRelay.On();
-                        break;
-                    }
-            }
-            InUpPosition = false;
-        }
-
-        void PulseOutput(ISwitchedOutput output, int pulseTime)
-        {
-            output.On();
-            CTimer pulseTimer = new CTimer(new CTimerCallbackFunction((o) => output.Off()), pulseTime);
-        }
-
-        /// <summary>
-        /// Attempts to get the port on teh specified device from config
-        /// </summary>
-        /// <param name="relayConfig"></param>
-        /// <returns></returns>
-        ISwitchedOutput GetSwitchedOutputFromDevice(string relayKey)
-        {
-            var portDevice = DeviceManager.GetDeviceForKey(relayKey);
-            if (portDevice != null)
-            {
-                return (portDevice as ISwitchedOutput);
-            }
-            else
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: Unable to get relay device with key '{0}'", relayKey);
-                return null;
-            }
-        }
-
-        Displays.DisplayBase GetDisplayBaseFromDevice(string displayKey)
-        {
-            var displayDevice = DeviceManager.GetDeviceForKey(displayKey);
-            if (displayDevice != null)
-            {
-                return displayDevice as Displays.DisplayBase;
-            }
-            else
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: Unable to get display device with key '{0}'", displayKey);
-                return null;
-            }
-        }
-
-    }
-
-    public class ScreenLiftControllerConfigProperties
-    {
-        [JsonProperty("displayDeviceKey")]
-        public string DisplayDeviceKey { get; set; }
-
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public eScreenLiftControlType Type { get; set; }
-
-        [JsonProperty("mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public eScreenLiftControlMode Mode { get; set; }
-
-        [JsonProperty("relays")]
-        public Dictionary<string,ScreenLiftRelaysConfig> Relays { get; set; }
-
-    }
-    public class ScreenLiftRelaysConfig
-    {
-        [JsonProperty("deviceKey")]
-        public string DeviceKey { get; set; }
-
-        [JsonProperty("pulseTimeInMs")]
-        public int PulseTimeInMs { get; set; }
-    }
-
-    public class ScreenLiftControllerFactory : EssentialsDeviceFactory<RelayControlledShade>
-    {
-        public ScreenLiftControllerFactory()
-        {
-            TypeNames = new List<string>() { "screenliftcontroller" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Comm Device");
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ScreenLiftControllerConfigProperties>(dc.Properties.ToString());
-
-            return new ScreenLiftController(dc.Key, dc.Name, props);
-        }
-    }
-
-    public enum eScreenLiftControlMode
-    {
-        momentary,
-        latched
-    }
-}

src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs

@@ -1,63 +0,0 @@
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.Generic
-{
-    public class GenericSink : EssentialsDevice, IRoutingSink
-    {
-        public GenericSink(string key, string name) : base(key, name)
-        {
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-
-            var inputPort = new RoutingInputPort($"{Key}-{RoutingPortNames.AnyVideoIn}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
-
-            InputPorts.Add(inputPort);
-
-        }
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-        public string CurrentSourceInfoKey { get; set; }
-
-        private SourceListItem _currentSource;
-        public SourceListItem CurrentSourceInfo {
-            get => _currentSource;
-            set {
-                if(value == _currentSource)
-                {
-                    return;
-                }
-
-                CurrentSourceChange?.Invoke(_currentSource, ChangeType.WillChange);
-
-                _currentSource = value;
-
-                CurrentSourceChange?.Invoke(_currentSource, ChangeType.DidChange);
-            }
-        }
-
-        public event SourceInfoChangeHandler CurrentSourceChange;
-    }
-
-    public class GenericSinkFactory : EssentialsDeviceFactory<GenericSink>
-    {
-        public GenericSinkFactory()
-        {
-            TypeNames = new List<string>() { "genericsink", "genericdestination" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Source Device");
-            return new GenericSource(dc.Key, dc.Name);
-        }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Lighting/LightingBase.cs

@@ -1,143 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Lighting;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Lighting
-{
-    [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")]
-    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
-    {
-        #region ILightingScenes Members
-
-        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
-        public List<LightingScene> LightingScenes { get; protected set; }
-
-        public LightingScene CurrentLightingScene { get; protected set; }
-		
-		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
-
-        #endregion
-
-        protected LightingBase(string key, string name)
-            : base(key, name)
-        {
-            LightingScenes = new List<LightingScene>();
-
-            CurrentLightingScene = new LightingScene();
-			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
-        }
-
-        public abstract void SelectScene(LightingScene scene);
-
-        public void SimulateSceneSelect(string sceneName)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, this, "Simulating selection of scene '{0}'", sceneName);
-
-            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
-
-            if (scene != null)
-            {
-                CurrentLightingScene = scene;
-                OnLightingSceneChange();
-            }
-        }
-
-        /// <summary>
-        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
-        /// </summary>
-        protected void OnLightingSceneChange()
-        {
-            foreach (var scene in LightingScenes)
-            {
-                if (scene == CurrentLightingScene)
-                    scene.IsActive = true;
-					
-                else
-                    scene.IsActive = false;
-            }
-
-            var handler = LightingSceneChange;
-            if (handler != null)
-            {
-                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
-            }
-        }
-
-	    protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
-		    string joinMapKey, EiscApiAdvanced bridge)
-	    {
-			var joinMap = new GenericLightingJoinMap(joinStart);
-
-			var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-			if (!string.IsNullOrEmpty(joinMapSerialized))
-				joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
-
-			if (bridge != null)
-			{
-				bridge.AddJoinMap(Key, joinMap);
-			}
-			else
-			{
-				Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-			}
-
-		    return LinkLightingToApi(lightingDevice, trilist, joinMap);
-	    }
-
-      protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, GenericLightingJoinMap joinMap)
-      {
-        Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-        Debug.LogMessage(LogEventLevel.Information, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
-
-        // GenericLighitng Actions & FeedBack
-        trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
-
-        var sceneIndex = 0;
-        foreach (var scene in lightingDevice.LightingScenes)
-        {
-          var index = sceneIndex;
-
-          trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + index), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[index]));
-          scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)]);
-          trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
-          trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
-
-          sceneIndex++;
-        }
-
-        trilist.OnlineStatusChange += (sender, args) =>
-        {
-          if (!args.DeviceOnLine) return;
-
-          sceneIndex = 0;
-          foreach (var scene in lightingDevice.LightingScenes)
-          {
-            var index = sceneIndex;
-
-            trilist.StringInput[(uint) (joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
-            trilist.BooleanInput[(uint) (joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
-            scene.IsActiveFeedback.FireUpdate();
-
-            sceneIndex++;
-          }
-        };
-
-        return joinMap;
-      }
-    }
-}

src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectType>ProgramLibrary</ProjectType>
-    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <AssemblyName>Essentials Devices Common</AssemblyName>
-    <RootNamespace>PepperDash.Essentials.Devices.Common</RootNamespace>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Title>PepperDash Essentials Devices Common</Title>
-    <PackageId>PepperDash.Essentials.Devices.Common</PackageId>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 4.7.2|AnyCPU'">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-419" />
-  </ItemGroup>
-</Project>

src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleSpaceRoom.cs

@@ -1,15 +0,0 @@
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-
-namespace PepperDash.Essentials.Devices.Common.Room
-{
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IHasDefaultDisplay, IHasCurrentVolumeControls, IRoomOccupancy,
-        IEmergency, IMicrophonePrivacy
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Room/IEssentialsRoomPropertiesConfig.cs

@@ -1,14 +0,0 @@
-using PepperDash.Essentials.Room.Config;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.Room
-{
-    public interface IEssentialsRoomPropertiesConfig
-    {
-        EssentialsRoomPropertiesConfig PropertiesConfig { get; }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Room/IEssentialsTechRoom.cs

@@ -1,22 +0,0 @@
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
-using System.Collections.Generic;
-using TwoWayDisplayBase = PepperDash.Essentials.Devices.Common.Displays.TwoWayDisplayBase;
-
-
-namespace PepperDash.Essentials.Devices.Common.Room
-{
-    public interface IEssentialsTechRoom:IEssentialsRoom, ITvPresetsProvider,IBridgeAdvanced,IRunDirectRouteAction
-    {
-        EssentialsTechRoomConfig PropertiesConfig { get; }
-        Dictionary<string, IRSetTopBoxBase> Tuners { get; }
-
-        Dictionary<string, TwoWayDisplayBase> Displays { get; }
-
-        void RoomPowerOn();
-
-        void RoomPowerOff();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Shades/ShadeBase.cs

@@ -1,22 +0,0 @@
-using PepperDash.Essentials.Core.Shades;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Shades
-{
-    public abstract class ShadeBase : EssentialsDevice, IShadesOpenCloseStop
-    {
-        public ShadeBase(string key, string name)
-            : base(key, name)
-        {
-
-        }
-
-        #region iShadesOpenClose Members
-
-        public abstract void Open();
-        public abstract void Stop();
-        public abstract void Close();
-
-        #endregion
-    }
-}

src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs

@@ -1,110 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.SoftCodec
-{
-    public class GenericSoftCodec : EssentialsDevice, IRoutingSource, IRoutingSink
-    {
-        public GenericSoftCodec(string key, string name, GenericSoftCodecProperties props) : base(key, name)
-        {
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-
-            for(var i = 1; i <= props.OutputCount; i++)
-            {
-                var outputPort = new RoutingOutputPort($"{Key}-output{i}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
-
-                OutputPorts.Add(outputPort);
-            }
-
-            for(var i = 1; i<= props.ContentInputCount; i++)
-            {
-                var inputPort = new RoutingInputPort($"{Key}-contentInput{i}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
-
-                InputPorts.Add(inputPort);
-            }
-
-            if (!props.HasCameraInputs)
-            {
-                return;
-            }
-
-            for(var i = 1; i <=props.CameraInputCount; i++)
-            {
-                var cameraPort = new RoutingInputPort($"{Key}-cameraInput{i}", eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, null, this);
-
-                InputPorts.Add(cameraPort);
-            }
-        }
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-        public string CurrentSourceInfoKey { get ; set; }
-        public SourceListItem CurrentSourceInfo
-        {
-            get
-            {
-                return _CurrentSourceInfo;
-            }
-            set
-            {
-                if (value == _CurrentSourceInfo) return;
-
-                var handler = CurrentSourceChange;
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.WillChange);
-
-                _CurrentSourceInfo = value;
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-            }
-        }
-
-        SourceListItem _CurrentSourceInfo;
-
-        public event SourceInfoChangeHandler CurrentSourceChange;
-    }
-
-    public class GenericSoftCodecProperties
-    {
-        [JsonProperty("hasCameraInputs")]
-        public bool HasCameraInputs { get; set; }
-
-        [JsonProperty("cameraInputCount")]
-        public int CameraInputCount { get; set; }
-
-        [JsonProperty("contentInputCount")]
-        public int ContentInputCount { get; set; }
-
-        [JsonProperty("contentOutputCount")]
-        public int OutputCount { get; set; }
-    }
-
-    public class GenericSoftCodecFactory: EssentialsDeviceFactory<GenericSoftCodec>
-    {
-        public GenericSoftCodecFactory()
-        {
-            TypeNames = new List<string> { "genericsoftcodec" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Attempting to create new Generic SoftCodec Device");
-
-            var props = dc.Properties.ToObject<GenericSoftCodecProperties>();
-
-            return new GenericSoftCodec(dc.Key, dc.Name, props);
-        }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Sources
-{
-    public class Laptop : EssentialsDevice, IHasFeedback, IRoutingOutputs, IAttachVideoStatus, IUiDisplayInfo, IUsageTracking
-	{
-		public uint DisplayUiType { get { return DisplayUiConstants.TypeLaptop; } }
-		public string IconName { get; set; }
-		public BoolFeedback HasPowerOnFeedback { get; private set; }
-
-		public RoutingOutputPort AnyVideoOut { get; private set; }
-
-		#region IRoutingOutputs Members
-
-		/// <summary>
-		/// Options: hdmi
-		/// </summary>
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-		#endregion
-
-		public Laptop(string key, string name)
-			: base(key, name)
-		{
-			IconName = "Laptop";
-			HasPowerOnFeedback = new BoolFeedback("HasPowerFeedback", 
-				() => this.GetVideoStatuses() != VideoStatusOutputs.NoStatus);
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-			OutputPorts.Add(AnyVideoOut = new RoutingOutputPort(RoutingPortNames.AnyOut, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-				eRoutingPortConnectionType.None, 0, this));
-		}
-
-		#region IHasFeedback Members
-
-		/// <summary>
-		/// Passes through the VideoStatuses list
-		/// </summary>
-        public FeedbackCollection<Feedback> Feedbacks
-        {
-            get
-            {
-                var newList = new FeedbackCollection<Feedback>();
-                newList.AddRange(this.GetVideoStatuses().ToList());
-                return newList;
-            }
-        }
-
-		#endregion
-
-        #region IUsageTracking Members
-
-        public UsageTracking UsageTracker { get; set; }
-
-        #endregion
-	}
-
-    public class LaptopFactory : EssentialsDeviceFactory<Laptop>
-    {
-        public LaptopFactory()
-        {
-            TypeNames = new List<string>() { "laptop" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Laptop Device");
-            return new Laptop(dc.Key, dc.Name);
-        }
-    }
-}

src/PepperDash.Essentials.Devices.Common/VideoCodec/CiscoCodec/eCommandType.cs

@@ -1,4 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
-{
-    enum eCommandType { SessionStart, SessionEnd, Command, GetStatus, GetConfiguration };
-}

src/PepperDash.Essentials.Devices.Common/VideoCodec/CiscoCodec/eExternalSourceMode.cs

@@ -1,4 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
-{
-    public enum eExternalSourceMode {Ready, NotReady, Hidden, Error}
-}

src/PepperDash.Essentials.Devices.Common/VideoCodec/CiscoCodec/eExternalSourceType.cs

@@ -1,4 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
-{
-    public enum eExternalSourceType {camera, desktop, document_camera, mediaplayer, PC, whiteboard, other}
-}

src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs

@@ -1,26 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec
-{
-    /// <summary>
-    /// Defines the required elements for layout control
-    /// </summary>
-    public interface IHasCodecLayouts
-    {
-        StringFeedback LocalLayoutFeedback { get; }
-
-        void LocalLayoutToggle();
-		void LocalLayoutToggleSingleProminent();
-		void MinMaxLayoutToggle();
-    }
-}

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -1,56 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectType>Program</ProjectType>
-    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RootNamespace>PepperDash.Essentials</RootNamespace>
-    <AssemblyName>PepperDashEssentials</AssemblyName>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <Title>PepperDash Essentials</Title>
-    <PackageId>PepperDashEssentials</PackageId>
-    <AssemblyInformationalVersion>$(Version)</AssemblyInformationalVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 4.7.2|AnyCPU'">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials iPad.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials TSW-560.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials TSW-760.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-419" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
-    <ProjectReference Include="..\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj" />
-  </ItemGroup>
-</Project>

src/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs

@@ -1,7 +1,18 @@
 using System;
-using PepperDash.Essentials.Core;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Room.Config
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Devices.Common.DSP;
+using PepperDash.Essentials.DM;
+
+namespace PepperDash.Essentials
 {
     /// <summary>
     /// 
@@ -28,8 +39,6 @@ namespace PepperDash.Essentials.Room.Config
         /// </summary>
         public IBasicVolumeWithFeedback GetDevice()
         {
-            throw new NotImplementedException("This method references DM CHASSIS Directly");
-            /*
             // DM output card format: deviceKey--output~number, dm8x8-1--output~4
             var match = Regex.Match(DeviceKey, @"([-_\w]+)--(\w+)~(\d+)");
             if (match.Success)
@@ -84,8 +93,6 @@ namespace PepperDash.Essentials.Room.Config
             }
 
             return null;
-        }
-             * */
         }
     }
 }

src/PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.DM.AirMedia;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+	public static class AirMediaControllerApiExtensions
+	{
+        public static void LinkToApi(this AirMediaController airMedia, BasicTriList trilist, uint joinStart, string joinMapKey)
+		{
+            AirMediaControllerJoinMap joinMap = new AirMediaControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<AirMediaControllerJoinMap>(joinMapSerialized);
+
+			joinMap.OffsetJoinNumbers(joinStart);
+
+			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			Debug.Console(0, "Linking to Airmedia: {0}", airMedia.Name);
+
+			trilist.StringInput[joinMap.Name].StringValue = airMedia.Name;			
+
+			var commMonitor = airMedia as ICommunicationMonitor;
+            if (commMonitor != null)
+            {
+                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            }
+
+            airMedia.IsInSessionFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsInSession]);
+            airMedia.HdmiVideoSyncDetectedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiVideoSync]);
+
+            trilist.SetSigTrueAction(joinMap.AutomaticInputRoutingEnabled, new Action( airMedia.AirMedia.DisplayControl.EnableAutomaticRouting));
+            trilist.SetSigFalseAction(joinMap.AutomaticInputRoutingEnabled, new Action( airMedia.AirMedia.DisplayControl.DisableAutomaticRouting));
+            airMedia.AutomaticInputRoutingEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AutomaticInputRoutingEnabled]);
+
+            trilist.SetUShortSigAction(joinMap.VideoOut, new Action<ushort>((u) => airMedia.SelectVideoOut(u)));
+
+            airMedia.VideoOutFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoOut]);
+            airMedia.ErrorFeedback.LinkInputSig(trilist.UShortInput[joinMap.ErrorFB]);
+            airMedia.NumberOfUsersConnectedFeedback.LinkInputSig(trilist.UShortInput[joinMap.NumberOfUsersConnectedFB]);
+
+            trilist.SetUShortSigAction(joinMap.LoginCode, new Action<ushort>((u) => airMedia.AirMedia.AirMedia.LoginCode.UShortValue = u));
+            airMedia.LoginCodeFeedback.LinkInputSig(trilist.UShortInput[joinMap.LoginCode]);
+
+            airMedia.ConnectionAddressFeedback.LinkInputSig(trilist.StringInput[joinMap.ConnectionAddressFB]);
+            airMedia.HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB]);
+            airMedia.SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback]);
+		}
+	}	
+}

src/PepperDashEssentials/Bridges/AppleTvBridge.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class AppleTvApiExtensions
+    {
+        public static void LinkToApi(this AppleTV appleTv, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            AppleTvJoinMap joinMap = new AppleTvJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if(!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<AppleTvJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Bridge Type {0}", appleTv.GetType().Name.ToString());
+
+            trilist.SetBoolSigAction(joinMap.UpArrow, (b) => appleTv.Up(b));
+            trilist.SetBoolSigAction(joinMap.DnArrow, (b) => appleTv.Down(b));
+            trilist.SetBoolSigAction(joinMap.LeftArrow, (b) => appleTv.Left(b));
+            trilist.SetBoolSigAction(joinMap.RightArrow, (b) => appleTv.Right(b));
+            trilist.SetBoolSigAction(joinMap.Select, (b) => appleTv.Select(b));
+            trilist.SetBoolSigAction(joinMap.Menu, (b) => appleTv.Menu(b));
+            trilist.SetBoolSigAction(joinMap.PlayPause, (b) => appleTv.Play(b));
+        }
+    }
+}

src/PepperDashEssentials/Bridges/BridgeFactory.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Bridges;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+
+namespace PepperDash.Essentials
+{
+    /// <summary>
+    /// Responsible for loading all of the device types for this library
+    /// </summary>
+    public class BridgeFactory
+    {
+        public BridgeFactory()
+        {
+            var eiscApiAdvancedFactory = new EiscApiAdvancedFactory() as IDeviceFactory;
+            eiscApiAdvancedFactory.LoadTypeFactories();
+
+            var eiscApiFactory = new EiscApiFactory() as IDeviceFactory;
+            eiscApiFactory.LoadTypeFactories();
+        }
+
+    }
+
+    public class CommBridge : Device
+    {
+        public CommBridgeProperties Properties { get; private set; }
+
+        public List<IBasicCommunication> CommDevices { get; private set; }
+
+        public CommBridge(string key, string name, JToken properties)
+            : base(key, name)
+        {
+            Properties = JsonConvert.DeserializeObject<CommBridgeProperties>(properties.ToString());
+        }
+
+        public override bool CustomActivate()
+        {
+            // Create EiscApis 
+            if (Properties.Eiscs != null)
+            {
+                foreach (var eisc in Properties.Eiscs)
+                {
+                    var ApiEisc = new BridgeApiEisc(eisc.IpId, eisc.Hostname);
+                }
+            }
+
+            foreach (var deviceKey in Properties.CommDevices)
+            {
+                var device = DeviceManager.GetDeviceForKey(deviceKey);
+
+                if (device != null)
+                {
+                    Debug.Console(0, "deviceKey {0} Found in Device Manager", device.Key);
+                    CommDevices.Add(device as IBasicCommunication);
+                }
+                else
+                {
+                    Debug.Console(0, "deviceKey {0} Not Found in Device Manager", deviceKey);
+                }
+            }
+
+            // Iterate through all the CommDevices and link up their Actions and Feedbacks
+
+            Debug.Console(0, "Bridge {0} Activated", this.Name);
+
+            return true;
+        }
+    }
+
+
+    public class EiscBridgeProperties
+    {
+        public string ParentDeviceKey { get; set; }
+        public eApiType ApiType { get; set; }
+        public List<EiscProperties> Eiscs { get; set; }
+        public string ApiOverrideFilePath { get; set; }
+
+        public class EiscProperties
+        {
+            public string IpId { get; set; }
+            public string Hostname { get; set; }
+        }
+    }
+
+    public class CommBridgeProperties : EiscBridgeProperties
+    {
+        public List<string> CommDevices { get; set; }
+    }
+
+    public enum eApiType { Eisc = 0 }
+
+    public class BridgeApiEisc
+    {
+        public uint Ipid { get; private set; }
+        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+
+        public BridgeApiEisc(string ipid, string hostname)
+        {
+            Ipid = (UInt32)int.Parse(ipid, System.Globalization.NumberStyles.HexNumber);
+            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(Ipid, hostname, Global.ControlSystem);
+            Eisc.Register();
+            Eisc.SigChange += Eisc_SigChange;
+            Debug.Console(0, "BridgeApiEisc Created at Ipid {0}", ipid);
+        }
+        void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
+        {
+            if (Debug.Level >= 1)
+                Debug.Console(1, "BridgeApiEisc change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+            var uo = args.Sig.UserObject;
+            if (uo is Action<bool>)
+                (uo as Action<bool>)(args.Sig.BoolValue);
+            else if (uo is Action<ushort>)
+                (uo as Action<ushort>)(args.Sig.UShortValue);
+            else if (uo is Action<string>)
+                (uo as Action<string>)(args.Sig.StringValue);
+        }
+    }
+}

src/PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using PepperDash.Essentials.Bridges;
+
+namespace PepperDash.Essentials {
+	public class BridgeFactory {
+		public static IKeyed GetDevice(PepperDash.Essentials.Core.Config.DeviceConfig dc) {
+			// ? why is this static JTA 2018-06-13? 
+
+			var key = dc.Key;
+			var name = dc.Name;
+			var type = dc.Type;
+			var properties = dc.Properties;
+			var propAnon = new { };
+			JsonConvert.DeserializeAnonymousType(dc.Properties.ToString(), propAnon);
+
+			var typeName = dc.Type.ToLower();
+			var groupName = dc.Group.ToLower();
+
+			Debug.Console(2, "Name {0}, Key {1}, Type {2}, Properties {3}", name, key, type, properties.ToString());
+			if (typeName == "essentialdm") 
+			{
+				return new EssentialDM(key, name, properties);
+			} 
+			else if (typeName == "essentialcomm") 
+			{
+				Debug.Console(2, "Launch Essential Comm");
+				return new EssentialComm(key, name, properties);
+			}
+			else if (typeName == "essentialdsp")
+			{
+				Debug.Console(2, "Launch EssentialDsp");
+				return new EssentialDsp(key, name, properties);
+			}
+			else if (typeName == "essentialstvone")
+			{
+				Debug.Console(2, "Launch essentialstvone");
+				return new EssentialsTVOne(key, name, properties);
+			}
+			else if (typeName == "essentialslighting")
+			{
+				Debug.Console(2, "Launch essentialslighting");
+				return new EssentialsLightsBridge(key, name, properties);
+			}
+			else if (typeName == "eiscapi") 
+            {
+			    return new EiscApi(dc);
+			}
+			return null;
+			}
+		}
+	public class BridgeApiEisc {
+		public uint Ipid;
+		public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc; 
+		public BridgeApiEisc(string ipid) {
+			Ipid = (UInt32)int.Parse(ipid, System.Globalization.NumberStyles.HexNumber);
+			Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(Ipid, "127.0.0.2", Global.ControlSystem);
+			Eisc.Register();
+			Eisc.SigChange += Eisc_SigChange;
+			Debug.Console(2, "BridgeApiEisc Created at Ipid {0}", ipid);
+			}
+		void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args) {
+			if (Debug.Level >= 1)
+				Debug.Console(2, "DDVC EISC change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+			var uo = args.Sig.UserObject;
+			if (uo is Action<bool>)
+				(uo as Action<bool>)(args.Sig.BoolValue);
+			else if (uo is Action<ushort>)
+				(uo as Action<ushort>)(args.Sig.UShortValue);
+			else if (uo is Action<string>)
+				(uo as Action<string>)(args.Sig.StringValue);
+			}
+		}
+	
+	}
+
+
+	
+	

src/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

@@ -0,0 +1,38 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.CrestronIO;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class C2nRthsControllerApiExtensions
+    {
+        public static void LinkToApi(this C2nRthsController device, BasicTriList triList, uint joinStart,
+            string joinMapKey)
+        {
+            var joinMap = new C2nRthsControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<C2nRthsControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, device, "Linking to Trilist '{0}'", triList.ID.ToString("X"));
+            
+
+            triList.SetBoolSigAction(joinMap.TemperatureFormat, device.SetTemperatureFormat);
+
+            device.IsOnline.LinkInputSig(triList.BooleanInput[joinMap.IsOnline]);
+            device.TemperatureFeedback.LinkInputSig(triList.UShortInput[joinMap.Temperature]);
+            device.HumidityFeedback.LinkInputSig(triList.UShortInput[joinMap.Humidity]);
+
+            triList.StringInput[joinMap.Name].StringValue = device.Name;
+
+
+        }
+         
+    }
+}

src/PepperDashEssentials/Bridges/CameraControllerBridge.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Devices.Common.Cameras;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class CameraControllerApiExtensions
+    {
+        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge)
+        {
+            CameraControllerJoinMap joinMap = new CameraControllerJoinMap(joinStart);
+            
+            // Adds the join map to the bridge
+            bridge.AddJoinMap(cameraDevice.Key, joinMap);
+
+            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
+
+            if (customJoins != null)
+            {
+                joinMap.SetCustomJoinData(customJoins);
+            }
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
+
+            var commMonitor = cameraDevice as ICommunicationMonitor;
+            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+
+            var ptzCamera = cameraDevice as IHasCameraPtzControl;
+
+            if (ptzCamera != null)
+            {
+                trilist.SetBoolSigAction(joinMap.PanLeft.JoinNumber, (b) =>
+                    {
+                        if (b)
+                        {
+                            ptzCamera.PanLeft();
+                        }
+                        else
+                        {
+                            ptzCamera.PanStop();
+                        }
+                    });
+                trilist.SetBoolSigAction(joinMap.PanRight.JoinNumber, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.PanRight();
+                    }
+                    else
+                    {
+                        ptzCamera.PanStop();
+                    }
+                });
+
+                trilist.SetBoolSigAction(joinMap.TiltUp.JoinNumber, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.TiltUp();
+                    }
+                    else
+                    {
+                        ptzCamera.TiltStop();
+                    }
+                });
+                trilist.SetBoolSigAction(joinMap.TiltDown.JoinNumber, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.TiltDown();
+                    }
+                    else
+                    {
+                        ptzCamera.TiltStop();
+                    }
+                });
+
+                trilist.SetBoolSigAction(joinMap.ZoomIn.JoinNumber, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomIn();
+                    }
+                    else
+                    {
+                        ptzCamera.ZoomStop();
+                    }
+                });
+
+                trilist.SetBoolSigAction(joinMap.ZoomOut.JoinNumber, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomOut();
+                    }
+                    else
+                    {
+                        ptzCamera.ZoomStop();
+                    }
+                });
+            }
+
+            if (cameraDevice is IPower)
+            {
+                var powerCamera = cameraDevice as IPower;
+                trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () => powerCamera.PowerOn());
+                trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () => powerCamera.PowerOff());
+             
+                powerCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
+                powerCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
+            }
+
+            if (cameraDevice is ICommunicationMonitor)
+            {
+                var monitoredCamera = cameraDevice as ICommunicationMonitor;
+                monitoredCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+            }
+
+            if (cameraDevice is IHasCameraPresets)
+            {
+                // Set the preset lables when they change
+                var presetsCamera = cameraDevice as IHasCameraPresets;
+                presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>((o, a) =>
+                {
+                    for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
+                    {
+                        int tempNum = i - 1;
+
+                        string label = "" ;
+
+                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
+
+                        if (preset != null)
+                            label = preset.Description;
+
+                        trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
+                    }
+                });
+                
+                for (int i = 0; i < joinMap.NumberOfPresets.JoinNumber; i++)
+                {
+                    int tempNum = i;
+
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallStart.JoinNumber + tempNum), () =>
+                        {
+                            presetsCamera.PresetSelect(tempNum);
+                        });
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveStart.JoinNumber + tempNum), () =>
+                        {
+                            var label = trilist.GetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum));
+
+                            presetsCamera.PresetStore(tempNum, label);
+                        });
+                }
+            }
+        }
+    }
+
+}

src/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -0,0 +1,288 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class DmChassisControllerApiExtentions
+    {
+        public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmChassisControllerJoinMap joinMap = new DmChassisControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmChassisControllerJoinMap>(joinMapSerialized);
+            
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmChassis, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            var chassis = dmChassis.Chassis as DmMDMnxn;
+
+            dmChassis.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+
+            trilist.SetUShortSigAction(joinMap.SystemId, new Action<ushort>(o => chassis.SystemId.UShortValue = o));
+            trilist.SetSigTrueAction(joinMap.SystemId, new Action(() => chassis.ApplySystemId()));
+
+            dmChassis.SystemIdFeebdack.LinkInputSig(trilist.UShortInput[joinMap.SystemId]);
+            dmChassis.SystemIdBusyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SystemId]);
+
+            // Link up outputs
+            for (uint i = 1; i <= dmChassis.Chassis.NumberOfOutputs; i++)
+            {
+                var ioSlot = i;
+
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
+                trilist.SetUShortSigAction(joinMap.OutputAudio + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio)));
+                trilist.SetUShortSigAction(joinMap.OutputUsb + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbOutput)));
+                trilist.SetUShortSigAction(joinMap.InputUsb + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbInput)));
+
+                if (dmChassis.TxDictionary.ContainsKey(ioSlot))
+                {
+                    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
+                    var txKey = dmChassis.TxDictionary[ioSlot];
+                    var basicTxDevice = DeviceManager.GetDeviceForKey(txKey) as BasicDmTxControllerBase;
+
+                    var advancedTxDevice = basicTxDevice as DmTxControllerBase;
+
+                    if (dmChassis.Chassis is DmMd8x8Cpu3 || dmChassis.Chassis is DmMd8x8Cpu3rps
+                        || dmChassis.Chassis is DmMd16x16Cpu3 || dmChassis.Chassis is DmMd16x16Cpu3rps
+                        || dmChassis.Chassis is DmMd32x32Cpu3 || dmChassis.Chassis is DmMd32x32Cpu3rps)
+                    {
+                        dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                    }
+                    else
+                    {
+                        if (advancedTxDevice != null)
+                        {
+                            advancedTxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                            Debug.Console(2, "Linking Tx Online Feedback from Advanced Transmitter at input {0}", ioSlot);
+                        }
+                        else if (dmChassis.InputEndpointOnlineFeedbacks[ioSlot] != null)
+                        {
+                            Debug.Console(2, "Linking Tx Online Feedback from Input Card {0}", ioSlot);
+                            dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);                           
+                        }
+                    }
+
+                    if (basicTxDevice != null && advancedTxDevice == null)
+                        trilist.BooleanInput[joinMap.TxAdvancedIsPresent + ioSlot].BoolValue = true;
+
+                    if (advancedTxDevice != null)
+                    {
+                        advancedTxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+                    }
+                    else if(advancedTxDevice == null || basicTxDevice != null)
+                    {
+                        Debug.Console(1, "Setting up actions and feedbacks on input card {0}", ioSlot);
+                        dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                        var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
+                        if (inputPort != null)
+                        {
+                            Debug.Console(1, "Port value for input card {0} is set", ioSlot);
+                            var port = inputPort.Port;
+
+                            if (port != null)
+                            {
+                                if (port is HdmiInputWithCEC)
+                                {
+                                    Debug.Console(1, "Port is HdmiInputWithCec");
+
+                                    var hdmiInPortWCec = port as HdmiInputWithCEC;
+
+                                    if (hdmiInPortWCec.HdcpSupportedLevel != eHdcpSupportedLevel.Unknown)
+                                    {
+                                        SetHdcpStateAction(true, hdmiInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                    }
+
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    if(dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)];
+
+                            if(inputPort != null)
+                            {
+                                var port = inputPort.Port;
+
+                                if (port is DMInputPortWithCec)
+                                {
+                                    Debug.Console(1, "Port is DMInputPortWithCec");
+
+                                    var dmInPortWCec = port as DMInputPortWithCec;
+
+                                    if (dmInPortWCec != null)
+                                    {
+                                        SetHdcpStateAction(dmChassis.PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], dmInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                    }
+
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    if (dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                    var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
+                    if (inputPort != null)
+                    {
+                        var hdmiPort = inputPort.Port as EndpointHdmiInput;
+
+                        if (hdmiPort != null)
+                        {
+                            SetHdcpStateAction(true, hdmiPort, joinMap.HdcpSupportState + ioSlot, trilist);
+                            dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+                        }
+                    }
+                }
+                
+                if (dmChassis.RxDictionary.ContainsKey(ioSlot))
+                {
+                    Debug.Console(2, "Creating Rx Feedbacks {0}", ioSlot);
+                    var rxKey = dmChassis.RxDictionary[ioSlot];
+                    var rxDevice = DeviceManager.GetDeviceForKey(rxKey) as DmRmcControllerBase;
+                    var hdBaseTDevice = DeviceManager.GetDeviceForKey(rxKey) as DmHdBaseTControllerBase;
+                    if (dmChassis.Chassis is DmMd8x8Cpu3 || dmChassis.Chassis is DmMd8x8Cpu3rps
+                        || dmChassis.Chassis is DmMd16x16Cpu3 || dmChassis.Chassis is DmMd16x16Cpu3rps
+                        || dmChassis.Chassis is DmMd32x32Cpu3 || dmChassis.Chassis is DmMd32x32Cpu3rps || hdBaseTDevice != null)
+                    {
+                        dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                    }
+                    else if (rxDevice != null)
+                    {
+                        rxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                    }          
+                }
+
+                // Feedback
+                dmChassis.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
+                dmChassis.AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio + ioSlot]);
+                dmChassis.UsbOutputRoutedToFeebacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputUsb + ioSlot]);
+                dmChassis.UsbInputRoutedToFeebacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.InputUsb + ioSlot]);
+
+                dmChassis.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
+                dmChassis.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
+                dmChassis.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
+                dmChassis.OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames + ioSlot]);
+                
+                dmChassis.OutputDisabledByHdcpFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputDisabledByHdcp + ioSlot]);
+            }
+        }
+
+        static void SetHdcpStateAction(bool hdcpTypeSimple, HdmiInputWithCEC port, uint join, BasicTriList trilist)
+        {
+            if (hdcpTypeSimple)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u =>
+                        {
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+        static void SetHdcpStateAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)
+        {
+            if (hdcpTypeSimple)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u =>
+                        {
+                            port.HdcpCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+        static void SetHdcpStateAction(bool supportsHdcp2, DMInputPortWithCec port, uint join, BasicTriList trilist)
+        {
+            if (!supportsHdcp2)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u =>
+                        {
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+    }
+
+}

src/PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class DmRmcControllerApiExtensions
+    {
+        public static void LinkToApi(this DmRmcControllerBase rmc, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmRmcControllerJoinMap joinMap = new DmRmcControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmRmcControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, rmc, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            rmc.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            if(rmc.VideoOutputResolutionFeedback != null)
+                rmc.VideoOutputResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentOutputResolution]);
+            if(rmc.EdidManufacturerFeedback != null)
+                rmc.EdidManufacturerFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidManufacturer]);
+            if(rmc.EdidNameFeedback != null)
+                rmc.EdidNameFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidName]);
+            if(rmc.EdidPreferredTimingFeedback != null)
+                rmc.EdidPreferredTimingFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidPrefferedTiming]);
+            if(rmc.EdidSerialNumberFeedback != null)
+                rmc.EdidSerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidSerialNumber]);
+        }
+    }
+}

src/PepperDashEssentials/Bridges/DmTxControllerBridge.cs

@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class DmTxControllerApiExtensions
+    {
+        public static void LinkToApi(this DmTxControllerBase tx, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmTxControllerJoinMap joinMap = new DmTxControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmTxControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, tx, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            tx.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            tx.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus]);
+            tx.AnyVideoInput.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentInputResolution]);
+            trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
+
+            bool hdcpTypeSimple;
+
+            if (tx.Hardware is DmTx4kX02CBase || tx.Hardware is DmTx4kzX02CBase)
+                hdcpTypeSimple = false;
+            else
+                hdcpTypeSimple = true;
+
+            if (tx is ITxRouting)
+            {
+                var txR = tx as ITxRouting;
+
+                trilist.SetUShortSigAction(joinMap.VideoInput,
+                    new Action<ushort>(i => txR.ExecuteNumericSwitch(i, 0, eRoutingSignalType.Video)));
+                trilist.SetUShortSigAction(joinMap.AudioInput,
+                    new Action<ushort>(i => txR.ExecuteNumericSwitch(i, 0, eRoutingSignalType.Audio)));
+
+                txR.VideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoInput]);
+                txR.AudioSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioInput]);
+
+                trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
+
+                if (txR.InputPorts[DmPortName.HdmiIn] != null)
+                {
+                    var inputPort = txR.InputPorts[DmPortName.HdmiIn];
+
+                    if (tx.Feedbacks["HdmiInHdcpCapability"] != null)
+                        (tx.Feedbacks["HdmiInHdcpCapability"] as IntFeedback).LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState]);
+
+                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
+                    {
+                        var port = inputPort.Port as EndpointHdmiInput;
+
+                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist);
+                    }
+                }
+
+                if (txR.InputPorts[DmPortName.HdmiIn1] != null)
+                {
+                    var inputPort = txR.InputPorts[DmPortName.HdmiIn1];
+
+                    if (tx.Feedbacks["HdmiIn1HdcpCapability"] != null)
+                        (tx.Feedbacks["HdmiIn1HdcpCapability"] as IntFeedback).LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState]);
+
+                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
+                    {
+                        var port = inputPort.Port as EndpointHdmiInput;
+
+                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist);
+                    }
+                }
+
+                if (txR.InputPorts[DmPortName.HdmiIn2] != null)
+                {
+                    var inputPort = txR.InputPorts[DmPortName.HdmiIn2];
+
+                    if (tx.Feedbacks["HdmiIn2HdcpCapability"] != null)
+                        (tx.Feedbacks["HdmiIn2HdcpCapability"] as IntFeedback).LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState]);
+
+                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
+                    {
+                        var port = inputPort.Port as EndpointHdmiInput;
+
+                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port2HdcpState, trilist);
+                    }
+                }
+
+            }
+
+            var txFreeRun = tx as IHasFreeRun;
+            if (txFreeRun != null)
+            {
+                txFreeRun.FreeRunEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.FreeRunEnabled]);
+                trilist.SetBoolSigAction(joinMap.FreeRunEnabled, new Action<bool>(b => txFreeRun.SetFreeRunEnabled(b)));
+            }
+
+            var txVga = tx as IVgaBrightnessContrastControls;
+            {
+                txVga.VgaBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.VgaBrightness]);
+                txVga.VgaContrastFeedback.LinkInputSig(trilist.UShortInput[joinMap.VgaContrast]);
+
+                trilist.SetUShortSigAction(joinMap.VgaBrightness, new Action<ushort>(u => txVga.SetVgaBrightness(u)));
+                trilist.SetUShortSigAction(joinMap.VgaContrast, new Action<ushort>(u => txVga.SetVgaContrast(u)));
+            }
+        }
+
+        static void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)
+        {
+            if (hdcpTypeSimple)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(s =>
+                        {
+                            port.HdcpCapability = (eHdcpCapabilityType)s;
+                        }));
+            }
+        }
+
+
+    }
+}

src/PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class DmpsAudioOutputControllerApiExtensions
+    {
+        public static void LinkToApi(this DmpsAudioOutputController dmAudioOutputController, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmpsAudioOutputControllerJoinMap joinMap = new DmpsAudioOutputControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmpsAudioOutputControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmAudioOutputController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            if (dmAudioOutputController.MasterVolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.MasterVolumeLevel, joinMap.MasterVolume);
+            }
+
+            if (dmAudioOutputController.SourceVolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.SourceVolumeLevel, joinMap.SourceVolume);
+            }
+
+            if (dmAudioOutputController.Codec1VolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.Codec1VolumeLevel, joinMap.Codec1Volume);
+            }
+
+            if (dmAudioOutputController.Codec2VolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.Codec2VolumeLevel, joinMap.Codec2Volume);
+            }
+
+        }
+
+        static void SetUpDmpsAudioOutputJoins(BasicTriList trilist, DmpsAudioOutput output, uint joinStart)
+        {
+            var volumeLevelJoin = joinStart;
+            var muteOnJoin = joinStart;
+            var muteOffJoin = joinStart + 1;
+            var volumeUpJoin = joinStart + 2;
+            var volumeDownJoin = joinStart + 3;
+
+
+            trilist.SetUShortSigAction(volumeLevelJoin, new Action<ushort>(o => output.SetVolume(o)));
+            output.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[volumeLevelJoin]);
+
+            trilist.SetSigTrueAction(muteOnJoin, new Action(output.MuteOn));
+            output.MuteFeedback.LinkInputSig(trilist.BooleanInput[muteOnJoin]);
+            trilist.SetSigTrueAction(muteOffJoin, new Action(output.MuteOff));
+            output.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[muteOffJoin]);
+
+            trilist.SetBoolSigAction(volumeUpJoin, new Action<bool>(b => output.VolumeUp(b)));
+            trilist.SetBoolSigAction(volumeDownJoin, new Action<bool>(b => output.VolumeDown(b)));
+        }
+    }
+}

src/PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class DmpsRoutingControllerApiExtentions 
+    {
+        public static void LinkToApi(this DmpsRoutingController dmpsRouter, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmpsRoutingControllerJoinMap joinMap = new DmpsRoutingControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmpsRouter, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            // Link up outputs
+            for (uint i = 1; i <= dmpsRouter.Dmps.NumberOfSwitcherInputs; i++)
+            {
+                Debug.Console(2, dmpsRouter, "Linking Input Card {0}", i);
+
+                var ioSlot = i;
+
+                //if (dmpsRouter.TxDictionary.ContainsKey(ioSlot))
+                //{
+                //    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
+                //    var TxKey = dmpsRouter.TxDictionary[ioSlot];
+                //    var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase;
+                //    //TxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                //    // TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                //    // trilist.SetUShortSigAction((ApiMap.HdcpSupport[ioSlot]), u => TxDevice.SetHdcpSupportAll((ePdtHdcpSupport)(u)));
+                //    // TxDevice.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap. + ioSlot]);
+                //    // trilist.UShortInput[ApiMap.HdcpSupportCapability[ioSlot]].UShortValue = TxDevice.HdcpSupportCapability;
+                //}
+                //else
+                //{
+                //    // dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[ApiMap.TxVideoSyncStatus[ioSlot]]);
+                //}
+                
+                if(dmpsRouter.VideoInputSyncFeedbacks[ioSlot] != null)
+                    dmpsRouter.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                if (dmpsRouter.InputNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
+
+                trilist.SetStringSigAction(joinMap.InputNames + ioSlot, new Action<string>(s => 
+                    {
+                        var inputCard = dmpsRouter.Dmps.SwitcherInputs[ioSlot] as DMInput;
+
+                        if (inputCard != null)
+                        {
+                            if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) && inputCard.NameFeedback.StringValue != s)
+                                if(inputCard.Name != null)
+                                    inputCard.Name.StringValue = s;
+                        }
+                    }));
+
+
+                if(dmpsRouter.InputEndpointOnlineFeedbacks[ioSlot] != null)
+                    dmpsRouter.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+            }
+
+            for (uint i = 1; i <= dmpsRouter.Dmps.NumberOfSwitcherOutputs; i++)
+            {
+                Debug.Console(2, dmpsRouter, "Linking Output Card {0}", i);
+
+                var ioSlot = i;
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmpsRouter.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
+                trilist.SetUShortSigAction(joinMap.OutputAudio + ioSlot, new Action<ushort>(o => dmpsRouter.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio)));
+
+                trilist.SetStringSigAction(joinMap.OutputNames + ioSlot, new Action<string>(s =>
+                {
+                    var outputCard = dmpsRouter.Dmps.SwitcherOutputs[ioSlot] as DMOutput;
+
+                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
+
+                    if (outputCard != null)
+                    {
+                        //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
+
+                        if (!(outputCard is Crestron.SimplSharpPro.DM.Cards.Card.Dmps3CodecOutput) && outputCard.NameFeedback != null)
+                        {
+                            if (!string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                            {
+                                //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
+
+                                if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
+                                {
+                                    outputCard.Name.StringValue = s;
+                                }
+                            }
+                        }
+                    }
+                }));
+
+                // Feedback
+                if(dmpsRouter.VideoOutputFeedbacks[ioSlot] != null)
+                    dmpsRouter.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
+                if (dmpsRouter.AudioOutputFeedbacks[ioSlot] != null)
+                    dmpsRouter.AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio + ioSlot]);
+                if (dmpsRouter.OutputNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
+                if (dmpsRouter.OutputVideoRouteNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
+                if (dmpsRouter.OutputAudioRouteNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames + ioSlot]);
+                if (dmpsRouter.OutputEndpointOnlineFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+            }
+        }
+    }
+}

src/PepperDashEssentials/Bridges/DspControllerBridge.cs

@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+
+namespace PepperDash.Essentials.Bridges
+{
+	public static class SamsungDisplayControllerApiExtensions
+	{
+		public static void LinkToApi(this PepperDash.Essentials.Core.TwoWayDisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+		{
+			var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DisplayControllerJoinMap;
+
+			if (joinMap == null)
+			{
+				joinMap = new DisplayControllerJoinMap();
+			}
+
+			joinMap.OffsetJoinNumbers(joinStart);
+			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			Debug.Console(0, "Linking to lighting Type {0}", displayDevice.GetType().Name.ToString());
+
+			var commMonitor = displayDevice as ICommunicationMonitor;
+			commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+			
+
+			// Poewer Off
+			trilist.SetSigTrueAction(joinMap.PowerOff, () => displayDevice.PowerOff());
+			displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
+
+			// Poewer On
+			trilist.SetSigTrueAction(joinMap.PowerOn, () => displayDevice.PowerOn());
+			displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
+			
+			// GenericLighitng Actions & FeedBack
+
+			// int sceneIndex = 1;
+			/*
+			foreach (var scene in displayDevice.LightingScenes)
+			{
+				var tempIndex = sceneIndex - 1;
+				//trilist.SetSigTrueAction((uint)(joinMap.LightingSceneOffset + sceneIndex), () => displayDevice.SelectScene(displayDevice.LightingScenes[tempIndex]));
+				scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)]);
+				trilist.StringInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)].StringValue = scene.Name;
+				trilist.BooleanInput[(uint)(joinMap.ButtonVisibilityOffset + sceneIndex)].BoolValue = true;
+				sceneIndex++;
+			}
+
+			if (displayDevice.GetType().Name.ToString() == "LutronQuantumArea")
+			{
+				var lutronDevice = displayDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
+				lutronDevice.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+				trilist.SetStringSigAction(joinMap.IntegrationIdSet, s => lutronDevice.IntegrationId = s);
+			}
+			*/ 
+			//ApiEisc.Eisc.SetStringSigAction(ApiMap.integrationID, (s) => { lutronLights.IntegrationId = s; });
+
+
+			/*
+			var lutronLights = displayDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
+
+			
+			for (uint i = 1; i <= lightingBase.CircuitCount; i++)
+            {
+                var circuit = i;
+				lightingBase.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
+				lightingBase.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
+				lightingBase.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
+				trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => lightingBase.CycleCircuit(circuit - 1));
+				trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => lightingBase.TurnOnCircuit(circuit - 1));
+				trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => lightingBase.TurnOffCircuit(circuit - 1));
+
+			}
+			 */ 
+		}
+	}
+	public class DisplayControllerJoinMap : JoinMapBase
+	{
+		public uint IsOnline { get; set; }
+		public uint PowerOff { get; set; }
+		public uint PowerOn { get; set; }
+		public uint SelectScene { get; set; }
+		public uint LightingSceneOffset { get; set; }
+		public uint ButtonVisibilityOffset { get; set; }
+		public uint IntegrationIdSet { get; set; }
+
+		public DisplayControllerJoinMap()
+		{
+			// Digital
+			IsOnline = 1;
+			PowerOff = 1;
+			PowerOn = 2;
+			SelectScene = 1;
+			IntegrationIdSet = 1;
+			LightingSceneOffset = 10;
+			ButtonVisibilityOffset = 40;
+			// Analog
+		}
+
+		public override void OffsetJoinNumbers(uint joinStart)
+		{
+			var joinOffset = joinStart - 1;
+
+			IsOnline = IsOnline + joinOffset;
+			PowerOff = PowerOff + joinOffset;
+			PowerOn = PowerOn + joinOffset;
+			SelectScene = SelectScene + joinOffset;
+			LightingSceneOffset = LightingSceneOffset + joinOffset;
+			ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
+			
+
+
+		}
+	}
+}

src/PepperDashEssentials/Bridges/EiscBridge.cs

@@ -0,0 +1,196 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp.Reflection;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Bridges
+{
+    [Obsolete("Please use 'eiscapiadvanced' in configurations going forward")]
+    public class EiscApi : BridgeApi
+    {
+        public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
+
+        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+
+        public EiscApi(DeviceConfig dc) :
+            base(dc.Key)
+        {
+            PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
+            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
+
+            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
+
+            Eisc.SigChange += Eisc_SigChange;
+
+            AddPostActivationAction(() =>
+            {
+                Debug.Console(1, this, "Linking Devices...");
+
+                foreach (var d in PropertiesConfig.Devices)
+                {
+                    var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
+
+                    if (device == null) continue;
+
+                    Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
+                    if (typeof(IBridge).IsAssignableFrom(device.GetType().GetCType()))      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
+                    {
+                        Debug.Console(2, this, "'{0}' is IBridge", device.Key);
+
+                        var dev = device as IBridge;
+
+                        if (dev == null)
+                        {
+                            Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Cast to IBridge failed for {0}");
+                            continue;
+                        }
+
+                        dev.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                    }
+                    if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType())) continue;
+                    Debug.Console(2, this, "'{0}' is IBridgeAdvanced", device.Key);
+
+                    var advDev = device as IBridgeAdvanced;
+
+                    if (advDev == null)
+                    {
+                        Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Cast to IBridgeAdvanced failed for {0}");
+                        continue;
+                    }
+
+                    try
+                    {
+                        advDev.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, null);
+                    }
+                    catch (NullReferenceException)
+                    {
+                        Debug.ConsoleWithLog(0, this,
+                            "Please update the bridge config to use eiscApiAdvanced with this device: {0}", device.Key);
+                    }
+                }
+                Debug.Console(1, this, "Devices Linked.");
+
+                var registerResult = Eisc.Register();
+
+                if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+                {
+                    Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
+                    return;
+                }
+
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
+            });
+        }
+
+        /// <summary>
+        /// Used for debugging to trigger an action based on a join number and type
+        /// </summary>
+        /// <param name="join"></param>
+        /// <param name="type"></param>
+        /// <param name="state"></param>
+        public void ExecuteJoinAction(uint join, string type, object state)
+        {
+            try
+            {
+                switch (type.ToLower())
+                {
+                    case "digital":
+                        {
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
+                            if (uo != null)
+                            {
+                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToBoolean(state));
+                            }
+                            else
+                                Debug.Console(1, this, "User Action is null.  Nothing to Execute");
+                            break;
+                        }
+                    case "analog":
+                        {
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
+                            if (uo != null)
+                            {
+                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToUInt16(state));
+                            }
+                            else
+                                Debug.Console(1, 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(1, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToString(state));
+                            }
+                            else
+                                Debug.Console(1, this, "User Action is null.  Nothing to Execute");
+                            break;
+                        }
+                    default:
+                        {
+                            Debug.Console(1, "Unknown join type.  Use digital/serial/analog");
+                            break;
+                        }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error: {0}", e);
+            }
+
+        }
+
+        /// <summary>
+        /// Handles incoming sig changes
+        /// </summary>
+        /// <param name="currentDevice"></param>
+        /// <param name="args"></param>
+        void Eisc_SigChange(object currentDevice, SigEventArgs args)
+        {
+            try
+            {
+                if (Debug.Level >= 1)
+                    Debug.Console(2, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                var uo = args.Sig.UserObject;
+
+                if (uo == null) return;
+
+                Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
+                if (uo is Action<bool>)
+                    (uo as Action<bool>)(args.Sig.BoolValue);
+                else if (uo is Action<ushort>)
+                    (uo as Action<ushort>)(args.Sig.UShortValue);
+                else if (uo is Action<string>)
+                    (uo as Action<string>)(args.Sig.StringValue);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
+            }
+        }
+    }
+
+    public class EiscApiFactory : EssentialsDeviceFactory<EiscApiAdvanced>
+    {
+        public EiscApiFactory()
+        {
+            TypeNames = new List<string>() { "eiscapi" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new EiscApi Device");
+
+            return new EiscApi(dc);
+        }
+    }
+
+}

src/PepperDashEssentials/Bridges/EssentialComms.cs

@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using Crestron.SimplSharpPro.CrestronThread;
+
+namespace PepperDash.Essentials {
+	public class EssentialCommConfig {
+		public string[] EiscApiIpids;
+		public EssentialCommCommConnectionConfigs[] CommConnections;
+		}
+	public class EssentialCommCommConnectionConfigs {
+		public uint joinNumber {get; set; }
+		public EssentialsControlPropertiesConfig control { get; set; }
+		}
+
+	public class EssentialCommsPort {
+		public IBasicCommunication Comm;
+		public IntFeedback StatusFeedback;
+		public BoolFeedback ConnectedFeedback;
+		public List<EssentialComApiMap> Outputs = new List<EssentialComApiMap>();
+		public String RxBuffer;
+		public EssentialCommsPort(EssentialsControlPropertiesConfig config, string keyPrefix) {
+			Comm = CommFactory.CreateCommForConfig(config, keyPrefix);
+			// var PortGather = new CommunicationGather(Comm, config.EndOfLineChar);
+			Comm.TextReceived += new EventHandler<GenericCommMethodReceiveTextArgs>(Communication_TextReceived);
+
+			var socket = Comm as ISocketStatus;
+			StatusFeedback = new IntFeedback(() => { return (int)socket.ClientStatus; });
+			ConnectedFeedback = new BoolFeedback(() => { return Comm.IsConnected; });
+
+			if (socket != null) {
+				socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
+				} else {
+				}
+
+			}
+		void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e) {
+			StatusFeedback.FireUpdate();
+			ConnectedFeedback.FireUpdate();
+			if (e.Client.IsConnected) {
+				// Tasks on connect
+				} else {
+				// Cleanup items from this session
+				}
+			}
+		void Communication_TextReceived(object sender, GenericCommMethodReceiveTextArgs args) {
+			try {
+				foreach (var Output in Outputs) {
+					Output.Api.Eisc.StringInput[Output.Join].StringValue = args.Text;
+					}
+
+				}
+			catch (Exception) {
+				throw new FormatException(string.Format("ERROR:{0}"));
+				}
+			}
+		}
+		
+	public class EssentialComm : Device {
+		public EssentialCommConfig Properties;
+		
+		public CommunicationGather PortGather { get; private set; }
+		public List<BridgeApiEisc> Apis {get; set;}
+		public Dictionary<string, StringFeedback> CommFeedbacks {get; private set; }
+		public StatusMonitorBase CommunicationMonitor { get; private set; }
+		public Dictionary<uint, EssentialCommsPort> CommDictionary { get; private set; }
+
+		public EssentialComm(string key, string name, JToken properties) : base(key, name) {
+			Properties = JsonConvert.DeserializeObject<EssentialCommConfig>(properties.ToString());
+			CommFeedbacks = new Dictionary<string, StringFeedback>();
+			CommDictionary = new Dictionary<uint, EssentialCommsPort>();
+			Apis = new List<BridgeApiEisc>();
+							int commNumber = 1;
+				foreach (var commConfig in Properties.CommConnections) {
+					var commPort = new EssentialCommsPort(commConfig.control, string.Format("{0}-{1}", this.Key, commConfig.joinNumber));
+					CommDictionary.Add(commConfig.joinNumber, commPort);
+
+					commNumber++;
+					}
+
+				foreach (var Ipid in Properties.EiscApiIpids) {
+					var ApiEisc = new BridgeApiEisc(Ipid);
+					Apis.Add(ApiEisc);
+					foreach (var commConnection in CommDictionary) {
+						Debug.Console(2, "Joining Api{0} to comm {1}", Ipid, commConnection.Key);
+						var tempComm = commConnection.Value;
+						var tempJoin = (uint)commConnection.Key;
+						EssentialComApiMap ApiMap = new EssentialComApiMap(ApiEisc, (uint)tempJoin);
+
+						tempComm.Outputs.Add(ApiMap);
+						// Check for ApiMap Overide Values here
+
+						ApiEisc.Eisc.SetBoolSigAction(tempJoin, b => {if (b) { tempComm.Comm.Connect(); } else { tempComm.Comm.Disconnect(); }});
+						ApiEisc.Eisc.SetStringSigAction(tempJoin, s => tempComm.Comm.SendText(s));
+
+						tempComm.StatusFeedback.LinkInputSig(ApiEisc.Eisc.UShortInput[tempJoin]);
+						tempComm.ConnectedFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[tempJoin]);
+
+
+
+						}
+					ApiEisc.Eisc.Register();
+					}
+		    }
+
+
+
+        public override bool CustomActivate()
+        {
+			try {
+
+
+					
+				Debug.Console(2, "Name {0} Activated", this.Name);
+				return true;
+				}
+			catch (Exception e) {
+				Debug.Console(0, "Bridge {0}", e);
+				return false;
+				}
+        }
+
+
+		}
+	public class EssentialComApiMap {
+		public uint Join;
+		public BridgeApiEisc Api;
+		public uint connectJoin; 
+		public  EssentialComApiMap(BridgeApiEisc api, uint join) {
+			Join = join;
+			Api = api;
+			}
+		}
+	}

src/PepperDashEssentials/Bridges/EssentialDM.cs

@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.DM;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using Crestron.SimplSharpPro.DM;
+
+namespace PepperDash.Essentials {
+	public class EssentialDM : PepperDash.Core.Device {
+		public EssentialDMProperties Properties;
+		public List<BridgeApiEisc> BridgeApiEiscs;
+		private PepperDash.Essentials.DM.DmChassisController DmSwitch;
+		private EssentialDMApiMap ApiMap = new EssentialDMApiMap();
+		public EssentialDM(string key, string name, JToken properties)
+			: base(key, name) {
+			Properties = JsonConvert.DeserializeObject<EssentialDMProperties>(properties.ToString());
+
+
+			}
+		public override bool CustomActivate() {
+			// Create EiscApis 
+			try {
+				foreach (var device in DeviceManager.AllDevices) {
+					if (device.Key == this.Properties.connectionDeviceKey) {
+						Debug.Console(2, "deviceKey {0} Matches", device.Key);
+						DmSwitch = DeviceManager.GetDeviceForKey(device.Key) as PepperDash.Essentials.DM.DmChassisController;
+
+						} 
+					
+
+					else 	{
+						Debug.Console(2, "deviceKey {0} doesn't match", device.Key);
+						}
+					}
+				if (Properties.EiscApiIpids != null) {
+
+					
+					foreach (string Ipid in Properties.EiscApiIpids) {
+						var ApiEisc = new BridgeApiEisc(Ipid);
+						for (uint x = 1; x <= DmSwitch.Chassis.NumberOfInputs;x++ ) {
+							uint tempX = x;
+							Debug.Console(2, "Creating EiscActions {0}", tempX);
+
+
+							ApiEisc.Eisc.SetUShortSigAction(ApiMap.OutputVideoRoutes[tempX], u => DmSwitch.ExecuteSwitch(u, tempX, eRoutingSignalType.Video));
+							ApiEisc.Eisc.SetUShortSigAction(ApiMap.OutputAudioRoutes[tempX], u => DmSwitch.ExecuteSwitch(u, tempX, eRoutingSignalType.Audio));
+
+
+                            if (DmSwitch.TxDictionary.ContainsKey(tempX)) {
+								Debug.Console(2, "Creating Tx Feedbacks {0}", tempX);
+								var TxKey = DmSwitch.TxDictionary[tempX];
+								var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase;
+								TxDevice.IsOnline.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.TxOnlineStatus[tempX]]);
+								TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.TxVideoSyncStatus[tempX]]);
+								ApiEisc.Eisc.SetUShortSigAction((ApiMap.HdcpSupport[tempX]), u => TxDevice.SetHdcpSupportAll((ePdtHdcpSupport)(u)));
+								TxDevice.HdcpSupportAllFeedback.LinkInputSig(ApiEisc.Eisc.UShortInput[ApiMap.HdcpSupport[tempX]]);
+								ApiEisc.Eisc.UShortInput[ApiMap.HdcpSupportCapability[tempX]].UShortValue = TxDevice.HdcpSupportCapability;
+								} 
+							else {
+								DmSwitch.VideoInputSyncFeedbacks[tempX].LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.TxVideoSyncStatus[tempX]]);
+								}
+							if (DmSwitch.RxDictionary.ContainsKey(tempX)) {
+								Debug.Console(2, "Creating Rx Feedbacks {0}", tempX);
+								var RxKey = DmSwitch.RxDictionary[tempX];
+								var RxDevice = DeviceManager.GetDeviceForKey(RxKey) as DmRmcControllerBase;
+								RxDevice.IsOnline.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.RxOnlineStatus[tempX]]);
+								}
+							// DmSwitch.InputEndpointOnlineFeedbacks[(ushort)tempOutputNum].LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.OutputVideoRoutes[tempOutputNum]]);
+							DmSwitch.VideoOutputFeedbacks[(ushort)tempX].LinkInputSig(ApiEisc.Eisc.UShortInput[ApiMap.OutputVideoRoutes[tempX]]);
+							DmSwitch.AudioOutputFeedbacks[(ushort)tempX].LinkInputSig(ApiEisc.Eisc.UShortInput[ApiMap.OutputAudioRoutes[tempX]]);
+							DmSwitch.InputNameFeedbacks[(ushort)tempX].LinkInputSig(ApiEisc.Eisc.StringInput[ApiMap.InputNames[tempX]]);
+							DmSwitch.OutputNameFeedbacks[(ushort)tempX].LinkInputSig(ApiEisc.Eisc.StringInput[ApiMap.OutputNames[tempX]]);
+							DmSwitch.OutputRouteNameFeedbacks[(ushort)tempX].LinkInputSig(ApiEisc.Eisc.StringInput[ApiMap.OutputRouteNames[tempX]]);
+							}
+						DmSwitch.IsOnline.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.ChassisOnline]);
+						ApiEisc.Eisc.Register();
+						}
+					}
+
+
+
+				Debug.Console(2, "Name {0} Activated", this.Name);
+				return true;
+				}
+			catch (Exception e) {
+				Debug.Console(2, "BRidge {0}", e);
+				return false;
+				}
+			}
+		}
+	public class EssentialDMProperties {
+		public string connectionDeviceKey;
+		public string[] EiscApiIpids;
+
+
+		}
+
+
+	public class EssentialDMApiMap {
+		public ushort ChassisOnline = 11;
+		public Dictionary<uint, ushort> OutputVideoRoutes;
+		public Dictionary<uint, ushort> OutputAudioRoutes;
+		public Dictionary<uint, ushort> TxOnlineStatus;
+		public Dictionary<uint, ushort> RxOnlineStatus;
+		public Dictionary<uint, ushort> TxVideoSyncStatus;
+		public Dictionary<uint, ushort> InputNames;
+		public Dictionary<uint, ushort> OutputNames;
+		public Dictionary<uint, ushort> OutputRouteNames;
+		public Dictionary<uint, ushort> HdcpSupport;
+		public Dictionary<uint, ushort> HdcpSupportCapability;
+
+		public EssentialDMApiMap() {
+			OutputVideoRoutes = new Dictionary<uint, ushort>();
+			OutputAudioRoutes = new Dictionary<uint, ushort>();
+			TxOnlineStatus = new Dictionary<uint, ushort>();
+			RxOnlineStatus = new Dictionary<uint, ushort>();
+			TxVideoSyncStatus = new Dictionary<uint, ushort>();
+			InputNames = new Dictionary<uint, ushort>();
+			OutputNames = new Dictionary<uint, ushort>();
+			OutputRouteNames = new Dictionary<uint, ushort>();
+			HdcpSupport = new Dictionary<uint, ushort>();
+			HdcpSupportCapability = new Dictionary<uint, ushort>();
+
+			for (uint x = 1; x <= 200; x++) {
+				// Debug.Console(0, "Init Value {0}", x);
+				uint tempNum = x;
+				HdcpSupportCapability[tempNum] = (ushort)(tempNum + 1200);
+				HdcpSupport[tempNum] = (ushort)(tempNum + 1000);
+				OutputVideoRoutes[tempNum] = (ushort)(tempNum + 100);
+				OutputAudioRoutes[tempNum] = (ushort)(tempNum + 300);
+				TxOnlineStatus[tempNum] = (ushort)(tempNum + 500);
+				RxOnlineStatus[tempNum] = (ushort)(tempNum + 700);
+				TxVideoSyncStatus[tempNum] = (ushort)(tempNum + 100);
+				InputNames[tempNum] = (ushort)(tempNum + 100);
+				OutputNames[tempNum] = (ushort)(tempNum + 300);
+				OutputRouteNames[tempNum] = (ushort)(tempNum + 2000);
+				}
+			}
+		}
+	}
+	

src/PepperDashEssentials/Bridges/EssentialDsp.cs

@@ -0,0 +1,217 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.DM;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using Crestron.SimplSharpPro.DM;
+
+namespace PepperDash.Essentials {
+	public class EssentialDsp : PepperDash.Core.Device {
+		public EssentialDspProperties Properties;
+		public List<BridgeApiEisc> BridgeApiEiscs;
+		private PepperDash.Essentials.Devices.Common.DSP.QscDsp Dsp;
+		private EssentialDspApiMap ApiMap = new EssentialDspApiMap();
+		public EssentialDsp(string key, string name, JToken properties)
+			: base(key, name) {
+			Properties = JsonConvert.DeserializeObject<EssentialDspProperties>(properties.ToString());
+
+
+			}
+		public override bool CustomActivate() {
+			// Create EiscApis 
+
+			try
+			{
+				ICommunicationMonitor comm = null;
+				foreach (var device in DeviceManager.AllDevices) 
+				{
+					if (device.Key == this.Properties.connectionDeviceKey) 
+					{
+						if (!(device is ICommunicationMonitor))
+						{
+							comm = device as ICommunicationMonitor;
+						}
+						Debug.Console(2, "deviceKey {0} Matches", device.Key);
+						Dsp = DeviceManager.GetDeviceForKey(device.Key) as PepperDash.Essentials.Devices.Common.DSP.QscDsp;
+						break;
+					} 
+					else 	
+					{
+						Debug.Console(2, "deviceKey {0} doesn't match", device.Key);
+						
+					}
+				}
+				if (Properties.EiscApiIpids != null && Dsp != null)
+				{
+					foreach (string Ipid in Properties.EiscApiIpids)
+					{
+						var ApiEisc = new BridgeApiEisc(Ipid);
+						Debug.Console(2, "Connecting EiscApi {0} to {1}", ApiEisc.Ipid, Dsp.Name);
+						ushort x = 1;
+						if (comm != null)
+						{
+							comm.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.Online]);
+						}
+						foreach (var channel in Dsp.LevelControlPoints)
+						{
+							//var QscChannel = channel.Value as PepperDash.Essentials.Devices.Common.DSP.QscDspLevelControl;
+							Debug.Console(2, "QscChannel {0} connect", x);
+								
+							var genericChannel = channel.Value as IBasicVolumeWithFeedback;
+							if (channel.Value.Enabled)
+							{
+								ApiEisc.Eisc.StringInput[ApiMap.channelName[x]].StringValue = channel.Value.LevelCustomName;
+								ApiEisc.Eisc.UShortInput[ApiMap.channelType[x]].UShortValue = (ushort)channel.Value.Type;
+
+								genericChannel.MuteFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.channelMuteToggle[x]]);
+								genericChannel.VolumeLevelFeedback.LinkInputSig(ApiEisc.Eisc.UShortInput[ApiMap.channelVolume[x]]);
+
+								ApiEisc.Eisc.SetSigTrueAction(ApiMap.channelMuteToggle[x], () => genericChannel.MuteToggle());
+								ApiEisc.Eisc.SetSigTrueAction(ApiMap.channelMuteOn[x], () => genericChannel.MuteOn());
+								ApiEisc.Eisc.SetSigTrueAction(ApiMap.channelMuteOff[x], () => genericChannel.MuteOff());
+
+								ApiEisc.Eisc.SetBoolSigAction(ApiMap.channelVolumeUp[x], b => genericChannel.VolumeUp(b));
+								ApiEisc.Eisc.SetBoolSigAction(ApiMap.channelVolumeDown[x], b => genericChannel.VolumeDown(b));
+
+								ApiEisc.Eisc.SetUShortSigAction(ApiMap.channelVolume[x], u => genericChannel.SetVolume(u));
+								ApiEisc.Eisc.SetStringSigAction(ApiMap.presetString, s => Dsp.RunPreset(s));
+							}
+							x++;
+
+						}
+						x = 1;
+						foreach (var preset in Dsp.PresetList)
+						{
+							ApiEisc.Eisc.StringInput[ApiMap.presets[x]].StringValue = preset.label;
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.presets[x], () => Dsp.RunPresetNumber(x));
+							x++;
+						}
+						foreach (var dialer in Dsp.Dialers)
+						{
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad0, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num0));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad1, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num1));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad2, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num2));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad3, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num3));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad4, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num4));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad5, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num5));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad6, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num6));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad7, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num7));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad8, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num8));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Keypad9, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Num9));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.KeypadStar, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Star));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.KeypadPound, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Pound));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.KeypadClear, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Clear));
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.KeypadBackspace, () => dialer.Value.SendKeypad(PepperDash.Essentials.Devices.Common.DSP.QscDspDialer.eKeypadKeys.Backspace));
+
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.Dial, () => dialer.Value.Dial());
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.DoNotDisturbToggle, () => dialer.Value.DoNotDisturbToggle());
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.DoNotDisturbOn, () => dialer.Value.DoNotDisturbOn());
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.DoNotDisturbOff, () => dialer.Value.DoNotDisturbOff());
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.AutoAnswerToggle, () => dialer.Value.AutoAnswerToggle());
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.AutoAnswerOn, () => dialer.Value.AutoAnswerOn());
+							ApiEisc.Eisc.SetSigTrueAction(ApiMap.AutoAnswerOff, () => dialer.Value.AutoAnswerOff());
+
+							dialer.Value.DoNotDisturbFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.DoNotDisturbToggle]);
+							dialer.Value.DoNotDisturbFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.DoNotDisturbOn]);
+							dialer.Value.DoNotDisturbFeedback.LinkComplementInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.DoNotDisturbOff]);
+
+							dialer.Value.AutoAnswerFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.AutoAnswerToggle]);
+							dialer.Value.AutoAnswerFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.AutoAnswerOn]);
+							dialer.Value.AutoAnswerFeedback.LinkComplementInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.AutoAnswerOff]);
+
+							dialer.Value.OffHookFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.Dial]);
+							dialer.Value.DialStringFeedback.LinkInputSig(ApiEisc.Eisc.StringInput[ApiMap.DialString]);
+						}
+					}
+				}
+
+				
+
+
+				Debug.Console(2, "Name {0} Activated", this.Name);
+				return true;
+				}
+			catch (Exception e) {
+				Debug.Console(0, "Bridge {0}", e);
+				return false;
+				}
+			}
+		}
+	public class EssentialDspProperties {
+		public string connectionDeviceKey;
+		public string[] EiscApiIpids;
+
+
+		}
+
+
+	public class EssentialDspApiMap {
+		public ushort Online = 1;
+		public ushort presetString = 2000;
+		public Dictionary<uint, ushort> channelMuteToggle;
+		public Dictionary<uint, ushort> channelMuteOn;
+		public Dictionary<uint, ushort> channelMuteOff;
+		public Dictionary<uint, ushort> channelVolume;
+		public Dictionary<uint, ushort> channelType;
+		public Dictionary<uint, ushort> channelName;
+		public Dictionary<uint, ushort> channelVolumeUp;
+		public Dictionary<uint, ushort> channelVolumeDown;
+		public Dictionary<uint, ushort> presets;
+		public ushort DialString = 3100;
+		public ushort Keypad0 = 3110;
+		public ushort Keypad1 = 3111;
+		public ushort Keypad2 = 3112;
+		public ushort Keypad3 = 3113;
+		public ushort Keypad4 = 3114;
+		public ushort Keypad5 = 3115;
+		public ushort Keypad6 = 3116;
+		public ushort Keypad7 = 3117;
+		public ushort Keypad8 = 3118;
+		public ushort Keypad9 = 3119;
+		public ushort KeypadStar = 3120;
+		public ushort KeypadPound = 3121;
+		public ushort KeypadClear = 3122;
+		public ushort KeypadBackspace = 3123;
+		public ushort Dial = 3124;
+		public ushort DoNotDisturbToggle = 3132;
+		public ushort DoNotDisturbOn = 3133;
+		public ushort DoNotDisturbOff = 3134;
+		public ushort AutoAnswerToggle = 3127;
+		public ushort AutoAnswerOn = 3125;
+		public ushort AutoAnswerOff = 3126;
+
+		public EssentialDspApiMap() {
+			channelMuteToggle = new Dictionary<uint, ushort>();
+			channelMuteOn = new Dictionary<uint, ushort>();
+			channelMuteOff = new Dictionary<uint, ushort>();
+			channelVolume = new Dictionary<uint, ushort>();
+			channelName = new Dictionary<uint, ushort>();
+			channelType = new Dictionary<uint, ushort>();
+			presets = new Dictionary<uint, ushort>();
+			channelVolumeUp = new Dictionary<uint, ushort>();
+			channelVolumeDown = new Dictionary<uint, ushort>();
+			for (uint x = 1; x <= 100; x++) {
+				uint tempNum = x;
+				presets[tempNum] = (ushort)(tempNum + 100);
+				channelMuteToggle[tempNum] = (ushort)(tempNum + 400);
+				channelMuteOn[tempNum] = (ushort)(tempNum + 600);
+				channelMuteOff[tempNum] = (ushort)(tempNum + 800);
+				channelVolume[tempNum] = (ushort)(tempNum + 200);
+				channelName[tempNum] = (ushort)(tempNum + 200);
+				channelType[tempNum] = (ushort)(tempNum + 400);
+				channelVolumeUp[tempNum] = (ushort)(tempNum + 1000);
+				channelVolumeDown[tempNum] = (ushort)(tempNum + 1200);
+				}
+			}
+		}
+	}
+	

src/PepperDashEssentials/Bridges/EssentialTVOne.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.DM;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.EthernetCommunication;
+using Crestron.SimplSharpPro.DM;
+
+namespace PepperDash.Essentials
+{
+	public class EssentialsTVOne : PepperDash.Core.Device
+	{
+		public EssentialTVOneProperties Properties;
+		public List<BridgeApiEisc> BridgeApiEiscs;
+		private PepperDash.Essentials.Devices.Common.TVOneCorio TVOneCorio;
+		private EssentialsTVOneApiMap ApiMap = new EssentialsTVOneApiMap();
+		public EssentialsTVOne(string key, string name, JToken properties)
+			: base(key, name)
+		{
+			Properties = JsonConvert.DeserializeObject<EssentialTVOneProperties>(properties.ToString());
+
+
+		}
+		public override bool CustomActivate() {
+			// Create EiscApis 
+			try
+			{
+				foreach (var device in DeviceManager.AllDevices) 
+				{
+					if (device.Key == this.Properties.connectionDeviceKey) 
+					{
+						Debug.Console(2, "deviceKey {0} Matches", device.Key);
+						TVOneCorio = DeviceManager.GetDeviceForKey(device.Key) as PepperDash.Essentials.Devices.Common.TVOneCorio;
+						break;
+					}	
+					else 	
+					{
+						Debug.Console(2, "deviceKey {0} doesn't match", device.Key);
+						
+					}
+				}
+				if (Properties.EiscApiIpids != null && TVOneCorio != null)
+				{
+					foreach (string Ipid in Properties.EiscApiIpids)
+					{
+						var ApiEisc = new BridgeApiEisc(Ipid);
+						Debug.Console(2, "Connecting EiscApi {0} to {1}", ApiEisc.Ipid, TVOneCorio.Name);
+						ushort x = 1;
+						TVOneCorio.OnlineFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.Online]);
+						ApiEisc.Eisc.SetUShortSigAction(ApiMap.CallPreset, u => TVOneCorio.CallPreset(u));
+						TVOneCorio.PresetFeedback.LinkInputSig(ApiEisc.Eisc.UShortInput[ApiMap.PresetFeedback]);
+
+					}
+				}
+
+				
+
+
+				Debug.Console(2, "Name {0} Activated", this.Name);
+				return true;
+				}
+			catch (Exception e) {
+				Debug.Console(0, "Bridge {0}", e);
+				return false;
+				}
+			}
+	}
+	public class EssentialTVOneProperties
+	{
+		public string connectionDeviceKey;
+		public string[] EiscApiIpids;
+
+
+	}
+
+
+	public class EssentialsTVOneApiMap
+	{
+		public ushort CallPreset = 1;
+		public ushort PresetFeedback = 1;
+		public ushort Online = 1;
+
+		public EssentialsTVOneApiMap()
+		{
+
+
+		}
+
+	}
+}

src/PepperDashEssentials/Bridges/GenericLightingBridge.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class GenericLightingApiExtensions
+    {
+        public static void LinkToApi(this PepperDash.Essentials.Core.Lighting.LightingBase lightingDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            GenericLightingJoinMap joinMap = new GenericLightingJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+
+            // GenericLighitng Actions & FeedBack
+            trilist.SetUShortSigAction(joinMap.SelectScene, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+            int sceneIndex = 1;
+            foreach (var scene in lightingDevice.LightingScenes)
+            {
+                var tempIndex = sceneIndex - 1;
+                trilist.SetSigTrueAction((uint)(joinMap.LightingSceneOffset + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[tempIndex]));
+                scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)]);
+                trilist.StringInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)].StringValue = scene.Name;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibilityOffset + sceneIndex)].BoolValue = true;
+                sceneIndex++;
+            }
+
+            if (lightingDevice.GetType().Name.ToString() == "LutronQuantumArea")
+            {
+                var lutronDevice = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
+                lutronDevice.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+                trilist.SetStringSigAction(joinMap.IntegrationIdSet, s => lutronDevice.IntegrationId = s);
+            }
+
+            //ApiEisc.Eisc.SetStringSigAction(ApiMap.integrationID, (s) => { lutronLights.IntegrationId = s; });
+
+
+            /*
+            var lutronLights = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
+
+			
+            for (uint i = 1; i <= lightingBase.CircuitCount; i++)
+            {
+                var circuit = i;
+                lightingBase.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
+                lightingBase.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
+                lightingBase.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
+                trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => lightingBase.CycleCircuit(circuit - 1));
+                trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => lightingBase.TurnOnCircuit(circuit - 1));
+                trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => lightingBase.TurnOffCircuit(circuit - 1));
+
+            }
+             */
+        }
+    }
+}

src/PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.CrestronIO;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class GenericRelayDeviceApiExtensions
+    {
+        public static void LinkToApi(this GenericRelayDevice relay, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            GenericRelayControllerJoinMap joinMap = new GenericRelayControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            if (relay.RelayOutput == null)
+            {
+                Debug.Console(1, relay, "Unable to link device '{0}'.  Relay is null", relay.Key);
+                return;
+            }
+
+            Debug.Console(1, relay, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            trilist.SetBoolSigAction(joinMap.Relay, new Action<bool>(b =>
+                {
+                    if (b)
+                        relay.CloseRelay();
+                    else
+                        relay.OpenRelay();
+                }));
+
+            // feedback for relay state
+
+            relay.OutputIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Relay]);
+        }
+
+    }
+}

src/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Essentials.Devices.Common.Occupancy;
+
+using PepperDash.Essentials.Core;
+using PepperDash.Core;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class GlsOccupancySensorBaseControllerApiExtensions
+    {
+        public static void LinkToApi(this GlsOccupancySensorBaseController occController, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            GlsOccupancySensorBaseJoinMap joinMap = new GlsOccupancySensorBaseJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            #region Single and Dual Sensor Stuff
+            occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            trilist.StringInput[joinMap.Name].StringValue = occController.Name;
+
+            trilist.OnlineStatusChange += new Crestron.SimplSharpPro.OnlineStatusChangeEventHandler((d, args) =>
+            {
+                if (args.DeviceOnLine)
+                {
+                    trilist.StringInput[joinMap.Name].StringValue = occController.Name;
+                }
+            }
+            );
+
+            // Occupied status
+            trilist.SetSigTrueAction(joinMap.ForceOccupied, new Action(() => occController.ForceOccupied()));
+            trilist.SetSigTrueAction(joinMap.ForceVacant, new Action(() => occController.ForceVacant()));
+            occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback]);
+            occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback]);
+            occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback]);
+            trilist.SetBoolSigAction(joinMap.EnableRawStates, new Action<bool>((b) => occController.EnableRawStates(b)));
+
+            // Timouts
+            trilist.SetUShortSigAction(joinMap.Timeout, new Action<ushort>((u) => occController.SetRemoteTimeout(u)));
+            occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout]);
+            occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback]);
+
+            // LED Flash
+            trilist.SetSigTrueAction(joinMap.EnableLedFlash, new Action(() => occController.SetLedFlashEnable(true)));
+            trilist.SetSigTrueAction(joinMap.DisableLedFlash, new Action(() => occController.SetLedFlashEnable(false)));
+            occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash]);
+
+            // Short Timeout
+            trilist.SetSigTrueAction(joinMap.EnableShortTimeout, new Action(() => occController.SetShortTimeoutState(true)));
+            trilist.SetSigTrueAction(joinMap.DisableShortTimeout, new Action(() => occController.SetShortTimeoutState(false)));
+            occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout]);
+
+            // PIR Sensor
+            trilist.SetSigTrueAction(joinMap.EnablePir, new Action(() => occController.SetPirEnable(true)));
+            trilist.SetSigTrueAction(joinMap.DisablePir, new Action(() => occController.SetPirEnable(false)));
+            occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir]);
+            
+            // PIR Sensitivity in Occupied State
+            trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState, new Action<bool>((b) => occController.IncrementPirSensitivityInOccupiedState(b)));
+            trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState, new Action<bool>((b) => occController.DecrementPirSensitivityInOccupiedState(b)));
+            occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInOccupiedState]);
+
+            // PIR Sensitivity in Vacant State
+            trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState, new Action<bool>((b) => occController.IncrementPirSensitivityInVacantState(b)));
+            trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState, new Action<bool>((b) => occController.DecrementPirSensitivityInVacantState(b)));
+            occController.PirSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInVacantState]);
+            #endregion
+
+            #region Dual Technology Sensor Stuff
+            var odtOccController = occController as GlsOdtOccupancySensorController;
+
+            if (odtOccController != null)
+            {
+                // OR When Vacated
+                trilist.SetBoolSigAction(joinMap.OrWhenVacated, new Action<bool>((b) => odtOccController.SetOrWhenVacatedState(b)));
+                odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated]);
+
+                // AND When Vacated
+                trilist.SetBoolSigAction(joinMap.AndWhenVacated, new Action<bool>((b) => odtOccController.SetAndWhenVacatedState(b)));
+                odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated]);
+
+                // Ultrasonic A Sensor
+                trilist.SetSigTrueAction(joinMap.EnableUsA, new Action(() => odtOccController.SetUsAEnable(true)));
+                trilist.SetSigTrueAction(joinMap.DisableUsA, new Action(() => odtOccController.SetUsAEnable(false)));
+                odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA]);
+
+                // Ultrasonic B Sensor
+                trilist.SetSigTrueAction(joinMap.EnableUsB, new Action(() => odtOccController.SetUsBEnable(true)));
+                trilist.SetSigTrueAction(joinMap.DisableUsB, new Action(() => odtOccController.SetUsBEnable(false)));
+                odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB]);
+
+                // US Sensitivity in Occupied State
+                trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState, new Action<bool>((b) => odtOccController.IncrementUsSensitivityInOccupiedState(b)));
+                trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState, new Action<bool>((b) => odtOccController.DecrementUsSensitivityInOccupiedState(b)));
+                odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInOccupiedState]);
+
+                // US Sensitivity in Vacant State
+                trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState, new Action<bool>((b) => odtOccController.IncrementUsSensitivityInVacantState(b)));
+                trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState, new Action<bool>((b) => odtOccController.DecrementUsSensitivityInVacantState(b)));
+                odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInVacantState]);
+
+                //Sensor Raw States
+                odtOccController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback]);
+                odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback]);
+
+            }
+            #endregion
+        }
+    }
+}

src/PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class HdMdxxxCEControllerApiExtensions
+    {
+        public static void LinkToApi(this HdMdxxxCEController hdMdPair, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            HdMdxxxCEControllerJoinMap joinMap = new HdMdxxxCEControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<HdMdxxxCEControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, hdMdPair, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            hdMdPair.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            hdMdPair.RemoteEndDetectedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RemoteEndDetected]);
+
+            trilist.SetSigTrueAction(joinMap.AutoRouteOn, new Action(() => hdMdPair.AutoRouteOn()));
+            hdMdPair.AutoRouteOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AutoRouteOn]);
+            trilist.SetSigTrueAction(joinMap.AutoRouteOff, new Action(() => hdMdPair.AutoRouteOff()));
+            hdMdPair.AutoRouteOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.AutoRouteOff]);
+
+            trilist.SetSigTrueAction(joinMap.PriorityRoutingOn, new Action(() => hdMdPair.PriorityRouteOn()));
+            hdMdPair.PriorityRoutingOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PriorityRoutingOn]);
+            trilist.SetSigTrueAction(joinMap.PriorityRoutingOff, new Action(() => hdMdPair.PriorityRouteOff()));
+            hdMdPair.PriorityRoutingOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PriorityRoutingOff]);
+
+            trilist.SetSigTrueAction(joinMap.InputOnScreenDisplayEnabled, new Action(() => hdMdPair.OnScreenDisplayEnable()));
+            hdMdPair.InputOnScreenDisplayEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputOnScreenDisplayEnabled]);
+            trilist.SetSigTrueAction(joinMap.AutoRouteOff, new Action(() => hdMdPair.OnScreenDisplayDisable()));
+            hdMdPair.InputOnScreenDisplayEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.InputOnScreenDisplayDisabled]);
+
+            trilist.SetUShortSigAction(joinMap.VideoSource, new Action<ushort>((i) => hdMdPair.ExecuteSwitch(i, null, eRoutingSignalType.Video | eRoutingSignalType.Audio)));
+            hdMdPair.VideoSourceFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoSource]);
+
+            trilist.UShortInput[joinMap.SourceCount].UShortValue = (ushort)hdMdPair.InputPorts.Count;
+
+            foreach (var input in hdMdPair.InputPorts)
+            {
+                var number = Convert.ToUInt16(input.Selector);
+                hdMdPair.SyncDetectedFeedbacks[number].LinkInputSig(trilist.BooleanInput[joinMap.SyncDetected + number]);
+                trilist.StringInput[joinMap.SourceNames + number].StringValue = input.Key;
+            }
+
+        } 
+    }
+}

src/PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class IBasicCommunicationApiExtensions
+    {
+        public static void LinkToApi(this GenericComm comm, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            IBasicCommunicationJoinMap joinMap = new IBasicCommunicationJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            if (comm.CommPort == null)
+            {
+                Debug.Console(1, comm, "Unable to link device '{0}'.  CommPort is null", comm.Key);
+                return;
+            }
+
+            Debug.Console(1, comm, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            // this is a permanent event handler. This cannot be -= from event
+            comm.CommPort.TextReceived += (s, a) =>
+            {
+                Debug.Console(2, comm, "RX: {0}", a.Text);
+                trilist.SetString(joinMap.TextReceived, a.Text);
+            };
+            trilist.SetStringSigAction(joinMap.SendText, new Action<string>(s => comm.CommPort.SendText(s)));
+            trilist.SetStringSigAction(joinMap.SetPortConfig, new Action<string>(s => comm.SetPortConfig(s)));
+
+
+            var sComm = comm.CommPort as ISocketStatus;
+            if (sComm != null)
+            {
+                sComm.ConnectionChange += (s, a) =>
+                {
+                    trilist.SetUshort(joinMap.Status, (ushort)(a.Client.ClientStatus));
+                    trilist.SetBool(joinMap.Connected, a.Client.ClientStatus ==
+                        Crestron.SimplSharp.CrestronSockets.SocketStatus.SOCKET_STATUS_CONNECTED);
+                };
+
+                trilist.SetBoolSigAction(joinMap.Connect, new Action<bool>(b =>
+                {
+                    if (b)
+                    {
+                        sComm.Connect();
+                    }
+                    else
+                    {
+                        sComm.Disconnect();
+                    }
+                }));
+            }
+        }
+    }
+}

src/PepperDashEssentials/Bridges/IBridge.cs

@@ -0,0 +1,14 @@
+using System;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Bridges
+{
+    /// <summary>
+    /// Defines a device that uses the legacy JoinMapBase for its join map
+    /// </summary>
+    [Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")]
+    public interface IBridge
+    {
+        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
+    }
+}

src/PepperDashEssentials/Bridges/IDigitalInputBridge.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.CrestronIO;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class IDigitalInputApiExtenstions
+    {
+        public static void LinkToApi(this IDigitalInput input, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            IDigitalInputJoinMap joinMap = new IDigitalInputJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            try
+            {
+                Debug.Console(1, input as Device, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+                // Link feedback for input state
+                input.InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState]);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, input as Device, "Unable to link device '{0}'.  Input is null", (input as Device).Key);
+                Debug.Console(1, input as Device, "Error: {0}", e);
+                return;
+            }
+        }
+    } 
+}

src/PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public static class IRSetTopBoxBaseApiExtensions
+    {
+        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.IRSetTopBoxBase stbDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            SetTopBoxControllerJoinMap joinMap = new SetTopBoxControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<SetTopBoxControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Display: {0}", stbDevice.Name);
+
+            trilist.StringInput[joinMap.Name].StringValue = stbDevice.Name;
+
+            var stbBase = stbDevice as ISetTopBoxControls;
+            if (stbBase != null)
+            {
+                trilist.BooleanInput[joinMap.HasDpad].BoolValue = stbBase.HasDpad;
+                trilist.BooleanInput[joinMap.HasNumeric].BoolValue = stbBase.HasNumeric;
+                trilist.BooleanInput[joinMap.HasDvr].BoolValue = stbBase.HasDvr;
+                trilist.BooleanInput[joinMap.HasPresets].BoolValue = stbBase.HasPresets;
+
+                trilist.SetBoolSigAction(joinMap.DvrList, (b) => stbBase.DvrList(b));
+                trilist.SetBoolSigAction(joinMap.Replay, (b) => stbBase.Replay(b));
+
+                trilist.SetStringSigAction(joinMap.LoadPresets, (s) => stbBase.LoadPresets(s));
+            }
+
+            var stbPower = stbDevice as IPower;
+            if (stbPower != null)
+            {
+                trilist.SetSigTrueAction(joinMap.PowerOn, () => stbPower.PowerOn());
+                trilist.SetSigTrueAction(joinMap.PowerOff, () => stbPower.PowerOff());
+                trilist.SetSigTrueAction(joinMap.PowerToggle, () => stbPower.PowerToggle());
+
+            }
+
+            var stbDPad = stbDevice as IDPad;
+            if (stbDPad != null)
+            {
+                trilist.SetBoolSigAction(joinMap.Up, (b) => stbDPad.Up(b));
+                trilist.SetBoolSigAction(joinMap.Down, (b) => stbDPad.Down(b));
+                trilist.SetBoolSigAction(joinMap.Left, (b) => stbDPad.Left(b));
+                trilist.SetBoolSigAction(joinMap.Right, (b) => stbDPad.Right(b));
+                trilist.SetBoolSigAction(joinMap.Select, (b) => stbDPad.Select(b));
+                trilist.SetBoolSigAction(joinMap.Menu, (b) => stbDPad.Menu(b));
+                trilist.SetBoolSigAction(joinMap.Exit, (b) => stbDPad.Exit(b));
+            }
+
+            var stbChannel = stbDevice as IChannel;
+            if (stbChannel != null)
+            {
+                trilist.SetBoolSigAction(joinMap.ChannelUp, (b) => stbChannel.ChannelUp(b));
+                trilist.SetBoolSigAction(joinMap.ChannelDown, (b) => stbChannel.ChannelDown(b));
+                trilist.SetBoolSigAction(joinMap.LastChannel, (b) => stbChannel.LastChannel(b));
+                trilist.SetBoolSigAction(joinMap.Guide, (b) => stbChannel.Guide(b));
+                trilist.SetBoolSigAction(joinMap.Info, (b) => stbChannel.Info(b));
+                trilist.SetBoolSigAction(joinMap.Exit, (b) => stbChannel.Exit(b));
+            }
+
+            var stbColor = stbDevice as IColor;
+            if (stbColor != null)
+            {
+                trilist.SetBoolSigAction(joinMap.Red, (b) => stbColor.Red(b));
+                trilist.SetBoolSigAction(joinMap.Green, (b) => stbColor.Green(b));
+                trilist.SetBoolSigAction(joinMap.Yellow, (b) => stbColor.Yellow(b));
+                trilist.SetBoolSigAction(joinMap.Blue, (b) => stbColor.Blue(b));
+            }
+
+            var stbKeypad = stbDevice as ISetTopBoxNumericKeypad;
+            if (stbKeypad != null)
+            {
+                trilist.StringInput[joinMap.KeypadAccessoryButton1Label].StringValue = stbKeypad.KeypadAccessoryButton1Label;
+                trilist.StringInput[joinMap.KeypadAccessoryButton2Label].StringValue = stbKeypad.KeypadAccessoryButton2Label;
+
+                trilist.BooleanInput[joinMap.HasKeypadAccessoryButton1].BoolValue = stbKeypad.HasKeypadAccessoryButton1;
+                trilist.BooleanInput[joinMap.HasKeypadAccessoryButton2].BoolValue = stbKeypad.HasKeypadAccessoryButton2;
+
+                trilist.SetBoolSigAction(joinMap.Digit0, (b) => stbKeypad.Digit0(b));
+                trilist.SetBoolSigAction(joinMap.Digit1, (b) => stbKeypad.Digit1(b));
+                trilist.SetBoolSigAction(joinMap.Digit2, (b) => stbKeypad.Digit2(b));
+                trilist.SetBoolSigAction(joinMap.Digit3, (b) => stbKeypad.Digit3(b));
+                trilist.SetBoolSigAction(joinMap.Digit4, (b) => stbKeypad.Digit4(b));
+                trilist.SetBoolSigAction(joinMap.Digit5, (b) => stbKeypad.Digit5(b));
+                trilist.SetBoolSigAction(joinMap.Digit6, (b) => stbKeypad.Digit6(b));
+                trilist.SetBoolSigAction(joinMap.Digit7, (b) => stbKeypad.Digit7(b));
+                trilist.SetBoolSigAction(joinMap.Digit8, (b) => stbKeypad.Digit8(b));
+                trilist.SetBoolSigAction(joinMap.Digit9, (b) => stbKeypad.Digit9(b));
+                trilist.SetBoolSigAction(joinMap.KeypadAccessoryButton1Press, (b) => stbKeypad.KeypadAccessoryButton1(b));
+                trilist.SetBoolSigAction(joinMap.KeypadAccessoryButton2Press, (b) => stbKeypad.KeypadAccessoryButton1(b));
+                trilist.SetBoolSigAction(joinMap.Dash, (b) => stbKeypad.Dash(b));
+                trilist.SetBoolSigAction(joinMap.KeypadEnter, (b) => stbKeypad.KeypadEnter(b));
+            }
+
+            var stbTransport = stbDevice as ITransport;
+            if (stbTransport != null)
+            {
+                trilist.SetBoolSigAction(joinMap.Play, (b) => stbTransport.Play(b));
+                trilist.SetBoolSigAction(joinMap.Pause, (b) => stbTransport.Pause(b));
+                trilist.SetBoolSigAction(joinMap.Rewind, (b) => stbTransport.Rewind(b));
+                trilist.SetBoolSigAction(joinMap.FFwd, (b) => stbTransport.FFwd(b));
+                trilist.SetBoolSigAction(joinMap.ChapMinus, (b) => stbTransport.ChapMinus(b));
+                trilist.SetBoolSigAction(joinMap.ChapPlus, (b) => stbTransport.ChapPlus(b));
+                trilist.SetBoolSigAction(joinMap.Stop, (b) => stbTransport.Stop(b));
+                trilist.SetBoolSigAction(joinMap.Record, (b) => stbTransport.Record(b));
+
+            }
+
+        }
+    }
+}