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,4 +390,3 @@ MigrationBackup/
 FodyWeavers.xsd
 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
 .DS_Store
-/._PepperDash.Essentials.sln

.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/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,24 +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<TKey, TSelector>: IKeyName
-    {
-        ISelectableItems<TKey> Inputs { get; }
-
-        void SetInput(TSelector selector);
-    }
-}

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,109 +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);
-    }
-
-    /// <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; }
-    }
-
-}

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")]
-        string 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/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,35 +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>
-    <Compile Remove="Routing\GenericExtensions.cs" />
-    <Compile Remove="Routing\IRoutingSinkWithFeedback.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
-  </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/Extensions.cs

@@ -1,251 +0,0 @@
-using PepperDash.Core;
-using Serilog.Events;
-using System.Collections.Generic;
-using System.Linq;
-
-
-namespace PepperDash.Essentials.Core
-{
-
-    /// <summary>
-    /// Extensions added to any IRoutingInputs classes to provide discovery-based routing
-    /// on those destinations.
-    /// </summary>
-    public static class Extensions
-	{
-        private static readonly Dictionary<string, RouteRequest> RouteRequests = new Dictionary<string, RouteRequest>();
-		/// <summary>
-		/// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
-		/// and then attempts a new Route and if sucessful, stores that RouteDescriptor
-		/// in RouteDescriptorCollection.DefaultCollection
-		/// </summary>
-		public static void ReleaseAndMakeRoute(this IRoutingSink destination, IRoutingOutputs source, eRoutingSignalType signalType)
-		{
-            var routeRequest = new RouteRequest { 
-                        Destination = destination,
-                        Source = source,
-                        SignalType = signalType
-                    };
-
-            var coolingDevice = destination as IWarmingCooling;
-
-
-            //We already have a route request for this device, and it's a cooling device and is cooling
-            if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
-
-                RouteRequests[destination.Key] = routeRequest;
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Device: {0} is cooling down and already has a routing request stored.  Storing new route request to route to source key: {1}", null, destination.Key, routeRequest.Source.Key);
-
-                return;
-            }
-
-            //New Request
-            if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= routeRequest.HandleCooldown;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
-
-                RouteRequests.Add(destination.Key, routeRequest);
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Device: {0} is cooling down.  Storing route request to route to source key: {1}", null, destination.Key, routeRequest.Source.Key);
-                return;
-            }
-
-            if (RouteRequests.ContainsKey(destination.Key) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
-            {
-                RouteRequests.Remove(destination.Key);
-                Debug.LogMessage(LogEventLevel.Verbose, "Device: {0} is NOT cooling down.  Removing stored route request and routing to source key: {1}", null, destination.Key, routeRequest.Source.Key);
-            }
-
-            destination.ReleaseRoute();
-
-			RunRouteRequest(routeRequest);
-		}
-
-        private static void RunRouteRequest(RouteRequest request)
-        {
-            if (request.Source == null)
-                return;
-            
-            var newRoute = request.Destination.GetRouteToSource(request.Source, request.SignalType);
-
-            if (newRoute == null)
-                return;
-
-            RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(newRoute);
-
-            Debug.LogMessage(LogEventLevel.Verbose, "Executing full route", request.Destination);
-
-            newRoute.ExecuteRoutes();
-        }
-
-		/// <summary>
-		/// Will release the existing route on the destination, if it is found in 
-		/// RouteDescriptorCollection.DefaultCollection
-		/// </summary>
-		/// <param name="destination"></param>
-        public static void ReleaseRoute(this IRoutingSink destination)
-		{
-
-            if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRequest) && destination is IWarmingCooling)
-            {
-                var coolingDevice = destination as IWarmingCooling;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRequest.HandleCooldown;
-            }
-
-            RouteRequests.Remove(destination.Key);
-
-			var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
-			if (current != null)
-			{
-				Debug.LogMessage(LogEventLevel.Debug, "Releasing current route: {0}", destination, current.Source.Key);
-				current.ReleaseRoutes();
-			}
-		}
-
-		/// <summary>
-		/// Builds a RouteDescriptor that contains the steps necessary to make a route between devices.  
-		/// Routes of type AudioVideo will be built as two separate routes, audio and video. If
-		/// a route is discovered, a new RouteDescriptor is returned.  If one or both parts
-		/// of an audio/video route are discovered a route descriptor is returned.  If no route is 
-		/// discovered, then null is returned
-		/// </summary>
-        public static RouteDescriptor GetRouteToSource(this IRoutingSink destination, IRoutingOutputs source, eRoutingSignalType signalType)
-		{
-			var routeDescriptor = new RouteDescriptor(source, destination, signalType);
-
-			// if it's a single signal type, find the route
-			if (!signalType.HasFlag(eRoutingSignalType.AudioVideo))
-			{
-				Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {0}", null, source.Key);
-
-				if (!destination.GetRouteToSource(source, null, null, signalType, 0, routeDescriptor))
-					routeDescriptor = null;
-
-                return routeDescriptor;
-			}
-			// otherwise, audioVideo needs to be handled as two steps.
-			
-			Debug.LogMessage(LogEventLevel.Debug, "Attempting to build audio and video routes from {0}", destination, source.Key);
-
-			var audioSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Audio, 0, routeDescriptor);
-
-			if (!audioSuccess)
-				Debug.LogMessage(LogEventLevel.Debug, "Cannot find audio route to {0}", destination, source.Key);
-
-			var videoSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Video, 0, routeDescriptor);
-
-			if (!videoSuccess)
-				Debug.LogMessage(LogEventLevel.Debug, "Cannot find video route to {0}", destination, source.Key);
-
-			if (!audioSuccess && !videoSuccess)
-				routeDescriptor = null;
-			
-            
-			return routeDescriptor;
-		}
-
-		/// <summary>
-		/// The recursive part of this.  Will stop on each device, search its inputs for the 
-		/// desired source and if not found, invoke this function for the each input port
-		/// hoping to find the source.
-		/// </summary>
-		/// <param name="destination"></param>
-		/// <param name="source"></param>
-		/// <param name="outputPortToUse">The RoutingOutputPort whose link is being checked for a route</param>
-		/// <param name="alreadyCheckedDevices">Prevents Devices from being twice-checked</param>
-		/// <param name="signalType">This recursive function should not be called with AudioVideo</param>
-		/// <param name="cycle">Just an informational counter</param>
-		/// <param name="routeTable">The RouteDescriptor being populated as the route is discovered</param>
-		/// <returns>true if source is hit</returns>
-		static bool GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source,
-			RoutingOutputPort outputPortToUse, List<IRoutingInputsOutputs> alreadyCheckedDevices, 
-				eRoutingSignalType signalType, int cycle, RouteDescriptor routeTable)
-		{
-			cycle++;
-
-			Debug.LogMessage(LogEventLevel.Verbose, "GetRouteToSource: {0} {1}--> {2}", null, cycle, source.Key, destination.Key);
-
-			RoutingInputPort goodInputPort = null;
-
-			var destinationTieLines = TieLineCollection.Default.Where(t =>
-                t.DestinationPort.ParentDevice == destination && (t.Type == signalType || t.Type.HasFlag(eRoutingSignalType.AudioVideo)));
-
-			// find a direct tie
-			var directTie = destinationTieLines.FirstOrDefault(
-				t => t.DestinationPort.ParentDevice == destination 
-					&& t.SourcePort.ParentDevice == source);
-			if (directTie != null) // Found a tie directly to the source
-			{
-				goodInputPort = directTie.DestinationPort;
-			}
-			else // no direct-connect.  Walk back devices.
-			{
-				Debug.LogMessage(LogEventLevel.Verbose, "is not directly connected to {0}. Walking down tie lines", destination, source.Key);
-
-				// No direct tie? Run back out on the inputs' attached devices... 
-				// Only the ones that are routing devices
-				var attachedMidpoints = destinationTieLines.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
-
-                //Create a list for tracking already checked devices to avoid loops, if it doesn't already exist from previous iteration
-                if (alreadyCheckedDevices == null)
-                    alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
-                alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs);
-
-				foreach (var inputTieToTry in attachedMidpoints)
-				{
-					var upstreamDeviceOutputPort = inputTieToTry.SourcePort;
-					var upstreamRoutingDevice = upstreamDeviceOutputPort.ParentDevice as IRoutingInputsOutputs;
-                    Debug.LogMessage(LogEventLevel.Verbose,  "Trying to find route on {0}", destination, upstreamRoutingDevice.Key);
-
-					// Check if this previous device has already been walked
-                    if (alreadyCheckedDevices.Contains(upstreamRoutingDevice))
-                    {
-                        Debug.LogMessage(LogEventLevel.Verbose, "Skipping input {0} on {1}, this was already checked", destination, upstreamRoutingDevice.Key, destination.Key);
-                        continue;
-                    }
-                    // haven't seen this device yet.  Do it.  Pass the output port to the next
-                    // level to enable switching on success
-                    var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort,
-                        alreadyCheckedDevices, signalType, cycle, routeTable);
-                    if (upstreamRoutingSuccess)
-                    {
-                        Debug.LogMessage(LogEventLevel.Verbose, "Upstream device route found", destination);
-                        goodInputPort = inputTieToTry.DestinationPort;
-                        break; // Stop looping the inputs in this cycle
-                    }
-				}
-			}
-
-			
-			if (goodInputPort == null) 
-			{
-                Debug.LogMessage(LogEventLevel.Verbose, "No route found to {0}", destination, source.Key);
-                return false;
-			}
-
-            // we have a route on corresponding inputPort. *** Do the route ***
-
-            if (outputPortToUse == null)
-            {
-                // it's a sink device
-                routeTable.Routes.Add(new RouteSwitchDescriptor(goodInputPort));
-            }
-            else if (destination is IRouting)
-            {
-                routeTable.Routes.Add(new RouteSwitchDescriptor(outputPortToUse, goodInputPort));
-            }
-            else // device is merely IRoutingInputOutputs
-                Debug.LogMessage(LogEventLevel.Verbose, "No routing. Passthrough device", destination);
-            
-            return true;
-        }
-	}	
-}

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

@@ -1,261 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-using Serilog.Events;
-
-
-namespace PepperDash.Essentials.Core
-{
-
-    /// <summary>
-    /// Extensions added to any IRoutingInputs classes to provide discovery-based routing
-    /// on those destinations.
-    /// </summary>
-    public static class GenericExtensions
-	{
-        //private static readonly Dictionary<string, RouteRequest<TInputSelector, TOutputSelector>> RouteRequests = new();
-
-		/// <summary>
-		/// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
-		/// and then attempts a new Route and if sucessful, stores that RouteDescriptor
-		/// in RouteDescriptorCollection.DefaultCollection
-		/// </summary>
-		public static void ReleaseAndMakeRoute<TInputSelector, TOutputSelector>(this IRoutingSink<TInputSelector> destination, IRoutingOutputs<TOutputSelector> source, eRoutingSignalType signalType)
-		{
-            var routeRequest = new RouteRequest<TInputSelector, TOutputSelector> { 
-                        Destination = destination,
-                        Source = source,
-                        SignalType = signalType
-                    };
-
-            var coolingDevice = destination as IWarmingCooling;
-            var existingRouteRequest = destination.GetRouteRequest<TOutputSelector>();
-
-            //We already have a route request for this device, and it's a cooling device and is cooling
-            if (existingRouteRequest != null && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
-
-                destination.UpdateRouteRequest(routeRequest);
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Device: {0} is cooling down and already has a routing request stored.  Storing new route request to route to source key: {1}", null, destination.Key, routeRequest.Source.Key);
-
-                return;
-            }
-
-            //New Request
-            if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= routeRequest.HandleCooldown;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
-
-                destination.UpdateRouteRequest(routeRequest);
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Device: {0} is cooling down.  Storing route request to route to source key: {1}", null, destination.Key, routeRequest.Source.Key);
-                return;
-            }
-
-            if (existingRouteRequest != null && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
-            {
-                destination.UpdateRouteRequest<TOutputSelector>(null);
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Device: {0} is NOT cooling down.  Removing stored route request and routing to source key: {1}", null, destination.Key, routeRequest.Source.Key);
-            }
-
-            destination.ReleaseRoute();
-
-			RunRouteRequest(routeRequest);
-		}
-
-        public static void RunRouteRequest<TInputSelector, TOutputSelector>(RouteRequest<TInputSelector, TOutputSelector> request)
-        {
-            if (request.Source == null)
-                return;
-            
-            var newRoute = request.Destination.GetRouteToSource(request.Source, request.SignalType);
-
-            if (newRoute == null)
-                return;
-
-            RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(newRoute);
-
-            Debug.LogMessage(LogEventLevel.Verbose, "Executing full route", request.Destination);
-
-            newRoute.ExecuteRoutes();
-        }
-
-		/// <summary>
-		/// Will release the existing route on the destination, if it is found in 
-		/// RouteDescriptorCollection.DefaultCollection
-		/// </summary>
-		/// <param name="destination"></param>
-        public static void ReleaseRoute<TInputSelector, TOutputSelector>(this IRoutingSink<TInputSelector> destination)
-		{
-            var existingRouteRequest = destination.GetRouteRequest<TOutputSelector>();
-
-            if (existingRouteRequest != null && destination is IWarmingCooling)
-            {
-                var coolingDevice = destination as IWarmingCooling;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
-            }
-
-            destination.UpdateRouteRequest<TOutputSelector>(null);
-
-			var current = RouteDescriptorCollection<TInputSelector, TOutputSelector>.DefaultCollection.RemoveRouteDescriptor(destination);
-			if (current != null)
-			{
-				Debug.LogMessage(LogEventLevel.Debug, "Releasing current route: {0}", destination, current.Source.Key);
-				current.ReleaseRoutes();
-			}
-		}
-
-		/// <summary>
-		/// Builds a RouteDescriptor that contains the steps necessary to make a route between devices.  
-		/// Routes of type AudioVideo will be built as two separate routes, audio and video. If
-		/// a route is discovered, a new RouteDescriptor is returned.  If one or both parts
-		/// of an audio/video route are discovered a route descriptor is returned.  If no route is 
-		/// discovered, then null is returned
-		/// </summary>
-        public static RouteDescriptor<TInputSelector, TOutputSelector> GetRouteToSource<TInputSelector, TOutputSelector>(this IRoutingSink<TInputSelector> destination, IRoutingOutputs<TOutputSelector> source, eRoutingSignalType signalType)
-		{
-			var routeDescriptor = new RouteDescriptor<TInputSelector, TOutputSelector>(source, destination, signalType);
-
-			// if it's a single signal type, find the route
-			if (!signalType.HasFlag(eRoutingSignalType.AudioVideo))
-			{
-				Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {0}", null, source.Key);
-
-				if (!destination.GetRouteToSource(source, null, null, signalType, 0, routeDescriptor))
-					routeDescriptor = null;
-
-                return routeDescriptor;
-			}
-			// otherwise, audioVideo needs to be handled as two steps.
-			
-			Debug.LogMessage(LogEventLevel.Debug, "Attempting to build audio and video routes from {0}", destination, source.Key);
-
-			var audioSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Audio, 0, routeDescriptor);
-
-			if (!audioSuccess)
-				Debug.LogMessage(LogEventLevel.Debug, "Cannot find audio route to {0}", destination, source.Key);
-
-			var videoSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Video, 0, routeDescriptor);
-
-			if (!videoSuccess)
-				Debug.LogMessage(LogEventLevel.Debug, "Cannot find video route to {0}", destination, source.Key);
-
-			if (!audioSuccess && !videoSuccess)
-				routeDescriptor = null;
-			
-            
-			return routeDescriptor;
-		}
-
-		/// <summary>
-		/// The recursive part of this.  Will stop on each device, search its inputs for the 
-		/// desired source and if not found, invoke this function for the each input port
-		/// hoping to find the source.
-		/// </summary>
-		/// <param name="destination"></param>
-		/// <param name="source"></param>
-		/// <param name="outputPortToUse">The RoutingOutputPort whose link is being checked for a route</param>
-		/// <param name="alreadyCheckedDevices">Prevents Devices from being twice-checked</param>
-		/// <param name="signalType">This recursive function should not be called with AudioVideo</param>
-		/// <param name="cycle">Just an informational counter</param>
-		/// <param name="routeTable">The RouteDescriptor being populated as the route is discovered</param>
-		/// <returns>true if source is hit</returns>
-		static bool GetRouteToSource<TInputSelector, TOutputSelector>(this IRoutingInputs<TInputSelector> destination, IRoutingOutputs<TOutputSelector> source,
-			RoutingOutputPort<TOutputSelector> outputPortToUse, List<IRoutingInputsOutputs<TInputSelector, TOutputSelector>> alreadyCheckedDevices, 
-				eRoutingSignalType signalType, int cycle, RouteDescriptor<TInputSelector, TOutputSelector> routeTable)
-		{
-
-			cycle++;
-
-			Debug.LogMessage(LogEventLevel.Verbose, "GetRouteToSource: {0} {1}--> {2}", null, cycle, source.Key, destination.Key);
-
-			RoutingInputPort<TInputSelector> goodInputPort = null;
-
-			var destDevInputTies = TieLineCollection.Default.Where(t =>
-                t.DestinationPort.ParentDevice == destination && (t.Type == signalType || t.Type.HasFlag(eRoutingSignalType.AudioVideo)));
-
-			// find a direct tie
-			var directTie = destDevInputTies.FirstOrDefault(
-				t => t.DestinationPort.ParentDevice == destination 
-					&& t.SourcePort.ParentDevice == source);
-			if (directTie != null) // Found a tie directly to the source
-			{
-				goodInputPort = directTie.DestinationPort;
-			}
-			else // no direct-connect.  Walk back devices.
-			{
-				Debug.LogMessage(LogEventLevel.Verbose, "is not directly connected to {0}. Walking down tie lines", destination, source.Key);
-
-				// No direct tie? Run back out on the inputs' attached devices... 
-				// Only the ones that are routing devices
-				var attachedMidpoints = destDevInputTies.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
-
-                //Create a list for tracking already checked devices to avoid loops, if it doesn't already exist from previous iteration
-                if (alreadyCheckedDevices == null)
-                    alreadyCheckedDevices = new List<IRoutingInputsOutputs<TInputSelector, TOutputSelector>>();
-                alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs<TInputSelector, TOutputSelector>);
-
-				foreach (var inputTieToTry in attachedMidpoints)
-				{
-					var upstreamDeviceOutputPort = inputTieToTry.SourcePort;
-					var upstreamRoutingDevice = upstreamDeviceOutputPort.ParentDevice as IRoutingInputsOutputs<TInputSelector, TOutputSelector>;
-                    Debug.LogMessage(LogEventLevel.Verbose,  "Trying to find route on {0}", destination, upstreamRoutingDevice.Key);
-
-					// Check if this previous device has already been walked
-                    if (alreadyCheckedDevices.Contains(upstreamRoutingDevice))
-                    {
-                        Debug.LogMessage(LogEventLevel.Verbose, "Skipping input {0} on {1}, this was already checked", destination, upstreamRoutingDevice.Key, destination.Key);
-                        continue;
-                    }
-                    // haven't seen this device yet.  Do it.  Pass the output port to the next
-                    // level to enable switching on success
-                    var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort,
-                        alreadyCheckedDevices, signalType, cycle, routeTable);
-                    if (upstreamRoutingSuccess)
-                    {
-                        Debug.LogMessage(LogEventLevel.Verbose, "Upstream device route found", destination);
-                        goodInputPort = inputTieToTry.DestinationPort;
-                        break; // Stop looping the inputs in this cycle
-                    }
-				}
-			}
-
-			
-			if (goodInputPort == null) 
-			{
-                Debug.LogMessage(LogEventLevel.Verbose, "No route found to {0}", destination, source.Key);
-                return false;
-			}
-
-            // we have a route on corresponding inputPort. *** Do the route ***
-
-            if (outputPortToUse == null)
-            {
-                // it's a sink device
-                routeTable.Routes.Add(new RouteSwitchDescriptor<TInputSelector, TOutputSelector>(goodInputPort));
-            }
-            else if (destination is IRouting)
-            {
-                routeTable.Routes.Add(new RouteSwitchDescriptor<TInputSelector, TOutputSelector>(outputPortToUse, goodInputPort));
-            }
-            else // device is merely IRoutingInputOutputs
-                Debug.LogMessage(LogEventLevel.Verbose, "No routing. Passthrough device", destination);
-            
-            return true;
-        }
-	}	
-}

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

@@ -1,30 +0,0 @@
-/* Unmerged change from project 'PepperDash.Essentials.Core (net6)'
-Before:
-namespace PepperDash.Essentials.Core.Routing.Interfaces
-After:
-using PepperDash;
-using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Core.Routing.Interfaces
-*/
-namespace PepperDash.Essentials.Core.Routing
-{
-    /// <summary>
-    /// The handler type for a Room's SourceInfoChange
-    /// </summary>
-    public delegate void SourceInfoChangeHandler(SourceListItem info, ChangeType type);
-    //*******************************************************************************************
-    // Interfaces
-
-    /// <summary>
-    /// For rooms with a single presentation source, change event
-    /// </summary>
-    public interface IHasCurrentSourceInfoChange
-    {
-        string CurrentSourceInfoKey { get; set; }
-        SourceListItem CurrentSourceInfo { get; set; }
-        event SourceInfoChangeHandler CurrentSourceChange;
-    }
-}

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/IRmcRouting.cs

@@ -1,10 +0,0 @@
-namespace PepperDash.Essentials.Core.Routing
-{
-    /// <summary>
-    /// Defines a receiver that has internal routing (DM-RMC-4K-Z-SCALER-C)
-    /// </summary>
-    public interface IRmcRouting : IRoutingNumeric
-    {
-        IntFeedback AudioVideoSourceNumericFeedback { get; }
-    }
-}

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

@@ -1,11 +0,0 @@
-using PepperDash.Essentials.Core.Routing;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines an IRmcRouting with a feedback event 
-    /// </summary>
-    public interface IRmcRoutingWithFeedback : IRmcRouting
-    {
-    }
-}

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

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines a midpoint device as have internal routing.  Any devices in the middle of the
-    /// signal chain, that do switching, must implement this for routing to work otherwise
-    /// the routing algorithm will treat the IRoutingInputsOutputs device as a passthrough
-    /// device.
-    /// </summary>
-    public interface IRouting : IRoutingInputsOutputs
-	{
-		void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType);        
-    }    
-
-    /*public interface IRouting<TInputSelector,TOutputSelector> : IRoutingInputsOutputs
-    {
-        void ExecuteSwitch(TInputSelector inputSelector, TOutputSelector outputSelector, eRoutingSignalType signalType);
-    }*/
-}

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

@@ -1,16 +0,0 @@
-using System;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines an event structure for reporting output route data
-    /// </summary>
-    public interface IRoutingFeedback : IKeyName
-    {
-        event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-        //void OnSwitchChange(RoutingNumericEventArgs e);
-    }
-}

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

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-
-	public interface IRoutingHasVideoInputSyncFeedbacks
-	{
-		FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; }
-	}	
-}

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/IRoutingInputs.cs

@@ -1,18 +0,0 @@
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines a class that has a collection of RoutingInputPorts
-    /// </summary>
-    public interface IRoutingInputs : IKeyed
-	{
-		RoutingPortCollection<RoutingInputPort> InputPorts { get; }
-	}
-
-/*    public interface IRoutingInputs<TSelector> : IKeyed
-    {
-        RoutingPortCollection<RoutingInputPort<TSelector>, TSelector> InputPorts { get; }
-    }*/
-}

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

@@ -1,16 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// For devices like RMCs, baluns, other devices with no switching.
-    /// </summary>
-    public interface IRoutingInputsOutputs : IRoutingInputs, IRoutingOutputs
-	{
-	}
-
-/*    /// <summary>
-    /// For devices like RMCs, baluns, other devices with no switching.
-    /// </summary>
-    public interface IRoutingInputsOutputs<TInputSelector, TOutputSelector> : IRoutingInputs<TInputSelector>, IRoutingOutputs<TOutputSelector>
-    {
-    }*/
-}

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

@@ -1,7 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    public interface IRoutingNumeric : IRouting
-    {
-        void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type);
-    }
-}

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

@@ -1,9 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines an IRoutingNumeric with a feedback event 
-    /// </summary>
-    public interface IRoutingNumericWithFeedback : IRoutingNumeric, IRoutingFeedback
-    {
-    }
-}

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/IRoutingOutputs.cs

@@ -1,19 +0,0 @@
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines a class that has a collection of RoutingOutputPorts
-    /// </summary>
-
-    public interface IRoutingOutputs : IKeyed
-	{
-		RoutingPortCollection<RoutingOutputPort> OutputPorts { get; }
-	}
-
-/*    public interface IRoutingOutputs<TSelector> : IKeyed
-    {
-        RoutingPortCollection<RoutingOutputPort<TSelector>, TSelector> OutputPorts { get; }
-    }*/
-}

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

@@ -1,22 +0,0 @@
-using PepperDash.Essentials.Core.Routing;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// For fixed-source endpoint devices
-    /// </summary>
-    public interface IRoutingSink : IRoutingInputs, IHasCurrentSourceInfoChange
-    {
-        RoutingInputPort CurrentInputPort { get; }
-    }
-
-    /*/// <summary>
-    /// For fixed-source endpoint devices
-    /// </summary>
-    public interface IRoutingSink<TSelector> : IRoutingInputs<TSelector>, IHasCurrentSourceInfoChange
-    {
-        void UpdateRouteRequest<TOutputSelector>(RouteRequest<TSelector, TOutputSelector> request);
-
-        RouteRequest<TSelector, TOutputSelector> GetRouteRequest<TOutputSelector>();
-    }*/
-}

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

@@ -1,25 +0,0 @@
-using PepperDash.Essentials.Core.Routing;
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core
-{
-    
-    /// <summary>
-    /// For fixed-source endpoint devices
-    /// </summary>
-    public interface IRoutingSinkWithFeedback : IRoutingSinkWithSwitching
-    {
-        
-    }
-
-/*    /// <summary>
-    /// For fixed-source endpoint devices
-    /// </summary>
-    public interface IRoutingSinkWithFeedback<TSelector> : IRoutingSinkWithSwitching<TSelector>
-    {
-        RouteSwitchDescriptor CurrentRoute { get; }
-
-        event EventHandler InputChanged;
-    }*/
-}

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

@@ -1,24 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core
-{
-    public delegate void InputChangedEventHandler(IRoutingSinkWithSwitching destination, RoutingInputPort currentPort);
-
-    /// <summary>
-    /// Endpoint device like a display, that selects inputs
-    /// </summary>
-    public interface IRoutingSinkWithSwitching : IRoutingSink
-	{		
-		void ExecuteSwitch(object inputSelector);
-
-        event InputChangedEventHandler InputChanged;
-    }
-
-/*    /// <summary>
-    /// Endpoint device like a display, that selects inputs
-    /// </summary>
-    public interface IRoutingSinkWithSwitching<TSelector> : IRoutingSink<TSelector>
-    {
-        void ExecuteSwitch(TSelector inputSelector);
-    }*/
-}

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/Routing/IRoutingSource.cs

@@ -1,9 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines an IRoutingOutputs devices as being a source - the start of the chain
-    /// </summary>
-    public interface IRoutingSource
-    { 
-	}
-}

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

@@ -1,12 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    public interface IRoutingWithClear : IRouting
-    {
-        /// <summary>
-        /// Clears a route to an output, however a device needs to do that
-        /// </summary>
-        /// <param name="outputSelector">Output to clear</param>
-        /// <param name="signalType">signal type to clear</param>
-        void ClearRoute(object outputSelector, eRoutingSignalType signalType);
-    }
-}

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

@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using System;
-
-namespace PepperDash.Essentials.Core
-{
-    public delegate void RouteChangedEventHandler(IRoutingWithFeedback midpoint, RouteSwitchDescriptor newRoute);
-    /// <summary>
-    /// Defines an IRouting with a feedback event
-    /// </summary>
-    public interface IRoutingWithFeedback : IRouting
-    {
-        List<RouteSwitchDescriptor> CurrentRoutes { get; }
-
-        event RouteChangedEventHandler RouteChanged;
-    }
-}

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

@@ -1,8 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    public interface ITxRouting : IRoutingNumeric
-    {
-        IntFeedback VideoSourceNumericFeedback { get; }
-        IntFeedback AudioSourceNumericFeedback { get; }
-    }
-}

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

@@ -1,9 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines an IRmcRouting with a feedback event 
-    /// </summary>
-    public interface ITxRoutingWithFeedback : ITxRouting
-    {
-    }
-}

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

@@ -1,152 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-using Serilog.Events;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Represents an collection of individual route steps between Source and Destination
-    /// </summary>
-    public class RouteDescriptor
-	{
-		public IRoutingInputs Destination { get; private set; }
-		public IRoutingOutputs Source { get; private set; }
-		public eRoutingSignalType SignalType { get; private set; }
-		public List<RouteSwitchDescriptor> Routes { get; private set; }
-
-
-		public RouteDescriptor(IRoutingOutputs source, IRoutingInputs destination, eRoutingSignalType signalType)
-		{
-			Destination = destination;
-			Source = source;
-			SignalType = signalType;
-			Routes = new List<RouteSwitchDescriptor>();
-		}
-
-		/// <summary>
-		/// Executes all routes described in this collection.  Typically called via
-		/// extension method IRoutingInputs.ReleaseAndMakeRoute()
-		/// </summary>
-		public void ExecuteRoutes()
-		{
-			foreach (var route in Routes)
-			{
-				Debug.LogMessage(LogEventLevel.Verbose, "ExecuteRoutes: {0}",null, route.ToString());
-
-                if (route.SwitchingDevice is IRoutingSinkWithSwitching sink)
-                {                   
-                    sink.ExecuteSwitch(route.InputPort.Selector);
-                    continue; 
-                }
-
-                if (route.SwitchingDevice is IRouting switchingDevice)
-                {
-                    switchingDevice.ExecuteSwitch(route.InputPort.Selector, route.OutputPort.Selector, SignalType);
-
-                    route.OutputPort.InUseTracker.AddUser(Destination, "destination-" + SignalType);
-
-                    Debug.LogMessage(LogEventLevel.Verbose, "Output port {0} routing. Count={1}", null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
-                }
-			}
-		}
-
-		/// <summary>
-		/// Releases all routes in this collection. Typically called via
-		/// extension method IRoutingInputs.ReleaseAndMakeRoute()
-		/// </summary>
-		public void ReleaseRoutes()
-		{
-			foreach (var route in Routes)
-			{
-				if (route.SwitchingDevice is IRouting)
-				{
-					// Pull the route from the port.  Whatever is watching the output's in use tracker is
-					// responsible for responding appropriately.
-					route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);
-					Debug.LogMessage(LogEventLevel.Verbose, "Port {0} releasing. Count={1}",null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
-				}
-			}
-		}
-
-		public override string ToString()
-		{
-			var routesText = Routes.Select(r => r.ToString()).ToArray();
-			return string.Format("Route table from {0} to {1}:\r{2}", Source.Key, Destination.Key, string.Join("\r", routesText));
-		}
-	}
-
-    /*/// <summary>
-    /// Represents an collection of individual route steps between Source and Destination
-    /// </summary>
-    public class RouteDescriptor<TInputSelector, TOutputSelector>
-    {
-        public IRoutingInputs<TInputSelector> Destination { get; private set; }
-        public IRoutingOutputs<TOutputSelector> Source { get; private set; }
-        public eRoutingSignalType SignalType { get; private set; }
-        public List<RouteSwitchDescriptor<TInputSelector, TOutputSelector>> Routes { get; private set; }
-
-
-        public RouteDescriptor(IRoutingOutputs<TOutputSelector> source, IRoutingInputs<TInputSelector> destination, eRoutingSignalType signalType)
-        {
-            Destination = destination;
-            Source = source;
-            SignalType = signalType;
-            Routes = new List<RouteSwitchDescriptor<TInputSelector, TOutputSelector>>();
-        }
-
-        /// <summary>
-        /// Executes all routes described in this collection.  Typically called via
-        /// extension method IRoutingInputs.ReleaseAndMakeRoute()
-        /// </summary>
-        public void ExecuteRoutes()
-        {
-            foreach (var route in Routes)
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, "ExecuteRoutes: {0}", null, route.ToString());
-
-                if (route.SwitchingDevice is IRoutingSinkWithSwitching<TInputSelector> sink)
-                {
-                    sink.ExecuteSwitch(route.InputPort.Selector);
-                    continue;
-                }
-
-                if (route.SwitchingDevice is IRouting switchingDevice)
-                {
-                    switchingDevice.ExecuteSwitch(route.InputPort.Selector, route.OutputPort.Selector, SignalType);
-
-                    route.OutputPort.InUseTracker.AddUser(Destination, "destination-" + SignalType);
-
-                    Debug.LogMessage(LogEventLevel.Verbose, "Output port {0} routing. Count={1}", null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Releases all routes in this collection. Typically called via
-        /// extension method IRoutingInputs.ReleaseAndMakeRoute()
-        /// </summary>
-        public void ReleaseRoutes()
-        {
-            foreach (var route in Routes)
-            {
-                if (route.SwitchingDevice is IRouting<TInputSelector, TOutputSelector>)
-                {
-                    // Pull the route from the port.  Whatever is watching the output's in use tracker is
-                    // responsible for responding appropriately.
-                    route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);
-                    Debug.LogMessage(LogEventLevel.Verbose, "Port {0} releasing. Count={1}", null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
-                }
-            }
-        }
-
-        public override string ToString()
-        {
-            var routesText = Routes.Select(r => r.ToString()).ToArray();
-            return string.Format("Route table from {0} to {1}:\r{2}", Source.Key, Destination.Key, string.Join("\r", routesText));
-        }
-    }*/
-}

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

@@ -1,123 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-using PepperDash.Core;
-using Serilog.Events;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// A collection of RouteDescriptors - typically the static DefaultCollection is used
-    /// </summary>
-    public class RouteDescriptorCollection
-    {
-        public static RouteDescriptorCollection DefaultCollection
-        {
-            get
-            {
-                if (_DefaultCollection == null)
-                    _DefaultCollection = new RouteDescriptorCollection();
-                return _DefaultCollection;
-            }
-        }
-        private static RouteDescriptorCollection _DefaultCollection;
-
-        private readonly List<RouteDescriptor> RouteDescriptors = new List<RouteDescriptor>();
-
-        /// <summary>
-        /// Adds a RouteDescriptor to the list.  If an existing RouteDescriptor for the
-        /// destination exists already, it will not be added - in order to preserve
-        /// proper route releasing.
-        /// </summary>
-        /// <param name="descriptor"></param>
-        public void AddRouteDescriptor(RouteDescriptor descriptor)
-        {
-            if (RouteDescriptors.Any(t => t.Destination == descriptor.Destination))
-            {
-                Debug.LogMessage(LogEventLevel.Debug, descriptor.Destination,
-                    "Route to [{0}] already exists in global routes table", descriptor.Source.Key);
-                return;
-            }
-            RouteDescriptors.Add(descriptor);
-        }
-
-        /// <summary>
-        /// Gets the RouteDescriptor for a destination
-        /// </summary>
-        /// <returns>null if no RouteDescriptor for a destination exists</returns>
-        public RouteDescriptor GetRouteDescriptorForDestination(IRoutingInputs destination)
-        {
-            return RouteDescriptors.FirstOrDefault(rd => rd.Destination == destination);
-        }
-
-        /// <summary>
-        /// Returns the RouteDescriptor for a given destination AND removes it from collection.
-        /// Returns null if no route with the provided destination exists.
-        /// </summary>
-        public RouteDescriptor RemoveRouteDescriptor(IRoutingInputs destination)
-        {
-            var descr = GetRouteDescriptorForDestination(destination);
-            if (descr != null)
-                RouteDescriptors.Remove(descr);
-            return descr;
-        }
-    }
-
-    /*/// <summary>
-    /// A collection of RouteDescriptors - typically the static DefaultCollection is used
-    /// </summary>
-    public class RouteDescriptorCollection<TInputSelector, TOutputSelector>
-	{
-		public static RouteDescriptorCollection<TInputSelector, TOutputSelector> DefaultCollection
-		{
-			get
-			{
-				if (_DefaultCollection == null)
-					_DefaultCollection = new RouteDescriptorCollection<TInputSelector, TOutputSelector>();
-				return _DefaultCollection;
-			}
-		}
-		private static RouteDescriptorCollection<TInputSelector, TOutputSelector> _DefaultCollection;
-
-		private readonly List<RouteDescriptor> RouteDescriptors = new List<RouteDescriptor>();
-
-		/// <summary>
-		/// Adds a RouteDescriptor to the list.  If an existing RouteDescriptor for the
-		/// destination exists already, it will not be added - in order to preserve
-		/// proper route releasing.
-		/// </summary>
-		/// <param name="descriptor"></param>
-		public void AddRouteDescriptor(RouteDescriptor descriptor)
-		{
-			if (RouteDescriptors.Any(t => t.Destination == descriptor.Destination))
-			{
-				Debug.LogMessage(LogEventLevel.Debug, descriptor.Destination, 
-					"Route to [{0}] already exists in global routes table", descriptor.Source.Key);
-				return;
-			}
-			RouteDescriptors.Add(descriptor);
-		}
-
-		/// <summary>
-		/// Gets the RouteDescriptor for a destination
-		/// </summary>
-		/// <returns>null if no RouteDescriptor for a destination exists</returns>
-		public RouteDescriptor GetRouteDescriptorForDestination(IRoutingInputs<TInputSelector> destination)
-		{
-			return RouteDescriptors.FirstOrDefault(rd => rd.Destination == destination);
-		}
-
-		/// <summary>
-		/// Returns the RouteDescriptor for a given destination AND removes it from collection.
-		/// Returns null if no route with the provided destination exists.
-		/// </summary>
-		public RouteDescriptor RemoveRouteDescriptor(IRoutingInputs<TInputSelector> destination)
-		{
-			var descr = GetRouteDescriptorForDestination(destination);
-			if (descr != null)
-				RouteDescriptors.Remove(descr);
-			return descr;
-		}
-	}*/
-}

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

@@ -1,44 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    public class RouteRequest
-    {
-        public IRoutingSink Destination {get; set;}
-        public IRoutingOutputs Source {get; set;}
-        public eRoutingSignalType SignalType {get; set;}
-
-        public void HandleCooldown(object sender, FeedbackEventArgs args)
-        {
-            var coolingDevice = sender as IWarmingCooling;
-            
-            if(args.BoolValue == false)
-            {
-                Destination.ReleaseAndMakeRoute(Source, SignalType);
-                
-                if(sender == null) return;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
-            }
-        }
-    }
-
-    /*public class RouteRequest<TInputSelector, TOutputSelector>
-    {
-        public IRoutingSink<TInputSelector> Destination { get; set; }
-        public IRoutingOutputs<TOutputSelector> Source { get; set; }
-        public eRoutingSignalType SignalType { get; set; }
-
-        public void HandleCooldown(object sender, FeedbackEventArgs args)
-        {
-            var coolingDevice = sender as IWarmingCooling;
-
-            if (args.BoolValue == false)
-            {
-                Destination.ReleaseAndMakeRoute(Source, SignalType);
-
-                if (sender == null) return;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
-            }
-        }
-    }*/
-}

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

@@ -1,60 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Represents an individual link for a route
-    /// </summary>
-    public class RouteSwitchDescriptor
-	{
-		public IRoutingInputs SwitchingDevice { get { return InputPort.ParentDevice; } }
-		public RoutingOutputPort OutputPort { get; set; }
-		public RoutingInputPort InputPort { get; set; }
-
-		public RouteSwitchDescriptor(RoutingInputPort inputPort)
-		{
-			InputPort = inputPort;
-		}
-
-		public RouteSwitchDescriptor(RoutingOutputPort outputPort, RoutingInputPort inputPort)
-		{
-			InputPort = inputPort;
-			OutputPort = outputPort;
-		}
-
-		public override string ToString()
-		{
-			if(SwitchingDevice is IRouting)
-				return string.Format("{0} switches output '{1}' to input '{2}'", SwitchingDevice.Key, OutputPort.Selector, InputPort.Selector);
-			else
-				return string.Format("{0} switches to input '{1}'", SwitchingDevice.Key, InputPort.Selector);
-		}
-	}
-
-    /*/// <summary>
-    /// Represents an individual link for a route
-    /// </summary>
-    public class RouteSwitchDescriptor<TInputSelector, TOutputSelector>
-    {
-        public IRoutingInputs<TInputSelector> SwitchingDevice { get { return InputPort.ParentDevice; } }
-        public RoutingOutputPort<TOutputSelector> OutputPort { get; set; }
-        public RoutingInputPort<TInputSelector> InputPort { get; set; }
-
-        public RouteSwitchDescriptor(RoutingInputPort<TInputSelector> inputPort)
-        {
-            InputPort = inputPort;
-        }
-
-        public RouteSwitchDescriptor(RoutingOutputPort<TOutputSelector> outputPort, RoutingInputPort<TInputSelector> inputPort)
-        {
-            InputPort = inputPort;
-            OutputPort = outputPort;
-        }
-
-        public override string ToString()
-        {
-            if (SwitchingDevice is IRouting)
-                return string.Format("{0} switches output '{1}' to input '{2}'", SwitchingDevice.Key, OutputPort.Selector, InputPort.Selector);
-            else
-                return string.Format("{0} switches to input '{1}'", SwitchingDevice.Key, InputPort.Selector);
-        }
-    }*/
-}

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

@@ -1,197 +0,0 @@
-using Org.BouncyCastle.Crypto.Prng;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace PepperDash.Essentials.Core.Routing
-{
-    public class RoutingFeedbackManager:EssentialsDevice
-    {
-        public RoutingFeedbackManager(string key, string name): base(key, name)
-        {
-            AddPostActivationAction(SubscribeForMidpointFeedback);
-            AddPostActivationAction(SubscribeForSinkFeedback);
-        }
-
-        private void SubscribeForMidpointFeedback()
-        {
-            var midpointDevices = DeviceManager.AllDevices.OfType<IRoutingWithFeedback>();
-
-            foreach (var device in midpointDevices)
-            {
-                device.RouteChanged += HandleMidpointUpdate;
-            }
-        }
-
-        private void SubscribeForSinkFeedback()
-        {
-                var sinkDevices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitching>();
-
-                foreach (var device in sinkDevices)
-                {
-                    device.InputChanged += HandleSinkUpdate;
-                }   
-        }
-
-        private void HandleMidpointUpdate(IRoutingWithFeedback midpoint, RouteSwitchDescriptor newRoute)
-        {
-            var devices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitching>();
-
-            foreach(var device in devices)
-            {
-                UpdateDestination(device, device.CurrentInputPort);
-            }
-        }
-
-        private void HandleSinkUpdate(IRoutingSinkWithSwitching sender, RoutingInputPort currentInputPort)
-        {
-            try
-            {
-                UpdateDestination(sender, currentInputPort);
-            }
-            catch (Exception ex)
-            {
-                Debug.LogMessage(ex, "Error handling Sink update from {senderKey}:{Exception}", this, sender.Key, ex);
-            }
-        }
-
-        private void UpdateDestination(IRoutingSinkWithSwitching destination, RoutingInputPort inputPort)
-        {
-            var tieLines = TieLineCollection.Default;
-
-            var firstTieLine = tieLines.FirstOrDefault(tl => tl.DestinationPort.Key == inputPort.Key);
-
-            if (firstTieLine == null)
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No tieline found for inputPort {inputPort}. Clearing current source", this, inputPort);
-
-                destination.CurrentSourceInfo = null;
-                destination.CurrentSourceInfoKey = string.Empty;
-                return;
-            }
-
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Getting source for first TieLine {tieLine}", this, firstTieLine);
-
-            var sourceTieLine = GetRootTieLine(firstTieLine);            
-
-            if (sourceTieLine == null)
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No route found to source for inputPort {inputPort}. Clearing current source", this, inputPort);
-
-                destination.CurrentSourceInfo = null;
-                destination.CurrentSourceInfoKey = string.Empty;
-            }
-
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);           
-
-            // Does not handle combinable scenarios or other scenarios where a display might be part of multiple rooms yet.
-            var room = DeviceManager.AllDevices.OfType<IEssentialsRoom>().FirstOrDefault((r) => {
-                if(r is IHasMultipleDisplays roomMultipleDisplays)
-                {
-                    return roomMultipleDisplays.Displays.Any(d => d.Value.Key == destination.Key);
-                }
-
-                if(r is IHasDefaultDisplay roomDefaultDisplay)
-                {
-                    return roomDefaultDisplay.DefaultDisplay.Key == destination.Key;
-                }
-
-                return false;
-            });
-            
-            if(room == null)
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "No room found for display {destination}", this, destination.Key);
-                return;
-            }
-
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);
-
-            var sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);
-
-            if (sourceList == null)
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "No source list found for source list key {key}. Unable to find source for tieLine {sourceTieLine}", this, room.SourceListKey, sourceTieLine);
-                return;
-            }
-
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);
-
-            var sourceListItem = sourceList.FirstOrDefault(sli => {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
-                    "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
-                    this,
-                    sli.Key,
-                    sli.Value.SourceKey,
-                    sourceTieLine.SourcePort.ParentDevice.Key);
-
-                return sli.Value.SourceKey.Equals(sourceTieLine.SourcePort.ParentDevice.Key,StringComparison.InvariantCultureIgnoreCase);
-            });            
-
-            var source = sourceListItem.Value;
-
-            if (source == null)
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No source found for device {key}. Clearing current source on {destination}", this, sourceTieLine.SourcePort.ParentDevice.Key, destination);
-
-                destination.CurrentSourceInfo = null;
-                destination.CurrentSourceInfoKey = string.Empty;
-                return;
-            }
-
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {source}", this, source);
-
-            destination.CurrentSourceInfo = source;
-            destination.CurrentSourceInfoKey = source.SourceKey;
-        }
-
-        private TieLine GetRootTieLine(TieLine tieLine)
-        {
-            TieLine nextTieLine = null;
-
-            if(tieLine.SourcePort.ParentDevice is IRoutingWithFeedback midpoint)
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source device is midpoint", this);
-
-                var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route => route.OutputPort.Key == tieLine.SourcePort.Key);
-
-                if(currentRoute == null)
-                {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No route through midpoint {midpoint} for outputPort {outputPort}", this, midpoint.Key, tieLine.SourcePort);
-                    return null;
-                }
-
-                nextTieLine = TieLineCollection.Default.FirstOrDefault(tl => tl.DestinationPort.Key == currentRoute.InputPort.Key);
-
-                if(tieLine != null)
-                {
-                    return GetRootTieLine(nextTieLine);
-                }
-
-                return tieLine;
-            }
-
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLIne Source Device {sourceDeviceKey} is IRoutingSource: {isIRoutingSource}", this,tieLine.SourcePort.ParentDevice.Key, tieLine.SourcePort.ParentDevice is IRoutingSource);
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source Device interfaces: {typeFullName}:{interfaces}",this, tieLine.SourcePort.ParentDevice.GetType().FullName, tieLine.SourcePort.ParentDevice.GetType().GetInterfaces().Select(i => i.Name));
-
-            if(tieLine.SourcePort.ParentDevice is IRoutingSource || tieLine.SourcePort.ParentDevice is IRoutingOutputs) //end of the chain
-            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root: {tieLine}", this, tieLine);
-                return tieLine;
-            }
-
-            nextTieLine = TieLineCollection.Default.FirstOrDefault(tl => tl.SourcePort.Key == tieLine.SourcePort.Key);
-
-            if(nextTieLine != null)
-            {
-                return GetRootTieLine(nextTieLine);
-            }
-
-            return null;
-        }
-    }
-}

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

@@ -1,77 +0,0 @@
-using System;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Basic RoutingInput with no statuses.
-    /// </summary>
-    public class RoutingInputPort : RoutingPort
-	{
-		/// <summary>
-		/// The IRoutingInputs object this lives on
-		/// </summary>
-		public IRoutingInputs ParentDevice { get; private set; }
-
-		/// <summary>
-		/// Constructor for a basic RoutingInputPort
-		/// </summary>
-		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-		/// May be string, number, whatever</param>
-		/// <param name="parent">The IRoutingInputs object this lives on</param>
-		public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingInputs parent)
-			: this (key, type, connType, selector, parent, false)
-		{
-		}
-
-		/// <summary>
-		/// Constructor for a virtual routing input port that lives inside a device. For example
-		/// the ports that link a DM card to a DM matrix bus
-		/// </summary>
-		/// <param name="isInternal">true for internal ports</param>
-		public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingInputs parent, bool isInternal)
-			: base(key, type, connType, selector, isInternal)
-		{
-			if (parent == null)
-				throw new ArgumentNullException(nameof(parent));
-			ParentDevice = parent;
-		}
-	}
-
-    /*/// <summary>
-    /// Basic RoutingInput with no statuses.
-    /// </summary>
-    public class RoutingInputPort<TSelector> : RoutingPort<TSelector>
-    {
-        /// <summary>
-        /// The IRoutingInputs object this lives on
-        /// </summary>
-        public IRoutingInputs<TSelector> ParentDevice { get; private set; }
-
-        /// <summary>
-        /// Constructor for a basic RoutingInputPort
-        /// </summary>
-        /// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-        /// May be string, number, whatever</param>
-        /// <param name="parent">The IRoutingInputs object this lives on</param>
-        public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-            TSelector selector, IRoutingInputs<TSelector> parent)
-            : this(key, type, connType, selector, parent, false)
-        {
-        }
-
-        /// <summary>
-        /// Constructor for a virtual routing input port that lives inside a device. For example
-        /// the ports that link a DM card to a DM matrix bus
-        /// </summary>
-        /// <param name="isInternal">true for internal ports</param>
-        public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-            TSelector selector, IRoutingInputs<TSelector> parent, bool isInternal)
-            : base(key, type, connType, selector, isInternal)
-        {
-            ParentDevice = parent ?? throw new ArgumentNullException(nameof(parent));
-        }
-    }*/
-}

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

@@ -1,30 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// A RoutingInputPort for devices like DM-TX and DM input cards. 
-    /// Will provide video statistics on connected signals
-    /// </summary>
-    public class RoutingInputPortWithVideoStatuses : RoutingInputPort
-	{
-		/// <summary>
-		/// Video statuses attached to this port
-		/// </summary>
-		public VideoStatusOutputs VideoStatus { get; private set; }
-
-		/// <summary>
-		/// Constructor 
-		/// </summary>
-		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-		/// May be string, number, whatever</param>
-		/// <param name="parent">The IRoutingInputs object this lives on</param>
-		/// <param name="funcs">A VideoStatusFuncsWrapper used to assign the callback funcs that will get 
-		/// the values for the various stats</param>
-		public RoutingInputPortWithVideoStatuses(string key, 
-			eRoutingSignalType type, eRoutingPortConnectionType connType, object selector, 
-			IRoutingInputs parent, VideoStatusFuncsWrapper funcs) :
-			base(key, type, connType, selector, parent)
-		{
-			VideoStatus = new VideoStatusOutputs(funcs);		
-		}
-	}
-}

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

@@ -1,43 +0,0 @@
-using System;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class RoutingNumericEventArgs : EventArgs
-    {
-
-        public uint? Output { get; set; }
-        public uint? Input { get; set; }
-
-        public eRoutingSignalType SigType { get; set; }
-        public RoutingInputPort InputPort { get; set; }
-        public RoutingOutputPort OutputPort { get; set; }
-
-        public RoutingNumericEventArgs(uint output, uint input, eRoutingSignalType sigType) : this(output, input, null, null, sigType)
-        {
-        }
-
-        public RoutingNumericEventArgs(RoutingOutputPort outputPort, RoutingInputPort inputPort,
-            eRoutingSignalType sigType)
-            : this(null, null, outputPort, inputPort, sigType)
-        {
-        }
-
-        public RoutingNumericEventArgs()
-            : this(null, null, null, null, 0)
-        {
- 
-        }
-
-        public RoutingNumericEventArgs(uint? output, uint? input, RoutingOutputPort outputPort,
-            RoutingInputPort inputPort, eRoutingSignalType sigType)
-        {
-            OutputPort = outputPort;
-            InputPort = inputPort;
-
-            Output = output;
-            Input = input;
-            SigType = sigType;
-        }
-    }
-}

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

@@ -1,75 +0,0 @@
-using System;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class RoutingOutputPort : RoutingPort
-	{
-		/// <summary>
-		/// The IRoutingOutputs object this port lives on
-		/// </summary>
-		public IRoutingOutputs ParentDevice { get; private set; }
-
-		public InUseTracking InUseTracker { get; private set; }
-
-
-		/// <summary>
-		/// </summary>
-		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-		/// May be string, number, whatever</param>
-		/// <param name="parent">The IRoutingOutputs object this port lives on</param>
-		public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingOutputs parent)
-			: this(key, type, connType, selector, parent, false)
-		{
-		}
-
-		public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingOutputs parent, bool isInternal)
-			: base(key, type, connType, selector, isInternal)
-		{
-            ParentDevice = parent ?? throw new ArgumentNullException(nameof(parent));
-			InUseTracker = new InUseTracking();
-		}
-
-        public override string ToString()
-        {
-            return ParentDevice.Key + ":" + Key;
-        }
-	}
-
-    /*public class RoutingOutputPort<TSelector> : RoutingPort<TSelector>
-    {
-        /// <summary>
-        /// The IRoutingOutputs object this port lives on
-        /// </summary>
-        public IRoutingOutputs ParentDevice { get; private set; }
-
-        public InUseTracking InUseTracker { get; private set; }
-
-
-        /// <summary>
-        /// </summary>
-        /// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-        /// May be string, number, whatever</param>
-        /// <param name="parent">The IRoutingOutputs object this port lives on</param>
-        public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-            TSelector selector, IRoutingOutputs parent)
-            : this(key, type, connType, selector, parent, false)
-        {
-        }
-
-        public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-            TSelector selector, IRoutingOutputs parent, bool isInternal)
-            : base(key, type, connType, selector, isInternal)
-        {
-            ParentDevice = parent ?? throw new ArgumentNullException(nameof(parent));
-            InUseTracker = new InUseTracking();
-        }
-
-        public override string ToString()
-        {
-            return ParentDevice.Key + ":" + Key;
-        }
-    }*/
-}

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

@@ -1,48 +0,0 @@
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Base class for RoutingInput and Output ports
-    /// </summary>
-    public abstract class RoutingPort : IKeyed
-	{
-		public string Key { get; private set; }
-		public eRoutingSignalType Type { get; private set; }
-		public eRoutingPortConnectionType ConnectionType { get; private set; }
-		public readonly object Selector;
-		public bool IsInternal { get; private set; }
-        public object FeedbackMatchObject { get; set; }
-        public object Port { get; set; }
-
-		public RoutingPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType, object selector, bool isInternal)
-		{
-			Key = key;
-			Type = type;
-			ConnectionType = connType;
-			Selector = selector;
-			IsInternal = isInternal;
-		}
-	}
-
-    /*public abstract class RoutingPort<TSelector>:IKeyed
-    {
-        public string Key { get; private set; }
-        public eRoutingSignalType Type { get; private set; }
-        public eRoutingPortConnectionType ConnectionType { get; private set; }
-        public readonly TSelector Selector;
-        public bool IsInternal { get; private set; }
-        public object FeedbackMatchObject { get; set; }
-        public object Port { get; set; }
-
-        public RoutingPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType, TSelector selector, bool isInternal)
-        {
-            Key = key;
-            Type = type;
-            ConnectionType = connType;
-            Selector = selector;
-            IsInternal = isInternal;
-        }
-    }*/
-}

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

@@ -1,82 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Core.Config
-{
-	public class TieLineConfig
-	{
-		public string SourceKey { get; set; }
-		public string SourceCard { get; set; }
-		public string SourcePort { get; set; }
-		public string DestinationKey { get; set; }
-		public string DestinationCard { get; set; }
-		public string DestinationPort { get; set; }
-
-		/// <summary>
-		/// Returns the appropriate tie line for either a card-based device or 
-		/// regular device with ports on-device.
-		/// </summary>
-		/// <returns>null if config data does not match ports, cards or devices</returns>
-		public TieLine GetTieLine()
-		{
-			Debug.LogMessage(LogEventLevel.Information, "Build TieLine: {0}",null, this);
-			// Get the source device
-			var sourceDev = DeviceManager.GetDeviceForKey(SourceKey) as IRoutingOutputs;
-			if (sourceDev == null)
-			{
-				LogError("Routable source not found");
-				return null;
-			}
-
-			// Get the destination device
-			var destDev = DeviceManager.GetDeviceForKey(DestinationKey) as IRoutingInputs;
-			if (destDev == null)
-			{
-				LogError("Routable destination not found");
-				return null;
-			}
-
-            //Get the source port
-            var sourceOutputPort = sourceDev.OutputPorts[SourcePort];
-
-            if (sourceOutputPort == null)
-			{
-				LogError("Source does not contain port");
-				return null;
-			}
-
-            //Get the Destination port
-            var destinationInputPort = destDev.InputPorts[DestinationPort];
-
-            if (destinationInputPort == null)
-				{
-					LogError("Destination does not contain port");
-					return null;
-				}            
-
-			return new TieLine(sourceOutputPort, destinationInputPort);
-		}
-
-		void LogError(string msg)
-		{
-			Debug.LogMessage(LogEventLevel.Error, "WARNING: Cannot create tie line: {message}:\r   {tieLineConfig}",null, msg, this);
-		}
-
-		public override string ToString()
-		{
-			return string.Format("{0}.{1}.{2} --> {3}.{4}.{5}", SourceKey, SourceCard, SourcePort,
-				DestinationKey, DestinationCard, DestinationPort);
-		}
-	}
-}

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

@@ -1,8 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    public enum eRoutingPortConnectionType
-	{
-		None, BackplaneOnly, DisplayPort, Dvi, Hdmi, Rgb, Vga, LineAudio, DigitalAudio, Sdi, 
-		Composite, Component, DmCat, DmMmFiber, DmSmFiber, Speaker, Streaming, UsbC, HdBaseT
-	}
-}

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

@@ -1,16 +0,0 @@
-using System;
-
-
-namespace PepperDash.Essentials.Core
-{
-    [Flags]
-	public enum eRoutingSignalType
-	{
-		Audio = 1,
-		Video = 2,     
-		AudioVideo = Audio | Video,
-        UsbOutput = 8,
-        UsbInput = 16,
-        SecondaryAudio = 32
-	}
-}

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,338 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Feedback = PepperDash.Essentials.Core.Feedback;
-
-namespace PepperDash.Essentials.Devices.Common.Displays
-{
-    public abstract class DisplayBase : EssentialsDevice
-        , IHasFeedback
-        , IRoutingSinkWithSwitching
-        , IHasPowerControl
-        , IWarmingCooling
-        , IUsageTracking
-	{
-        private RoutingInputPort _currentInputPort;
-        public RoutingInputPort CurrentInputPort
-        {
-            get
-            {
-                return _currentInputPort;
-            }
-
-            protected set
-            {
-                _currentInputPort = value;
-
-                InputChanged?.Invoke(this, _currentInputPort);
-            }
-        }
-
-        public event InputChangedEventHandler InputChanged;
-
-        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,291 +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, this, "Cooldown timer ending");
-						_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)
-		{
-            try
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, "ExecuteSwitch: {0}", this, selector);
-
-                if (!_PowerIsOn)
-                {
-                    PowerOn();
-                }
-
-                if (!Inputs.Items.TryGetValue(selector.ToString(), out var input))
-                    return;
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Selected input: {input}", this, input.Key);
-                input.Select();
-
-                var inputPort = InputPorts.FirstOrDefault(port =>
-                {
-                    Debug.LogMessage(LogEventLevel.Verbose, "Checking input port {inputPort} with selector {portSelector} against {selector}", this, port, port.Selector, selector);
-                    return port.Selector.ToString() == selector.ToString();
-                });
-
-                if (inputPort == null)
-                {
-                    Debug.LogMessage(LogEventLevel.Verbose, "Unable to find input port for selector {selector}", this, selector);                    
-                    return;
-                }
-
-                Debug.LogMessage(LogEventLevel.Verbose, "Setting current input port to {inputPort}", this, inputPort);
-                CurrentInputPort = inputPort;
-            } catch (Exception ex)
-            {
-                Debug.LogMessage(ex, "Error making switch: {Exception}", this);
-            }
-        }
-
-        public void SetInput(string selector)
-        {
-			ISelectableItem currentInput = null;
-
-			try
-			{
-				currentInput = Inputs.Items.SingleOrDefault(Inputs => Inputs.Value.IsSelected).Value;
-			}
-			catch { }
-			
-
-            if (currentInput != null)
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "SetInput: {0}", selector);
-                currentInput.IsSelected = false;
-            }
-
-			if (!Inputs.Items.TryGetValue(selector, out var input))
-                return;
-
-			input.IsSelected = true;
-
-			Inputs.CurrentItem = selector;
-        }
-
-
-
-        #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 MockDisplay2Factory : EssentialsDeviceFactory<MockDisplay>
-    {
-        public MockDisplay2Factory()
-        {
-            TypeNames = new List<string>() { "mockdisplay2" };
-        }
-
-        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,97 +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 IHasInputs<string, string> _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()
-        {
-            _parent.SetInput(Key);
-        }
-    }
-}

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

@@ -1,65 +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 RoutingInputPort CurrentInputPort => InputPorts[0];
-
-        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-402" />
-  </ItemGroup>
-</Project>

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

@@ -1,16 +0,0 @@
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Routing;
-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,133 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
-using Serilog.Events;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PepperDash.Essentials.Devices.Common.SoftCodec
-{
-    public class GenericSoftCodec : EssentialsDevice, IRoutingSource, IRoutingOutputs, IRoutingSinkWithSwitching
-    {
-        private RoutingInputPort _currentInputPort;
-        public RoutingInputPort CurrentInputPort {
-            get => _currentInputPort;
-            set
-            {
-                _currentInputPort = value;
-
-                InputChanged?.Invoke(this, _currentInputPort);
-            }
-        }
-
-        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, $"contentInput{i}", 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, $"cameraInput{i}", 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 event InputChangedEventHandler InputChanged;
-
-        public void ExecuteSwitch(object inputSelector)
-        {
-            var inputPort = InputPorts.FirstOrDefault(p => p.Selector == inputSelector);
-
-            if(inputPort == null)
-            {
-                Debug.LogMessage(LogEventLevel.Warning, "No input port found for selector {inputSelector}", inputSelector);
-                return;
-            }
-
-            CurrentInputPort = inputPort;
-        }
-    }
-
-    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/InRoomPc.cs

@@ -1,77 +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 InRoomPc : EssentialsDevice, IHasFeedback, IRoutingSource, 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
-	}
-
-    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.Devices.Common/Sources/Laptop.cs

@@ -1,80 +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, IRoutingSource, 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>
-            {
-                (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-402" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
-    <ProjectReference Include="..\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj" />
-  </ItemGroup>
-</Project>