ci: update msbuild command and separate setup from push

The default version will be used for local builds.
It can be overridden by using the `/p:Version=X.X.X`
option with MSBuild.

.github/scripts/GenerateVersionNumber-2.0.0.ps1

@@ -0,0 +1,23 @@
+$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/add-issues-to-project.yml

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

.github/workflows/docker.yml

@@ -3,17 +3,16 @@ name: Branch Build Using Docker
 on:
   push:
     branches:
-      - feature/*
-      - hotfix/*
-      - bugfix/*
-      - release/*
-      - development
+      - feature-2.0.0/*
+      - hotfix-2.0.0/*
+      - release-2.0.0/*
+      - development-2.0.0
 
 env:
-  # solution path doesn't need slashes unless it is multiple folders deep
+  # 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
+  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
@@ -21,121 +20,75 @@ env:
   # 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@v2
-        with:
-          fetch-depth: 0
-        # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # Generate the appropriate version number
+  Build_Project_4-Series:
+    runs-on: windows-latest
+    steps:      
+      - uses: actions/checkout@v3
       - name: Set Version Number
+        id: setVersion
         shell: powershell
         run: |
-          $version = ./.github/scripts/GenerateVersionNumber.ps1
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+          $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 install .\packages.config -OutputDirectory .\packages -ExcludeVersion
-      # Login to Docker
-      - name: Login to Docker
-        uses: azure/docker-login@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+        run: nuget restore .\$($Env:SOLUTION_FILE).sln
       # Build the solutions in the docker image
-      - name: Build Solution
-        shell: powershell
+      - 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: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
-      # Zip up the output files as needed
-      - name: Zip Build Output
-        shell: powershell
-        run: ./.github/scripts/ZipBuildOutput.ps1
-      # Write the version to a file to be consumed by the push jobs
-      - name: Write Version
-        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
-      # Upload the build output as an artifact
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: Build
-          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-      # Upload the Version file as an artifact
-      - name: Upload version.txt
-        uses: actions/upload-artifact@v1
-        with:
-          name: Version
-          path: ${{env.GITHUB_HOME}}\output\version.txt
+          git tag ${{ steps.setVersion.outputs.version }}
+          git push --tags origin
+      # Create the release on the source repo
       - name: Create Release
         id: create_release
-        # using contributor's version to allow for pointing at the right commit
-        uses: fleskesvor/create-release@feature/support-target-commitish
+#        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:
-          tag_name: ${{ env.VERSION  }}
-          release_name: ${{ env.VERSION }}
+          artifacts: 'output\*.*(cpz|cplz)'
+          generateReleaseNotes: true
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload the build package to the release
-      - name: Upload Release Package
-        id: upload_release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Push_Nuget_Package:
-    needs: Build_Project
-    runs-on: windows-2019
-    steps:
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      - name: Add nuget.exe
-        uses: nuget/setup-nuget@v1
-      - name: Add Github Packages source
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-      - name: Add nuget.org API Key
-        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
-      - name: Create nuget package
-        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
-      - name: Publish nuget package to Github registry
-        run: nuget push **/*.nupkg -source github
-      - name: Publish nuget package to nuget.org
-        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
+          tag: ${{ steps.setVersion.outputs.version }}
+      - name: Setup Nuget
+        run: | 
+          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json
+          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: Public to Github Nuget
+        run: nuget push .\output\*.nupkg -Source github

.gitignore

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

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 Essentials from your own 
-  repository. As we identify and recognize extensions that are of general interest to Essentials, we 
+  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 
   may seek to incorporate them with our baseline.
 
 ## Legal

PepperDash.Essentials.sln

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

@@ -1,49 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", "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", "essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", "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", "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

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

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

PepperDashEssentials/Bridges/AppleTvBridge.cs

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

PepperDashEssentials/Bridges/BridgeFactory.cs

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

PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs

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

PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

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

PepperDashEssentials/Bridges/CameraControllerBridge.cs

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

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

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

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

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

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

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

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

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

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

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

PepperDashEssentials/Bridges/DspControllerBridge.cs

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

PepperDashEssentials/Bridges/EiscBridge.cs

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

PepperDashEssentials/Bridges/EssentialComms.cs

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

PepperDashEssentials/Bridges/EssentialDM.cs

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

PepperDashEssentials/Bridges/EssentialDsp.cs

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

PepperDashEssentials/Bridges/EssentialTVOne.cs

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

PepperDashEssentials/Bridges/GenericLightingBridge.cs

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

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

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

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

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

PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs

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

PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

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

PepperDashEssentials/Bridges/IBridge.cs

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

PepperDashEssentials/Bridges/IDigitalInputBridge.cs

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

PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

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

PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class AirMediaControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Indicates that the device is online when high
-        /// </summary>
-        public uint IsOnline { get; set; }
-        /// <summary>
-        /// Indicates that the device is in session when high
-        /// </summary>
-        public uint IsInSession { get; set; }
-        /// <summary>
-        /// Indicates sync detected on HDMI input when high
-        /// </summary>
-        public uint HdmiVideoSync { get; set; }
-        /// <summary>
-        /// Set High to enable automatic input routing and low to disable.  Feedback high when enabled
-        /// </summary>
-        public uint AutomaticInputRoutingEnabled { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Selects source and provides feedback
-        /// </summary>
-        public uint VideoOut { get; set; }
-        /// <summary>
-        /// Provided error feedback
-        /// </summary>
-        public uint ErrorFB { get; set; }
-        /// <summary>
-        /// Indicates the number of connected users as feedback
-        /// </summary>
-        public uint NumberOfUsersConnectedFB { get; set; }
-        /// <summary>
-        /// Sets the login code and provides the current code as feedback
-        /// </summary>
-        public uint LoginCode { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Provides the name defined in config as feedback
-        /// </summary>
-        public uint Name { get; set; }
-        /// <summary>
-        /// Provides the connection address as feedback
-        /// </summary>
-        public uint ConnectionAddressFB { get; set; }
-        /// <summary>
-        /// Provides the hostname as feedback
-        /// </summary>
-        public uint HostnameFB { get; set; }
-        /// <summary>
-        /// Provides the serial number as feedback
-        /// </summary>
-        public uint SerialNumberFeedback { get; set; }
-        #endregion
-
-        public AirMediaControllerJoinMap()
-        {
-            // Digital
-            IsOnline = 1;
-            IsInSession = 2;
-            HdmiVideoSync = 3;
-            AutomaticInputRoutingEnabled = 4;
-
-            // Analog
-            VideoOut = 1;
-            ErrorFB = 2;
-            NumberOfUsersConnectedFB = 3;
-            LoginCode = 4;
-
-            // Serial
-            Name = 1;
-            ConnectionAddressFB = 2;
-            HostnameFB = 3;
-            SerialNumberFeedback = 4;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            IsInSession = IsInSession + joinOffset;
-            HdmiVideoSync = HdmiVideoSync + joinOffset;
-            AutomaticInputRoutingEnabled = AutomaticInputRoutingEnabled + joinOffset;
-
-            VideoOut = VideoOut + joinOffset;
-            ErrorFB = ErrorFB + joinOffset;
-            NumberOfUsersConnectedFB = NumberOfUsersConnectedFB + joinOffset;
-            LoginCode = LoginCode + joinOffset;
-
-            Name = Name + joinOffset;
-            ConnectionAddressFB = ConnectionAddressFB + joinOffset;
-            HostnameFB = HostnameFB + joinOffset;
-            SerialNumberFeedback = SerialNumberFeedback + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class AppleTvJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Sends up arrow command while high
-        /// </summary>
-        public uint UpArrow { get; set; }
-        /// <summary>
-        /// Sends down arrow command while high
-        /// </summary>
-        public uint DnArrow { get; set; }
-        /// <summary>
-        /// Sends left arrow command while high
-        /// </summary>
-        public uint LeftArrow { get; set; }
-        /// <summary>
-        /// Sends right arrow command while high
-        /// </summary>
-        public uint RightArrow { get; set; }
-        /// <summary>
-        /// Sends menu command
-        /// </summary>
-        public uint Menu { get; set; }
-        /// <summary>
-        /// Sends select command
-        /// </summary>
-        public uint Select { get; set; }
-        /// <summary>
-        /// Sends play/pause command
-        /// </summary>
-        public uint PlayPause { get; set; }
-        #endregion
-
-        public AppleTvJoinMap()
-        {
-            UpArrow = 1;
-            DnArrow = 2;
-            LeftArrow = 3;
-            RightArrow = 4;
-            Menu = 5;
-            Select = 6;
-            PlayPause = 7;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            UpArrow = UpArrow + joinOffset;
-            DnArrow = DnArrow + joinOffset;
-            LeftArrow = LeftArrow + joinOffset;
-            RightArrow = RightArrow + joinOffset;
-            Menu = Menu + joinOffset;
-            Select = Select + joinOffset;
-            PlayPause = PlayPause + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Linq;
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class C2nRthsControllerJoinMap:JoinMapBase
-    {
-        public uint IsOnline { get; set; }
-        public uint Name { get; set; }
-        public uint Temperature { get; set; }
-        public uint Humidity { get; set; }
-        public uint TemperatureFormat { get; set; }
-
-        public C2nRthsControllerJoinMap()
-        {
-            //digital
-            IsOnline = 1;
-            TemperatureFormat = 2;
-
-            //Analog
-            Temperature = 2;
-            Humidity = 3;
-
-            //serial
-            Name = 1;
-
-            
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-            var properties =
-                GetType().GetCType().GetProperties().Where(p => p.PropertyType == typeof(uint)).ToList();
-
-            foreach (var propertyInfo in properties)
-            {
-                propertyInfo.SetValue(this, (uint)propertyInfo.GetValue(this, null) + joinOffset, null);
-            }
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    /// <summary>
-    /// Join map for CameraBase devices
-    /// </summary>
-    /// 
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class CameraControllerJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("TiltUp")]
-        public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("TiltDown")]
-        public JoinDataComplete TiltDown = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "Tilt Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PanLeft")]
-        public JoinDataComplete PanLeft = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "Pan Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PanRight")]
-        public JoinDataComplete PanRight = new JoinDataComplete(new JoinData() { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata() { Label = "Pan Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ZoomIn")]
-        public JoinDataComplete ZoomIn = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata() { Label = "Zoom In", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ZoomOut")]
-        public JoinDataComplete ZoomOut = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata() { Label = "Zoom Out", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata() { Label = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PowerOn")]
-        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata() { Label = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PowerOff")]
-        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata() { Label = "Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("NumberOfPresets")]
-        public JoinDataComplete NumberOfPresets = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "Tells Essentials the number of defined presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        [JoinName("PresetRecallStart")]
-        public JoinDataComplete PresetRecallStart = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata() { Label = "Preset Recall Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PresetLabelStart")]
-        public JoinDataComplete PresetLabelStart = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata() { Label = "Preset Label Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("PresetSaveStart")]
-        public JoinDataComplete PresetSaveStart = new JoinDataComplete(new JoinData() { JoinNumber = 31, JoinSpan = 20 }, new JoinMetadata() { Label = "Preset Save Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraModeAuto")]
-        public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeManual")]
-        public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeOff")]
-        public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData() { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SupportsCameraModeAuto")]
-        public JoinDataComplete SupportsCameraModeAuto = new JoinDataComplete(new JoinData() { JoinNumber = 55, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Camera Mode Auto", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SupportsCameraModeOff")]
-        public JoinDataComplete SupportsCameraModeOff = new JoinDataComplete(new JoinData() { JoinNumber = 56, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Camera Mode Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SupportsPresets")]
-        public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData() { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        public CameraControllerJoinMap(uint joinStart)
-            : base(joinStart, typeof(CameraControllerJoinMap))
-        {
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DigitalLoggerJoinMap : JoinMapBase
-    {
-        public uint IsOnline { get; set; }
-        public uint CircuitNames { get; set; }
-        public uint CircuitState { get; set; }
-        public uint CircuitCycle { get; set; }
-        public uint CircuitIsCritical { get; set; }
-        public uint CircuitOnCmd { get; set; }
-        public uint CircuitOffCmd { get; set; }
-
-        public DigitalLoggerJoinMap()
-        {
-            // Digital
-            IsOnline = 9;
-            CircuitState = 0;
-            CircuitCycle = 0;
-            CircuitIsCritical = 10;
-            CircuitOnCmd = 10;
-            CircuitOffCmd = 20;
-            // Serial
-            CircuitNames = 0;
-            // Analog
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            CircuitNames = CircuitNames + joinOffset;
-            CircuitState = CircuitState + joinOffset;
-            CircuitCycle = CircuitCycle + joinOffset;
-            CircuitIsCritical = CircuitIsCritical + joinOffset;
-            CircuitOnCmd = CircuitOnCmd + joinOffset;
-            CircuitOffCmd = CircuitOffCmd + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DisplayControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Turns the display off and reports power off feedback
-        /// </summary>
-        public uint PowerOff { get; set; }
-        /// <summary>
-        /// Turns the display on and repots power on feedback
-        /// </summary>
-        public uint PowerOn { get; set; }
-        /// <summary>
-        /// Indicates that the display device supports two way communication when high
-        /// </summary>
-        public uint IsTwoWayDisplay { get; set; }
-        /// <summary>
-        /// Increments the volume while high
-        /// </summary>
-        public uint VolumeUp { get; set; }
-        /// <summary>
-        /// Decrements teh volume while high
-        /// </summary>
-        public uint VolumeDown { get; set; }
-        /// <summary>
-        /// Toggles the mute state.  Feedback is high when volume is muted
-        /// </summary>
-        public uint VolumeMute { get; set; }
-        /// <summary>
-        /// Range of digital joins to select inputs and report current input as feedback
-        /// </summary>
-        public uint InputSelectOffset { get; set; }
-        /// <summary>
-        /// Range of digital joins to report visibility for input buttons
-        /// </summary>
-        public uint ButtonVisibilityOffset { get; set; }
-        /// <summary>
-        /// High if the device is online
-        /// </summary>
-        public uint IsOnline { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Analog join to set the input and report current input as feedback
-        /// </summary>
-        public uint InputSelect { get; set; }
-        /// <summary>
-        /// Sets the volume level and reports the current level as feedback 
-        /// </summary>
-        public uint VolumeLevel { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Reports the name of the display as defined in config as feedback
-        /// </summary>
-        public uint Name { get; set; }
-        /// <summary>
-        /// Range of serial joins that reports the names of the inputs as feedback
-        /// </summary>
-        public uint InputNamesOffset { get; set; }
-        #endregion
-
-        public DisplayControllerJoinMap()
-        {
-            // Digital
-            IsOnline = 50;
-            PowerOff = 1;
-            PowerOn = 2;
-            IsTwoWayDisplay = 3;
-            VolumeUp = 5;
-            VolumeDown = 6;
-            VolumeMute = 7;
-
-            ButtonVisibilityOffset = 40;
-            InputSelectOffset = 10;
-
-            // Analog
-            InputSelect = 11;
-            VolumeLevel = 5;
-
-            // Serial
-            Name = 1;
-            InputNamesOffset = 10;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            PowerOff = PowerOff + joinOffset;
-            PowerOn = PowerOn + joinOffset;
-            IsTwoWayDisplay = IsTwoWayDisplay + joinOffset;
-            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
-            Name = Name + joinOffset;
-            InputNamesOffset = InputNamesOffset + joinOffset;
-            InputSelectOffset = InputSelectOffset + joinOffset;
-
-            InputSelect = InputSelect + joinOffset;
-
-            VolumeUp = VolumeUp + joinOffset;
-            VolumeDown = VolumeDown + joinOffset;
-            VolumeMute = VolumeMute + joinOffset;
-            VolumeLevel = VolumeLevel + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges {
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DmBladeChassisControllerJoinMap : JoinMapBase {
-        #region Digital/Analogs
-        #endregion
-
-        #region Digitals
-        /// <summary>
-        /// High when device is online
-        /// </summary>
-        public uint IsOnline { get; set; }
-        /// <summary>
-        /// Range reports video sync feedback for each input
-        /// </summary>
-        public uint VideoSyncStatus { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding input's endpoint is online
-        /// </summary>
-        public uint InputEndpointOnline { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding output's endpoint is online
-        /// </summary>
-        public uint OutputEndpointOnline { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding input's transmitter supports bridging as a separate device for detailed AV switching, HDCP control, etc.
-        /// </summary>
-        public uint TxAdvancedIsPresent { get; set; } // indicates that there is an attached transmitter that should be bridged to be interacted with
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Range sets and reports the current video source for the corresponding output
-        /// </summary>
-        public uint OutputVideo { get; set; }
-        /// <summary>
-        /// Range sets and reports the current HDCP state for the corresponding input card
-        /// </summary>
-        public uint HdcpSupportState { get; set; }
-        /// <summary>
-        /// Range reports the highest supported HDCP state level for the corresponding input card
-        /// </summary>
-        public uint HdcpSupportCapability { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Range sets and reports the name for the corresponding input card
-        /// </summary>
-        public uint InputNames { get; set; }
-        /// <summary>
-        /// Range sets and reports the name for the corresponding output card
-        /// </summary>
-        public uint OutputNames { get; set; }
-        /// <summary>
-        /// Range reports the name of the current video source for the corresponding output card
-        /// </summary>
-        public uint OutputCurrentVideoInputNames { get; set; }
-        /// <summary>
-        /// Range reports the current input resolution for each corresponding input card
-        /// </summary>
-        public uint InputCurrentResolution { get; set; }
-        #endregion
-
-        public DmBladeChassisControllerJoinMap() {
-            //Digital/Analog
-
-            //Digital 
-            IsOnline = 11;
-            VideoSyncStatus = 100; //101-299
-            InputEndpointOnline = 500; //501-699
-            OutputEndpointOnline = 700; //701-899
-            TxAdvancedIsPresent = 1000; //1001-1199
-
-            //Analog
-            OutputVideo = 100; //101-299
-            HdcpSupportState = 1000; //1001-1199
-            HdcpSupportCapability = 1200; //1201-1399
-
-
-            //Serial
-            InputNames = 100; //101-299
-            OutputNames = 300; //301-499
-            OutputCurrentVideoInputNames = 2000; //2001-2199
-            InputCurrentResolution = 2400; // 2401-2599
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart) {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            OutputVideo = OutputVideo + joinOffset;
-            VideoSyncStatus = VideoSyncStatus + joinOffset;
-            InputNames = InputNames + joinOffset;
-            OutputNames = OutputNames + joinOffset;
-            OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
-            InputCurrentResolution = InputCurrentResolution + joinOffset;
-            InputEndpointOnline = InputEndpointOnline + joinOffset;
-            OutputEndpointOnline = OutputEndpointOnline + joinOffset;
-            HdcpSupportState = HdcpSupportState + joinOffset;
-            HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DmChassisControllerJoinMap : JoinMapBase
-        {
-#region Digital/Analogs
-        /// <summary>
-        /// Analog input sets System ID, output reports current ID as feedback.
-        /// Digital input applies System ID, output is high when applying busy.
-        /// </summary>
-        public uint SystemId { get; set; }
-#endregion
-
-#region Digitals
-        /// <summary>
-        /// High when device is online
-        /// </summary>
-        public uint IsOnline { get; set; }
-        /// <summary>
-        /// Range reports video sync feedback for each input
-        /// </summary>
-        public uint VideoSyncStatus { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding input's endpoint is online
-        /// </summary>
-        public uint InputEndpointOnline { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding output's endpoint is online
-        /// </summary>
-        public uint OutputEndpointOnline { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding input's transmitter supports bridging as a separate device for detailed AV switching, HDCP control, etc.
-        /// </summary>
-        public uint TxAdvancedIsPresent { get; set; } // indicates that there is an attached transmitter that should be bridged to be interacted with
-        /// <summary>
-        /// Range reports high if corresponding output is disabled by HDCP.
-        /// </summary>
-        public uint OutputDisabledByHdcp { get; set; } // indicates that there is an attached transmitter that should be bridged to be interacted with
-#endregion
-
-#region Analogs
-        /// <summary>
-        /// Range sets and reports the current video source for the corresponding output
-        /// </summary>
-        public uint OutputVideo { get; set; }
-        /// <summary>
-        /// Range sets and reports the current audio source for the corresponding output
-        /// </summary>
-        public uint OutputAudio { get; set; }
-        /// <summary>
-        /// Range sets and reports the current Usb source for the corresponding output
-        /// </summary>
-        public uint OutputUsb { get; set; }
-        /// <summary>
-        /// Range sets and reports the current Usb source for the corresponding input
-        /// </summary>
-        public uint InputUsb { get; set; }
-        /// <summary>
-        /// Range sets and reports the current HDCP state for the corresponding input card
-        /// </summary>
-        public uint HdcpSupportState { get; set; }
-        /// <summary>
-        /// Range reports the highest supported HDCP state level for the corresponding input card
-        /// </summary>
-        public uint HdcpSupportCapability { get; set; }
-        /// <summary>
-        /// DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback
-        /// </summary>
-        public uint InputStreamCardStatus { get; set; }
-        /// <summary>
-        /// DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback
-        /// </summary>
-        public uint OutputStreamCardStatus { get; set; }
-#endregion
-
-#region Serials
-        /// <summary>
-        /// Range sets and reports the name for the corresponding input card
-        /// </summary>
-        public uint InputNames { get; set; }
-        /// <summary>
-        /// Range sets and reports the name for the corresponding output card
-        /// </summary>
-        public uint OutputNames { get; set; }
-        /// <summary>
-        /// Range reports the name of the current video source for the corresponding output card
-        /// </summary>
-        public uint OutputCurrentVideoInputNames { get; set; }
-        /// <summary>
-        /// Range reports the name of the current audio source for the corresponding output card
-        /// </summary>
-        public uint OutputCurrentAudioInputNames { get; set; }
-        /// <summary>
-        /// Range reports the current input resolution for each corresponding input card
-        /// </summary>
-        public uint InputCurrentResolution { get; set; }
-#endregion
-
-        public DmChassisControllerJoinMap()
-        {
-            //Digital/Analog
-            SystemId = 10; // Analog sets/gets SystemId, digital input applies and provides feedback of ID change busy
-
-            //Digital 
-            IsOnline = 11;
-            VideoSyncStatus = 100; //101-299
-            InputEndpointOnline = 500; //501-699
-            OutputEndpointOnline = 700; //701-899
-            TxAdvancedIsPresent = 1000; //1001-1199
-            OutputDisabledByHdcp = 1200; //1201-1399
-
-            //Analog
-            OutputVideo = 100; //101-299
-            OutputAudio = 300; //301-499
-            OutputUsb = 500; //501-699
-            InputUsb = 700; //701-899
-            HdcpSupportState = 1000; //1001-1199
-            HdcpSupportCapability = 1200; //1201-1399
-            InputStreamCardStatus = 1500; //1501-1532
-            OutputStreamCardStatus = 1600; //1601-1632
-
-
-            //Serial
-            InputNames = 100; //101-299
-            OutputNames = 300; //301-499
-            OutputCurrentVideoInputNames = 2000; //2001-2199
-            OutputCurrentAudioInputNames = 2200; //2201-2399
-            InputCurrentResolution = 2400; // 2401-2599
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            SystemId = SystemId + joinOffset;
-            IsOnline = IsOnline + joinOffset;
-            OutputVideo = OutputVideo + joinOffset;
-            OutputAudio = OutputAudio + joinOffset;
-            OutputUsb = OutputUsb + joinOffset;
-            InputUsb = InputUsb + joinOffset;
-            VideoSyncStatus = VideoSyncStatus + joinOffset;
-            InputNames = InputNames + joinOffset;
-            OutputNames = OutputNames + joinOffset;
-            OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
-            OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
-            InputCurrentResolution = InputCurrentResolution + joinOffset;
-            InputEndpointOnline = InputEndpointOnline + joinOffset;
-            OutputEndpointOnline = OutputEndpointOnline + joinOffset;
-            HdcpSupportState = HdcpSupportState + joinOffset;
-            HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-            InputStreamCardStatus = InputStreamCardStatus + joinOffset;
-            OutputStreamCardStatus = OutputStreamCardStatus + joinOffset;
-            OutputDisabledByHdcp = OutputDisabledByHdcp + joinOffset;
-            TxAdvancedIsPresent = TxAdvancedIsPresent + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DmRmcControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// High when device is online (if not attached to a DMP3 or DM chassis with a CPU3 card
-        /// </summary>
-        public uint IsOnline { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Reports the current output resolution
-        /// </summary>
-        public uint CurrentOutputResolution { get; set; }
-        /// <summary>
-        /// Reports the EDID manufacturer value
-        /// </summary>
-        public uint EdidManufacturer { get; set; }
-        /// <summary>
-        /// Reports the EDID Name value
-        /// </summary>
-        public uint EdidName { get; set; }
-        /// <summary>
-        /// Reports the EDID preffered timing value
-        /// </summary>
-        public uint EdidPrefferedTiming { get; set; }
-        /// <summary>
-        /// Reports the EDID serial number value
-        /// </summary>
-        public uint EdidSerialNumber { get; set; }
-        #endregion
-
-        #region Analogs
-        public uint AudioVideoSource { get; set; }
-        #endregion
-
-        public DmRmcControllerJoinMap()
-        {
-            // Digital
-            IsOnline = 1;
-
-            // Serial
-            CurrentOutputResolution = 1;
-            EdidManufacturer = 2;
-            EdidName = 3;
-            EdidPrefferedTiming = 4;
-            EdidSerialNumber = 5;
-
-            //Analog
-            AudioVideoSource = 1;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            CurrentOutputResolution = CurrentOutputResolution + joinOffset;
-            EdidManufacturer = EdidManufacturer + joinOffset;
-            EdidName = EdidName + joinOffset;
-            EdidPrefferedTiming = EdidPrefferedTiming + joinOffset;
-            EdidSerialNumber = EdidSerialNumber + joinOffset;
-            AudioVideoSource = AudioVideoSource + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -1,100 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DmTxControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// High when device is online (if not attached to a DMP3 or DM chassis with a CPU3 card
-        /// </summary>
-        public uint IsOnline { get; set; }
-        /// <summary>
-        /// High when video sync is detected
-        /// </summary>
-        public uint VideoSyncStatus { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public uint FreeRunEnabled { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Sets and reports the video source
-        /// </summary>
-        public uint VideoInput { get; set; }
-        /// <summary>
-        /// Sets and reports the audio source
-        /// </summary>
-        public uint AudioInput { get; set; }
-        /// <summary>
-        /// Reports the highest supported HDCP state level for the corresponding input card
-        /// </summary>
-        public uint HdcpSupportCapability { get; set; }
-        /// <summary>
-        /// Sets and reports the current HDCP state for the corresponding input port
-        /// </summary>
-        public uint Port1HdcpState { get; set; }
-        /// <summary>
-        /// Sets and reports the current HDCP state for the corresponding input port
-        /// </summary>
-        public uint Port2HdcpState { get; set; }
-
-        /// <summary>
-        /// Sets and reports the current VGA Brightness level
-        /// </summary>
-        public uint VgaBrightness { get; set; }
-
-        /// <summary>
-        /// Sets and reports the current VGA Contrast level
-        /// </summary>
-        public uint VgaContrast { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Reports the current input resolution
-        /// </summary>
-        public uint CurrentInputResolution { get; set; }
-        #endregion
-
-
-        public DmTxControllerJoinMap()
-        {
-            // Digital
-            IsOnline = 1;
-            VideoSyncStatus = 2;
-            FreeRunEnabled = 3;
-            // Serial
-            CurrentInputResolution = 1;
-            // Analog
-            VideoInput = 1;
-            AudioInput = 2;
-            HdcpSupportCapability = 3;
-            Port1HdcpState = 4;
-            Port2HdcpState = 5;
-            VgaBrightness = 6;
-            VgaContrast = 7;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            VideoSyncStatus = VideoSyncStatus + joinOffset;
-            FreeRunEnabled = FreeRunEnabled + joinOffset;
-            CurrentInputResolution = CurrentInputResolution + joinOffset;
-            VideoInput = VideoInput + joinOffset;
-            AudioInput = AudioInput + joinOffset;
-            HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-            Port1HdcpState = Port1HdcpState + joinOffset;
-            Port2HdcpState = Port2HdcpState + joinOffset;
-            VgaBrightness = VgaBrightness + joinOffset;
-            VgaContrast = VgaContrast + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DmpsAudioOutputControllerJoinMap : JoinMapBase
-    {
-        #region Digital/Analog
-        /// <summary>
-        /// Range of joins for Master Volume 
-        /// Analog join 1 is volume level and feedback
-        /// Digital join 1 is Mute on and feedback
-        /// Digital join 2 is Mute off and feedback
-        /// Digital join 3 is volume up
-        /// Digital join 4 is volume down
-        /// </summary>
-        public uint MasterVolume { get; set; }
-        /// <summary>
-        /// Range of joins for Source Volume 
-        /// Analog join 11 is volume level and feedback
-        /// Digital join 11 is Mute on and feedback
-        /// Digital join 12 is Mute off and feedback
-        /// Digital join 13 is volume up
-        /// Digital join 14 is volume down
-        /// </summary>
-        public uint SourceVolume { get; set; }
-        /// <summary>
-        /// Range of joins for Codec1 Volume (if applicable)
-        /// Analog join 21 is volume level and feedback
-        /// Digital join 21 is Mute on and feedback
-        /// Digital join 22 is Mute off and feedback
-        /// Digital join 23 is volume up
-        /// Digital join 24 is volume down
-        /// </summary>
-        public uint Codec1Volume { get; set; }
-        /// <summary>
-        /// Range of joins for Codec2 Volume (if applicable)
-        /// Analog join 31 is volume level and feedback
-        /// Digital join 31 is Mute on and feedback
-        /// Digital join 32 is Mute off and feedback
-        /// Digital join 33 is volume up
-        /// Digital join 34 is volume down
-        /// </summary>
-        public uint Codec2Volume { get; set; }
-        #endregion
-
-        public DmpsAudioOutputControllerJoinMap()
-        {
-            MasterVolume = 1; // 1-10
-            SourceVolume = 11; // 11-20
-            Codec1Volume = 21; // 21-30
-            Codec2Volume = 31; // 31-40
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart;
-
-            MasterVolume = MasterVolume + joinOffset;
-            SourceVolume = SourceVolume + joinOffset;
-            Codec1Volume = Codec1Volume + joinOffset;
-            Codec2Volume = Codec2Volume + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class DmpsRoutingControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Range reports video sync feedback for each input
-        /// </summary>
-        public uint VideoSyncStatus { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding input's endpoint is online
-        /// </summary>
-        public uint InputEndpointOnline { get; set; }
-        /// <summary>
-        /// Range reports high if corresponding output's endpoint is online
-        /// </summary>
-        public uint OutputEndpointOnline { get; set; }       
-        #endregion
-
-
-        #region Analogs
-        /// <summary>
-        /// Range sets and reports the current video source for the corresponding output
-        /// </summary>
-        public uint OutputVideo { get; set; }
-        /// <summary>
-        /// Range sets and reports the current audio source for the corresponding output
-        /// </summary>
-        public uint OutputAudio { get; set; }
-        /// <summary>
-        /// Range sets and reports the current Usb source for the corresponding output
-        /// </summary>
-        //public uint OutputUsb { get; set; }
-        ///// <summary>
-        ///// Range sets and reports the current Usb source for the corresponding input
-        ///// </summary>
-        //public uint InputUsb { get; set; }
-        ///// <summary>
-        ///// Range sets and reports the current HDCP state for the corresponding input card
-        ///// </summary>
-        //public uint HdcpSupportState { get; set; }
-        ///// <summary>
-        ///// Range reports the highest supported HDCP state level for the corresponding input card
-        ///// </summary>
-        //public uint HdcpSupportCapability { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Range sets and reports the name for the corresponding input card
-        /// </summary>
-        public uint InputNames { get; set; }
-        /// <summary>
-        /// Range sets and reports the name for the corresponding output card
-        /// </summary>
-        public uint OutputNames { get; set; }
-        /// <summary>
-        /// Range reports the name of the current video source for the corresponding output card
-        /// </summary>
-        public uint OutputCurrentVideoInputNames { get; set; }
-        /// <summary>
-        /// Range reports the name of the current audio source for the corresponding output card
-        /// </summary>
-        public uint OutputCurrentAudioInputNames { get; set; }
-        /// <summary>
-        /// Range reports the current input resolution for each corresponding input card
-        /// </summary>
-        public uint InputCurrentResolution { get; set; }
-        #endregion
-
-
-        public DmpsRoutingControllerJoinMap()
-        {
-            //Digital 
-            VideoSyncStatus = 100; //101-299
-            InputEndpointOnline = 500; //501-699
-            OutputEndpointOnline = 700; //701-899
-
-            //Analog
-            OutputVideo = 100; //101-299
-            OutputAudio = 300; //301-499
-            //OutputUsb = 500; //501-699
-            //InputUsb = 700; //701-899
-            VideoSyncStatus = 100; //101-299
-            //HdcpSupportState = 1000; //1001-1199
-            //HdcpSupportCapability = 1200; //1201-1399
-
-
-            //Serial
-            InputNames = 100; //101-299
-            OutputNames = 300; //301-499
-            OutputCurrentVideoInputNames = 2000; //2001-2199
-            OutputCurrentAudioInputNames = 2200; //2201-2399
-            InputCurrentResolution = 2400; // 2401-2599
-            InputEndpointOnline = 500; //501-699
-            OutputEndpointOnline = 700; //701-899
-
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            OutputVideo = OutputVideo + joinOffset;
-            OutputAudio = OutputAudio + joinOffset;
-            //OutputUsb = OutputUsb + joinOffset;
-            //InputUsb = InputUsb + joinOffset;
-            VideoSyncStatus = VideoSyncStatus + joinOffset;
-            InputNames = InputNames + joinOffset;
-            OutputNames = OutputNames + joinOffset;
-            OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
-            OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
-            InputCurrentResolution = InputCurrentResolution + joinOffset;
-            InputEndpointOnline = InputEndpointOnline + joinOffset;
-            OutputEndpointOnline = OutputEndpointOnline + joinOffset;
-            //HdcpSupportState = HdcpSupportState + joinOffset;
-            //HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class GenericLightingJoinMap : JoinMapBase
-    {
-        public uint IsOnline { get; set; }
-        public uint SelectScene { get; set; }
-        public uint LightingSceneOffset { get; set; }
-        public uint ButtonVisibilityOffset { get; set; }
-        public uint IntegrationIdSet { get; set; }
-
-        public GenericLightingJoinMap()
-        {
-            // Digital
-            IsOnline = 1;
-            SelectScene = 1;
-            IntegrationIdSet = 1;
-            LightingSceneOffset = 10;
-            ButtonVisibilityOffset = 40;
-            // Analog
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            SelectScene = SelectScene + joinOffset;
-            LightingSceneOffset = LightingSceneOffset + joinOffset;
-            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class GenericRelayControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Sets and reports the state of the relay (High = closed, Low = Open)
-        /// </summary>
-        public uint Relay { get; set; }
-        #endregion
-
-        public GenericRelayControllerJoinMap()
-        {
-            Relay = 1;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            Relay = Relay + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -1,239 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class GlsOccupancySensorBaseJoinMap : JoinMapBase
-    {
-        #region Digitals
-
-        /// <summary>
-        /// High when device is online
-        /// </summary>
-        public uint IsOnline { get; set; }
-        /// <summary>
-        /// Forces the device to report occupied status
-        /// </summary>
-        public uint ForceOccupied { get; set; }
-        /// <summary>
-        /// Forces the device to report vacant status
-        /// </summary>
-        public uint ForceVacant { get; set; }
-        /// <summary>
-        /// Enables raw status reporting
-        /// </summary>
-        public uint EnableRawStates { get; set; }
-        /// <summary>
-        /// High when raw occupancy is detected
-        /// </summary>
-        public uint RawOccupancyFeedback { get; set; }
-        /// <summary>
-        /// High when PIR sensor detects motion
-        /// </summary>
-        public uint RawOccupancyPirFeedback { get; set; }
-        /// <summary>
-        /// High when US sensor detects motion
-        /// </summary>
-        public uint RawOccupancyUsFeedback { get; set; }
-        /// <summary>
-        /// High when occupancy is detected
-        /// </summary>
-        public uint RoomOccupiedFeedback { get; set; }
-        /// <summary>
-        /// Hich when occupancy is detected in the grace period
-        /// </summary>
-        public uint GraceOccupancyDetectedFeedback { get; set; }
-        /// <summary>
-        /// High when vacancy is detected
-        /// </summary>
-        public uint RoomVacantFeedback { get; set; }
-
-        /// <summary>
-        /// Enables the LED Flash when set high
-        /// </summary>
-        public uint EnableLedFlash { get; set; }
-        /// <summary>
-        /// Disables the LED flash when set high
-        /// </summary>
-        public uint DisableLedFlash { get; set; }
-        /// <summary>
-        /// Enables the Short Timeout
-        /// </summary>
-        public uint EnableShortTimeout { get; set; }
-        /// <summary>
-        /// Disables the Short Timout
-        /// </summary>
-        public uint DisableShortTimeout { get; set; }
-        /// <summary>
-        /// Set high to enable one technology to trigger occupancy
-        /// </summary>
-        public uint OrWhenVacated { get; set; }
-        /// <summary>
-        /// Set high to require both technologies to trigger occupancy
-        /// </summary>
-        public uint AndWhenVacated { get; set; }
-        /// <summary>
-        /// Enables Ultrasonic Sensor A
-        /// </summary>
-        public uint EnableUsA { get; set; }
-        /// <summary>
-        /// Disables Ultrasonic Sensor A
-        /// </summary>
-        public uint DisableUsA { get; set; }
-        /// <summary>
-        /// Enables Ultrasonic Sensor B
-        /// </summary>
-        public uint EnableUsB { get; set; }
-        /// <summary>
-        /// Disables Ultrasonic Sensor B
-        /// </summary>
-        public uint DisableUsB { get; set; }
-        /// <summary>
-        /// Enables Pir
-        /// </summary>
-        public uint EnablePir { get; set; }
-        /// <summary>
-        /// Disables Pir
-        /// </summary>
-        public uint DisablePir { get; set; }
-        public uint IncrementUsInOccupiedState { get; set; }
-        public uint DecrementUsInOccupiedState { get; set; }
-        public uint IncrementUsInVacantState { get; set; }
-        public uint DecrementUsInVacantState { get; set; }
-        public uint IncrementPirInOccupiedState { get; set; }
-        public uint DecrementPirInOccupiedState { get; set; }
-        public uint IncrementPirInVacantState { get; set; }
-        public uint DecrementPirInVacantState { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Sets adn reports the remote timeout value
-        /// </summary>
-        public uint Timeout { get; set; }
-        /// <summary>
-        /// Reports the local timeout value
-        /// </summary>
-        public uint TimeoutLocalFeedback { get; set; }
-        /// <summary>
-        /// Sets the minimum internal photo sensor value and reports the current level
-        /// </summary>
-        public uint InternalPhotoSensorValue { get; set; }
-        /// <summary>
-        /// Sets the minimum external photo sensor value and reports the current level
-        /// </summary>
-        public uint ExternalPhotoSensorValue { get; set; }
-
-        public uint UsSensitivityInOccupiedState { get; set; }
-
-        public uint UsSensitivityInVacantState { get; set; }
-
-        public uint PirSensitivityInOccupiedState { get; set; }
-
-        public uint PirSensitivityInVacantState { get; set; }
-        #endregion
-
-        #region Serial
-        public uint Name { get; set; }
-        #endregion
-
-        public GlsOccupancySensorBaseJoinMap()
-        {
-            IsOnline = 1;
-            ForceOccupied = 2;
-            ForceVacant = 3;
-            EnableRawStates = 4;
-            RoomOccupiedFeedback = 2;
-            GraceOccupancyDetectedFeedback = 3;
-            RoomVacantFeedback = 4;
-            RawOccupancyFeedback = 5;
-            RawOccupancyPirFeedback = 6;
-            RawOccupancyUsFeedback = 7;
-            EnableLedFlash = 11;
-            DisableLedFlash = 12;
-            EnableShortTimeout = 13;
-            DisableShortTimeout = 14;
-            OrWhenVacated = 15;
-            AndWhenVacated = 16;
-            EnableUsA = 17;
-            DisableUsA = 18;
-            EnableUsB = 19;
-            DisableUsB = 20;
-            EnablePir = 21;
-            DisablePir = 22;
-            IncrementUsInOccupiedState = 23;
-            DecrementUsInOccupiedState = 24;
-            IncrementUsInVacantState = 25;
-            DecrementUsInVacantState = 26;
-            IncrementPirInOccupiedState = 27;
-            DecrementPirInOccupiedState = 28;
-            IncrementPirInVacantState = 29;
-            DecrementPirInVacantState = 30;
-
-            Timeout = 1;
-            TimeoutLocalFeedback = 2;
-            InternalPhotoSensorValue = 3;
-            ExternalPhotoSensorValue = 4;
-            UsSensitivityInOccupiedState = 5;
-            UsSensitivityInVacantState = 6;
-            PirSensitivityInOccupiedState = 7;
-            PirSensitivityInVacantState = 8;
-
-            Name = 1;
-            
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline =                          IsOnline + joinOffset; 
-            ForceOccupied =                     ForceOccupied + joinOffset; 
-            ForceVacant =                       ForceVacant + joinOffset; 
-            EnableRawStates =                   EnableRawStates + joinOffset; 
-            RoomOccupiedFeedback =              RoomOccupiedFeedback + joinOffset; 
-            GraceOccupancyDetectedFeedback =    GraceOccupancyDetectedFeedback + joinOffset;
-            RoomVacantFeedback =                RoomVacantFeedback + joinOffset; 
-            RawOccupancyFeedback =              RawOccupancyFeedback + joinOffset;
-            RawOccupancyPirFeedback =           RawOccupancyPirFeedback + joinOffset;
-            RawOccupancyUsFeedback =            RawOccupancyUsFeedback + joinOffset;
-            EnableLedFlash =                    EnableLedFlash + joinOffset; 
-            DisableLedFlash =                   DisableLedFlash + joinOffset; 
-            EnableShortTimeout =                EnableShortTimeout + joinOffset; 
-            DisableShortTimeout =               DisableShortTimeout + joinOffset; 
-            OrWhenVacated =                     OrWhenVacated + joinOffset; 
-            AndWhenVacated =                    AndWhenVacated + joinOffset; 
-            EnableUsA =                         EnableUsA + joinOffset; 
-            DisableUsA =                        DisableUsA + joinOffset; 
-            EnableUsB =                         EnableUsB + joinOffset; 
-            DisableUsB =                        DisableUsB + joinOffset; 
-            EnablePir =                         EnablePir + joinOffset; 
-            DisablePir =                        DisablePir + joinOffset; 
-            IncrementUsInOccupiedState =        IncrementUsInOccupiedState + joinOffset; 
-            DecrementUsInOccupiedState =        DecrementUsInOccupiedState + joinOffset; 
-            IncrementUsInVacantState =          IncrementUsInVacantState + joinOffset; 
-            DecrementUsInVacantState =          DecrementUsInVacantState + joinOffset; 
-            IncrementPirInOccupiedState =       IncrementPirInOccupiedState + joinOffset;
-            DecrementPirInOccupiedState =       DecrementPirInOccupiedState + joinOffset;
-            IncrementPirInVacantState =         IncrementPirInVacantState + joinOffset; 
-            DecrementPirInVacantState =         DecrementPirInVacantState + joinOffset; 
-                                                
-            Timeout =                           Timeout + joinOffset; 
-            TimeoutLocalFeedback =              TimeoutLocalFeedback + joinOffset; 
-            InternalPhotoSensorValue =          InternalPhotoSensorValue + joinOffset; 
-            ExternalPhotoSensorValue =          ExternalPhotoSensorValue + joinOffset; 
-            UsSensitivityInOccupiedState =      UsSensitivityInOccupiedState + joinOffset;
-            UsSensitivityInVacantState =        UsSensitivityInVacantState + joinOffset; 
-            PirSensitivityInOccupiedState =     PirSensitivityInOccupiedState + joinOffset;
-            PirSensitivityInVacantState =       PirSensitivityInVacantState + joinOffset;
-
-            Name =                              Name + joinOffset;
-        }
-    }    
-         
-}        

PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class HdMdxxxCEControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// High when the pair is online
-        /// </summary>
-        public uint IsOnline { get; set; }
-
-        /// <summary>
-        /// High when the remote end device is online
-        /// </summary>
-        public uint RemoteEndDetected { get; set; }
-
-        /// <summary>
-        /// Sets Auto Route On and provides feedback
-        /// </summary>
-        public uint AutoRouteOn { get; set; }
-
-        /// <summary>
-        /// Sets Auto Route Off and provides feedback
-        /// </summary>
-        public uint AutoRouteOff { get; set; }
-
-        /// <summary>
-        /// Sets Priority Routing On and provides feedback
-        /// </summary>
-        public uint PriorityRoutingOn { get; set; }
-
-        /// <summary>
-        /// Sets Priority Routing Off and provides feedback
-        /// </summary>
-        public uint PriorityRoutingOff { get; set; }
-
-        /// <summary>
-        /// Enables OSD and provides feedback
-        /// </summary>
-        public uint InputOnScreenDisplayEnabled { get; set; }
-
-        /// <summary>
-        /// Disables OSD and provides feedback
-        /// </summary>
-        public uint InputOnScreenDisplayDisabled { get; set; }
-
-        /// <summary>
-        /// Provides Video Sync Detected feedback for each input
-        /// </summary>
-        public uint SyncDetected { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Sets the video source for the receiver's HDMI out and provides feedback
-        /// </summary>
-        public uint VideoSource { get; set; }
-
-        /// <summary>
-        /// Indicates the number of sources supported by the Tx/Rx pair
-        /// </summary>
-        public uint SourceCount { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Indicates the name of each input port
-        /// </summary>
-        public uint SourceNames { get; set; }
-        #endregion
-
-        public HdMdxxxCEControllerJoinMap()
-        {
-            //Digital
-            IsOnline = 1;
-            RemoteEndDetected = 2;
-            AutoRouteOn = 3;
-            AutoRouteOff = 4;
-            PriorityRoutingOn = 5;
-            PriorityRoutingOff = 6;
-            InputOnScreenDisplayEnabled = 7;
-            InputOnScreenDisplayDisabled = 8;
-            SyncDetected = 10; // 11-15
-
-            //Analog
-            VideoSource = 1;
-            SourceCount = 2;
-
-            //Serials
-            SourceNames = 10; // 11-15
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            RemoteEndDetected = RemoteEndDetected + joinOffset;
-            AutoRouteOn = AutoRouteOn + joinOffset;
-            AutoRouteOff = AutoRouteOff + joinOffset;
-            PriorityRoutingOn = PriorityRoutingOn + joinOffset;
-            PriorityRoutingOff = PriorityRoutingOff + joinOffset;
-            InputOnScreenDisplayEnabled = InputOnScreenDisplayEnabled + joinOffset;
-            InputOnScreenDisplayDisabled = InputOnScreenDisplayDisabled + joinOffset;
-            SyncDetected = SyncDetected + joinOffset;
-
-            VideoSource = VideoSource + joinOffset;
-            SourceCount = SourceCount + joinOffset;
-
-            SourceNames = SourceNames + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class IBasicCommunicationJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Set High to connect, Low to disconnect
-        /// </summary>
-        public uint Connect { get; set; }
-        /// <summary>
-        /// Reports Connected State (High = Connected)
-        /// </summary>
-        public uint Connected { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Reports the connections status value
-        /// </summary>
-        public uint Status { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Data back from port
-        /// </summary>
-        public uint TextReceived { get; set; }
-        /// <summary>
-        /// Sends data to the port
-        /// </summary>
-        public uint SendText { get; set; }
-        /// <summary>
-        /// Takes a JSON serialized string that sets a COM port's parameters
-        /// </summary>
-        public uint SetPortConfig { get; set; }
-        #endregion
-
-        public IBasicCommunicationJoinMap()
-        {
-            TextReceived = 1;
-            SendText = 1;
-            SetPortConfig = 2;
-            Connect = 1;
-            Connected = 1;
-            Status = 1;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            TextReceived = TextReceived + joinOffset;
-            SendText = SendText + joinOffset;
-            SetPortConfig = SetPortConfig + joinOffset;
-            Connect = Connect + joinOffset;
-            Connected = Connected + joinOffset;
-            Status = Status + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class IDigitalInputJoinMap : JoinMapBase
-    {
-        #region Digitals
-        /// <summary>
-        /// Reports the state of the digital input
-        /// </summary>
-        public uint InputState { get; set; }
-        #endregion
-
-        public IDigitalInputJoinMap()
-        {
-            InputState = 1;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            InputState = InputState + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs

@@ -1,213 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using Crestron.SimplSharp.Reflection;
-
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class SetTopBoxControllerJoinMap : JoinMapBase
-    {
-        #region Digitals
-        public uint DvrList { get; set; } //
-        public uint Replay { get; set; }
-        public uint Up { get; set; } //
-        public uint Down { get; set; } //
-        public uint Left { get; set; } //
-        public uint Right { get; set; } //
-        public uint Select { get; set; } //
-        public uint Menu { get; set; } //
-        public uint Exit { get; set; } //
-        public uint Digit0 { get; set; } //
-        public uint Digit1 { get; set; } // 
-        public uint Digit2 { get; set; } //
-        public uint Digit3 { get; set; } //
-        public uint Digit4 { get; set; } // 
-        public uint Digit5 { get; set; } //
-        public uint Digit6 { get; set; } //
-        public uint Digit7 { get; set; } //
-        public uint Digit8 { get; set; } //
-        public uint Digit9 { get; set; } //
-        public uint Dash { get; set; } //
-        public uint KeypadEnter { get; set; } //
-        public uint ChannelUp { get; set; } //
-        public uint ChannelDown { get; set; } //
-        public uint LastChannel { get; set; } //
-        public uint Guide { get; set; } //
-        public uint Info { get; set; } //
-        public uint Red { get; set; } //
-        public uint Green { get; set; } //
-        public uint Yellow { get; set; } //
-        public uint Blue { get; set; } //
-        public uint ChapMinus { get; set; }
-        public uint ChapPlus { get; set; }
-        public uint FFwd { get; set; } //
-        public uint Pause { get; set; } //
-        public uint Play { get; set; } //
-        public uint Record { get; set; }
-        public uint Rewind { get; set; } //
-        public uint Stop { get; set; } //
-
-        public uint PowerOn { get; set; } //
-        public uint PowerOff { get; set; } //
-        public uint PowerToggle { get; set; } //
-
-        public uint HasKeypadAccessoryButton1 { get; set; }
-        public uint HasKeypadAccessoryButton2 { get; set; }
-
-        public uint KeypadAccessoryButton1Press { get; set; }
-        public uint KeypadAccessoryButton2Press { get; set; }
-
-
-        public uint HasDvr { get; set; }
-        public uint HasPresets { get; set; }
-        public uint HasNumeric { get; set; }
-        public uint HasDpad { get; set; }
-
-
-        #endregion
-
-        #region Analogs
-
-        #endregion
-
-        #region Strings
-        public uint Name { get; set; }
-        public uint LoadPresets { get; set; }
-        public uint KeypadAccessoryButton1Label { get; set; }
-        public uint KeypadAccessoryButton2Label { get; set; }
-
-        #endregion
-
-        public SetTopBoxControllerJoinMap()
-        {
-            PowerOn = 1;
-            PowerOff = 2;
-            PowerToggle = 3;
-
-            HasDpad = 4;
-            Up = 4;
-            Down = 5;
-            Left = 6;
-            Right = 7;
-            Select = 8;
-            Menu = 9;
-            Exit = 10;
-
-            HasNumeric = 11;
-            Digit0 = 11;
-            Digit1 = 12;
-            Digit2 = 13;
-            Digit3 = 14;
-            Digit4 = 15;
-            Digit5 = 16;
-            Digit6 = 17;
-            Digit7 = 18;
-            Digit8 = 19;
-            Digit9 = 20;
-            Dash = 21;
-            KeypadEnter = 22;
-            ChannelUp = 23;
-            ChannelDown = 24;
-            LastChannel = 25;
-
-            Guide = 26;
-            Info = 27;
-            Red = 28;
-            Green = 29;
-            Yellow = 30;
-            Blue = 31;
-
-            HasDvr = 32;
-            DvrList = 32;
-            Play = 33;
-            Pause = 34;
-            Stop = 35;
-            FFwd = 36;
-            Rewind = 37;
-            ChapPlus = 38;
-            ChapMinus = 39;
-            Replay = 40;
-            Record = 41;
-            HasKeypadAccessoryButton1 = 42;
-            KeypadAccessoryButton1Press = 42;
-            HasKeypadAccessoryButton2 = 43;
-            KeypadAccessoryButton2Press = 43;
-
-            Name = 1;
-            KeypadAccessoryButton1Label = 42;
-            KeypadAccessoryButton2Label = 43;
-
-            LoadPresets = 50;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            PowerOn += joinOffset;
-            PowerOff += joinOffset;
-            PowerToggle += joinOffset;
-
-            HasDpad += joinOffset;
-            Up += joinOffset;
-            Down += joinOffset;
-            Left += joinOffset;
-            Right += joinOffset;
-            Select += joinOffset;
-            Menu += joinOffset;
-            Exit += joinOffset;
-
-            HasNumeric += joinOffset;
-            Digit0 += joinOffset;
-            Digit1 += joinOffset;
-            Digit2 += joinOffset;
-            Digit3 += joinOffset;
-            Digit4 += joinOffset;
-            Digit5 += joinOffset;
-            Digit6 += joinOffset;
-            Digit7 += joinOffset;
-            Digit8 += joinOffset;
-            Digit9 += joinOffset;
-            Dash += joinOffset;
-            KeypadEnter += joinOffset;
-            ChannelUp += joinOffset;
-            ChannelDown += joinOffset;
-            LastChannel += joinOffset;
-
-            Guide += joinOffset;
-            Info += joinOffset;
-            Red += joinOffset;
-            Green += joinOffset;
-            Yellow += joinOffset;
-            Blue += joinOffset;
-
-            HasDvr += joinOffset;
-            DvrList += joinOffset;
-            Play += joinOffset;
-            Pause += joinOffset;
-            Stop += joinOffset;
-            FFwd += joinOffset;
-            Rewind += joinOffset;
-            ChapPlus += joinOffset;
-            ChapMinus += joinOffset;
-            Replay += joinOffset;
-            Record += joinOffset;
-            HasKeypadAccessoryButton1 += joinOffset;
-            KeypadAccessoryButton1Press += joinOffset;
-            HasKeypadAccessoryButton2 += joinOffset;
-            KeypadAccessoryButton2Press += joinOffset;
-
-            Name += joinOffset;
-            KeypadAccessoryButton1Label += joinOffset;
-            KeypadAccessoryButton2Label += joinOffset;
-
-            LoadPresets += joinOffset;
-        }
-
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class StatusSignControllerJoinMap:JoinMapBase
-    {
-        public uint IsOnline { get; set; }
-        public uint Name { get; set; }
-        public uint RedLed { get; set; }
-        public uint GreenLed { get; set; }
-        public uint BlueLed { get; set; }
-        public uint RedControl { get; set; }
-        public uint GreenControl { get; set; }
-        public uint BlueControl { get; set; }
-
-        public StatusSignControllerJoinMap()
-        {
-            //digital
-            IsOnline = 1;
-            RedControl = 2;
-            GreenControl = 3;
-            BlueControl = 4;
-
-            //Analog
-            RedLed = 2;
-            GreenLed = 3;
-            BlueLed = 4;
-
-            //string 
-            Name = 1;
-
-
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-            var properties =
-                GetType().GetCType().GetProperties().Where(p => p.PropertyType == typeof (uint)).ToList();
-
-            foreach (var propertyInfo in properties)
-            {
-                propertyInfo.SetValue(this, (uint) propertyInfo.GetValue(this, null) + joinOffset, null);
-            }
-        }
-    }
-}

PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -1,227 +0,0 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
-    public class SystemMonitorJoinMap : JoinMapBase
-    {
-        /// <summary>
-        /// Offset to indicate where the range of iterated program joins will start
-        /// </summary>
-        public uint ProgramStartJoin { get; set; }
-
-        /// <summary>
-        /// Offset to indicate where the range of iterated Ethernet joins will start
-        /// </summary>
-        public uint EthernetStartJoin { get; set; }
-
-        /// <summary>
-        /// Offset between each program join set
-        /// </summary>
-        public uint ProgramOffsetJoin { get; set; }
-
-        /// <summary>
-        /// Offset between each Ethernet Interface join set
-        /// </summary>
-        public uint EthernetOffsetJoin { get; set; }
-
-        #region Digitals
-        /// <summary>
-        /// Range Sets and reports whether the corresponding program slot is started
-        /// </summary>
-        public uint ProgramStart { get; set; }
-        /// <summary>
-        /// Range Sets and reports whether the corresponding program slot is stopped
-        /// </summary>
-        public uint ProgramStop { get; set; }
-        /// <summary>
-        /// Range Sets and reports whether the corresponding program is registered
-        /// </summary>
-        public uint ProgramRegister { get; set; }
-        /// <summary>
-        /// Range Sets and reports whether the corresponding program is unregistered
-        /// </summary>
-        public uint ProgramUnregister { get; set; }
-        #endregion
-
-        #region Analogs
-        /// <summary>
-        /// Sets and reports the time zone
-        /// </summary>
-        public uint TimeZone { get; set; }
-        #endregion
-
-        #region Serials
-        /// <summary>
-        /// Reports the time zone name
-        /// </summary>
-        public uint TimeZoneName { get; set; }
-        /// <summary>
-        /// Reports the IO Controller Version
-        /// </summary>
-        public uint IOControllerVersion { get; set; }
-        /// <summary>
-        /// Reports the SNMP App Version
-        /// </summary>
-        public uint SnmpAppVersion { get; set; }
-        /// <summary>
-        /// Reports the BACnet App Version
-        /// </summary>
-        public uint BACnetAppVersion { get; set; }
-        /// <summary>
-        /// Reports the firmware version
-        /// </summary>
-        public uint ControllerVersion { get; set; }
-
-        /// <summary>
-        /// Reports the name of the corresponding program
-        /// </summary>
-        public uint ProgramName { get; set; }
-        /// <summary>
-        /// Reports the compile time of the corresponding program
-        /// </summary>
-        public uint ProgramCompiledTime { get; set; }
-        /// <summary>
-        /// Reports the Crestron Database version of the corresponding program
-        /// </summary>
-        public uint ProgramCrestronDatabaseVersion { get; set; }
-        /// <summary>
-        /// Reports the Environment Version of the corresponding program
-        /// </summary>
-        public uint ProgramEnvironmentVersion { get; set; }
-        /// <summary>
-        /// Serialized JSON output that aggregates the program info of the corresponding program
-        /// </summary>
-        public uint AggregatedProgramInfo { get; set; }
-        /// <summary>
-        /// Reports the controller serial number
-        /// </summary>
-        public uint SerialNumber { get; set; }
-        /// <summary>
-        /// Reports the controller model
-        /// </summary>
-        public uint Model { get; set; }
-        /// <summary>
-        /// Reports the Host name set on the corresponding interface
-        /// </summary>
-        public uint HostName { get; set; }
-        /// <summary>
-        /// Reports the Current IP address set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned address.
-        /// </summary>
-        public uint CurrentIpAddress { get; set; }
-        /// <summary>
-        /// Reporst the Current Default Gateway set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned gateway
-        /// </summary>
-        public uint CurrentDefaultGateway { get; set; }
-        /// <summary>
-        /// Reports the Current Subnet Mask set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned subnet mask
-        /// </summary>
-        public uint CurrentSubnetMask { get; set; }
-        /// <summary>
-        /// Reports the Static IP address set on the corresponding interface. If DHCP is disabled, this will match the Current IP address
-        /// </summary>
-        public uint StaticIpAddress { get; set; }
-        /// <summary>
-        /// Reporst the Static Default Gateway set on the corresponding interface. If DHCP is disabled, this will match the Current gateway
-        /// </summary>
-        public uint StaticDefaultGateway { get; set; }
-        /// <summary>
-        /// Reports the Current Subnet Mask set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned subnet mask
-        /// </summary>
-        public uint StaticSubnetMask { get; set; }
-        /// <summary>
-        /// Reports the current DomainFeedback on the corresponding interface
-        /// </summary>
-        public uint Domain { get; set; }
-        /// <summary>
-        /// Reports the current DNS Servers on the corresponding interface
-        /// </summary>
-        public uint DnsServer { get; set; }
-        /// <summary>
-        /// Reports the MAC Address of the corresponding interface
-        /// </summary>
-        public uint MacAddress { get; set; }
-        /// <summary>
-        /// Reports the DHCP Status of the corresponding interface
-        /// </summary>
-        public uint DhcpStatus { get; set; }
-
-        /// <summary>
-        /// Reports the current uptime. Updated in 5 minute intervals.
-        /// </summary>
-        public uint Uptime { get; set; }
-
-        /// <summary>
-        /// Reports the date of the last boot
-        /// </summary>
-        public uint LastBoot { get; set; }
-        #endregion
-
-        public SystemMonitorJoinMap()
-        {
-            TimeZone = 1;
-
-            TimeZoneName = 1;
-            IOControllerVersion = 2;
-            SnmpAppVersion = 3;
-            BACnetAppVersion = 4;
-            ControllerVersion = 5;
-            SerialNumber = 6;
-            Model = 7;
-            Uptime = 8;
-            LastBoot = 9;
-
-
-            ProgramStartJoin = 10;
-
-            ProgramOffsetJoin = 5;
-
-            // Offset in groups of 5 joins
-            ProgramStart = 1;
-            ProgramStop = 2;
-            ProgramRegister = 3;
-            ProgramUnregister = 4;
-
-            ProgramName = 1;
-            ProgramCompiledTime = 2;
-            ProgramCrestronDatabaseVersion = 3;
-            ProgramEnvironmentVersion = 4;
-            AggregatedProgramInfo = 5;
-
-            EthernetStartJoin = 75;
-
-            EthernetOffsetJoin = 15;
-
-            // Offset in groups of 15
-            HostName = 1;
-            CurrentIpAddress = 2;
-            CurrentSubnetMask = 3;
-            CurrentDefaultGateway = 4;
-            StaticIpAddress = 5;
-            StaticSubnetMask = 6;
-            StaticDefaultGateway = 7;
-            Domain = 8;
-            DnsServer = 9;
-            MacAddress = 10;
-            DhcpStatus = 11;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            TimeZone = TimeZone + joinOffset;
-
-            TimeZoneName = TimeZoneName + joinOffset;
-            IOControllerVersion = IOControllerVersion + joinOffset;
-            SnmpAppVersion = SnmpAppVersion + joinOffset;
-            BACnetAppVersion = BACnetAppVersion + joinOffset;
-            ControllerVersion = ControllerVersion + joinOffset;
-
-            // Sets the initial join value where the iterated program joins will begin
-            ProgramStartJoin = ProgramStartJoin + joinOffset;
-            EthernetStartJoin = EthernetStartJoin + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Bridges/StatusSignControllerBridge.cs

@@ -1,65 +0,0 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.CrestronIO;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public static class StatusSignDeviceApiExtensions
-    {
-        public static void LinkToApi(this StatusSignController ssDevice, BasicTriList trilist, uint joinStart,
-            string joinMapKey)
-        {
-            var joinMap = new StatusSignControllerJoinMap();
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<StatusSignControllerJoinMap>(joinMapSerialized);
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, ssDevice, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            trilist.SetBoolSigAction(joinMap.RedControl, b => EnableControl(trilist, joinMap, ssDevice));
-            trilist.SetBoolSigAction(joinMap.GreenControl, b => EnableControl(trilist, joinMap, ssDevice));
-            trilist.SetBoolSigAction(joinMap.BlueControl, b => EnableControl(trilist, joinMap, ssDevice));
-
-            trilist.SetUShortSigAction(joinMap.RedLed, u => SetColor(trilist, joinMap, ssDevice));
-            trilist.SetUShortSigAction(joinMap.GreenLed, u => SetColor(trilist, joinMap, ssDevice));
-            trilist.SetUShortSigAction(joinMap.BlueLed, u => SetColor(trilist, joinMap, ssDevice));
-
-            trilist.StringInput[joinMap.Name].StringValue = ssDevice.Name;
-
-            ssDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-            ssDevice.RedLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RedControl]);
-            ssDevice.BlueLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.BlueControl]);
-            ssDevice.GreenLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.GreenControl]);
-
-            ssDevice.RedLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.RedLed]);
-            ssDevice.BlueLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.BlueLed]);
-            ssDevice.GreenLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.GreenLed]);
-
-        }
-
-        private static void EnableControl(BasicTriList triList, StatusSignControllerJoinMap joinMap,
-            StatusSignController device)
-        {
-            var redEnable = triList.BooleanOutput[joinMap.RedControl].BoolValue;
-            var greenEnable = triList.BooleanOutput[joinMap.GreenControl].BoolValue;
-            var blueEnable = triList.BooleanOutput[joinMap.BlueControl].BoolValue;
-            device.EnableLedControl(redEnable, greenEnable, blueEnable);
-        }
-
-        private static void SetColor(BasicTriList triList, StatusSignControllerJoinMap joinMap,
-            StatusSignController device)
-        {
-            var redBrightness = triList.UShortOutput[joinMap.RedLed].UShortValue;
-            var greenBrightness = triList.UShortOutput[joinMap.GreenLed].UShortValue;
-            var blueBrightness = triList.UShortOutput[joinMap.BlueLed].UShortValue;
-
-            device.SetColor(redBrightness, greenBrightness, blueBrightness);
-        }
-    }
-}

PepperDashEssentials/Bridges/SystemMonitorBridge.cs

@@ -1,108 +0,0 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.Diagnostics;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Monitoring;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public static class SystemMonitorBridge
-    {
-        public static void LinkToApi(this SystemMonitorController systemMonitorController, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            var joinMap = new SystemMonitorJoinMap();
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if(!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<SystemMonitorJoinMap>(joinMapSerialized);
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-            Debug.Console(2, systemMonitorController, "Linking API starting at join: {0}", joinStart);
-
-            systemMonitorController.TimeZoneFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeZone]);
-            systemMonitorController.TimeZoneTextFeedback.LinkInputSig(trilist.StringInput[joinMap.TimeZoneName]);
-
-            systemMonitorController.IoControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
-            systemMonitorController.SnmpVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.SnmpAppVersion]);
-            systemMonitorController.BaCnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
-            systemMonitorController.ControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.ControllerVersion]);
-            systemMonitorController.SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumber]);
-            systemMonitorController.ModelFeedback.LinkInputSig(trilist.StringInput[joinMap.Model]);
-            systemMonitorController.UptimeFeedback.LinkInputSig(trilist.StringInput[joinMap.Uptime]);
-            systemMonitorController.LastStartFeedback.LinkInputSig(trilist.StringInput[joinMap.LastBoot]);
-
-            // iterate the program status feedback collection and map all the joins
-            LinkProgramInfoJoins(systemMonitorController, trilist, joinMap);
-
-            LinkEthernetInfoJoins(systemMonitorController, trilist, joinMap);
-        }
-
-        private static void LinkEthernetInfoJoins(SystemMonitorController systemMonitorController, BasicTriList trilist, SystemMonitorJoinMap joinMap)
-        {
-            var ethernetSlotJoinStart = joinMap.EthernetStartJoin;
-
-            foreach (var fb in systemMonitorController.EthernetStatusFeedbackCollection)
-            {
-                fb.Value.CurrentIpAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentIpAddress]);
-                fb.Value.CurrentSubnetMaskFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentSubnetMask]);
-                fb.Value.CurrentDefaultGatewayFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentDefaultGateway]);
-                fb.Value.StaticIpAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticIpAddress]);
-                fb.Value.StaticSubnetMaskFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticSubnetMask]);
-                fb.Value.StaticDefaultGatewayFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticDefaultGateway]);
-                fb.Value.HostNameFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.HostName]);
-                fb.Value.MacAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.MacAddress]);
-                fb.Value.DomainFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.Domain]);
-                fb.Value.DnsServerFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.DnsServer]);
-                fb.Value.DhcpStatusFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.DhcpStatus]);
-
-                ethernetSlotJoinStart += joinMap.EthernetOffsetJoin;
-            }
-        }
-
-        private static void LinkProgramInfoJoins(SystemMonitorController systemMonitorController, BasicTriList trilist,
-            SystemMonitorJoinMap joinMap)
-        {
-            var programSlotJoinStart = joinMap.ProgramStartJoin;
-
-            foreach (var p in systemMonitorController.ProgramStatusFeedbackCollection)
-            {
-                var programNumber = p.Value.Program.Number;
-
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart,
-                    b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start);
-                p.Value.ProgramStartedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStart]);
-
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStop,
-                    b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Stop);
-                p.Value.ProgramStoppedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStop]);
-
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramRegister,
-                    b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Register);
-                p.Value.ProgramRegisteredFeedback.LinkInputSig(
-                    trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramRegister]);
-
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramUnregister,
-                    b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister);
-                p.Value.ProgramUnregisteredFeedback.LinkInputSig(
-                    trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]);
-
-                p.Value.ProgramNameFeedback.LinkInputSig(trilist.StringInput[programSlotJoinStart + joinMap.ProgramName]);
-                p.Value.ProgramCompileTimeFeedback.LinkInputSig(
-                    trilist.StringInput[programSlotJoinStart + joinMap.ProgramCompiledTime]);
-                p.Value.CrestronDataBaseVersionFeedback.LinkInputSig(
-                    trilist.StringInput[programSlotJoinStart + joinMap.ProgramCrestronDatabaseVersion]);
-                p.Value.EnvironmentVersionFeedback.LinkInputSig(
-                    trilist.StringInput[programSlotJoinStart + joinMap.ProgramEnvironmentVersion]);
-                p.Value.AggregatedProgramInfoFeedback.LinkInputSig(
-                    trilist.StringInput[programSlotJoinStart + joinMap.AggregatedProgramInfo]);
-
-                programSlotJoinStart = programSlotJoinStart + joinMap.ProgramOffsetJoin;
-            }
-        }
-    }
-}

PepperDashEssentials/PepperDashEssentials.csproj

@@ -1,233 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1BED5BA9-88C4-4365-9362-6F4B128071D3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDashEssentials</RootNamespace>
-    <AssemblyName>PepperDashEssentials</AssemblyName>
-    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92230};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.0</OSVersion>
-    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <FormFactorID>
-    </FormFactorID>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
-    <Compile Include="Bridges\EiscBridge.cs" />
-    <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
-    <Compile Include="Bridges\BridgeFactory.cs" />
-    <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DigitalLoggerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DisplayControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GenericLightingJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GenericRelayControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\HdMdxxxCEControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
-    <Compile Include="Bridges\IBridge.cs" />
-    <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
-    <Compile Include="Factory\DeviceFactory.cs" />
-    <Compile Include="Devices\Amplifier.cs" />
-    <Compile Include="ControlSystem.cs" />
-    <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="Fusion\EssentialsTechRoomFusionSystemController.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\SimplRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
-    <Compile Include="Room\Config\EssentialsTechRoomConfig.cs" />
-    <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
-    <Compile Include="Room\Types\EssentialsCombinedHuddleVtc1Room.cs" />
-    <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
-    <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
-    <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
-    <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
-    <Compile Include="Room\Types\EssentialsTechRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleSpaceRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleVtc1Room.cs" />
-    <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
-    <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
-    <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />
-    <Compile Include="UIDrivers\Essentials\EssentialsHeaderDriver.cs" />
-    <Compile Include="UIDrivers\JoinedSigInterlock.cs" />
-    <Compile Include="UIDrivers\ScreenSaverController.cs" />
-    <Compile Include="UIDrivers\SigInterlock.cs" />
-    <Compile Include="UIDrivers\EssentialsHuddleVTC\EssentialsHuddlePresentationUiDriver.cs" />
-    <Compile Include="UIDrivers\EssentialsHuddle\EssentialsHuddleTechPageDriver.cs" />
-    <Compile Include="UI\HttpLogoServer.cs" />
-    <Compile Include="UI\SmartObjectHeaderButtonList.cs" />
-    <Compile Include="UI\SubpageReferenceListCallStagingItem.cs" />
-    <Compile Include="UIDrivers\VC\EssentialsVideoCodecUiDriver.cs" />
-    <Compile Include="UIDrivers\EssentialsHuddleVTC\EssentialsHuddleVtc1PanelAvFunctionsDriver.cs" />
-    <Compile Include="UIDrivers\SourceChangeArgs.cs" />
-    <Compile Include="UI\JoinConstants\UISmartObjectJoin.cs" />
-    <Compile Include="UI\JoinConstants\UIStringlJoin.cs" />
-    <Compile Include="UI\JoinConstants\UIUshortJoin.cs" />
-    <Compile Include="UIDrivers\DualDisplayRouting.cs" />
-    <Compile Include="UIDrivers\Essentials\EssentialsPresentationPanelAvFunctionsDriver.cs" />
-    <Compile Include="UIDrivers\Page Drivers\SingleSubpageModalDriver.cs" />
-    <Compile Include="UIDrivers\Essentials\EssentialsPanelMainInterfaceDriver.cs" />
-    <Compile Include="UIDrivers\enums and base.cs" />
-    <Compile Include="UIDrivers\EssentialsHuddle\EssentialsHuddlePanelAvFunctionsDriver.cs" />
-    <Compile Include="UIDrivers\Page Drivers\SingleSubpageModalAndBackDriver.cs" />
-    <Compile Include="UIDrivers\SmartObjectRoomsList.cs" />
-    <Compile Include="UI\JoinConstants\UIBoolJoin.cs" />
-    <Compile Include="UI\DualDisplaySourceSRLController.cs" />
-    <Compile Include="UI\SubpageReferenceListActivityItem.cs" />
-    <Compile Include="Room\Types\EssentialsHuddleSpaceRoom.cs" />
-    <Compile Include="UI\EssentialsTouchpanelController.cs" />
-    <Compile Include="UI\SubpageReferenceListSourceItem.cs" />
-    <None Include="app.config" />
-    <EmbeddedResource Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <None Include="Properties\ControlSystem.cfg" />
-    <EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-560.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-760.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
-      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
-      <Name>PepperDash_Essentials_Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj">
-      <Project>{892B761C-E479-44CE-BD74-243E9214AF13}</Project>
-      <Name>Essentials Devices Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\essentials-framework\Essentials DM\Essentials_DM\PepperDash_Essentials_DM.csproj">
-      <Project>{9199CE8A-0C9F-4952-8672-3EED798B284F}</Project>
-      <Name>PepperDash_Essentials_DM</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
-  </PropertyGroup>
-</Project>

PepperDashEssentials/PluginLoading/PluginLoading.cs

@@ -1,491 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Plugins;
-
-namespace PepperDash.Essentials
-{
-    /// <summary>
-    /// Deals with loading plugins at runtime
-    /// </summary>
-    public static class PluginLoader
-    {
-        /// <summary>
-        /// The complete list of loaded assemblies. Includes Essentials Framework assemblies and plugins
-        /// </summary>
-        public static List<LoadedAssembly> LoadedAssemblies { get; private set; }
-
-        /// <summary>
-        /// The list of assemblies loaded from the plugins folder
-        /// </summary>
-        static List<LoadedAssembly> LoadedPluginFolderAssemblies;
-
-        /// <summary>
-        /// The directory to look in for .cplz plugin packages
-        /// </summary>
-        static string _pluginDirectory = Global.FilePathPrefix + "plugins";
-
-        /// <summary>
-        /// The directory where plugins will be moved to and loaded from
-        /// </summary>
-        static string _loadedPluginsDirectoryPath = _pluginDirectory + Global.DirectorySeparator + "loadedAssemblies";
-
-        // The temp directory where .cplz archives will be unzipped to
-        static string _tempDirectory = _pluginDirectory + Global.DirectorySeparator + "temp";
-
-        static PluginLoader()
-        {
-            LoadedAssemblies = new List<LoadedAssembly>();
-            LoadedPluginFolderAssemblies = new List<LoadedAssembly>();
-        }
-
-        /// <summary>
-        /// Retrieves all the loaded assemblies from the program directory
-        /// </summary>
-        public static void AddProgramAssemblies()
-        {
-            Debug.Console(2, "Getting Assemblies loaded with Essentials");
-            // Get the loaded assembly filenames
-            var appDi = new DirectoryInfo(Global.ApplicationDirectoryPathPrefix);
-            var assemblyFiles = appDi.GetFiles("*.dll");
-
-            Debug.Console(2, "Found {0} Assemblies", assemblyFiles.Length);
-
-            foreach (var fi in assemblyFiles)
-            {
-                string version = string.Empty;
-                Assembly assembly = null;
-
-                switch (fi.Name)
-                {
-                    case ("PepperDashEssentials.dll"):
-                        {
-                            version = Global.AssemblyVersion;
-                            assembly = Assembly.GetExecutingAssembly();
-                            break;
-                        }
-                    case ("PepperDashEssentialsBase.dll"):
-                        {
-
-                            break;
-                        }
-                    case ("PepperDash_Core.dll"):
-                        {
-                            version = PepperDash.Core.Debug.PepperDashCoreVersion;
-                            break;
-                        }
-                }
-
-                LoadedAssemblies.Add(new LoadedAssembly(fi.Name, version, assembly));
-            }
-
-            if (Debug.Level > 1)
-            {
-                Debug.Console(2, "Loaded Assemblies:");
-
-                foreach (var assembly in LoadedAssemblies)
-                {
-                    Debug.Console(2, "Assembly: {0}", assembly.Name);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Loads an assembly via Reflection and adds it to the list of loaded assemblies
-        /// </summary>
-        /// <param name="fileName"></param>
-        static LoadedAssembly LoadAssembly(string filePath)
-        {
-                Debug.Console(2, "Attempting to load {0}", filePath);
-                var assembly = Assembly.LoadFrom(filePath);
-                if (assembly != null)
-                {
-                    var assyVersion = GetAssemblyVersion(assembly);
-
-                    var loadedAssembly = new LoadedAssembly(assembly.GetName().Name, assyVersion, assembly);
-                    LoadedAssemblies.Add(loadedAssembly);
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded assembly '{0}', version {1}", loadedAssembly.Name, loadedAssembly.Version);
-                    return loadedAssembly;
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to load assembly: '{0}'", filePath);
-                }
-
-            return null;
-
-        }
-
-        /// <summary>
-        /// Attempts to get the assembly informational version and if not possible gets the version
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        static string GetAssemblyVersion(Assembly assembly)
-        {
-            var ver = assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
-            if (ver != null && ver.Length > 0)
-            {
-                // Get the AssemblyInformationalVersion              
-                AssemblyInformationalVersionAttribute verAttribute = ver[0] as AssemblyInformationalVersionAttribute;
-                return verAttribute.InformationalVersion;
-            }
-            else
-            {
-                // Get the AssemblyVersion
-                var version = assembly.GetName().Version;
-                var verStr = string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
-                return verStr;
-            }
-        }
-
-        /// <summary>
-        /// Checks if the filename matches an already loaded assembly file's name
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <returns>True if file already matches loaded assembly file.</returns>
-        public static bool CheckIfAssemblyLoaded(string name)
-        {
-            Debug.Console(2, "Checking if assembly: {0} is loaded...", name);
-            var loadedAssembly = LoadedAssemblies.FirstOrDefault(s => s.Name.Equals(name));
-
-            if (loadedAssembly != null)
-            {
-                Debug.Console(2, "Assembly already loaded.");
-                return true;
-            }
-            else
-            {
-                Debug.Console(2, "Assembly not loaded.");
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Used by console command to report the currently loaded assemblies and versions
-        /// </summary>
-        /// <param name="command"></param>
-        public static void ReportAssemblyVersions(string command)
-        {
-            Debug.Console(0, "Loaded Assemblies:");
-            foreach (var assembly in LoadedAssemblies)
-            {
-                Debug.Console(0, "{0} Version: {1}", assembly.Name, assembly.Version);
-            }
-        }
-
-        /// <summary>
-        /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
-        /// </summary>
-        static void MoveDllAssemblies()
-        {
-            Debug.Console(0, "Looking for .dll assemblies from plugins folder...");
-
-            var pluginDi = new DirectoryInfo(_pluginDirectory);
-            var pluginFiles = pluginDi.GetFiles("*.dll");
-
-            if (pluginFiles.Length > 0)
-            {
-                if (!Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    Directory.CreateDirectory(_loadedPluginsDirectoryPath);
-                }
-            }
-
-            foreach (var pluginFile in pluginFiles)
-            {
-                try
-                {
-                    Debug.Console(0, "Found .dll: {0}", pluginFile.Name);
-
-                    if (!CheckIfAssemblyLoaded(pluginFile.Name))
-                    {
-                        string filePath = string.Empty;
-
-                        filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + pluginFile.Name;
-
-                        // Check if there is a previous file in the loadedPlugins directory and delete
-                        if (File.Exists(filePath))
-                        {
-                            Debug.Console(0, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath);
-                            File.Delete(filePath);
-                        }
-
-                        // Move the file
-                        File.Move(pluginFile.FullName, filePath);
-                        Debug.Console(2, "Moved {0} to {1}", pluginFile.FullName, filePath);
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Skipping assembly: {0}.  There is already an assembly with that name loaded.", pluginFile.FullName);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, "Error with plugin file {0} . Exception: {1}", pluginFile.FullName, e);
-                    continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                }
-            }
-
-            Debug.Console(0, "Done with .dll assemblies");
-        }
-
-        /// <summary>
-        /// Unzips each .cplz archive into the temp directory and moves any unloaded files into loadedPlugins
-        /// </summary>
-        static void UnzipAndMoveCplzArchives()
-        {
-            Debug.Console(0, "Looking for .cplz archives from plugins folder...");
-            var di = new DirectoryInfo(_pluginDirectory);
-            var zFiles = di.GetFiles("*.cplz");
-
-            if (zFiles.Length > 0)
-            {
-                if (!Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    Directory.CreateDirectory(_loadedPluginsDirectoryPath);
-                }
-            }
-
-            foreach (var zfi in zFiles)
-            {
-                Directory.CreateDirectory(_tempDirectory);
-                var tempDi = new DirectoryInfo(_tempDirectory);
-
-                Debug.Console(0, "Found cplz: {0}. Unzipping into temp plugins directory", zfi.Name);
-                var result = CrestronZIP.Unzip(zfi.FullName, tempDi.FullName);
-                Debug.Console(0, "UnZip Result: {0}", result.ToString());
-
-                var tempFiles = tempDi.GetFiles("*.dll");
-                foreach (var tempFile in tempFiles)
-                {
-                    try
-                    {
-                        if (!CheckIfAssemblyLoaded(tempFile.Name))
-                        {
-                            string filePath = string.Empty;
-
-                            filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + tempFile.Name;
-
-                            // Check if there is a previous file in the loadedPlugins directory and delete
-                            if (File.Exists(filePath))
-                            {
-                                Debug.Console(0, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath);
-                                File.Delete(filePath);
-                            }
-
-                            // Move the file
-                            File.Move(tempFile.FullName, filePath);
-                            Debug.Console(2, "Moved {0} to {1}", tempFile.FullName, filePath);
-                        }
-                        else
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Skipping assembly: {0}.  There is already an assembly with that name loaded.", tempFile.FullName);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(2, "Assembly {0} is not a custom assembly. Exception: {1}", tempFile.FullName, e);
-                        continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                    }  
-                }
-
-                // Delete the .cplz and the temp directory
-                Directory.Delete(_tempDirectory, true);
-                zfi.Delete();
-            }
-
-            Debug.Console(0, "Done with .cplz archives");
-        }
-
-        /// <summary>
-        /// Attempts to load the assemblies from the loadedPlugins folder
-        /// </summary>
-        static void LoadPluginAssemblies()
-        {
-            Debug.Console(0, "Loading assemblies from loadedPlugins folder...");
-            var pluginDi = new DirectoryInfo(_loadedPluginsDirectoryPath);
-            var pluginFiles = pluginDi.GetFiles("*.dll");
-
-            Debug.Console(2, "Found {0} plugin assemblies to load", pluginFiles.Length);
-
-            foreach (var pluginFile in pluginFiles)
-            {
-                var loadedAssembly = LoadAssembly(pluginFile.FullName);
-
-                LoadedPluginFolderAssemblies.Add(loadedAssembly);
-            }
-
-            Debug.Console(0, "All Plugins Loaded.");
-        }
-
-        /// <summary>
-        /// Iterate the loaded assemblies and try to call the LoadPlugin method
-        /// </summary>
-        static void LoadCustomPluginTypes()
-        {
-            Debug.Console(0, "Loading Custom Plugin Types...");
-            foreach (var loadedAssembly in LoadedPluginFolderAssemblies)
-            {
-                // iteratate this assembly's classes, looking for "LoadPlugin()" methods
-                try
-                {
-                    var assy = loadedAssembly.Assembly;
-                    var types = assy.GetTypes();
-                    foreach (var type in types)
-                    {
-                        try
-                        {
-                            if (typeof(IPluginDeviceFactory).IsAssignableFrom(type))
-                            {
-                                var plugin = (IPluginDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type); 
-                                LoadCustomPlugin(plugin, loadedAssembly);
-                            }
-                            else
-                            {
-                                var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
-                                var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
-                                if (loadPlugin != null)
-                                {
-                                    LoadCustomLegacyPlugin(type, loadPlugin, loadedAssembly);
-                                }
-                            }
-                      }
-                        catch (Exception e)
-                        {
-                            Debug.Console(2, "Load Plugin not found. {0} is not a plugin assembly. Exception: {1}", loadedAssembly.Name, e);
-                            continue;
-                        }
-
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, "Error Loading Assembly: {0} Exception: (1) ", loadedAssembly.Name, e);
-                    continue;
-                }
-            }
-            // plugin dll will be loaded.  Any classes in plugin should have a static constructor
-            // that registers that class with the Core.DeviceFactory
-            Debug.Console(0, "Done Loading Custom Plugin Types.");
-        }
-
-        /// <summary>
-        /// Loads a
-        /// </summary>
-        /// <param name="plugin"></param>
-        static void LoadCustomPlugin(IPluginDeviceFactory plugin, LoadedAssembly loadedAssembly)
-        {
-            var passed = Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
-
-            if (!passed)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", plugin.MinimumEssentialsFrameworkVersion);
-                return;
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", plugin.MinimumEssentialsFrameworkVersion);
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading plugin: {0}", loadedAssembly.Name);
-            plugin.LoadTypeFactories();
-        }
-
-        /// <summary>
-        /// Loads a a custom plugin via the legacy method
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="loadPlugin"></param>
-        static void LoadCustomLegacyPlugin(CType type, MethodInfo loadPlugin, LoadedAssembly loadedAssembly)
-        {
-            Debug.Console(2, "LoadPlugin method found in {0}", type.Name);
-
-            var fields = type.GetFields(BindingFlags.Public | BindingFlags.Static);
-
-            var minimumVersion = fields.FirstOrDefault(p => p.Name.Equals("MinimumEssentialsFrameworkVersion"));
-            if (minimumVersion != null)
-            {
-                Debug.Console(2, "MinimumEssentialsFrameworkVersion found");
-
-                var minimumVersionString = minimumVersion.GetValue(null) as string;
-
-                if (!string.IsNullOrEmpty(minimumVersionString))
-                {
-                    var passed = Global.IsRunningMinimumVersionOrHigher(minimumVersionString);
-
-                    if (!passed)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", minimumVersionString);
-                        return;
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", minimumVersionString);
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion found but not set.  Loading plugin, but your mileage may vary.");
-                }
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion not found.  Loading plugin, but your mileage may vary.");
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading legacy plugin: {0}", loadedAssembly.Name);
-            loadPlugin.Invoke(null, null);
-  
-        }
-
-         /// <summary>
-        /// Loads plugins
-        /// </summary>
-        public static void LoadPlugins()
-        {
-            if (Directory.Exists(_pluginDirectory))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for plugins");
-
-                // Deal with any .dll files
-                MoveDllAssemblies();
-
-                // Deal with any .cplz files
-                UnzipAndMoveCplzArchives();
-
-				if(Directory.Exists(_loadedPluginsDirectoryPath)) {
-					// Load the assemblies from the loadedPlugins folder into the AppDomain
-					LoadPluginAssemblies();
-
-					// Load the types from any custom plugin assemblies
-					LoadCustomPluginTypes();
-				}
-            }
-        }
-    }
-
-    /// <summary>
-    /// Represents an assembly loaded at runtime and it's associated metadata
-    /// </summary>
-    public class LoadedAssembly
-    {
-        public string Name { get; private set; }
-        public string Version { get; private set; }
-        public Assembly Assembly { get; private set; }
-
-        public LoadedAssembly(string name, string version, Assembly assembly)
-        {
-            Name = name;
-            Version = version;
-            Assembly = assembly;
-        }
-    }
-}

PepperDashEssentials/Properties/AssemblyInfo.cs

@@ -1,10 +0,0 @@
-using System.Reflection;
-using Crestron.SimplSharp.Reflection;
-
-[assembly: System.Reflection.AssemblyTitle("PepperDashEssentials")]
-[assembly: System.Reflection.AssemblyCompany("PepperDash Technology Corp")]
-[assembly: System.Reflection.AssemblyProduct("PepperDashEssentials")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright © PepperDash Technology Corp 2020")]
-[assembly: System.Reflection.AssemblyVersion("0.0.0.*")]
-[assembly: System.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")]
-[assembly: Crestron.SimplSharp.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")]

PepperDashEssentials/Properties/AssemblyInfo.cs.orig

@@ -1,12 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("PepperDashEssentials")]
-[assembly: AssemblyCompany("PepperDash Technology Corp")]
-[assembly: AssemblyProduct("PepperDashEssentials")]
-[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
-<<<<<<< HEAD
-[assembly: AssemblyVersion("1.1.8.*")]
-=======
-[assembly: AssemblyVersion("1.3.0.*")]
-
->>>>>>> feature/ecs-684

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs.orig

@@ -1,850 +0,0 @@
-<<<<<<< HEAD
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-
-namespace PepperDash.Essentials
-{
-	public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange
-	{
-		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
-
-        protected override Func<bool> OnFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    var val = CurrentSourceInfo != null
-                        && CurrentSourceInfo.Type == eSourceListItemType.Route
-                        && disp != null
-                        && disp.PowerIsOnFeedback.BoolValue;
-                    return val;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsWarmingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsWarmingUpFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsCoolingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsCoolingDownFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-
-		public EssentialsRoomPropertiesConfig Config { get; private set; }
-
-		public IRoutingSinkWithSwitching DefaultDisplay { get; private set; }
-		public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; }
-		public IBasicVolumeControls DefaultVolumeControls { get; private set; }
-
-		public bool ExcludeFromGlobalFunctions { get; set; }
-
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
-
-        public string DefaultSourceItem { get; set; }
-
-        public ushort DefaultVolume { get; set; }
-
-		/// <summary>
-		/// If room is off, enables power on to last source. Default true
-		/// </summary>
-		public bool EnablePowerOnToLastSource { get; set; }
-		string LastSourceKey;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public IBasicVolumeControls CurrentVolumeControls 
-		{
-			get { return _CurrentAudioDevice;  }
-			set
-			{
-				if (value == _CurrentAudioDevice) return;
-
-				var oldDev = _CurrentAudioDevice;
-				// derigister this room from the device, if it can
-				if (oldDev is IInUseTracking)
-					(oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
-				var handler = CurrentVolumeDeviceChange;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
-				_CurrentAudioDevice = value;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
-				// register this room with new device, if it can
-				if (_CurrentAudioDevice is IInUseTracking)
-					(_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
-			}
-		}
-		IBasicVolumeControls _CurrentAudioDevice;
-
-		/// <summary>
-		/// The SourceListItem last run - containing names and icons 
-		/// </summary>
-		public SourceListItem CurrentSourceInfo
-		{
-			get { return _CurrentSourceInfo; }
-			private set
-			{
-				if (value == _CurrentSourceInfo) return;
-
-				var handler = CurrentSingleSourceChange;
-				// remove from in-use tracker, if so equipped
-				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.WillChange);
-
-				_CurrentSourceInfo = value;
-
-				// add to in-use tracking
-				if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.DidChange);
-			}
-		}
-		SourceListItem _CurrentSourceInfo;
-
-        public string CurrentSourceInfoKey { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		public EssentialsHuddleSpaceRoom(string key, string name, IRoutingSinkWithSwitching defaultDisplay, 
-			IRoutingSinkNoSwitching defaultAudio, EssentialsRoomPropertiesConfig config)
-			: base(key, name)
-		{
-			Config = config;
-			DefaultDisplay = defaultDisplay;
-			DefaultAudioDevice = defaultAudio;
-			if (defaultAudio is IBasicVolumeControls)
-				DefaultVolumeControls = defaultAudio as IBasicVolumeControls;
-			else if (defaultAudio is IHasVolumeDevice)
-				DefaultVolumeControls = (defaultAudio as IHasVolumeDevice).VolumeDevice;
-            CurrentVolumeControls = DefaultVolumeControls;
-
-            var disp = DefaultDisplay as DisplayBase;
-            if (disp != null)
-            {
-                // Link power, warming, cooling to display
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
-                    {
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                        {
-                            if (!disp.PowerIsOnFeedback.BoolValue)
-                                CurrentSourceInfo = null;
-                            OnFeedback.FireUpdate();
-                        }
-                    };
-
-                disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
-                { 
-                    IsWarmingUpFeedback.FireUpdate();
-                    if (!IsWarmingUpFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-                disp.IsCoolingDownFeedback.OutputChange += (o, a) => 
-                {
-                    IsCoolingDownFeedback.FireUpdate(); 
-                    if (IsCoolingDownFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-            }
-          
-			SourceListKey = "default";
-			EnablePowerOnToLastSource = true;
-   		}
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void Shutdown()
-        {
-            RunRouteAction("roomOff");
-        }
-
-        /// <summary>
-        /// Routes the default source item, if any
-        /// </summary>
-        public void RunDefaultRoute()
-        {
-            if (DefaultSourceItem != null)
-                RunRouteAction(DefaultSourceItem);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-		public void RunRouteAction(string routeKey)
-		{
-			RunRouteAction(routeKey, null);
-		}   
-
-		/// <summary>
-		/// Gets a source from config list SourceListKey and dynamically build and executes the
-		/// route or commands
-		/// </summary>
-		/// <param name="name"></param>
-		public void RunRouteAction(string routeKey, Action successCallback)
-		{
-			// Run this on a separate thread
-			new CTimer(o =>
-				{
-					Debug.Console(1, this, "Run route action '{0}'", routeKey);
-					var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
-					if(dict == null)
-					{
-						Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
-						return;
-					}
-
-					// Try to get the list item by it's string key
-					if (!dict.ContainsKey(routeKey))
-					{
-						Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'", 
-							routeKey, SourceListKey);
-						return;
-					}
-
-					var item = dict[routeKey];
-                    //Debug.Console(2, this, "Action {0} has {1} steps",
-                    //    item.SourceKey, item.RouteList.Count);
-
-                    // End usage timer on last source
-                    if (!string.IsNullOrEmpty(LastSourceKey))
-                    {
-                        var lastSource = dict[LastSourceKey].SourceDevice;
-
-                        try
-                        {
-                            if (lastSource != null && lastSource is IUsageTracking)
-                                (lastSource as IUsageTracking).UsageTracker.EndDeviceUsage();
-                        }
-                        catch (Exception e)
-                        {
-                            Debug.Console(1, this, "*#* EXCEPTION in end usage tracking (257):\r{0}", e); 
-                        }
-                    }
-
-					// Let's run it
-                    if (routeKey.ToLower() != "roomoff")
-                    {
-                        LastSourceKey = routeKey;
-                    }
-                    else
-                    {
-                        CurrentSourceInfoKey = null;
-                    }
-
-					foreach (var route in item.RouteList)
-					{
-						// if there is a $defaultAll on route, run two separate
-						if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
-						{
-                            // Going to assume a single-path route for now
-							var tempVideo = new SourceRouteListItem
-							{
-								DestinationKey = "$defaultDisplay",
-								SourceKey = route.SourceKey,
-								Type = eRoutingSignalType.Video
-							};
-                            DoRoute(tempVideo);
-
-                            //var tempAudio = new SourceRouteListItem
-                            //{
-                            //    DestinationKey = "$defaultAudio",
-                            //    SourceKey = route.SourceKey,
-                            //    Type = eRoutingSignalType.Audio
-                            //};
-                            //DoRoute(tempAudio);
-                            //continue; -- not sure why this was here
-						}
-						else
-							DoRoute(route);
-					}
-
-                    // Start usage timer on routed source
-                    if (item.SourceDevice is IUsageTracking)
-                    {
-                        (item.SourceDevice as IUsageTracking).UsageTracker.StartDeviceUsage();
-                    }
-
-
-					// Set volume control on room, using default if non provided
-					IBasicVolumeControls volDev = null;
-					// Handle special cases for volume control
-					if (string.IsNullOrEmpty(item.VolumeControlKey) 
-						|| item.VolumeControlKey.Equals("$defaultAudio", StringComparison.OrdinalIgnoreCase))
-						volDev = DefaultVolumeControls;
-					else if (item.VolumeControlKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-						volDev = DefaultDisplay as IBasicVolumeControls;
-					// Or a specific device, probably rarely used.
-					else
-					{
-						var dev = DeviceManager.GetDeviceForKey(item.VolumeControlKey);
-						if (dev is IBasicVolumeControls)
-							volDev = dev as IBasicVolumeControls;
-						else if (dev is IHasVolumeDevice)
-							volDev = (dev as IHasVolumeDevice).VolumeDevice;
-					}
-					CurrentVolumeControls = volDev;
-
-					// store the name and UI info for routes
-                    if (item.SourceKey == "$off")
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = null;
-                    }
-                    else if (item.SourceKey != null)
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = item;
-                    }
-					// And finally, set the "control".  This will trigger event
-					//CurrentControlDevice = DeviceManager.GetDeviceForKey(item.SourceKey) as Device;
-
-					OnFeedback.FireUpdate();
-
-					// report back when done
-					if (successCallback != null)
-						successCallback();
-
-				}, 0); // end of CTimer
-		}
-
-		/// <summary>
-		/// Will power the room on with the last-used source
-		/// </summary>
-		public void PowerOnToDefaultOrLastSource()
-		{
-			if (!EnablePowerOnToLastSource || LastSourceKey == null)
-				return;
-			RunRouteAction(LastSourceKey);
-		}
-
-        /// <summary>
-        /// Does what it says
-        /// </summary>
-        public override void SetDefaultLevels()
-        {
-            Debug.Console(0, this, "SetDefaultLevels not implemented");
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="route"></param>
-		/// <returns></returns>
-		bool DoRoute(SourceRouteListItem route)
-		{
-			IRoutingSinkNoSwitching dest = null;
-
-			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-				dest = DefaultAudioDevice;
-			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-				dest = DefaultDisplay;
-			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
-
-			if (dest == null)
-			{
-				Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-				return false;
-			}
-
-			if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-			{
-				dest.ReleaseRoute();
-				if (dest is IPower)
-					(dest as IPower).PowerOff();
-			}
-			else
-			{
-				var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-				if (source == null)
-				{
-					Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-					return false;
-				}
-				dest.ReleaseAndMakeRoute(source, route.Type);
-			}
-			return true;
-=======
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-
-namespace PepperDash.Essentials
-{
-	public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange
-	{
-		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
-
-        protected override Func<bool> OnFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    var val = CurrentSourceInfo != null
-                        && CurrentSourceInfo.Type == eSourceListItemType.Route
-                        && disp != null
-                        && disp.PowerIsOnFeedback.BoolValue;
-                    return val;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsWarmingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsWarmingUpFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsCoolingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsCoolingDownFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-
-		public EssentialsRoomPropertiesConfig Config { get; private set; }
-
-		public IRoutingSinkWithSwitching DefaultDisplay { get; private set; }
-		public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; }
-		public IBasicVolumeControls DefaultVolumeControls { get; private set; }
-
-		public bool ExcludeFromGlobalFunctions { get; set; }
-
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
-
-        public string DefaultSourceItem { get; set; }
-
-        public ushort DefaultVolume { get; set; }
-
-		/// <summary>
-		/// If room is off, enables power on to last source. Default true
-		/// </summary>
-		public bool EnablePowerOnToLastSource { get; set; }
-		string LastSourceKey;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public IBasicVolumeControls CurrentVolumeControls 
-		{
-			get { return _CurrentAudioDevice;  }
-			set
-			{
-				if (value == _CurrentAudioDevice) return;
-
-				var oldDev = _CurrentAudioDevice;
-				// derigister this room from the device, if it can
-				if (oldDev is IInUseTracking)
-					(oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
-				var handler = CurrentVolumeDeviceChange;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
-				_CurrentAudioDevice = value;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
-				// register this room with new device, if it can
-				if (_CurrentAudioDevice is IInUseTracking)
-					(_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
-			}
-		}
-		IBasicVolumeControls _CurrentAudioDevice;
-
-		/// <summary>
-		/// The SourceListItem last run - containing names and icons 
-		/// </summary>
-		public SourceListItem CurrentSourceInfo
-		{
-			get { return _CurrentSourceInfo; }
-			private set
-			{
-				if (value == _CurrentSourceInfo) return;
-
-				var handler = CurrentSingleSourceChange;
-				// remove from in-use tracker, if so equipped
-				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.WillChange);
-
-				_CurrentSourceInfo = value;
-
-				// add to in-use tracking
-				if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.DidChange);
-			}
-		}
-		SourceListItem _CurrentSourceInfo;
-
-        public string CurrentSourceInfoKey { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		public EssentialsHuddleSpaceRoom(string key, string name, IRoutingSinkWithSwitching defaultDisplay, 
-			IRoutingSinkNoSwitching defaultAudio, EssentialsRoomPropertiesConfig config)
-			: base(key, name)
-		{
-			Config = config;
-			DefaultDisplay = defaultDisplay;
-			DefaultAudioDevice = defaultAudio;
-			if (defaultAudio is IBasicVolumeControls)
-				DefaultVolumeControls = defaultAudio as IBasicVolumeControls;
-			else if (defaultAudio is IHasVolumeDevice)
-				DefaultVolumeControls = (defaultAudio as IHasVolumeDevice).VolumeDevice;
-            CurrentVolumeControls = DefaultVolumeControls;
-
-            var disp = DefaultDisplay as DisplayBase;
-            if (disp != null)
-            {
-                // Link power, warming, cooling to display
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
-                    {
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                        {
-                            if (!disp.PowerIsOnFeedback.BoolValue)
-                                CurrentSourceInfo = null;
-                            OnFeedback.FireUpdate();
-                        }
-                    };
-
-                disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
-                { 
-                    IsWarmingUpFeedback.FireUpdate();
-                    if (!IsWarmingUpFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-                disp.IsCoolingDownFeedback.OutputChange += (o, a) => 
-                {
-                    IsCoolingDownFeedback.FireUpdate(); 
-                    if (IsCoolingDownFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-            }
-          
-			SourceListKey = "default";
-			EnablePowerOnToLastSource = true;
-   		}
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override void EndShutdown()
-        {
-            RunRouteAction("roomOff");
-        }
-
-        /// <summary>
-        /// Routes the default source item, if any
-        /// </summary>
-        public void RunDefaultRoute()
-        {
-            if (DefaultSourceItem != null)
-                RunRouteAction(DefaultSourceItem);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-		public void RunRouteAction(string routeKey)
-		{
-			RunRouteAction(routeKey, null);
-		}   
-
-		/// <summary>
-		/// Gets a source from config list SourceListKey and dynamically build and executes the
-		/// route or commands
-		/// </summary>
-		/// <param name="name"></param>
-		public void RunRouteAction(string routeKey, Action successCallback)
-		{
-			// Run this on a separate thread
-			new CTimer(o =>
-				{
-					Debug.Console(1, this, "Run route action '{0}'", routeKey);
-					var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
-					if(dict == null)
-					{
-						Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
-						return;
-					}
-
-					// Try to get the list item by it's string key
-					if (!dict.ContainsKey(routeKey))
-					{
-						Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'", 
-							routeKey, SourceListKey);
-						return;
-					}
-
-					var item = dict[routeKey];
-                    //Debug.Console(2, this, "Action {0} has {1} steps",
-                    //    item.SourceKey, item.RouteList.Count);
-
-                    // End usage timer on last source
-                    if (!string.IsNullOrEmpty(LastSourceKey))
-                    {
-                        var lastSource = dict[LastSourceKey].SourceDevice;
-
-                        try
-                        {
-                            if (lastSource != null && lastSource is IUsageTracking)
-                                (lastSource as IUsageTracking).UsageTracker.EndDeviceUsage();
-                        }
-                        catch (Exception e)
-                        {
-                            Debug.Console(1, this, "*#* EXCEPTION in end usage tracking (257):\r{0}", e); 
-                        }
-                    }
-
-					// Let's run it
-                    if (routeKey.ToLower() != "roomoff")
-                    {
-                        LastSourceKey = routeKey;
-                    }
-                    else
-                    {
-                        CurrentSourceInfoKey = null;
-                    }
-
-					foreach (var route in item.RouteList)
-					{
-						// if there is a $defaultAll on route, run two separate
-						if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
-						{
-                            // Going to assume a single-path route for now
-							var tempVideo = new SourceRouteListItem
-							{
-								DestinationKey = "$defaultDisplay",
-								SourceKey = route.SourceKey,
-								Type = eRoutingSignalType.Video
-							};
-                            DoRoute(tempVideo);
-
-                            //var tempAudio = new SourceRouteListItem
-                            //{
-                            //    DestinationKey = "$defaultAudio",
-                            //    SourceKey = route.SourceKey,
-                            //    Type = eRoutingSignalType.Audio
-                            //};
-                            //DoRoute(tempAudio);
-                            //continue; -- not sure why this was here
-						}
-						else
-							DoRoute(route);
-					}
-
-                    // Start usage timer on routed source
-                    if (item.SourceDevice is IUsageTracking)
-                    {
-                        (item.SourceDevice as IUsageTracking).UsageTracker.StartDeviceUsage();
-                    }
-
-
-					// Set volume control on room, using default if non provided
-					IBasicVolumeControls volDev = null;
-					// Handle special cases for volume control
-					if (string.IsNullOrEmpty(item.VolumeControlKey) 
-						|| item.VolumeControlKey.Equals("$defaultAudio", StringComparison.OrdinalIgnoreCase))
-						volDev = DefaultVolumeControls;
-					else if (item.VolumeControlKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-						volDev = DefaultDisplay as IBasicVolumeControls;
-					// Or a specific device, probably rarely used.
-					else
-					{
-						var dev = DeviceManager.GetDeviceForKey(item.VolumeControlKey);
-						if (dev is IBasicVolumeControls)
-							volDev = dev as IBasicVolumeControls;
-						else if (dev is IHasVolumeDevice)
-							volDev = (dev as IHasVolumeDevice).VolumeDevice;
-					}
-					CurrentVolumeControls = volDev;
-
-					// store the name and UI info for routes
-                    if (item.SourceKey == "$off")
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = null;
-                    }
-                    else if (item.SourceKey != null)
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = item;
-                    }
-					// And finally, set the "control".  This will trigger event
-					//CurrentControlDevice = DeviceManager.GetDeviceForKey(item.SourceKey) as Device;
-
-					OnFeedback.FireUpdate();
-
-					// report back when done
-					if (successCallback != null)
-						successCallback();
-
-				}, 0); // end of CTimer
-		}
-
-		/// <summary>
-		/// Will power the room on with the last-used source
-		/// </summary>
-		public void PowerOnToDefaultOrLastSource()
-		{
-			if (!EnablePowerOnToLastSource || LastSourceKey == null)
-				return;
-			RunRouteAction(LastSourceKey);
-		}
-
-        /// <summary>
-        /// Does what it says
-        /// </summary>
-        public override void SetDefaultLevels()
-        {
-            Debug.Console(0, this, "SetDefaultLevels not implemented");
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="route"></param>
-		/// <returns></returns>
-		bool DoRoute(SourceRouteListItem route)
-		{
-			IRoutingSinkNoSwitching dest = null;
-
-			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-				dest = DefaultAudioDevice;
-			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-				dest = DefaultDisplay;
-			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
-
-			if (dest == null)
-			{
-				Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-				return false;
-			}
-
-			if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-			{
-				dest.ReleaseRoute();
-				if (dest is IPower)
-					(dest as IPower).PowerOff();
-			}
-			else
-			{
-				var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-				if (source == null)
-				{
-					Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-					return false;
-				}
-				dest.ReleaseAndMakeRoute(source, route.Type);
-			}
-			return true;
->>>>>>> origin/feature/ecs-342
-		}
-
-        public override void RoomVacatedForTimeoutPeriod(object o)
-        {
-            //Implement this
-        }
-
-		/// <summary>
-		/// Runs "roomOff" action on all rooms not set to ExcludeFromGlobalFunctions
-		/// </summary>
-		public static void AllRoomsOff()
-		{
-			var allRooms = DeviceManager.AllDevices.Where(d => 
-				d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
-			foreach (var room in allRooms)
-				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
-		}
-	}
-}

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs.orig

@@ -1,967 +0,0 @@
-<<<<<<< HEAD
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-
-namespace PepperDash.Essentials
-{
-	public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange, IPrivacy
-	{
-		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
-
-
-        //************************
-        // Call-related stuff
-
-        public BoolFeedback InCallFeedback { get; private set; }
-
-        /// <summary>
-        /// Make this more specific
-        /// </summary>
-        public List<CodecActiveCallItem> ActiveCalls { get; private set; }
-
-        /// <summary>
-        /// States: 0 for on hook, 1 for video, 2 for audio, 3 for telekenesis
-        /// </summary>
-        public IntFeedback CallTypeFeedback { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public BoolFeedback PrivacyModeIsOnFeedback { get; private set; }
-
-        /// <summary>
-        /// When something in the room is sharing with the far end or through other means
-        /// </summary>
-        public BoolFeedback IsSharingFeedback { get; private set; }
-
-        //************************
-
-
-        protected override Func<bool> OnFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    var val = CurrentSourceInfo != null
-                        && CurrentSourceInfo.Type == eSourceListItemType.Route
-                        && disp != null
-                        && disp.PowerIsOnFeedback.BoolValue;
-                    return val;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsWarmingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsWarmingUpFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsCoolingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsCoolingDownFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-
-        public EssentialsHuddleVtc1PropertiesConfig Config { get; private set; }
-
-		public IRoutingSinkWithSwitching DefaultDisplay { get; private set; }
-		public IBasicVolumeControls DefaultAudioDevice { get; private set; }
-		public IBasicVolumeControls DefaultVolumeControls { get; private set; }
-
-        public VideoCodecBase VideoCodec { get; private set; }
-
-		public bool ExcludeFromGlobalFunctions { get; set; }
-
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
-        
-        public string DefaultSourceItem { get; set; }
-
-        public ushort DefaultVolume { get; set; }
-
-		/// <summary>
-		/// If room is off, enables power on to last source. Default true
-		/// </summary>
-		public bool EnablePowerOnToLastSource { get; set; }
-		string LastSourceKey;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public IBasicVolumeControls CurrentVolumeControls 
-		{
-			get { return _CurrentAudioDevice;  }
-			set
-			{
-				if (value == _CurrentAudioDevice) return;
-
-				var oldDev = _CurrentAudioDevice;
-				// derigister this room from the device, if it can
-				if (oldDev is IInUseTracking)
-					(oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
-				var handler = CurrentVolumeDeviceChange;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
-				_CurrentAudioDevice = value;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
-				// register this room with new device, if it can
-				if (_CurrentAudioDevice is IInUseTracking)
-					(_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
-			}
-		}
-		IBasicVolumeControls _CurrentAudioDevice;
-
-		/// <summary>
-		/// The SourceListItem last run - containing names and icons 
-		/// </summary>
-		public SourceListItem CurrentSourceInfo
-		{
-			get { return _CurrentSourceInfo; }
-			private set
-			{
-				if (value == _CurrentSourceInfo) return;
-
-				var handler = CurrentSingleSourceChange;
-				// remove from in-use tracker, if so equipped
-				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.WillChange);
-
-				_CurrentSourceInfo = value;
-
-				// add to in-use tracking
-				if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.DidChange);
-			}
-		}
-		SourceListItem _CurrentSourceInfo;
-
-        public string CurrentSourceInfoKey { get; private set; }
-
-        /// <summary>
-        /// "codecOsd"
-        /// </summary>
-        public string DefaultCodecRouteString { get { return "codecOsd"; } } 
-
-        /// <summary>
-        /// Temporary implementation. Returns the schedule-ready object or null if none. Fow now,
-        /// always returns the VideoCodec if it is capable
-        /// </summary>
-        public IHasScheduleAwareness ScheduleSource { get { return VideoCodec as IHasScheduleAwareness; } }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-        public EssentialsHuddleVtc1Room(string key, string name, IRoutingSinkWithSwitching defaultDisplay, 
-			IBasicVolumeControls defaultAudio, VideoCodecBase codec, EssentialsHuddleVtc1PropertiesConfig config)
-			: base(key, name)
-		{
-            if (codec == null)
-                throw new ArgumentNullException("codec cannot be null");
-			Config = config;
-			DefaultDisplay = defaultDisplay;
-            VideoCodec = codec;
-			DefaultAudioDevice = defaultAudio;
-
-			if (defaultAudio is IBasicVolumeControls)
-				DefaultVolumeControls = defaultAudio as IBasicVolumeControls;
-			else if (defaultAudio is IHasVolumeDevice)
-				DefaultVolumeControls = (defaultAudio as IHasVolumeDevice).VolumeDevice;
-            CurrentVolumeControls = DefaultVolumeControls;
-
-            var disp = DefaultDisplay as DisplayBase;
-            if (disp != null)
-            {
-                // Link power, warming, cooling to display
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
-                    {
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                        {
-                            if (!disp.PowerIsOnFeedback.BoolValue)
-                                CurrentSourceInfo = null;
-                            OnFeedback.FireUpdate();
-                        }
-                        if (disp.PowerIsOnFeedback.BoolValue)
-                        {
-                            SetDefaultLevels();
-                        }
-                    };
-
-                disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
-                { 
-                    IsWarmingUpFeedback.FireUpdate();
-                    if (!IsWarmingUpFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-                disp.IsCoolingDownFeedback.OutputChange += (o, a) => 
-                {
-                    IsCoolingDownFeedback.FireUpdate(); 
-                    if (IsCoolingDownFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-            }
-
-            InCallFeedback = new BoolFeedback(() => VideoCodec.IsInCall);
-            IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingSourceFeedback.StringValue != null); 
-
-            // link privacy to VC (for now?)
-            PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-            VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
-
-            CallTypeFeedback = new IntFeedback(() => 0);
-          
-			SourceListKey = "default";
-			EnablePowerOnToLastSource = true;
-   		}
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void Shutdown()
-        {
-            RunRouteAction("roomOff");
-            VideoCodec.EndAllCalls();
-        }
-
-        /// <summary>
-        /// Routes the default source item, if any. Returns true when default route exists
-        /// </summary>
-        public bool RunDefaultPresentRoute()
-        {
-            if (DefaultSourceItem != null)
-                RunRouteAction(DefaultSourceItem);
-            return DefaultSourceItem != null;
-        }
-
-        /// <summary>
-        /// Sets up the room when started into call mode without presenting a source
-        /// </summary>
-        /// <returns></returns>
-        public bool RunDefaultCallRoute()
-        {
-            RunRouteAction(DefaultCodecRouteString);
-            return true;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-		public void RunRouteAction(string routeKey)
-		{
-			RunRouteAction(routeKey, null);
-		}   
-
-		/// <summary>
-		/// Gets a source from config list SourceListKey and dynamically build and executes the
-		/// route or commands
-		/// </summary>
-		/// <param name="name"></param>
-        public void RunRouteAction(string routeKey, Action successCallback)
-        {
-            // Run this on a separate thread
-            new CTimer(o =>
-            {
-                try
-                {
-
-                    Debug.Console(1, this, "Run route action '{0}'", routeKey);
-                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
-                    if (dict == null)
-                    {
-                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
-                        return;
-                    }
-
-                    // Try to get the list item by it's string key
-                    if (!dict.ContainsKey(routeKey))
-                    {
-                        Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'",
-                            routeKey, SourceListKey);
-                        return;
-                    }
-
-                    // End usage timer on last source
-                    if (!string.IsNullOrEmpty(LastSourceKey))
-                    {
-                        var usageLastSource = dict[LastSourceKey].SourceDevice as IUsageTracking;
-                        if (usageLastSource != null && usageLastSource.UsageTracker != null)
-                        {
-                            try
-                            {
-                                // There MAY have been failures in here.  Protect
-                                usageLastSource.UsageTracker.EndDeviceUsage();
-                            }
-                            catch (Exception e)
-                            {
-                            }
-                        }
-                    }
-
-                    // Let's run it
-                    var item = dict[routeKey];
-                    if (routeKey.ToLower() != "roomoff")
-                    {
-             
-                        LastSourceKey = routeKey;
-                    }
-                    else
-                        CurrentSourceInfoKey = null;
-
-                    // hand off the individual routes to this helper
-                    foreach (var route in item.RouteList)
-                        DoRouteItem(route);
-
-                    // Start usage timer on routed source
-                    var usageNewSource = item.SourceDevice as IUsageTracking;
-                    if (usageNewSource != null && usageNewSource.UsageTracker != null) // Have to make sure there is a usage tracker!
-                    {
-                        (item.SourceDevice as IUsageTracking).UsageTracker.StartDeviceUsage();
-                    }
-
-                    // store the name and UI info for routes
-                    if (item.SourceKey == "$off")
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = null;
-                    }
-                    else if (item.SourceKey != null)
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = item;
-                    }
-
-                    OnFeedback.FireUpdate();
-
-                    // report back when done
-                    if (successCallback != null)
-                        successCallback();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, this, "ERROR in routing: {0}", e);
-                }
-
-            }, 0); // end of CTimer
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="route"></param>
-        void DoRouteItem(SourceRouteListItem route)
-        {
-            // if there is a $defaultAll on route, run two separate
-            if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
-            {
-                // Going to assume a single-path route for now
-                var tempVideo = new SourceRouteListItem
-                {
-                    DestinationKey = "$defaultDisplay",
-                    SourceKey = route.SourceKey,
-                    Type = eRoutingSignalType.Video
-                };
-                DoRoute(tempVideo);
-            }
-            else
-                DoRoute(route);
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="route"></param>
-		/// <returns></returns>
-		bool DoRoute(SourceRouteListItem route)
-		{
-			IRoutingSinkNoSwitching dest = null;
-
-			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
-			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-				dest = DefaultDisplay;
-			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
-
-			if (dest == null)
-			{
-				Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-				return false;
-			}
-
-			if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-			{
-				dest.ReleaseRoute();
-				if (dest is IPower)
-					(dest as IPower).PowerOff();
-			}
-			else
-			{
-				var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-				if (source == null)
-				{
-					Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-					return false;
-				}
-				dest.ReleaseAndMakeRoute(source, route.Type);
-			}
-			return true;
-=======
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-
-namespace PepperDash.Essentials
-{
-	public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange, IPrivacy
-	{
-		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
-
-
-        //************************
-        // Call-related stuff
-
-        public BoolFeedback InCallFeedback { get; private set; }
-
-        /// <summary>
-        /// Make this more specific
-        /// </summary>
-        public List<CodecActiveCallItem> ActiveCalls { get; private set; }
-
-        /// <summary>
-        /// States: 0 for on hook, 1 for video, 2 for audio, 3 for telekenesis
-        /// </summary>
-        public IntFeedback CallTypeFeedback { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public BoolFeedback PrivacyModeIsOnFeedback { get; private set; }
-
-        /// <summary>
-        /// When something in the room is sharing with the far end or through other means
-        /// </summary>
-        public BoolFeedback IsSharingFeedback { get; private set; }
-
-        //************************
-
-
-        protected override Func<bool> OnFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    var val = CurrentSourceInfo != null
-                        && CurrentSourceInfo.Type == eSourceListItemType.Route
-                        && disp != null
-                        && disp.PowerIsOnFeedback.BoolValue;
-                    return val;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsWarmingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsWarmingUpFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override Func<bool> IsCoolingFeedbackFunc
-        {
-            get
-            {
-                return () =>
-                {
-                    var disp = DefaultDisplay as DisplayBase;
-                    if (disp != null)
-                        return disp.IsCoolingDownFeedback.BoolValue;
-                    else
-                        return false;
-                };
-            }
-        }
-
-        public EssentialsHuddleVtc1PropertiesConfig Config { get; private set; }
-
-		public IRoutingSinkWithSwitching DefaultDisplay { get; private set; }
-		public IBasicVolumeControls DefaultAudioDevice { get; private set; }
-		public IBasicVolumeControls DefaultVolumeControls { get; private set; }
-
-        public VideoCodecBase VideoCodec { get; private set; }
-
-		public bool ExcludeFromGlobalFunctions { get; set; }
-
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
-        
-        public string DefaultSourceItem { get; set; }
-
-        public ushort DefaultVolume { get; set; }
-
-		/// <summary>
-		/// If room is off, enables power on to last source. Default true
-		/// </summary>
-		public bool EnablePowerOnToLastSource { get; set; }
-		string LastSourceKey;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public IBasicVolumeControls CurrentVolumeControls 
-		{
-			get { return _CurrentAudioDevice;  }
-			set
-			{
-				if (value == _CurrentAudioDevice) return;
-
-				var oldDev = _CurrentAudioDevice;
-				// derigister this room from the device, if it can
-				if (oldDev is IInUseTracking)
-					(oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
-				var handler = CurrentVolumeDeviceChange;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
-				_CurrentAudioDevice = value;
-				if (handler != null)
-					CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
-				// register this room with new device, if it can
-				if (_CurrentAudioDevice is IInUseTracking)
-					(_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
-			}
-		}
-		IBasicVolumeControls _CurrentAudioDevice;
-
-		/// <summary>
-		/// The SourceListItem last run - containing names and icons 
-		/// </summary>
-		public SourceListItem CurrentSourceInfo
-		{
-			get { return _CurrentSourceInfo; }
-			private set
-			{
-				if (value == _CurrentSourceInfo) return;
-
-				var handler = CurrentSingleSourceChange;
-				// remove from in-use tracker, if so equipped
-				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.WillChange);
-
-				_CurrentSourceInfo = value;
-
-				// add to in-use tracking
-				if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.DidChange);
-			}
-		}
-		SourceListItem _CurrentSourceInfo;
-
-        public string CurrentSourceInfoKey { get; private set; }
-
-        /// <summary>
-        /// "codecOsd"
-        /// </summary>
-        public string DefaultCodecRouteString { get { return "codecOsd"; } } 
-
-        /// <summary>
-        /// Temporary implementation. Returns the schedule-ready object or null if none. Fow now,
-        /// always returns the VideoCodec if it is capable
-        /// </summary>
-        public IHasScheduleAwareness ScheduleSource { get { return VideoCodec as IHasScheduleAwareness; } }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-        public EssentialsHuddleVtc1Room(string key, string name, IRoutingSinkWithSwitching defaultDisplay, 
-			IBasicVolumeControls defaultAudio, VideoCodecBase codec, EssentialsHuddleVtc1PropertiesConfig config)
-			: base(key, name)
-		{
-            if (codec == null)
-                throw new ArgumentNullException("codec cannot be null");
-			Config = config;
-			DefaultDisplay = defaultDisplay;
-            VideoCodec = codec;
-			DefaultAudioDevice = defaultAudio;
-
-			if (defaultAudio is IBasicVolumeControls)
-				DefaultVolumeControls = defaultAudio as IBasicVolumeControls;
-			else if (defaultAudio is IHasVolumeDevice)
-				DefaultVolumeControls = (defaultAudio as IHasVolumeDevice).VolumeDevice;
-            CurrentVolumeControls = DefaultVolumeControls;
-
-            var disp = DefaultDisplay as DisplayBase;
-            if (disp != null)
-            {
-                // Link power, warming, cooling to display
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
-                    {
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                        {
-                            if (!disp.PowerIsOnFeedback.BoolValue)
-                                CurrentSourceInfo = null;
-                            OnFeedback.FireUpdate();
-                        }
-                        if (disp.PowerIsOnFeedback.BoolValue)
-                        {
-                            SetDefaultLevels();
-                        }
-                    };
-
-                disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
-                { 
-                    IsWarmingUpFeedback.FireUpdate();
-                    if (!IsWarmingUpFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-                disp.IsCoolingDownFeedback.OutputChange += (o, a) => 
-                {
-                    IsCoolingDownFeedback.FireUpdate(); 
-                    if (IsCoolingDownFeedback.BoolValue)
-                        (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-            }
-
-            InCallFeedback = new BoolFeedback(() => VideoCodec.IsInCall);
-            IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingSourceFeedback.StringValue != null); 
-
-            // link privacy to VC (for now?)
-            PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-            VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
-
-            CallTypeFeedback = new IntFeedback(() => 0);
-          
-			SourceListKey = "default";
-			EnablePowerOnToLastSource = true;
-   		}
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        protected override void EndShutdown()
-        {
-            RunRouteAction("roomOff");
-            VideoCodec.EndAllCalls();
-        }
-
-        /// <summary>
-        /// Routes the default source item, if any. Returns true when default route exists
-        /// </summary>
-        public bool RunDefaultPresentRoute()
-        {
-            if (DefaultSourceItem != null)
-                RunRouteAction(DefaultSourceItem);
-            return DefaultSourceItem != null;
-        }
-
-        /// <summary>
-        /// Sets up the room when started into call mode without presenting a source
-        /// </summary>
-        /// <returns></returns>
-        public bool RunDefaultCallRoute()
-        {
-            RunRouteAction(DefaultCodecRouteString);
-            return true;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-		public void RunRouteAction(string routeKey)
-		{
-			RunRouteAction(routeKey, null);
-		}   
-
-		/// <summary>
-		/// Gets a source from config list SourceListKey and dynamically build and executes the
-		/// route or commands
-		/// </summary>
-		/// <param name="name"></param>
-        public void RunRouteAction(string routeKey, Action successCallback)
-        {
-            // Run this on a separate thread
-            new CTimer(o =>
-            {
-                try
-                {
-
-                    Debug.Console(1, this, "Run route action '{0}'", routeKey);
-                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
-                    if (dict == null)
-                    {
-                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
-                        return;
-                    }
-
-                    // Try to get the list item by it's string key
-                    if (!dict.ContainsKey(routeKey))
-                    {
-                        Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'",
-                            routeKey, SourceListKey);
-                        return;
-                    }
-
-                    // End usage timer on last source
-                    if (!string.IsNullOrEmpty(LastSourceKey))
-                    {
-                        var usageLastSource = dict[LastSourceKey].SourceDevice as IUsageTracking;
-                        if (usageLastSource != null && usageLastSource.UsageTracker != null)
-                        {
-                            try
-                            {
-                                // There MAY have been failures in here.  Protect
-                                usageLastSource.UsageTracker.EndDeviceUsage();
-                            }
-                            catch (Exception e)
-                            {
-                                Debug.Console(1, this, "*#* EXCEPTION in end usage tracking:\r{0}", e);
-                            }
-                        }
-                    }
-
-                    // Let's run it
-                    var item = dict[routeKey];
-                    if (routeKey.ToLower() != "roomoff")
-                    {
-             
-                        LastSourceKey = routeKey;
-                    }
-                    else
-                        CurrentSourceInfoKey = null;
-
-                    // hand off the individual routes to this helper
-                    foreach (var route in item.RouteList)
-                        DoRouteItem(route);
-
-                    // Start usage timer on routed source
-                    var usageNewSource = item.SourceDevice as IUsageTracking;
-                    if (usageNewSource != null && usageNewSource.UsageTracker != null) // Have to make sure there is a usage tracker!
-                    {
-                        (item.SourceDevice as IUsageTracking).UsageTracker.StartDeviceUsage();
-                    }
-
-                    // store the name and UI info for routes
-                    if (item.SourceKey == "$off")
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = null;
-                    }
-                    else if (item.SourceKey != null)
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = item;
-                    }
-
-                    OnFeedback.FireUpdate();
-
-                    // report back when done
-                    if (successCallback != null)
-                        successCallback();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, this, "ERROR in routing: {0}", e);
-                }
-
-            }, 0); // end of CTimer
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="route"></param>
-        void DoRouteItem(SourceRouteListItem route)
-        {
-            // if there is a $defaultAll on route, run two separate
-            if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
-            {
-                // Going to assume a single-path route for now
-                var tempVideo = new SourceRouteListItem
-                {
-                    DestinationKey = "$defaultDisplay",
-                    SourceKey = route.SourceKey,
-                    Type = eRoutingSignalType.Video
-                };
-                DoRoute(tempVideo);
-            }
-            else
-                DoRoute(route);
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="route"></param>
-		/// <returns></returns>
-		bool DoRoute(SourceRouteListItem route)
-		{
-			IRoutingSinkNoSwitching dest = null;
-
-			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
-			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-				dest = DefaultDisplay;
-			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
-
-			if (dest == null)
-			{
-				Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-				return false;
-			}
-
-			if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-			{
-				dest.ReleaseRoute();
-				if (dest is IPower)
-					(dest as IPower).PowerOff();
-			}
-			else
-			{
-				var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-				if (source == null)
-				{
-					Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-					return false;
-				}
-				dest.ReleaseAndMakeRoute(source, route.Type);
-			}
-			return true;
->>>>>>> origin/feature/ecs-342
-		}
-
-        public override void RoomVacatedForTimeoutPeriod(object o)
-        {
-            //Implement this
-        }
-        
-        /// <summary>
-        /// Does what it says
-        /// </summary>
-        public override void SetDefaultLevels()
-        {
-            Debug.Console(1, this, "Restoring default levels");
-            var vc = CurrentVolumeControls as IBasicVolumeWithFeedback;
-            if (vc != null)
-                vc.SetVolume(DefaultVolume);
-        }
-        /// <summary>
-        /// Will power the room on with the last-used source
-        /// </summary>
-        public void PowerOnToDefaultOrLastSource()
-        {
-            if (!EnablePowerOnToLastSource || LastSourceKey == null)
-                return;
-            RunRouteAction(LastSourceKey);
-        }
-
-		/// <summary>
-		/// Runs "roomOff" action on all rooms not set to ExcludeFromGlobalFunctions
-		/// </summary>
-		public static void AllRoomsOff()
-		{
-			var allRooms = DeviceManager.AllDevices.Where(d => 
-				d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
-			foreach (var room in allRooms)
-				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
-		}
-
-        #region IPrivacy Members
-
-
-        public void PrivacyModeOff()
-        {
-            VideoCodec.PrivacyModeOff();
-        }
-
-        public void PrivacyModeOn()
-        {
-            VideoCodec.PrivacyModeOn();
-        }
-
-        public void PrivacyModeToggle()
-        {
-            VideoCodec.PrivacyModeToggle();
-        }
-
-        #endregion
-    }
-}

PepperDashEssentials/UI - FILES ORPHANED-DELETE/CrestronTouchpanelPropertiesConfig.cs

@@ -1,33 +0,0 @@
-namespace PepperDash.Essentials
-{
-	public class CrestronTouchpanelPropertiesConfig
-	{
-		public string IpId { get; set; }
-		public string DefaultRoomKey { get; set; }
-		public string RoomListKey { get; set; }
-		public string SgdFile { get; set; }
-        public string ProjectName { get; set; }
-		public bool ShowVolumeGauge { get; set; }
-		public bool UsesSplashPage { get; set; }
-		public bool ShowDate { get; set; }
-		public bool ShowTime { get; set; }
-        public UiSetupPropertiesConfig Setup { get; set; }
-
-        /// <summary>
-        /// The count of sources that will trigger the "additional" arrows to show on the SRL.
-        /// Defaults to 5
-        /// </summary>
-        public int SourcesOverflowCount { get; set; }
-
-        public CrestronTouchpanelPropertiesConfig()
-        {
-            SourcesOverflowCount = 5;
-        }
-	}
-
-    public class UiSetupPropertiesConfig
-    {
-        public bool IsVisible { get; set; }
-    }
-
-}

PepperDashEssentials/UI - FILES ORPHANED-DELETE/EssentialsTouchpanelController.cs

@@ -1,221 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.PageManagers;
-
-namespace PepperDash.Essentials
-{
-	public class EssentialsTouchpanelController : Device
-	{
-		public BasicTriListWithSmartObject Panel { get; private set; }
-
-		public PanelDriverBase PanelDriver { get; private set; }
-
-		CTimer BacklightTransitionedOnTimer;
-
-		public EssentialsTouchpanelController(string key, string name, Tswx52ButtonVoiceControl tsw, 
-			string projectName, string sgdPath)
-			: base(key, name)
-		{
-			Panel = tsw;
-			tsw.LoadSmartObjects(sgdPath);
-			tsw.SigChange += new Crestron.SimplSharpPro.DeviceSupport.SigEventHandler(Tsw_SigChange);
-		}
-
-		/// <summary>
-		/// Config constructor
-		/// </summary>
-		public EssentialsTouchpanelController(string key, string name, string type, CrestronTouchpanelPropertiesConfig props, uint id)
-			: base(key, name)
-		{
-			AddPostActivationAction(() =>
-				{
-					Debug.Console(0, this, "post-activation linking");
-					type = type.ToLower();
-					try
-					{
-                        if (type == "crestronapp")
-                        {
-                            var app = new CrestronApp(id, Global.ControlSystem);
-                            app.ParameterProjectName.Value = props.ProjectName;
-                            Panel = app;
-                        }
-                        else if (type == "tsw560")
-                            Panel = new Tsw560(id, Global.ControlSystem);
-                        else if (type == "tsw752")
-                            Panel = new Tsw752(id, Global.ControlSystem);
-                        else if (type == "tsw1052")
-                            Panel = new Tsw1052(id, Global.ControlSystem);
-                        else
-                        {
-                            Debug.Console(0, this, "WARNING: Cannot create TSW controller with type '{0}'", type);
-                            return;
-                        }
-					}
-					catch (Exception e)
-					{
-						Debug.Console(0, this, "WARNING: Cannot create TSW base class. Panel will not function: {0}", e.Message);
-						return;				
-					}
-
-                    // Reserved sigs
-                    if (Panel is TswFt5ButtonSystem)
-                    {
-                        var tsw = Panel as TswFt5ButtonSystem;
-                        tsw.ExtenderSystemReservedSigs.Use();
-                        tsw.ExtenderSystemReservedSigs.DeviceExtenderSigChange
-                            += ExtenderSystemReservedSigs_DeviceExtenderSigChange;
-                    }
-
-                    new CTimer(o =>
-                        {
-                            var regSuccess = Panel.Register();
-                            if (regSuccess != eDeviceRegistrationUnRegistrationResponse.Success)
-                                Debug.Console(0, this, "WARNING: Registration failed. Continuing, but panel may not function: {0}", regSuccess);
-
-                            // Give up cleanly if SGD is not present.
-                            var sgdName = @"\NVRAM\Program" + InitialParametersClass.ApplicationNumber
-                                + @"\sgd\" + props.SgdFile;
-                            if (!File.Exists(sgdName))
-                            {
-                                Debug.Console(0, this, "WARNING: Smart object file '{0}' not present. Exiting TSW load", sgdName);
-                                return;
-                            }
-
-                            Panel.LoadSmartObjects(sgdName);
-                            Panel.SigChange += Tsw_SigChange;
-
-                            var mainDriver = new EssentialsPanelMainInterfaceDriver(Panel, props);
-                            // Then the AV driver
-
-                            // spin up different room drivers depending on room type
-                            var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
-                            if (room is EssentialsHuddleSpaceRoom)
-                            {
-                                Debug.Console(0, this, "Adding huddle space driver");
-                                var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
-                                avDriver.CurrentRoom = room as EssentialsHuddleSpaceRoom;
-                                avDriver.DefaultRoomKey = props.DefaultRoomKey;
-                                mainDriver.AvDriver = avDriver;
-                                LoadAndShowDriver(mainDriver);  // This is a little convoluted.
-
-                                if (Panel is TswFt5ButtonSystem)
-                                {
-                                    var tsw = Panel as TswFt5ButtonSystem;
-                                    // Wire up hard keys
-                                    tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                                    //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                                    tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                                    tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                                    tsw.ButtonStateChange += new ButtonEventHandler(Tsw_ButtonStateChange);
-                                }
-                            }
-                            else if (room is EssentialsPresentationRoom)
-                            {
-                                Debug.Console(0, this, "Adding presentation room driver");
-                                var avDriver = new EssentialsPresentationPanelAvFunctionsDriver(mainDriver, props);
-                                avDriver.CurrentRoom = room as EssentialsPresentationRoom;
-                                avDriver.DefaultRoomKey = props.DefaultRoomKey;
-                                mainDriver.AvDriver = avDriver;
-                                LoadAndShowDriver(mainDriver);
-                                
-                                if (Panel is TswFt5ButtonSystem)
-                                {
-                                    var tsw = Panel as TswFt5ButtonSystem;
-                                    // Wire up hard keys
-                                    tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                                    //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                                    tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                                    tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                                    tsw.ButtonStateChange += new ButtonEventHandler(Tsw_ButtonStateChange);
-                                }
-                            }
-                            else
-                            {
-                                Debug.Console(0, this, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", props.DefaultRoomKey);
-                            }
-                        }, 0);
-				});
-		}
-
-		public void LoadAndShowDriver(PanelDriverBase driver)
-		{
-			PanelDriver = driver;
-			driver.Show();
-		}
-
-		void HomePressed()
-		{
-			if (BacklightTransitionedOnTimer == null)
-				PanelDriver.BackButtonPressed();
-		}
-
-
-		void ExtenderSystemReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
-		{
-			// If the sig is transitioning on, mark it in case it was home button that transitioned it
-			var blOnSig = (Panel as TswFt5ButtonSystem).ExtenderSystemReservedSigs.BacklightOnFeedback;
-			if (args.Sig == blOnSig && blOnSig.BoolValue)
-			{
-				BacklightTransitionedOnTimer = new CTimer(o =>
-				{
-					BacklightTransitionedOnTimer = null;
-				}, 200);
-			}
-		}
-
-        public void PulseBool(uint join)
-        {
-            var act = Panel.BooleanInput[join].UserObject as Action<bool>;
-            if (act != null)
-            {
-                act(true);
-                act(false);
-            }
-        }
-
-        public void SetBoolSig(uint join, bool value)
-        {
-            var act = Panel.BooleanInput[join].UserObject as Action<bool>;
-            if (act != null)
-                act(value);
-        }
-
-        public void SetIntSig(uint join, ushort value)
-        {
-            var act = Panel.BooleanInput[join].UserObject as Action<ushort>;
-            if (act != null)
-            {
-                act(value);
-            }
-        }
-
-		void Tsw_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
-		{
-			if (Debug.Level == 2)
-				Debug.Console(2, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-			var uo = args.Sig.UserObject;
-			if (uo is Action<bool>)
-				(uo as Action<bool>)(args.Sig.BoolValue);
-			else if (uo is Action<ushort>)
-				(uo as Action<ushort>)(args.Sig.UShortValue);
-			else if (uo is Action<string>)
-				(uo as Action<string>)(args.Sig.StringValue);
-		}
-	
-		void Tsw_ButtonStateChange(GenericBase device, ButtonEventArgs args)
-		{
-			var uo = args.Button.UserObject;
-			if(uo is Action<bool>)
-				(uo as Action<bool>)(args.Button.State == eButtonState.Pressed);
-		}
-	}
-}

PepperDashEssentials/UI - FILES ORPHANED-DELETE/SubpageReferenceListSourceItem.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.UI;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials
-{
-    public class SubpageReferenceListSourceItem : SubpageReferenceListItem
-    {
-        public SourceListItem SourceItem { get; private set; }
-
-        public SubpageReferenceListSourceItem(uint index, SubpageReferenceList owner,
-            SourceListItem sourceItem, Action<bool> routeAction)
-            : base(index, owner)
-        {
-            SourceItem = sourceItem;
-            owner.GetBoolFeedbackSig(index, 1).UserObject = new Action<bool>(routeAction);
-            owner.StringInputSig(index, 1).StringValue = SourceItem.PreferredName;
-        }
-
-        public void RegisterForSourceChange(IHasCurrentSourceInfoChange room)
-        {
-            room.CurrentSingleSourceChange -= room_CurrentSourceInfoChange;
-            room.CurrentSingleSourceChange += room_CurrentSourceInfoChange;
-        }
-
-        void room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
-        {
-            if (type == ChangeType.WillChange && info == SourceItem)
-                ClearFeedback();
-            else if (type == ChangeType.DidChange && info == SourceItem)
-                SetFeedback();
-        }
-
-        /// <summary>
-        /// Called by SRL to release all referenced objects
-        /// </summary>
-        public override void Clear()
-        {
-            Owner.BoolInputSig(Index, 1).UserObject = null;
-            Owner.StringInputSig(Index, 1).StringValue = "";
-        }
-
-        /// <summary>
-        /// Sets the selected feedback on the button
-        /// </summary>
-        public void SetFeedback()
-        {
-            Owner.BoolInputSig(Index, 1).BoolValue = true;
-        }
-
-        /// <summary>
-        /// Clears the selected feedback on the button
-        /// </summary>
-        public void ClearFeedback()
-        {
-            Owner.BoolInputSig(Index, 1).BoolValue = false;
-        }
-    }
-}

PepperDashEssentials/UI/DualDisplaySourceSRLController.cs

@@ -1,28 +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 Crestron.SimplSharpPro.UI;
-
-//using PepperDash.Essentials.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class DualDisplaySourceSRLController : SubpageReferenceList
-//    {
-//        public DualDisplaySourceSRLController(BasicTriListWithSmartObject triList,
-//            uint smartObjectId, EssentialsPresentationRoom room)
-//            : base(triList, smartObjectId, 3, 3, 3)
-//        {
-//            var srcList = room.s items.Values.ToList().OrderBy(s => s.Order);
-//            foreach (var item in srcList)
-//            {
-//                GetBoolFeedbackSig(index, 1).UserObject = new Action<bool>(routeAction);
-
-//            }
-//        }
-//    }
-//}

PepperDashEssentials/UI/SubpageReferenceListActivityItem.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.UI;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials
-{
-    public class SubpageReferenceListActivityItem : SubpageReferenceListItem
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="owner"></param>
-        /// <param name="buttonMode">0=Share, 1=Phone Call, 2=Video Call, 3=End Meeting</param>
-        /// <param name="pressAction"></param>
-        public SubpageReferenceListActivityItem(uint index, SubpageReferenceList owner, 
-            ushort buttonMode, Action<bool> pressAction)
-            : base(index, owner)
-        {
-            Owner.GetBoolFeedbackSig(Index, 1).UserObject = pressAction;
-            Owner.UShortInputSig(Index, 1).UShortValue = buttonMode;
-        }
-
-        /// <summary>
-        /// Called by SRL to release all referenced objects
-        /// </summary>
-        public override void Clear()
-        {
-            Owner.BoolInputSig(Index, 1).UserObject = null;
-            Owner.UShortInputSig(Index, 1).UShortValue = 0;
-        }
-    }
-}

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs.orig

@@ -1,250 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-
-namespace PepperDash.Essentials.UIDrivers.VC
-{
-
-    /// <summary>
-    /// This fella will likely need to interact with the room's source, although that is routed via the spark...
-    /// Probably needs event or FB to feed AV driver - to show two-mute volume when appropriate.
-    /// 
-    /// </summary>
-    public class EssentialsVideoCodecUiDriver : PanelDriverBase
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        VideoCodecBase Codec;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        SmartObjectDynamicList DirectorySrl; // ***************** SRL ???
-
-
-        /// <summary>
-        /// To drive UI elements outside of this driver that may be dependent on this.
-        /// </summary>
-        BoolFeedback InCall;
-        BoolFeedback LocalPrivacyIsMuted;
-
-        /// <summary>
-        /// For the subpages above the bar
-        /// </summary>
-        JoinedSigInterlock VCControlsInterlock;
-
-        /// <summary>
-        /// For the different staging bars: Active, inactive
-        /// </summary>
-        JoinedSigInterlock StagingBarInterlock;
-
-        /// <summary>
-        /// For the staging button feedbacks
-        /// </summary>
-        JoinedSigInterlock StagingButtonFeedbackInterlock;
-
-        SmartObjectNumeric DialKeypad;
-
-        // These are likely temp until we get a keyboard built
-        StringFeedback DialStringFeedback;
-        StringBuilder DialStringBuilder = new StringBuilder();
-        BoolFeedback DialStringBackspaceVisibleFeedback;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="triList"></param>
-        /// <param name="codec"></param>
-        public EssentialsVideoCodecUiDriver(BasicTriListWithSmartObject triList, VideoCodecBase codec)
-            : base(triList)
-        {
-            Codec = codec;
-            SetupCallStagingPopover();
-            SetupDialKeypad();
-
-            InCall = new BoolFeedback(() => false);
-            LocalPrivacyIsMuted = new BoolFeedback(() => false);
-
-            //DirectorySrl = new SubpageReferenceList(triList, UISmartObjectJoin.VCDirectoryList, 3, 3, 3);
-
-            VCControlsInterlock = new JoinedSigInterlock(triList);
-            VCControlsInterlock.SetButDontShow(UIBoolJoin.VCDirectoryVisible);
-
-            StagingBarInterlock = new JoinedSigInterlock(triList);
-            StagingBarInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
-
-            StagingButtonFeedbackInterlock = new JoinedSigInterlock(triList);
-            StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCRecentsVisible);
-
-            DialStringFeedback = new StringFeedback(() => DialStringBuilder.ToString());
-            DialStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.KeyboardText]);
-
-            DialStringBackspaceVisibleFeedback = new BoolFeedback(() => DialStringBuilder.Length > 0);
-            DialStringBackspaceVisibleFeedback
-                .LinkInputSig(TriList.BooleanInput[UIBoolJoin.KeyboardClearVisible]);
-
-            Codec.ActiveCallCountFeedback.OutputChange += new EventHandler<EventArgs>(InCallFeedback_OutputChange);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void Show()
-        {
-            VCControlsInterlock.Show();
-            StagingBarInterlock.Show();
-            base.Show();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void Hide()
-        {
-            VCControlsInterlock.Hide();
-            StagingBarInterlock.Hide();
-            base.Hide();
-        }
-
-        /// <summary>
-        /// Builds the call stage
-        /// </summary>
-        void SetupCallStagingPopover()
-        {
-            TriList.SetSigFalseAction(UIBoolJoin.VCStagingDirectoryPress, ShowDirectory);
-            TriList.SetSigFalseAction(UIBoolJoin.VCStagingConnectPress, ConnectPress);
-            TriList.SetSigFalseAction(UIBoolJoin.VCStagingKeypadPress, ShowKeypad);
-            TriList.SetSigFalseAction(UIBoolJoin.VCStagingRecentsPress, ShowRecents);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void SetupDialKeypad()
-        {
-            if(TriList.SmartObjects.Contains(UISmartObjectJoin.VCDialKeypad))
-            {
-                DialKeypad = new SmartObjectNumeric(TriList.SmartObjects[UISmartObjectJoin.VCDialKeypad], true);
-                DialKeypad.Digit0.SetSigFalseAction(() => DialKeypadPress("0"));
-                DialKeypad.Digit1.SetSigFalseAction(() => DialKeypadPress("1"));
-                DialKeypad.Digit2.SetSigFalseAction(() => DialKeypadPress("2"));
-                DialKeypad.Digit3.SetSigFalseAction(() => DialKeypadPress("3"));
-                DialKeypad.Digit4.SetSigFalseAction(() => DialKeypadPress("4"));
-                DialKeypad.Digit5.SetSigFalseAction(() => DialKeypadPress("5"));
-                DialKeypad.Digit6.SetSigFalseAction(() => DialKeypadPress("6"));
-                DialKeypad.Digit7.SetSigFalseAction(() => DialKeypadPress("7"));
-                DialKeypad.Digit8.SetSigFalseAction(() => DialKeypadPress("8"));
-                DialKeypad.Digit9.SetSigFalseAction(() => DialKeypadPress("9"));
-                DialKeypad.Misc1SigName = "*";
-                DialKeypad.Misc1.SetSigFalseAction(() => DialKeypadPress("*"));
-                DialKeypad.Misc2SigName = "#";
-                DialKeypad.Misc2.SetSigFalseAction(() => DialKeypadPress("#"));
-                TriList.SetSigFalseAction(UIBoolJoin.KeyboardClearPress, DialKeypadBackspacePress);
-            }
-            else
-                Debug.Console(0, "Trilist {0:x2}, VC dial keypad object {1} not found. Check SGD file or VTP",
-                    TriList.ID, UISmartObjectJoin.VCDialKeypad);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void ShowCameraControls()
-        {
-            VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraVisible);
-            StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingCameraPress);
-        }
-
-        void ShowKeypad()
-        {
-            VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
-            StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
-        }
-
-        void ShowDirectory()
-        {
-            // populate directory
-            VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCDirectoryVisible);
-            StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingDirectoryPress);
-        }
-
-        void ShowRecents()
-        {
-            //populate recents
-            VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCDirectoryVisible);
-            StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingRecentsPress);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        void ConnectPress()
-        {
-            if (Codec.IsInCall)
-<<<<<<< HEAD
-                Codec.EndCall("end whatever is selected");
-=======
-                Codec.EndAllCalls();
->>>>>>> origin/feature/cisco-spark-2
-            else
-                Codec.Dial(DialStringBuilder.ToString());
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void InCallFeedback_OutputChange(object sender, EventArgs e)
-        {
-            var inCall = Codec.IsInCall;
-            Debug.Console(1, "*#* Codec Driver InCallFeedback change={0}", InCall);
-            TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(inCall ? 1 : 0);
-            StagingBarInterlock.ShowInterlocked(
-                inCall ? UIBoolJoin.VCStagingActivePopoverVisible : UIBoolJoin.VCStagingInactivePopoverVisible);
-
-            if (Codec.IsInCall) // Call is starting
-            {
-                // Header icon
-                // Volume bar needs to have mic mute
-            }
-            else // ending
-            {
-                // Header icon
-                // Volume bar no mic mute (or hidden if no source?)
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="i"></param>
-        void DialKeypadPress(string i)
-        {
-            DialStringBuilder.Append(i);
-            DialStringFeedback.FireUpdate();
-            TriList.BooleanInput[UIBoolJoin.KeyboardClearVisible].BoolValue = 
-                DialStringBuilder.Length > 0;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void DialKeypadBackspacePress()
-        {
-            DialStringBuilder.Remove(DialStringBuilder.Length - 1, 1);
-            DialStringFeedback.FireUpdate();
-            TriList.BooleanInput[UIBoolJoin.KeyboardClearVisible].BoolValue =
-                DialStringBuilder.Length > 0;
-            TriList.SetBool(UIBoolJoin.VCStagingConnectEnable, DialStringBuilder.Length > 0);
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", "PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

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

@@ -1,98 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteOn")]
-        public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteOff")]
-        public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteToggle")]
-        public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CurrentOutputResolution")]
-        public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidManufacturer")]
-        public JoinDataComplete EdidManufacturer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Manufacturer", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidName")]
-        public JoinDataComplete EdidName = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidPrefferedTiming")]
-        public JoinDataComplete EdidPrefferedTiming = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Preferred Timing", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidSerialNumber")]
-        public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("AudioVideoSource")]
-        public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port1HdcpState")]
-        public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port2HdcpState")]
-        public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdmiInputSync")]
-        public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("ScalerOutWallMode")]
-        public JoinDataComplete ScalerOutWallMode = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "Set Wall Mode for Scaler video Wall mode", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("ScalerOutWallModeRaw")]
-        public JoinDataComplete ScalerOutWallModeRaw = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
-            new JoinMetadata { Description = "Set Wall Mode for Scaler video Wall mode", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmRmcControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmRmcControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmRmcControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
-    }
-}

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

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

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

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/CenIoCom/CenIoComController.cs

@@ -1,85 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-	/// <summary>
-	/// Wrapper class for CEN-IO-COM-Xxx expander module
-	/// </summary>
-	[Description("Wrapper class for the CEN-IO-COM-102 & CEN-IO-COM-202 expander module")]
-	public class CenIoComController : CrestronGenericBaseDevice, IComPorts
-    {
-        private readonly CenIoCom _cenIoCom;
-
-        public CenIoComController(string key, string name, CenIoCom cenIo)
-			:base(key, name, cenIo)
-        {
-	        _cenIoCom = cenIo;
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _cenIoCom.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _cenIoCom.NumberOfComPorts; }
-        }
-
-        #endregion
-
-    }
-
-	public class CenIoCom102ControllerFactory : EssentialsDeviceFactory<CenIoComController>
-	{
-		private const string CenIoCom102Type = "ceniocom102";
-		private const string CenIoCom202Type = "ceniocom202";
-
-        public CenIoCom102ControllerFactory()
-        {
-			TypeNames = new List<string> { CenIoCom102Type, CenIoCom202Type };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new CEN-IO-COM-Xxx Device");
-
-	        var control = CommFactory.GetControlPropertiesConfig(dc);
-	        if (control == null)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, control properties not found");
-				return null;
-	        }
-
-	        var ipid = control.IpIdInt;
-	        if (ipid < 2)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid IP-ID found");
-				return null;
-	        }
-
-	        switch (dc.Type)
-	        {
-				case CenIoCom102Type:
-		        {
-					return new CenIoComController(dc.Key, dc.Name, new CenIoCom102(ipid, Global.ControlSystem));
-		        }
-				case CenIoCom202Type:
-		        {
-					return new CenIoComController(dc.Key, dc.Name, new CenIoCom202(ipid, Global.ControlSystem));
-		        }
-				default:
-		        {
-					Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid type '{0}'", dc.Type);
-					return null;
-		        }
-	        }
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Device Info/NetworkDeviceHelpers.cs

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/CodecInterfaces.cs.orig

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Requirements for a device that has dialing capabilities
-    /// </summary>
-    public interface IHasDialer
-    {
-        // Add requirements for Dialer functionality
-
-        void Dial(string number);
-<<<<<<< HEAD
-        void EndCall(string number);
-=======
-        void EndCall(object activeCall);
-        void EndAllCalls();
->>>>>>> origin/feature/cisco-spark-2
-        void AcceptCall();
-        void RejectCall();
-        void SendDtmf(string digit);
-
-        IntFeedback ActiveCallCountFeedback { get; }
-        BoolFeedback IncomingCallFeedback { get; }   
-    }
-
-    /// <summary>
-    /// Defines minimum volume controls for a codec device with dialing capabilities
-    /// </summary>
-    public interface ICodecAudio : IBasicVolumeWithFeedback, IPrivacy
-    {
-
-    }
-
-    /// <summary>
-    /// Adds control of codec receive volume
-    /// </summary>
-    public interface IReceiveVolume
-    {
-        // Break this out into 3 interfaces
-        void SetReceiveVolume(ushort level);
-        void ReceiveMuteOn();
-        void ReceiveMuteOff();
-        void ReceiveMuteToggle();
-        IntFeedback ReceiveLevelFeedback { get; }
-        BoolFeedback ReceiveMuteIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Adds control of codec transmit volume
-    /// </summary>
-    public interface ITransmitVolume
-    {
-        void SetTransmitVolume(ushort level);
-        void TransmitMuteOn();
-        void TransmitMuteOff();
-        void TransmitMuteToggle();
-        IntFeedback TransmitLevelFeedback { get; }
-        BoolFeedback TransmitMuteIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Adds control of codec privacy function (microphone mute)
-    /// </summary>
-    public interface IPrivacy
-    {
-        void PrivacyModeOn();
-        void PrivacyModeOff();
-        void PrivacyModeToggle();
-        BoolFeedback PrivacyModeIsOnFeedback { get; }
-    }
-
-    public interface IHasCallHistory
-    {
-        // Add recent calls list
-    }
-
-    public interface IHasDirectory
-    {
-
-    }
-
-    public interface IHasObtp
-    {
-
-        // Upcoming Meeting warning event
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs.orig

@@ -1,253 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-using Crestron.SimplSharpPro.UI;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public static class DeviceManager
-	{
-		//public static List<Device> Devices { get { return _Devices; } }
-		//static List<Device> _Devices = new List<Device>();
-
-		static Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Returns a copy of all the devices in a list
-		/// </summary>
-		public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }
-
-		public static void Initialize(CrestronControlSystem cs)
-		{
-			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s));
-			}, "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s));
-			}, "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s));
-			}, "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
-                "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
-		}
-
-		/// <summary>
-		/// Calls activate on all Device class items
-		/// </summary>
-		public static void ActivateAll()
-		{
-			foreach (var d in Devices.Values)
-<<<<<<< HEAD
-			{
-				try
-				{
-					if (d is Device)
-						(d as Device).Activate();
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, d, "ERROR: Device activation failure:\r{0}", e);
-				}
-			}
-=======
-			{
-                try
-                {
-                    if (d is Device)
-                        (d as Device).Activate();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(0, d, "ERROR: Device activation failure:\r{0}", e);
-                }
-            }
->>>>>>> origin/feature/ecs-342-neil
-		}
-
-		/// <summary>
-		/// Calls activate on all Device class items
-		/// </summary>
-		public static void DeactivateAll()
-		{
-			foreach (var d in Devices.Values)
-			{
-				if (d is Device)
-					(d as Device).Deactivate();
-			}
-		}
-
-		//static void ListMethods(string devKey)
-		//{
-		//    var dev = GetDeviceForKey(devKey);
-		//    if(dev != null)
-		//    {
-		//        var type = dev.GetType().GetCType();
-		//        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
-		//        var sb = new StringBuilder();
-		//        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
-		//        foreach (var m in methods)
-		//        {
-		//            sb.Append(string.Format("{0}(", m.Name));
-		//            var pars = m.GetParameters();
-		//            foreach (var p in pars)
-		//                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
-		//            sb.AppendLine(")");
-		//        }
-		//        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-		//    }
-		//}
-
-		static void ListDevices(string s)
-		{
-			Debug.Console(0, "{0} Devices registered with Device Mangager:",Devices.Count);
-			var sorted = Devices.Values.ToList();
-			sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
-
-			foreach (var d in sorted)
-			{
-				var name = d is IKeyName ? (d as IKeyName).Name : "---";
-				Debug.Console(0, "  [{0}] {1}", d.Key, name);
-			}
-		}
-
-		static void ListDeviceFeedbacks(string devKey)
-		{
-			var dev = GetDeviceForKey(devKey);
-			if(dev == null)
-			{
-				Debug.Console(0, "Device '{0}' not found", devKey);
-				return;
-			}
-			var statusDev = dev as IHasFeedback;
-			if(statusDev == null)
-			{
-				Debug.Console(0, "Device '{0}' does not have visible feedbacks", devKey);
-				return;
-			}
-			statusDev.DumpFeedbacksToConsole(true);
-		}
-
-        //static void ListDeviceCommands(string devKey)
-        //{
-        //    var dev = GetDeviceForKey(devKey);
-        //    if (dev == null)
-        //    {
-        //        Debug.Console(0, "Device '{0}' not found", devKey);
-        //        return;
-        //    }
-        //    Debug.Console(0, "This needs to be reworked.  Stay tuned.", devKey);
-        //}
-
-		static void ListDeviceCommStatuses(string input)
-		{
-			var sb = new StringBuilder();
-			foreach (var dev in Devices.Values)
-			{
-				if (dev is ICommunicationMonitor)
-					sb.Append(string.Format("{0}: {1}\r", dev.Key, (dev as ICommunicationMonitor).CommunicationMonitor.Status));
-			}
-			CrestronConsole.ConsoleCommandResponse(sb.ToString());
-		}
-
-
-        //static void DoDeviceCommand(string command)
-        //{
-        //    Debug.Console(0, "Not yet implemented.  Stay tuned");
-        //}
-
-		public static void AddDevice(IKeyed newDev)
-		{
-			// Check for device with same key
-			//var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
-			////// If it exists, remove or warn??
-			//if (existingDevice != null)
-			if(Devices.ContainsKey(newDev.Key))
-			{
-				Debug.Console(0, newDev, "WARNING: A device with this key already exists.  Not added to manager");
-				return;
-			}
-			Devices.Add(newDev.Key, newDev);
-			//if (!(_Devices.Contains(newDev)))
-			//    _Devices.Add(newDev);
-		}
-
-		public static void RemoveDevice(IKeyed newDev)
-		{
-			if(newDev == null)
-				return;
-			if (Devices.ContainsKey(newDev.Key))
-				Devices.Remove(newDev.Key);
-			//if (_Devices.Contains(newDev))
-			//    _Devices.Remove(newDev);
-			else
-				Debug.Console(0, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
-		}
-
-		public static IEnumerable<string> GetDeviceKeys()
-		{
-			//return _Devices.Select(d => d.Key).ToList();
-			return Devices.Keys;
-		}
-
-		public static IEnumerable<IKeyed> GetDevices()
-		{
-			//return _Devices.Select(d => d.Key).ToList();
-			return Devices.Values;
-		}
-
-		public static IKeyed GetDeviceForKey(string key)
-		{
-			//return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-			if (key != null && Devices.ContainsKey(key))
-				return Devices[key];
-
-			return null;
-		}
-
-        /// <summary>
-        /// Console handler that simulates com port data receive 
-        /// </summary>
-        /// <param name="s"></param>
-        public static void SimulateComReceiveOnDevice(string s)
-        {
-            // devcomsim:1 xyzabc
-            var match = Regex.Match(s, @"(\S*)\s*(.*)");
-            if (match.Groups.Count < 3)
-            {
-                CrestronConsole.ConsoleCommandResponse("  Format: devsimreceive:P <device key> <string to send>");
-                return;
-            }
-            //Debug.Console(2, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
-
-            ComPortController com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
-            if (com == null)
-            {
-                CrestronConsole.ConsoleCommandResponse("'{0}' is not a comm port device", match.Groups[1].Value);
-                return;
-            }
-            com.SimulateReceive(match.Groups[2].Value);
-        }
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks_BACKUP_3692.cs

@@ -1,135 +0,0 @@
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	public interface IHasFeedback : IKeyed
-	{
-		/// <summary>
-		/// This method shall return a list of all Output objects on a device,
-		/// including all "aggregate" devices.
-		/// </summary>
-		List<Feedback> Feedbacks { get; }
-
-	}
-
-
-	public static class IHasFeedbackExtensions
-	{
-		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-		{
-            CType t = source.GetType();
-            // get the properties and set them into a new collection of NameType wrappers
-            var props = t.GetProperties().Select(p => new PropertyNameType(p, t));
-
-
-
-			var feedbacks = source.Feedbacks.OrderBy(x => x.Type);
-			if (feedbacks != null)
-			{
-				Debug.Console(0, source, "\n\nAvailable feedbacks:");
-				foreach (var f in feedbacks)
-				{
-					string val = "";
-                    string type = "";
-					if (getCurrentStates)
-					{
-                        if (f is BoolFeedback)
-                        {
-                            val = f.BoolValue.ToString();
-                            type = "boolean";
-                        }
-                        else if (f is IntFeedback)
-                        {
-                            val = f.IntValue.ToString();
-                            type = "integer";
-                        }
-                        else if (f is StringFeedback)
-                        {
-                            val = f.StringValue;
-                            type = "string";
-                        }
-					}
-					Debug.Console(0, "{0,-12} {1, -25} {2}", type,
-						(string.IsNullOrEmpty(f.Cue.Name) ? "-no name-" : f.Cue.Name), val);
-				}
-			}
-			else
-				Debug.Console(0, source, "No available outputs:");
-		}
-	}
-=======
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	public interface IHasFeedback : IKeyed
-	{
-		/// <summary>
-		/// This method shall return a list of all Output objects on a device,
-		/// including all "aggregate" devices.
-		/// </summary>
-		List<Feedback> Feedbacks { get; }
-
-	}
-
-
-	public static class IHasFeedbackExtensions
-	{
-		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-		{
-			var feedbacks = source.Feedbacks.OrderBy(x => x.Type);
-			if (feedbacks != null)
-			{
-				Debug.Console(0, source, "\n\nAvailable feedbacks:");
-				foreach (var f in feedbacks)
-				{
-					string val = "";
-					if (getCurrentStates)
-					{
-                        if (f is BoolFeedback)
-                            val = " = " + f.BoolValue;
-                        else if(f is IntFeedback)
-                            val = " = " + f.IntValue;
-                        else if(f is StringFeedback)
-                            val = " = " + f.StringValue;
-
-                        //switch (f.Type)
-                        //{
-                        //    case eCueType.Bool:
-                        //        val = " = " + f.BoolValue;
-                        //        break;
-                        //    case eCueType.Int:
-                        //        val = " = " + f.IntValue;
-                        //        break;
-                        //    case eCueType.String:
-                        //        val = " = " + f.StringValue;
-                        //        break;
-                        //    //case eOutputType.Other:
-                        //    //    break;
-                        //}
-					}
-					Debug.Console(0, "{0,-8} {1}{2}", f.GetType(),
-						(string.IsNullOrEmpty(f.Cue.Name) ? "-none-" : f.Cue.Name), val);
-				}
-			}
-			else
-				Debug.Console(0, source, "No available outputs:");
-		}
-	}
-
-    public static class IHasFeedbackFusionExtensions
-    {
-
-    }
->>>>>>> origin/feature/ecs-307
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks_BASE_3692.cs

@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	public interface IHasFeedback : IKeyed
-	{
-		/// <summary>
-		/// This method shall return a list of all Output objects on a device,
-		/// including all "aggregate" devices.
-		/// </summary>
-		List<Feedback> Feedbacks { get; }
-
-	}
-
-
-	public static class IHasFeedbackExtensions
-	{
-		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-		{
-			var feedbacks = source.Feedbacks.OrderBy(x => x.Type);
-			if (feedbacks != null)
-			{
-				Debug.Console(0, source, "\n\nAvailable feedbacks:");
-				foreach (var f in feedbacks)
-				{
-					string val = "";
-					if (getCurrentStates)
-					{
-                        if (f is BoolFeedback)
-                            val = " = " + f.BoolValue;
-                        else if(f is IntFeedback)
-                            val = " = " + f.IntValue;
-                        else if(f is StringFeedback)
-                            val = " = " + f.StringValue;
-
-                        //switch (f.Type)
-                        //{
-                        //    case eCueType.Bool:
-                        //        val = " = " + f.BoolValue;
-                        //        break;
-                        //    case eCueType.Int:
-                        //        val = " = " + f.IntValue;
-                        //        break;
-                        //    case eCueType.String:
-                        //        val = " = " + f.StringValue;
-                        //        break;
-                        //    //case eOutputType.Other:
-                        //    //    break;
-                        //}
-					}
-					Debug.Console(0, "{0,-8} {1}{2}", f.GetType(),
-						(string.IsNullOrEmpty(f.Cue.Name) ? "-none-" : f.Cue.Name), val);
-				}
-			}
-			else
-				Debug.Console(0, source, "No available outputs:");
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks_LOCAL_3692.cs

@@ -1,65 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	public interface IHasFeedback : IKeyed
-	{
-		/// <summary>
-		/// This method shall return a list of all Output objects on a device,
-		/// including all "aggregate" devices.
-		/// </summary>
-		List<Feedback> Feedbacks { get; }
-
-	}
-
-
-	public static class IHasFeedbackExtensions
-	{
-		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-		{
-            CType t = source.GetType();
-            // get the properties and set them into a new collection of NameType wrappers
-            var props = t.GetProperties().Select(p => new PropertyNameType(p, t));
-
-
-
-			var feedbacks = source.Feedbacks.OrderBy(x => x.Type);
-			if (feedbacks != null)
-			{
-				Debug.Console(0, source, "\n\nAvailable feedbacks:");
-				foreach (var f in feedbacks)
-				{
-					string val = "";
-                    string type = "";
-					if (getCurrentStates)
-					{
-                        if (f is BoolFeedback)
-                        {
-                            val = f.BoolValue.ToString();
-                            type = "boolean";
-                        }
-                        else if (f is IntFeedback)
-                        {
-                            val = f.IntValue.ToString();
-                            type = "integer";
-                        }
-                        else if (f is StringFeedback)
-                        {
-                            val = f.StringValue;
-                            type = "string";
-                        }
-					}
-					Debug.Console(0, "{0,-12} {1, -25} {2}", type,
-						(string.IsNullOrEmpty(f.Cue.Name) ? "-no name-" : f.Cue.Name), val);
-				}
-			}
-			else
-				Debug.Console(0, source, "No available outputs:");
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks_REMOTE_3692.cs

@@ -1,68 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	public interface IHasFeedback : IKeyed
-	{
-		/// <summary>
-		/// This method shall return a list of all Output objects on a device,
-		/// including all "aggregate" devices.
-		/// </summary>
-		List<Feedback> Feedbacks { get; }
-
-	}
-
-
-	public static class IHasFeedbackExtensions
-	{
-		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-		{
-			var feedbacks = source.Feedbacks.OrderBy(x => x.Type);
-			if (feedbacks != null)
-			{
-				Debug.Console(0, source, "\n\nAvailable feedbacks:");
-				foreach (var f in feedbacks)
-				{
-					string val = "";
-					if (getCurrentStates)
-					{
-                        if (f is BoolFeedback)
-                            val = " = " + f.BoolValue;
-                        else if(f is IntFeedback)
-                            val = " = " + f.IntValue;
-                        else if(f is StringFeedback)
-                            val = " = " + f.StringValue;
-
-                        //switch (f.Type)
-                        //{
-                        //    case eCueType.Bool:
-                        //        val = " = " + f.BoolValue;
-                        //        break;
-                        //    case eCueType.Int:
-                        //        val = " = " + f.IntValue;
-                        //        break;
-                        //    case eCueType.String:
-                        //        val = " = " + f.StringValue;
-                        //        break;
-                        //    //case eOutputType.Other:
-                        //    //    break;
-                        //}
-					}
-					Debug.Console(0, "{0,-8} {1}{2}", f.GetType(),
-						(string.IsNullOrEmpty(f.Cue.Name) ? "-none-" : f.Cue.Name), val);
-				}
-			}
-			else
-				Debug.Console(0, source, "No available outputs:");
-		}
-	}
-
-    public static class IHasFeedbackFusionExtensions
-    {
-
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IUsageTracking.cs.orig

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IUsageTracking
-    {
-        UsageTracking UsageTracker { get; set; }
-    }
-
-    //public static class IUsageTrackingExtensions
-    //{
-    //    public static void EnableUsageTracker(this IUsageTracking device)
-    //    {
-    //        device.UsageTracker = new UsageTracking();
-    //    }
-    //}
-
-    public class UsageTracking
-    {
-        public event EventHandler<DeviceUsageEventArgs> DeviceUsageEnded;
-
-        public InUseTracking InUseTracker { get; protected set; }
-
-        public bool UsageIsTracked { get; set; }
-        public DateTime UsageStartTime { get; protected set; }
-        public DateTime UsageEndTime { get; protected set; }
-
-        public Device Parent { get; private set; }
-
-        public UsageTracking(Device parent)
-        {
-            Parent = parent;
-   
-            InUseTracker = new InUseTracking();
-
-            InUseTracker.InUseFeedback.OutputChange +=new EventHandler<EventArgs>(InUseFeedback_OutputChange);
-        }
-
-        void  InUseFeedback_OutputChange(object sender, EventArgs e)
-        {
- 	        if(InUseTracker.InUseFeedback.BoolValue)
-            {
-                StartDeviceUsage();
-            }
-            else
-            {
-                EndDeviceUsage();
-            }
-        }
-
-
-        /// <summary>
-        /// Stores the usage start time
-        /// </summary>
-        public void StartDeviceUsage()
-        {
-            UsageStartTime = DateTime.Now;
-        }
-
-        /// <summary>
-        /// Calculates the difference between the usage start and end times, gets the total minutes used and fires an event to pass that info to a consumer
-        /// </summary>
-        public void EndDeviceUsage()
-        {
-            try
-            {
-                UsageEndTime = DateTime.Now;
-
-                if (UsageStartTime != null)
-                {
-                    var timeUsed = UsageEndTime - UsageStartTime;
-
-                    var handler = DeviceUsageEnded;
-
-                    if (handler != null)
-                    {
-                        Debug.Console(1, "Device Usage Ended for: {0} at {1}.  In use for {2} minutes.", Parent.Name, UsageEndTime, timeUsed.Minutes);
-                        handler(this, new DeviceUsageEventArgs() { UsageEndTime = UsageEndTime, MinutesUsed = timeUsed.Minutes });
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-<<<<<<< HEAD
-                Debug.Console(1, "Device Usage Ended at {0}.  In use for {1} minutes.", UsageEndTime, timeUsed.Minutes);
-                handler(this, new DeviceUsageEventArgs() { UsageEndTime = UsageEndTime, MinutesUsed = timeUsed.Minutes });
-=======
-                Debug.Console(1, "Error ending device usage: {0}", e);
->>>>>>> origin/feature/fusion-nyu
-            }
-        }
-    }
-
-    public class DeviceUsageEventArgs : EventArgs
-    {
-        public DateTime UsageEndTime { get; set; }
-        public int MinutesUsed { get; set; }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/PowerInterfaces.cs

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/REMOVE IHasFeedbacks.cs

@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	//public interface IHasFeedback : IKeyed
-	//{
-	//    /// <summary>
-	//    /// This method shall return a list of all Output objects on a device,
-	//    /// including all "aggregate" devices.
-	//    /// </summary>
-	//    List<Feedback> Feedbacks { get; }
-
-	//}
-
-
-	//public static class IHasFeedbackExtensions
-	//{
-	//    public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-	//    {
-	//        var outputs = source.Feedbacks.OrderBy(x => x.Type);
-	//        if (outputs != null)
-	//        {
-	//            Debug.Console(0, source, "\n\nAvailable outputs:");
-	//            foreach (var o in outputs)
-	//            {
-	//                string val = "";
-	//                if (getCurrentStates)
-	//                {
-	//                    switch (o.Type)
-	//                    {
-	//                        case eCueType.Bool:
-	//                            val = " = " + o.BoolValue;
-	//                            break;
-	//                        case eCueType.Int:
-	//                            val = " = " + o.IntValue;
-	//                            break;
-	//                        case eCueType.String:
-	//                            val = " = " + o.StringValue;
-	//                            break;
-	//                        //case eOutputType.Other:
-	//                        //    break;
-	//                    }
-	//                }
-	//                Debug.Console(0, "{0,-8} {1,5} {2}{3}", o.Type, o.Cue.Number,
-	//                    (string.IsNullOrEmpty(o.Cue.Name) ? "-none-" : o.Cue.Name), val);
-	//            }
-	//        }
-	//        else
-	//            Debug.Console(0, source, "No available outputs:");
-	//    }
-	//}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Extensions/StringExtensions.cs

@@ -1,78 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    public static class StringExtensions
-    {
-        /// <summary>
-        /// Returns null if a string is empty, otherwise returns the string
-        /// </summary>
-        /// <param name="s">string input</param>
-        /// <returns>null if the string is emtpy, otherwise returns the string</returns>
-        public static string NullIfEmpty(this string s)
-        {
-            return string.IsNullOrEmpty(s) ? null : s;
-        }
-
-        /// <summary>
-        /// Returns null if a string is empty or made of only whitespace characters, otherwise returns the string
-        /// </summary>
-        /// <param name="s">string input</param>
-        /// <returns>null if the string is wempty or made of only whitespace characters, otherwise returns the string</returns>
-        public static string NullIfWhiteSpace(this string s)
-        {
-            return string.IsNullOrEmpty(s.Trim()) ? null : s;
-        }
-
-        /// <summary>
-        /// Returns a replacement string if the input string is empty or made of only whitespace characters, otherwise returns the input string
-        /// </summary>
-        /// <param name="s">input string</param>
-        /// <param name="newString">string to replace with if input string is empty or whitespace</param>
-        /// <returns>returns newString if s is null, emtpy, or made of whitespace characters, otherwise returns s</returns>
-        public static string ReplaceIfNullOrEmpty(this string s, string newString)
-        {
-            return string.IsNullOrEmpty(s) ? newString : s;
-        }
-
-        /// <summary>
-        /// Overload for Contains that allows setting an explicit String Comparison
-        /// </summary>
-        /// <param name="source">Source String</param>
-        /// <param name="toCheck">String to check in Source String</param>
-        /// <param name="comp">Comparison parameters</param>
-        /// <returns>true of string contains "toCheck"</returns>
-        public static bool Contains(this string source, string toCheck, StringComparison comp)
-        {
-            if (string.IsNullOrEmpty(source)) return false;
-            return source.IndexOf(toCheck, comp) >= 0;
-        }
-
-        /// <summary>
-        /// Performs TrimStart() and TrimEnd() on source string
-        /// </summary>
-        /// <param name="source">String to Trim</param>
-        /// <returns>Trimmed String</returns>
-        public static string TrimAll(this string source)
-        {
-            return string.IsNullOrEmpty(source) ? string.Empty : source.TrimStart().TrimEnd();
-        }
-
-        /// <summary>
-        /// Performs TrimStart(chars char[]) and TrimEnd(chars char[]) on source string.
-        /// </summary>
-        /// <param name="source">String to Trim</param>
-        /// <param name="chars">Char Array to trim from string</param>
-        /// <returns>Trimmed String</returns>
-        public static string TrimAll(this string source, char[] chars)
-        {
-            return string.IsNullOrEmpty(source) ? string.Empty : source.TrimStart(chars).TrimEnd(chars);
-        }
-
-    }
-}

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

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package >
-  <metadata>
-    <id>PepperDashEssentials</id>
-    <version>1.5.6</version>
-    <title>PepperDash Essentials</title>
-    <authors>PepperDash Technologies</authors>
-    <owners>pepperdash</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/PepperDash/PepperDashCore</projectUrl>
-    <copyright>Copyright 2020</copyright>
-    <description>PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs. Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.</description>
-    <tags>crestron 3series 4series</tags>
-    <repository type="git" url="https://github.com/PepperDash/Essentials"/>
-    <dependencies>
-      <dependency id="PepperDashCore" version="[1.0.45, 2.0.0)"/>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="**" target="lib\net35"/>
-    <file src="**" target="lib\net47"/>
-  </files>
-</package>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs

@@ -1,13 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Crestron.SimplSharp.Reflection;
-
-[assembly: System.Reflection.AssemblyTitle("PepperDashEssentialsBase")]
-[assembly: System.Reflection.AssemblyCompany("PepperDash Technology Corp")]
-[assembly: System.Reflection.AssemblyProduct("PepperDashEssentials")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright © PepperDash Technology Corp 2020")]
-[assembly: System.Reflection.AssemblyVersion("0.0.0.*")]
-[assembly: System.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")]
-[assembly: Crestron.SimplSharp.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")]
-[assembly: InternalsVisibleTo("Essentials Devices Common")]
-[assembly: InternalsVisibleTo("PepperDash_Essentials_DM")]

essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs

@@ -1,371 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Crestron.SimplSharpPro;
-using Newtonsoft.Json;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Touchpanels
-{
-	/// <summary>
-	/// A wrapper class for the touchpanel portion of an MPC3 class process to allow for configurable
-	/// behavior of the keybad buttons
-	/// </summary>
-	public class Mpc3TouchpanelController : Device
-	{
-		readonly MPC3Basic _touchpanel;
-
-		readonly Dictionary<string, KeypadButton> _buttons;
-
-		public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
-			: base(key, name)
-		{
-			_touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
-			if (_touchpanel == null)
-			{
-				Debug.Console(1, this, "Failed to construct MPC3 Touchpanel Controller with key {0}, check configuration", key);
-				return;
-			}
-
-			if (_touchpanel.Registerable)
-			{
-				var registrationResponse = _touchpanel.Register();
-				Debug.Console(0, this, "touchpanel registration response: {0}", registrationResponse);
-			}
-
-			_touchpanel.BaseEvent += _touchpanel_BaseEvent;
-			_touchpanel.ButtonStateChange += _touchpanel_ButtonStateChange;
-			_touchpanel.PanelStateChange += _touchpanel_PanelStateChange;
-
-			_buttons = buttons;
-			if (_buttons == null)
-			{
-				Debug.Console(1, this,
-					"Button properties are null, failed to setup MPC3 Touch Controller, check configuration");
-				return;
-			}
-
-			AddPostActivationAction(() =>
-			{
-				foreach (var button in _buttons)
-				{
-					var buttonKey = button.Key.ToLower();
-					var buttonConfig = button.Value;
-
-					InitializeButton(buttonKey, buttonConfig);
-					InitializeButtonFeedback(buttonKey, buttonConfig);
-				}
-
-				ListButtons();
-			});
-		}
-
-		/// <summary>
-		/// Enables/disables buttons based on event type configuration 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="config"></param>
-		public void InitializeButton(string key, KeypadButton config)
-		{
-			if (config == null)
-			{
-				Debug.Console(1, this, "Button '{0}' config is null, unable to initialize", key);
-				return;
-			}
-
-			int buttonNumber;
-			TryParseInt(key, out buttonNumber);
-
-			var buttonEventTypes = config.EventTypes;
-			BoolOutputSig enabledFb = null;
-			BoolOutputSig disabledFb = null;
-
-			switch (key)
-			{
-				case ("power"):
-					{
-						if (buttonEventTypes == null || buttonEventTypes.Keys == null)
-							_touchpanel.DisablePowerButton();
-						else
-							_touchpanel.EnablePowerButton();
-
-
-						enabledFb = _touchpanel.PowerButtonEnabledFeedBack;
-						disabledFb = _touchpanel.PowerButtonDisabledFeedBack;
-
-						break;
-					}
-				//case ("volumeup"):
-				//    {
-				//        break;
-				//    }
-				//case ("volumedown"):
-				//    {
-				//        break;
-				//    }
-				//case ("volumefeedback"):
-				//    {
-				//        break;
-				//    }
-				case ("mute"):
-					{
-						if (buttonEventTypes == null || buttonEventTypes.Keys == null)
-							_touchpanel.DisableMuteButton();
-						else
-							_touchpanel.EnableMuteButton();
-
-
-						enabledFb = _touchpanel.MuteButtonEnabledFeedBack;
-						disabledFb = _touchpanel.MuteButtonDisabledFeedBack;
-
-						break;
-					}
-				default:
-					{
-						if (buttonNumber == 0 || buttonNumber > 9)
-							break;
-
-						if (buttonEventTypes == null || buttonEventTypes.Keys == null)
-							_touchpanel.DisableNumericalButton((uint)buttonNumber);
-						else
-							_touchpanel.EnableNumericalButton((uint)buttonNumber);
-
-
-						if (_touchpanel.NumericalButtonEnabledFeedBack != null)
-							enabledFb = _touchpanel.NumericalButtonEnabledFeedBack[(uint)buttonNumber];
-
-						if (_touchpanel.NumericalButtonDisabledFeedBack != null)
-							disabledFb = _touchpanel.NumericalButtonDisabledFeedBack[(uint)buttonNumber];
-
-						break;
-					}
-			}
-
-			Debug.Console(0, this, "InitializeButton: key-'{0}' enabledFb-'{1}', disabledFb-'{2}'",
-				key, enabledFb ?? (object)"null", disabledFb ?? (object)"null");
-		}
-
-		/// <summary>
-		/// Links button feedback if configured
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="config"></param>
-		public void InitializeButtonFeedback(string key, KeypadButton config)
-		{
-			//Debug.Console(1, this, "Initializing button '{0}' feedback...", key);
-
-			if (config == null)
-			{
-				Debug.Console(1, this, "Button '{0}' config is null, skipping.", key);
-				return;
-			}
-
-			int buttonNumber;
-			TryParseInt(key, out buttonNumber);
-
-			// Link up the button feedbacks to the specified device feedback
-			var buttonFeedback = config.Feedback;
-			if (buttonFeedback == null || string.IsNullOrEmpty(buttonFeedback.DeviceKey))
-			{
-				Debug.Console(1, this, "Button '{0}' feedback not configured, skipping.",
-					key);
-				return;
-			}
-
-			Feedback deviceFeedback;
-
-			try
-			{
-				var device = DeviceManager.GetDeviceForKey(buttonFeedback.DeviceKey) as Device;
-				if (device == null)
-				{
-					Debug.Console(1, this, "Button '{0}' feedback deviceKey '{1}' not found.",
-						key, buttonFeedback.DeviceKey);
-					return;
-				}
-
-				deviceFeedback = device.GetFeedbackProperty(buttonFeedback.FeedbackName);
-				if (deviceFeedback == null)
-				{
-					Debug.Console(1, this, "Button '{0}' feedbackName property '{1}' not found.",
-						key, buttonFeedback.FeedbackName);
-					return;
-				}
-
-				// TODO [ ] verify if this can replace the current method
-				//Debug.Console(0, this, "deviceFeedback.GetType().Name: '{0}'", deviceFeedback.GetType().Name);
-				//switch (feedback.GetType().Name.ToLower())
-				//{
-				//    case("boolfeedback"):
-				//    {
-				//        break;
-				//    }
-				//    case("intfeedback"):
-				//    {
-				//        break;
-				//    }
-				//    case("stringfeedback"):
-				//    {
-				//        break;
-				//    }
-				//}
-			}
-			catch (Exception ex)
-			{
-				Debug.Console(1, this, "InitializeButtonFeedback (button '{1}', deviceKey '{2}') Exception Message: {0}",
-					ex.Message, key, buttonFeedback.DeviceKey);
-				Debug.Console(2, this, "InitializeButtonFeedback (button '{1}', deviceKey '{2}') Exception StackTrace: {0}",
-					ex.StackTrace, key, buttonFeedback.DeviceKey);
-				if (ex.InnerException != null) Debug.Console(2, this, "InitializeButtonFeedback (button '{1}', deviceKey '{2}') InnerException: {0}",
-					ex.InnerException, key, buttonFeedback.DeviceKey);
-
-				return;
-			}
-
-			var boolFeedback = deviceFeedback as BoolFeedback;
-			var intFeedback = deviceFeedback as IntFeedback;
-
-			switch (key)
-			{
-				case ("power"):
-					{
-						if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.FeedbackPower);
-						break;
-					}
-				case ("volumeup"):
-				case ("volumedown"):
-				case ("volumefeedback"):
-					{
-						if (intFeedback != null)
-						{
-							var volumeFeedback = intFeedback;
-							volumeFeedback.LinkInputSig(_touchpanel.VolumeBargraph);
-						}
-						break;
-					}
-				case ("mute"):
-					{
-						if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.FeedbackMute);
-						break;
-					}
-				default:
-					{
-						if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.Feedbacks[(uint)buttonNumber]);
-						break;
-					}
-			}
-		}
-
-		/// <summary>
-		/// Try parse int helper method
-		/// </summary>
-		/// <param name="str"></param>
-		/// <param name="result"></param>
-		/// <returns></returns>
-		public bool TryParseInt(string str, out int result)
-		{
-			try
-			{
-				result = int.Parse(str);
-				return true;
-			}
-			catch
-			{
-				result = 0;
-				return false;
-			}
-		}
-
-		private void _touchpanel_BaseEvent(GenericBase device, BaseEventArgs args)
-		{
-			Debug.Console(1, this, "BaseEvent: eventId-'{0}', index-'{1}'", args.EventId, args.Index);
-		}
-
-		private void _touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
-		{
-			Debug.Console(1, this, "ButtonStateChange: buttonNumber-'{0}' buttonName-'{1}', buttonState-'{2}'", args.Button.Number, args.Button.Name, args.NewButtonState);
-			var type = args.NewButtonState.ToString();
-
-			if (_buttons.ContainsKey(args.Button.Number.ToString(CultureInfo.InvariantCulture)))
-			{
-				Press(args.Button.Number.ToString(CultureInfo.InvariantCulture), type);
-			}
-			else if (_buttons.ContainsKey(args.Button.Name.ToString()))
-			{
-				Press(args.Button.Name.ToString(), type);
-			}
-		}
-
-		private void _touchpanel_PanelStateChange(GenericBase device, BaseEventArgs args)
-		{
-			Debug.Console(1, this, "PanelStateChange: eventId-'{0}', index-'{1}'", args.EventId, args.Index);
-		}
-
-		/// <summary>
-		/// Runs the function associated with this button/type. One of the following strings:
-		/// Pressed, Released, Tapped, DoubleTapped, Held, HeldReleased    
-		/// </summary>
-		/// <param name="buttonKey"></param>
-		/// <param name="type"></param>
-		public void Press(string buttonKey, string type)
-		{
-			Debug.Console(2, this, "Press: buttonKey-'{0}', type-'{1}'", buttonKey, type);
-
-			// TODO: In future, consider modifying this to generate actions at device activation time
-			//       to prevent the need to dynamically call the method via reflection on each button press
-			if (!_buttons.ContainsKey(buttonKey)) return;
-
-			var button = _buttons[buttonKey];
-			if (!button.EventTypes.ContainsKey(type)) return;
-
-			foreach (var eventType in button.EventTypes[type]) DeviceJsonApi.DoDeviceAction(eventType);
-		}
-
-
-		public void ListButtons()
-		{
-			var line = new string('-', 35);
-
-			Debug.Console(0, this, line);
-
-			Debug.Console(0, this, "MPC3 Controller {0} - Available Butons", Key);
-
-			foreach (var button in _buttons)
-			{
-				Debug.Console(0, this, "Key: {0}", button.Key);
-			}
-
-			Debug.Console(0, this, line);
-		}
-	}
-
-	/// <summary>
-	/// Represents the configuration of a keypad button
-	/// </summary>
-	public class KeypadButton
-	{
-		[JsonProperty("eventTypes")]
-		public Dictionary<string, DeviceActionWrapper[]> EventTypes { get; set; }
-
-		[JsonProperty("feedback")]
-		public KeypadButtonFeedback Feedback { get; set; }
-
-		public KeypadButton()
-		{
-			EventTypes = new Dictionary<string, DeviceActionWrapper[]>();
-			Feedback = new KeypadButtonFeedback();
-		}
-	}
-
-	/// <summary>
-	/// Represents the configuration of a keypad button feedback
-	/// </summary>
-	public class KeypadButtonFeedback
-	{
-		[JsonProperty("deviceKey")]
-		public string DeviceKey { get; set; }
-
-		[JsonProperty("feedbackName")]
-		public string FeedbackName { get; set; }
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Web/RequestHandlers/AppDebugRequestHandler.cs

@@ -1,82 +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 AppDebugRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>		
-		public AppDebugRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <summary>
-		/// Handles GET method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandleGet(HttpCwsContext context)
-		{
-			var appDebug = new AppDebug { Level = Debug.Level };
-
-			var body = JsonConvert.SerializeObject(appDebug, 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 appDebug = new AppDebug();
-			var requestBody = JsonConvert.DeserializeAnonymousType(data, appDebug);
-
-			Debug.SetDebugLevel(requestBody.Level);
-
-			appDebug.Level = Debug.Level;
-			var responseBody = JsonConvert.SerializeObject(appDebug, Formatting.Indented);
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";
-			context.Response.Write(responseBody, false);
-			context.Response.End();
-		}
-	}
-
-	public class AppDebug
-	{
-		[JsonProperty("level", NullValueHandling = NullValueHandling.Ignore)]
-		public int Level { get; set; }
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Web/RequestHandlers/DevJsonRequestHandler.cs

@@ -1,66 +0,0 @@
-using System;
-using Crestron.SimplSharp.WebScripting;
-using PepperDash.Core;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class DevJsonRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public DevJsonRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <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;
-			}
-			
-			try
-			{
-				DeviceJsonApi.DoDeviceActionWithJson(data);
-
-				context.Response.StatusCode = 200;
-				context.Response.StatusDescription = "OK";
-				context.Response.End();
-			}
-			catch (Exception ex)
-			{
-				Debug.Console(1, "Exception Message: {0}", ex.Message);
-				Debug.Console(2, "Exception Stack Trace: {0}", ex.StackTrace);
-				if(ex.InnerException != null) Debug.Console(2, "Exception Inner: {0}", ex.InnerException);
-
-				context.Response.StatusCode = 400;
-				context.Response.StatusDescription = "Bad Request";
-				context.Response.End();
-			}
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Web/RequestHandlers/DevListRequestHandler.cs

@@ -1,51 +0,0 @@
-using System.Linq;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class DevListRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public DevListRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <summary>
-		/// Handles GET method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandleGet(HttpCwsContext context)
-		{
-			var allDevices = DeviceManager.AllDevices;
-			if (allDevices == null)
-			{
-				context.Response.StatusCode = 404;
-				context.Response.StatusDescription = "Not Found";
-				context.Response.End();
-
-				return;
-			}
-
-			allDevices.Sort((a, b) => System.String.Compare(a.Key, b.Key, System.StringComparison.Ordinal));
-
-			var deviceList = allDevices.Select(d => EssentialsWebApiHelpers.MapToDeviceListObject(d)).ToList();
-
-			var js = JsonConvert.SerializeObject(deviceList, Formatting.Indented);			
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";
-			context.Response.ContentType = "application/json";
-			context.Response.ContentEncoding = System.Text.Encoding.UTF8;
-			context.Response.Write(js, false);
-			context.Response.End();
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/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 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 o = new DeviceActionWrapper();
-			var body = JsonConvert.DeserializeAnonymousType(data, o);			
-			
-			if (string.IsNullOrEmpty(body.DeviceKey))
-			{
-				context.Response.StatusCode = 400;
-				context.Response.StatusDescription = "Bad Request";
-				context.Response.End();
-
-				return;
-			}
-
-			var deviceProps = DeviceJsonApi.GetProperties(body.DeviceKey);
-			if (deviceProps == null || deviceProps.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(deviceProps, false);
-			context.Response.End();
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Web/RequestHandlers/DisableAllStreamDebugRequestHandler.cs

@@ -1,32 +0,0 @@
-using Crestron.SimplSharp.WebScripting;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class DisableAllStreamDebugRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public DisableAllStreamDebugRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <summary>
-		/// Handles POST method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandlePost(HttpCwsContext context)
-		{
-			DeviceManager.DisableAllDeviceStreamDebugging();
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";
-			context.Response.End();
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs

@@ -1,102 +0,0 @@
-using System.Linq;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core.Web.RequestHandlers;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	public class GetFeedbacksForDeviceRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public GetFeedbacksForDeviceRequestHandler()
-			: 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()) as IHasFeedback;
-			if (device == null)
-			{
-				context.Response.StatusCode = 404;
-				context.Response.StatusDescription = "Not Found";
-				context.Response.End();
-
-				return;
-			}
-
-			var boolFeedback =
-				from feedback in device.Feedbacks.OfType<BoolFeedback>()
-				where !string.IsNullOrEmpty(feedback.Key)
-				select new
-				{
-					FeedbackKey = feedback.Key,
-					Value = feedback.BoolValue
-				};
-
-			var intFeedback =
-				from feedback in device.Feedbacks.OfType<IntFeedback>()
-				where !string.IsNullOrEmpty(feedback.Key)
-				select new
-				{
-					FeedbackKey = feedback.Key,
-					Value = feedback.IntValue
-				};
-
-			var stringFeedback = 
-				from feedback in device.Feedbacks.OfType<StringFeedback>()
-				where !string.IsNullOrEmpty(feedback.Key)
-				select new
-				{
-					FeedbackKey = feedback.Key,
-					Value = feedback.StringValue ?? string.Empty
-				};
-
-			var responseObj = new
-			{
-				BoolValues = boolFeedback,
-				IntValues = intFeedback,
-				SerialValues = stringFeedback
-			};
-
-			var js = JsonConvert.SerializeObject(responseObj, Formatting.Indented);
-
-			context.Response.StatusCode = 200;
-			context.Response.StatusDescription = "OK";
-			context.Response.ContentType = "application/json";
-			context.Response.ContentEncoding = System.Text.Encoding.UTF8;
-			context.Response.Write(js, false);
-			context.Response.End();
-		}
-	}
-}