Updates drawing to have correct decision labels

Add backwards compatability with `IBridge` to `EiscApiAdvanced`

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]-"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.  
+
+**Stacktrace**
+
+Include a stack trace of the exception if possible.
+```
+Paste stack trace here
+```
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]-"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+If this is a request for support for a new device or type, be as specific as possible and include any pertinent manufacturer and model information.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/scripts/GenerateVersionNumber.ps1

@@ -0,0 +1,49 @@
+$latestVersions = $(git tag --merged origin/master)
+$latestVersion = [version]"0.0.0"
+Foreach ($version in $latestVersions) {
+  Write-Host $version
+  try {
+    if (([version]$version) -ge $latestVersion) {
+      $latestVersion = $version
+      Write-Host "Setting latest version to: $latestVersion"
+    }
+  }
+  catch {
+    Write-Host "Unable to convert $($version). Skipping"
+    continue;
+  }
+}
+
+$newVersion = [version]$latestVersion
+$phase = ""
+$newVersionString = ""
+switch -regex ($Env:GITHUB_REF) {
+  '^refs\/heads\/master*.' {
+    $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, $newVersion.Build
+  }
+  '^refs\/heads\/feature\/*.' {
+    $phase = 'alpha'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/release\/*.' {
+    $splitRef = $Env:GITHUB_REF -split "/"
+    $version = [version]($splitRef[-1] -replace "v", "")
+    $phase = 'rc'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $version.Major, $version.Minor, $version.Build, $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/development*.' {
+    $phase = 'beta'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/hotfix\/*.' {
+    $phase = 'hotfix'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/bugfix\/*.' {
+    $phase = 'hotfix'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+}
+
+
+Write-Output $newVersionString

.github/scripts/UpdateAssemblyVersion.ps1

@@ -0,0 +1,40 @@
+function Update-SourceVersion {
+    Param ([string]$Version)
+    #$fullVersion = $Version
+    $baseVersion = [regex]::Match($Version, "(\d+.\d+.\d+).*").captures.groups[1].value
+    $NewAssemblyVersion = ‘AssemblyVersion("‘ + $baseVersion + ‘.*")’
+    Write-Output "AssemblyVersion = $NewAssemblyVersion"
+    $NewAssemblyInformationalVersion = ‘AssemblyInformationalVersion("‘ + $Version + ‘")’
+    Write-Output "AssemblyInformationalVersion = $NewAssemblyInformationalVersion"
+
+    foreach ($o in $input) {
+        Write-output $o.FullName
+        $TmpFile = $o.FullName + “.tmp”
+        get-content $o.FullName |
+        ForEach-Object {
+            $_ -replace ‘AssemblyVersion\(".*"\)’, $NewAssemblyVersion } |
+        ForEach-Object {
+            $_ -replace ‘AssemblyInformationalVersion\(".*"\)’, $NewAssemblyInformationalVersion
+        }  > $TmpFile 
+        move-item $TmpFile $o.FullName -force
+    }
+}
+
+function Update-AllAssemblyInfoFiles ( $version ) {
+    foreach ($file in “AssemblyInfo.cs”, “AssemblyInfo.vb” ) {
+        get-childitem -Path $Env:GITHUB_WORKSPACE -recurse | Where-Object { $_.Name -eq $file } | Update-SourceVersion $version ;
+    }
+}
+
+# validate arguments
+$r = [System.Text.RegularExpressions.Regex]::Match($args[0], "\d+\.\d+\.\d+.*");
+if ($r.Success) {
+    Write-Output "Updating Assembly Version to $args ...";
+    Update-AllAssemblyInfoFiles $args[0];
+}
+else {
+    Write-Output ” “;
+    Write-Output “Error: Input version does not match x.y.z format!”
+    Write-Output ” “;
+    Write-Output "Unable to apply version to AssemblyInfo.cs files";
+}

.github/scripts/ZipBuildOutput.ps1

@@ -0,0 +1,44 @@
+# Uncomment these for local testing
+# $Env:GITHUB_WORKSPACE = "C:\Working Directories\PD\essentials"
+# $Env:SOLUTION_FILE = "PepperDashEssentials"
+# $Env:VERSION = "0.0.0-buildType-test"
+
+# Sets the root directory for the operation
+$destination = "$($Env:GITHUB_HOME)\output"
+New-Item -ItemType Directory -Force -Path ($destination)
+Get-ChildItem ($destination)
+$exclusions = @(git submodule foreach --quiet 'echo $name')
+# Trying to get any .json schema files (not currently working)
+# Gets any files with the listed extensions.
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll" | ForEach-Object {
+  $allowed = $true;
+  # Exclude any files in submodules
+  foreach ($exclude in $exclusions) {
+    if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) {
+      $allowed = $false;
+      break;
+    }
+  }
+  if ($allowed) {
+    Write-Host "allowing $($_)"
+    $_;
+  }
+} | Copy-Item -Destination ($destination) -Force
+Write-Host "Getting matching files..."
+# Get any files from the output folder that match the following extensions
+Get-ChildItem -Path $destination | Where-Object { ($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz")) } | ForEach-Object { 
+  # Replace the extensions with dll and xml and create an array 
+  # Removed dll file capture, as previous step should capture all of them. Add if needed-> $($_ -replace "cpz|clz|cplz", "dll"),
+  $filenames = @($($_ -replace "cpz|clz|cplz", "xml"))
+  Write-Host "Filenames:"
+  Write-Host $filenames
+  if ($filenames.length -gt 0) {
+    # Attempt to get the files and return them to the output directory
+    Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
+  }
+}
+
+Get-ChildItem -Path $destination\*.cpz | Rename-Item -NewName { "$($_.BaseName)-$($Env:VERSION)$($_.Extension)" }
+Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
+Write-Host "Output Contents post Zip"
+Get-ChildItem -Path $destination

.github/workflows/docker.yml

@@ -0,0 +1,270 @@
+name: Branch Build Using Docker
+
+on:
+  push:
+    branches:
+      - feature/*
+      - hotfix/*
+      - bugfix/*
+      - release/*
+      - development
+
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Debug
+  # Defaults to master as the release branch.  Change as necessary
+  RELEASE_BRANCH: master
+jobs:
+  Build_Project:
+    runs-on: windows-latest
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      # And any submodules
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        # Fetch all tags
+      - name: Fetch tags
+        run: git fetch --tags
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          $version = ./.github/scripts/GenerateVersionNumber.ps1
+          Write-Output "::set-env name=VERSION::$version"
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          Write-Output ${{ env.VERSION }}
+          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      # Build the solutions in the docker image
+      - name: Build Solution
+        shell: powershell
+        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
+      # Create the release on the source repo
+      - name: Create tag for non-rc builds
+        if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
+        run: |
+          git tag $($Env:VERSION)
+          git push --tags origin
+      - name: Create Release
+        id: create_release
+        # using contributor's version to allow for pointing at the right commit
+        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
+        uses: fleskesvor/create-release@feature/support-target-commitish
+        with:
+          tag_name: ${{ env.VERSION  }}
+          release_name: ${{ env.VERSION }}
+          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Upload the build package to the release
+      - name: Upload Release Package
+        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
+        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 }}
+  # This step always runs and pushes the build to the internal build rep
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: check Github ref
+        run: ${{toJson(github.ref)}}
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+      # Copy Contents of output folder to root directory
+      - 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
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    if: contains(github.ref, 'master') || contains(github.ref, '/release/')
+    steps:
+      # Checkout the repo
+      - name: check Github ref
+        run: ${{toJson(github.ref)}}
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - 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
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.github/workflows/master.yml

@@ -0,0 +1,232 @@
+name: Master Build using Docker
+
+on:
+  release:
+    types:
+      - created
+    branches:
+      - master
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Release
+  # Defaults to master as the release branch.  Change as necessary
+  RELEASE_BRANCH: master
+jobs:
+  Build_Project:
+    runs-on: windows-latest
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      # And any submodules
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        env:
+          TAG_NAME: ${{ github.event.release.tag_name }}
+        run: Write-Output "::set-env name=VERSION::$($Env:TAG_NAME)"
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          Write-Output ${{ env.VERSION }}
+          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      # Build the solutions in the docker image
+      - name: Build Solution
+        shell: powershell
+        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
+      # Upload the build package to the release
+      - name: Upload Release Package
+        id: upload_release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.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 }}
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Checkout Master branch
+        run: git checkout master
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - 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
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: git push -u origin master --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout master branch
+      - name: Create new branch
+        run: git checkout master
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - 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
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: git push -u origin master --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.gitignore

@@ -20,4 +20,8 @@ obj/
 [Rr]elease*/
 _ReSharper*/
 SIMPLSharpLogs/
-*.projectinfo
+*.projectinfo
+essentials-framework/EssentialDMTestConfig/
+output/
+
+PepperDashEssentials-0.0.0-buildType-test.zip

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "essentials-framework/pepperdashcore-builds"]
+	path = essentials-framework/pepperdashcore-builds
+	url = https://github.com/ndorin/PepperDashCore-Builds.git
+[submodule "Essentials-Template-UI"]
+	path = Essentials-Template-UI
+	url = https://github.com/PepperDash/Essentials-Template-UI.git

CONTRIBUTING.md

@@ -0,0 +1,110 @@
+# Contributors Guide
+
+Essentials is an open source project. If you are interested in making it better,
+there are many ways you can contribute. For example, you can:
+
+- Submit a bug report
+- Suggest a new feature
+- Provide feedback by commenting on feature requests/proposals
+- Propose a patch by submitting a pull request
+- Suggest or submit documentation improvements
+- Review outstanding pull requests
+- Answer questions from other users
+- Share the software with other users who are interested
+- Teach others to use the software
+
+## Bugs and Feature Requests
+
+If you believe that you have found a bug or wish to propose a new feature,
+please first search the existing [issues] to see if it has already been
+reported. If you are unable to find an existing issue, consider using one of
+the provided templates to create a new issue and provide as many details as you
+can to assist in reproducing the bug or explaining your proposed feature.
+
+## Patch Submission tips
+
+Patches should be submitted in the form of Pull Requests to the Essentials
+[repository] on GitHub. But first, consider the following tips to ensure a
+smooth process when submitting a patch:
+
+- Ensure that the patch compiles and does not break any build-time tests.
+- Be understanding, patient, and friendly; developers may need time to review
+  your submissions before they can take action or respond. This does not mean
+  your contribution is not valued. If your contribution has not received a
+  response in a reasonable time, consider commenting with a polite inquiry for
+  an update.
+- Limit your patches to the smallest reasonable change to achieve your intended
+  goal. For example, do not make unnecessary indentation changes; but don't go
+  out of your way to make the patch so minimal that it isn't easy to read,
+  either. Consider the reviewer's perspective.
+- Before submission, please squash your commits to using a message that starts
+  with the issue number and a description of the changes.
+- Isolate multiple patches from each other. If you wish to make several
+  independent patches, do so in separate, smaller pull requests that can be
+  reviewed more easily.
+- Be prepared to answer questions from reviewers. They may have further
+  questions before accepting your patch, and may even propose changes. Please
+  accept this feedback constructively, and not as a rejection of your proposed
+  change.
+  
+## GitFlow Branch Model
+This repository adheres to the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model and is intitialized for GitFlow to make for consistent branch name prefixes.  Please take time to familiarize yourself with this model.
+
+- `master` will contain the latest stable version of the framework and release builds will be created from tagged commits on `master`.
+- HotFix/Patch Pull Requests should target `master` as the base branch.
+- All other Pull Requests (bug fixes, enhancements, etc.) should target `development` as the base branch.
+- `release/vX.Y.X` branches will be used for release candidates when moving new features from `development` to `master`.  
+  Beta builds will be created from tagged commits on release candidate branches.
+
+## Review
+
+- We welcome code reviews from anyone. A committer is required to formally
+  accept and merge the changes.
+- Reviewers will be looking for things like threading issues, performance
+  implications, API design, duplication of existing functionality, readability
+  and code style, avoidance of bloat (scope-creep), etc.
+- Reviewers will likely ask questions to better understand your change.
+- Reviewers will make comments about changes to your patch:
+    - MUST means that the change is required
+    - SHOULD means that the change is suggested, further discussion on the
+      subject may be required
+    - COULD means that the change is optional
+
+## Timeline and Managing Expectations
+
+As we continue to engage contributors and learn best practices for running a successful open source project, our processes 
+and guidance will likely evolve. We will try to communicate expectations as we are able and to always be responsive. We 
+hope that the community will share their suggestions for improving this engagement.  Based on the level of initial interest 
+we receive and the availability of resources to evaluate contributions, we anticipate the following:
+
+- We will initially prioritize pull requests that include small bug fixes and code that addresses potential vulnerabilities   
+  as well as pull requests that include improvements for processor language specifications because these require a 
+  reasonable amount of effort to evaluate and will help us exercise and revise our process for accepting contributions.  In 
+  other words, we are going to start small in order to work out the kinks first.
+- We are committed to maintaining the integrity and security of our code base.  In addition to the careful review the 
+  maintainers will give to code contributions to make sure they do not introduce new bugs or vulnerabilities, we will be 
+  trying to identify best practices to incorporate with our open source project so that contributors can have more control 
+  over whether their contributions are accepted. These might include things like style guides and requirements for tests and 
+  documentation to accompany some code contributions.  As a result, it may take a long time for some contributions to be 
+  accepted.  This does not mean we are ignoring them.
+- We are committed to integrating this GitHub project with our team's regular development work flow so that the open source 
+  project remains dynamic and relevant.  This may  affect our responsiveness and ability to accept pull requests 
+  quickly.  This does not mean we are ignoring them.
+- Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community.        
+  There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own 
+  repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we 
+  may seek to incorporate them with our baseline.
+
+## Legal
+
+Consistent with Section D.6. of the GitHub Terms of Service as of 2019, and the MIT license, the project maintainer for this project accepts contributions using the inbound=outbound model.
+When you submit a pull request to this repository (inbound), you are agreeing to license your contribution under the same terms as specified in [LICENSE] (outbound).
+
+This is an open source project.
+Contributions you make to this repository are completely voluntary.
+When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment, you expressly waive any future pay claims against PepperDash related to your contribution, and you acknowledge that this does not create an obligation on the part of PepperDash of any kind.
+Furthermore, your contributing to this project does not create an employer-employee relationship between the PepperDash and the contributor.
+
+[issues]: https://github.com/PepperDash/Essentials/issues
+[repository]: https://github.com/PepperDash/Essentials
+[LICENSE]: https://github.com/PepperDash/Essentials/blob/master/LICENSE.md

Essentials Core/PepperDashEssentialsBase/Comm and IR/REMOVE ComPortConfig.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-
-	//public class ComPortConfig
-	//{
-	//    //public string ContolPortDevKey { get; set; }
-
-	//    //public uint ControlPortNumber { get; set; }
-
-	//    [JsonConverter(typeof(ComSpecJsonConverter))]
-	//    public ComPort.ComPortSpec ComParams { get; set; }
-	//}
-}

Essentials Core/PepperDashEssentialsBase/Constants/CommonCues.cs

@@ -1,127 +0,0 @@
-using Crestron.SimplSharpPro;
-
-namespace PepperDash.Essentials.Core
-{
-	public static class CommonBoolCue
-	{
-		public static readonly Cue Power = new Cue("Power", 101, eCueType.Bool);
-		public static readonly Cue PowerOn = new Cue("PowerOn", 102, eCueType.Bool);
-		public static readonly Cue PowerOff = new Cue("PowerOff", 103, eCueType.Bool);
-
-		public static readonly Cue HasPowerFeedback = new Cue("HasPowerFeedback", 101, eCueType.Bool);
-		public static readonly Cue PowerOnFeedback = new Cue("PowerOnFeedback", 102, eCueType.Bool);
-		public static readonly Cue IsOnlineFeedback = new Cue("IsOnlineFeedback", 104, eCueType.Bool);
-		public static readonly Cue IsWarmingUp = new Cue("IsWarmingUp", 105, eCueType.Bool);
-		public static readonly Cue IsCoolingDown = new Cue("IsCoolingDown", 106, eCueType.Bool);
-
-		public static readonly Cue Dash = new Cue("Dash", 109, eCueType.Bool);
-		public static readonly Cue Digit0 = new Cue("Digit0", 110, eCueType.Bool);
-		public static readonly Cue Digit1 = new Cue("Digit1", 111, eCueType.Bool);
-		public static readonly Cue Digit2 = new Cue("Digit2", 112, eCueType.Bool);
-		public static readonly Cue Digit3 = new Cue("Digit3", 113, eCueType.Bool);
-		public static readonly Cue Digit4 = new Cue("Digit4", 114, eCueType.Bool);
-		public static readonly Cue Digit5 = new Cue("Digit5", 115, eCueType.Bool);
-		public static readonly Cue Digit6 = new Cue("Digit6", 116, eCueType.Bool);
-		public static readonly Cue Digit7 = new Cue("Digit7", 117, eCueType.Bool);
-		public static readonly Cue Digit8 = new Cue("Digit8", 118, eCueType.Bool);
-		public static readonly Cue Digit9 = new Cue("Digit9", 119, eCueType.Bool);
-		public static readonly Cue KeypadMisc1 = new Cue("KeypadMisc1", 120, eCueType.Bool);
-		public static readonly Cue KeypadMisc2 = new Cue("KeypadMisc2", 121, eCueType.Bool);
-
-		public static readonly Cue NumericEnter = new Cue("Enter", 122, eCueType.Bool);
-		public static readonly Cue ChannelUp = new Cue("ChannelUp", 123, eCueType.Bool);
-		public static readonly Cue ChannelDown = new Cue("ChannelDown", 124, eCueType.Bool);
-		public static readonly Cue Last = new Cue("Last", 125, eCueType.Bool);
-		public static readonly Cue OpenClose = new Cue("OpenClose", 126, eCueType.Bool);
-		public static readonly Cue Subtitle = new Cue("Subtitle", 127, eCueType.Bool);
-		public static readonly Cue Audio = new Cue("Audio", 128, eCueType.Bool);
-		public static readonly Cue Info = new Cue("Info", 129, eCueType.Bool);
-		public static readonly Cue Menu = new Cue("Menu", 130, eCueType.Bool);
-		public static readonly Cue DeviceMenu = new Cue("DeviceMenu", 131, eCueType.Bool);
-		public static readonly Cue Return = new Cue("Return", 132, eCueType.Bool);
-		public static readonly Cue Back = new Cue("Back", 133, eCueType.Bool);
-		public static readonly Cue Exit = new Cue("Exit", 134, eCueType.Bool);
-		public static readonly Cue Clear = new Cue("Clear", 135, eCueType.Bool);
-		public static readonly Cue List = new Cue("List", 136, eCueType.Bool);
-		public static readonly Cue Guide = new Cue("Guide", 137, eCueType.Bool);
-		public static readonly Cue Am = new Cue("Am", 136, eCueType.Bool);
-		public static readonly Cue Fm = new Cue("Fm", 137, eCueType.Bool);
-		public static readonly Cue Up = new Cue("Up", 138, eCueType.Bool);
-		public static readonly Cue Down = new Cue("Down", 139, eCueType.Bool);
-		public static readonly Cue Left = new Cue("Left", 140, eCueType.Bool);
-		public static readonly Cue Right = new Cue("Right", 141, eCueType.Bool);
-		public static readonly Cue Select = new Cue("Select", 142, eCueType.Bool);
-		public static readonly Cue SmartApps = new Cue("SmartApps", 143, eCueType.Bool);
-		public static readonly Cue Dvr = new Cue("Dvr", 144, eCueType.Bool);
-
-		public static readonly Cue Play = new Cue("Play", 145, eCueType.Bool);
-		public static readonly Cue Pause = new Cue("Pause", 146, eCueType.Bool);
-		public static readonly Cue Stop = new Cue("Stop", 147, eCueType.Bool);
-		public static readonly Cue ChapNext = new Cue("ChapNext", 148, eCueType.Bool);
-		public static readonly Cue ChapPrevious = new Cue("ChapPrevious", 149, eCueType.Bool);
-		public static readonly Cue Rewind = new Cue("Rewind", 150, eCueType.Bool);
-		public static readonly Cue Ffwd = new Cue("Ffwd", 151, eCueType.Bool);
-		public static readonly Cue Replay = new Cue("Replay", 152, eCueType.Bool);
-		public static readonly Cue Advance = new Cue("Advance", 153, eCueType.Bool);
-		public static readonly Cue Record = new Cue("Record", 154, eCueType.Bool);
-		public static readonly Cue Red = new Cue("Red", 155, eCueType.Bool);
-		public static readonly Cue Green = new Cue("Green", 156, eCueType.Bool);
-		public static readonly Cue Yellow = new Cue("Yellow", 157, eCueType.Bool);
-		public static readonly Cue Blue = new Cue("Blue", 158, eCueType.Bool);
-		public static readonly Cue Home = new Cue("Home", 159, eCueType.Bool);
-		public static readonly Cue PopUp = new Cue("PopUp", 160, eCueType.Bool);
-		public static readonly Cue PageUp = new Cue("PageUp", 161, eCueType.Bool);
-		public static readonly Cue PageDown = new Cue("PageDown", 162, eCueType.Bool);
-		public static readonly Cue Search = new Cue("Search", 163, eCueType.Bool);
-		public static readonly Cue Setup = new Cue("Setup", 164, eCueType.Bool);
-		public static readonly Cue RStep = new Cue("RStep", 165, eCueType.Bool);
-		public static readonly Cue FStep = new Cue("FStep", 166, eCueType.Bool);
-
-		public static readonly Cue IsConnected = new Cue("IsConnected", 281, eCueType.Bool);
-		public static readonly Cue IsOk = new Cue("IsOk", 282, eCueType.Bool);
-		public static readonly Cue InWarning = new Cue("InWarning", 283, eCueType.Bool);
-		public static readonly Cue InError = new Cue("InError", 284, eCueType.Bool);
-		public static readonly Cue StatusUnknown = new Cue("StatusUnknown", 285, eCueType.Bool);
-        
-        public static readonly Cue VolumeUp = new Cue("VolumeUp", 401, eCueType.Bool);
-		public static readonly Cue VolumeDown = new Cue("VolumeDown", 402, eCueType.Bool);
-		public static readonly Cue MuteOn = new Cue("MuteOn", 403, eCueType.Bool);
-		public static readonly Cue MuteOff = new Cue("MuteOff", 404, eCueType.Bool);
-		public static readonly Cue MuteToggle = new Cue("MuteToggle", 405, eCueType.Bool);
-		public static readonly Cue ShowVolumeButtons = new Cue("ShowVolumeButtons", 406, eCueType.Bool);
-		public static readonly Cue ShowVolumeSlider = new Cue("ShowVolumeSlider", 407, eCueType.Bool);
-
-		public static readonly Cue Hdmi1 = new Cue("Hdmi1", 451, eCueType.Bool);
-		public static readonly Cue Hdmi2 = new Cue("Hdmi2", 452, eCueType.Bool);
-		public static readonly Cue Hdmi3 = new Cue("Hdmi3", 453, eCueType.Bool);
-		public static readonly Cue Hdmi4 = new Cue("Hdmi4", 454, eCueType.Bool);
-		public static readonly Cue Hdmi5 = new Cue("Hdmi5", 455, eCueType.Bool);
-		public static readonly Cue Hdmi6 = new Cue("Hdmi6", 456, eCueType.Bool);
-		public static readonly Cue DisplayPort1 = new Cue("DisplayPort1", 457, eCueType.Bool);
-		public static readonly Cue DisplayPort2 = new Cue("DisplayPort2", 458, eCueType.Bool);
-		public static readonly Cue Dvi1 = new Cue("Dvi1", 459, eCueType.Bool);
-		public static readonly Cue Dvi2 = new Cue("Dvi2", 460, eCueType.Bool);
-		public static readonly Cue Video1 = new Cue("Video1", 461, eCueType.Bool);
-		public static readonly Cue Video2 = new Cue("Video2", 462, eCueType.Bool);
-		public static readonly Cue Component1 = new Cue("Component1", 463, eCueType.Bool);
-		public static readonly Cue Component2 = new Cue("Component2", 464, eCueType.Bool);
-		public static readonly Cue Vga1 = new Cue("Vga1", 465, eCueType.Bool);
-		public static readonly Cue Vga2 = new Cue("Vga2", 466, eCueType.Bool);
-		public static readonly Cue Rgb1 = new Cue("Rgb1", 467, eCueType.Bool);
-		public static readonly Cue Rgb2 = new Cue("Rgb2", 468, eCueType.Bool);
-		public static readonly Cue Antenna = new Cue("Antenna", 469, eCueType.Bool);
-
-        public static readonly Cue InCall = new Cue("InCall", 501, eCueType.Bool);
-	}
-
-	public static class CommonIntCue
-	{
-		public static readonly Cue MainVolumeLevel = new Cue("MainVolumeLevel", 401, eCueType.Int);
-		public static readonly Cue MainVolumeLevelFeedback = new Cue("MainVolumeLevelFeedback", 401, eCueType.Int);
-	}
-
-	public static class CommonStringCue
-	{
-		public static readonly Cue IpConnectionsText = new Cue("IpConnectionsText", 9999, eCueType.String);
-	}
-}

Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class GenericDigitalInputDevice : Device, IDigitalInput
-    {
-        public DigitalInput InputPort { get; private set; }
-
-        public BoolFeedback InputStateFeedback { get; private set; }
-
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.State;
-            }
-        }
-
-        public GenericDigitalInputDevice(string key, DigitalInput inputPort):
-            base(key)
-        {
-            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
-
-            InputPort = inputPort;
-
-            InputPort.StateChange += new DigitalInputEventHandler(InputPort_StateChange);
-
-        }
-
-        void InputPort_StateChange(DigitalInput digitalInput, DigitalInputEventArgs args)
-        {
-            InputStateFeedback.FireUpdate();
-        }
-
-    }
-}

Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    /// <summary>
-    /// Represents a generic device controlled by relays
-    /// </summary>
-    public class GenericRelayDevice : Device, ISwitchedOutput
-    {
-        public Relay RelayOutput { get; private set; }
-
-        public BoolFeedback OutputIsOnFeedback { get; private set; }
-
-        public GenericRelayDevice(string key, Relay relay):
-            base(key)
-        {
-            OutputIsOnFeedback = new BoolFeedback(new Func<bool>(() => RelayOutput.State));
-
-            if (relay.AvailableForUse)
-                RelayOutput = relay;
-
-            RelayOutput.StateChange += new RelayEventHandler(RelayOutput_StateChange);
-        }
-
-        void RelayOutput_StateChange(Relay relay, RelayEventArgs args)
-        {
-            OutputIsOnFeedback.FireUpdate();
-        }
-
-        public void OpenRelay()
-        {
-            RelayOutput.State = false;
-        }
-
-        public void CloseRelay()
-        {
-            RelayOutput.State = true;
-        }
-
-        public void ToggleRelayState()
-        {
-            if (RelayOutput.State == true)
-                OpenRelay();
-            else
-                CloseRelay();
-        }
-
-        #region ISwitchedOutput Members
-
-        void ISwitchedOutput.On()
-        {
-            CloseRelay();
-        }
-
-        void ISwitchedOutput.Off()
-        {
-            OpenRelay();
-        }
-
-        #endregion
-    }
-}

Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -1,122 +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 PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// A bridge class to cover the basic features of GenericBase hardware
-	/// </summary>
-	public class CrestronGenericBaseDevice : Device, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
-	{
-		public virtual GenericBase Hardware { get; protected set; }
-
-		public BoolFeedback IsOnline { get; private set; }
-		public BoolFeedback IsRegistered { get; private set; }
-		public StringFeedback IpConnectionsText { get; private set; }
-
-		public CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
-			: base(key, name)
-		{
-			Hardware = hardware;
-			IsOnline = new BoolFeedback(CommonBoolCue.IsOnlineFeedback, () => Hardware.IsOnline);
-			IsRegistered = new BoolFeedback(new Cue("IsRegistered", 0, eCueType.Bool), () => Hardware.Registered);
-			IpConnectionsText = new StringFeedback(CommonStringCue.IpConnectionsText, () => 
-				string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray()));
-			CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
-		}
-
-		/// <summary>
-		/// Make sure that overriding classes call this!
-		/// Registers the Crestron device, connects up to the base events, starts communication monitor
-		/// </summary>
-		public override bool CustomActivate()
-		{
-            Debug.Console(0, this, "Activating");
-            var response = Hardware.RegisterWithLogging(Key);
-            if (response != eDeviceRegistrationUnRegistrationResponse.Success)
-            {
-                Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-                return false;
-            }
-            Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
-            CommunicationMonitor.Start();    
-
-			return true;
-		}
-
-		/// <summary>
-		/// This disconnects events and unregisters the base hardware device.
-		/// </summary>
-		/// <returns></returns>
-		public override bool Deactivate()
-		{
-			CommunicationMonitor.Stop();
-			Hardware.OnlineStatusChange -= Hardware_OnlineStatusChange;
-
-			return Hardware.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
-		}
-
-		/// <summary>
-		/// Returns a list containing the Outputs that we want to expose.
-		/// </summary>
-		public virtual List<Feedback> Feedbacks
-		{
-			get
-			{
-				return new List<Feedback>
-				{
-					IsOnline,
-					IsRegistered,
-					IpConnectionsText
-				};
-			}
-		}
-
-		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-		{
-			IsOnline.FireUpdate();
-		}
-
-		#region IStatusMonitor Members
-
-		public StatusMonitorBase CommunicationMonitor { get; private set; }
-		#endregion
-
-        #region IUsageTracking Members
-
-        public UsageTracking UsageTracker { get; set; }
-
-        #endregion
-	}
-
-	//***********************************************************************************
-	public class CrestronGenericBaseDeviceEventIds
-	{
-		public const uint IsOnline = 1;
-		public const uint IpConnectionsText =2;
-	}
-
-	/// <summary>
-	/// Adds logging to Register() failure
-	/// </summary>
-	public static class GenericBaseExtensions
-	{
-		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
-		{
-			var result = device.Register();
-			if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
-			}
-			return result;
-		}
-
-	}
-}

Essentials Core/PepperDashEssentialsBase/Cues and DevAction/Cues.cs

@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// Encapsulates a string-named, joined and typed command to a device
-	/// </summary>
-	[Obsolete()]
-	public class DevAction
-	{
-		public Cue Cue { get; private set; }
-		public Action<object> Action { get; private set; }
-
-
-		public DevAction(Cue cue, Action<object> action)
-		{
-			Cue = cue;
-			Action = action;
-		}
-	}
-
-	public enum eCueType
-	{
-		Bool, Int, String, Void, Other
-	}
-
-
-    /// <summary>
-    /// The Cue class is a container to represent a name / join number / type for simplifying
-    /// commands coming into devices.
-    /// </summary>
-	public class Cue
-	{
-		public string Name { get; private set; }
-		public uint Number { get; private set; }
-		public eCueType Type { get; private set; }
-
-		public Cue(string name, uint join, eCueType type)
-		{
-			Name = name;
-			Number = join;
-			Type = type;
-		}
-
-		/// <summary>
-		/// Override that prints out the cue's data
-		/// </summary>
-		public override string ToString()
-		{
-			return string.Format("{0} Cue '{1}'-{2}", Type, Name, Number);
-		}
-
-		///// <summary>
-		///// Returns a new Cue with JoinNumber offset
-		///// </summary>
-		//public Cue GetOffsetCopy(uint offset)
-		//{
-		//    return new Cue(Name, Number + offset, Type);
-		//}
-
-		/// <summary>
-		/// Helper method to create a Cue of Bool type
-		/// </summary>
-		/// <returns>Cue</returns>
-		public static Cue BoolCue(string name, uint join)
-		{
-			return new Cue(name, join, eCueType.Bool);
-		}
-
-		/// <summary>
-		/// Helper method to create a Cue of ushort type
-		/// </summary>
-		/// <returns>Cue</returns>		
-		public static Cue UShortCue(string name, uint join)
-		{
-			return new Cue(name, join, eCueType.Int);
-		}
-
-		/// <summary>
-		/// Helper method to create a Cue of string type
-		/// </summary>
-		/// <returns>Cue</returns>
-		public static Cue StringCue(string name, uint join)
-		{
-			return new Cue(name, join, eCueType.String);
-		}
-
-		public static readonly Cue DefaultBoolCue = new Cue("-none-", 0, eCueType.Bool);
-		public static readonly Cue DefaultIntCue = new Cue("-none-", 0, eCueType.Int);
-		public static readonly Cue DefaultStringCue = new Cue("-none-", 0, eCueType.String);
-	}
-}

Essentials Core/PepperDashEssentialsBase/Debug/Debug.cs

@@ -1,142 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharp.CrestronDataStore;
-//using Crestron.SimplSharpPro;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public class Debug
-//    {
-//        public static uint Level { get; private set; }
-
-//        /// <summary>
-//        /// This should called from the ControlSystem Initiailize method.
-//        /// </summary>
-//        public static void Initialize()
-//        {
-//            // Add command to console
-//            CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug", 
-//                "appdebug:P [0-2]: Sets the application's console debug message level", 
-//                ConsoleAccessLevelEnum.AccessOperator);
-
-//            uint level = 0;
-//            var err = CrestronDataStoreStatic.GetGlobalUintValue("DebugLevel", out level);
-//            if (err == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-//                SetDebugLevel(level);
-//            else if (err == CrestronDataStore.CDS_ERROR.CDS_RECORD_NOT_FOUND)
-//                CrestronDataStoreStatic.SetGlobalUintValue("DebugLevel", 0);
-//            else
-//                CrestronConsole.PrintLine("Error restoring console debug level setting: {0}", err);
-//        }
-
-//        /// <summary>
-//        /// Callback for console command
-//        /// </summary>
-//        /// <param name="levelString"></param>
-//        public static void SetDebugFromConsole(string levelString)
-//        {
-//            try
-//            {
-//                if (string.IsNullOrEmpty(levelString.Trim()))
-//                {
-//                    CrestronConsole.PrintLine("AppDebug level = {0}", Level);
-//                    return;
-//                }
-
-//                SetDebugLevel(Convert.ToUInt32(levelString));
-//            }
-//            catch
-//            {
-//                CrestronConsole.PrintLine("Usage: appdebug:P [0-2]");
-//            }
-//        }
-
-//        /// <summary>
-//        /// Sets the debug level
-//        /// </summary>
-//        /// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
-//        public static void SetDebugLevel(uint level)
-//        {
-//            if (level <= 2)
-//            {
-//                Level = 2;
-//                CrestronConsole.PrintLine("[Application {0}], Debug level set to {1}", 
-//                    InitialParametersClass.ApplicationNumber, level);
-//                var err = CrestronDataStoreStatic.SetGlobalUintValue("DebugLevel", level);
-//                if(err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-//                    CrestronConsole.PrintLine("Error saving console debug level setting: {0}", err);
-//            }
-//        }
-
-//        /// <summary>
-//        /// Prints message to console if current debug level is equal to or higher than the level of this message.
-//        /// Uses CrestronConsole.PrintLine.
-//        /// </summary>
-//        /// <param name="level"></param>
-//        /// <param name="format">Console format string</param>
-//        /// <param name="items">Object parameters</param>
-//        public static void Console(uint level, string format, params object[] items)
-//        {
-//            if (Level >= level)
-//                CrestronConsole.PrintLine("App {0}:{1}", InitialParametersClass.ApplicationNumber,
-//                    string.Format(format, items));
-//        }
-
-//        /// <summary>
-//        /// Appends a device Key to the beginning of a message
-//        /// </summary>
-//        public static void Console(uint level, IKeyed dev, string format, params object[] items)
-//        {
-//            if (Level >= level)
-//                Console(level, "[{0}] {1}", dev.Key, string.Format(format, items));
-//        }
-
-//        public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel, 
-//            string format, params object[] items)
-//        {
-//            if (Level >= level)
-//            {
-//                var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
-//                Console(level, str);
-//                LogError(errorLogLevel, str);
-//            }
-//        }
-
-//        public static void Console(uint level, ErrorLogLevel errorLogLevel,
-//            string format, params object[] items)
-//        {
-//            if (Level >= level)
-//            {
-//                var str = string.Format(format, items);
-//                Console(level, str);
-//                LogError(errorLogLevel, str);
-//            }
-//        }
-
-//        public static void LogError(ErrorLogLevel errorLogLevel, string str)
-//        {
-//            string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
-//            switch (errorLogLevel)
-//            {
-//                case ErrorLogLevel.Error:
-//                    ErrorLog.Error(msg);
-//                    break;
-//                case ErrorLogLevel.Warning:
-//                    ErrorLog.Warn(msg);
-//                    break;
-//                case ErrorLogLevel.Notice:
-//                    ErrorLog.Notice(msg);
-//                    break;
-//            }
-//        }
-
-//        public enum ErrorLogLevel
-//        {
-//            Error, Warning, Notice, None
-//        }
-//    }
-//}

Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -1,239 +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)
-			{
-				try
-				{
-					if (d is Device)
-						(d as Device).Activate();
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, d, "ERROR: Device activation failure:\r{0}", e);
-				}
-			}
-		}
-
-		/// <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 Core/PepperDashEssentialsBase/Devices/NewInterfaces.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-namespace PepperDash.Essentials.Core
-{
-	//public interface IVolumeFunctions
-	//{
-	//    BoolCueActionPair VolumeUpCueActionPair { get; }
-	//    BoolCueActionPair VolumeDownCueActionPair { get; }
-	//    BoolCueActionPair MuteToggleCueActionPair { get; }
-	//}
-
-	//public interface IVolumeTwoWay : IVolumeFunctions
-	//{
-	//    IntFeedback VolumeLevelFeedback { get; }
-	//    UShortCueActionPair VolumeLevelCueActionPair { get; }
-	//    BoolFeedback IsMutedFeedback { get; }
-	//}
-
-	///// <summary>
-	///// 
-	///// </summary>
-	//public static class IFunctionListExtensions
-	//{
-	//    public static string GetFunctionsConsoleList(this IHasCueActionList device)
-	//    {
-	//        var sb = new StringBuilder();
-	//        var list = device.CueActionList;
-	//        foreach (var cap in list)
-	//            sb.AppendFormat("{0,-15} {1,4} {2}\r", cap.Cue.Name, cap.Cue.Number, cap.GetType().Name);
-	//        return sb.ToString();
-	//    }
-	//}
-
-	public enum AudioChangeType
-	{
-		Mute, Volume
-	}
-
-	public class AudioChangeEventArgs
-	{
-		public AudioChangeType ChangeType { get; private set; }
-		public IBasicVolumeControls AudioDevice { get; private set; }
-
-		public AudioChangeEventArgs(IBasicVolumeControls device, AudioChangeType changeType)
-		{
-			ChangeType = changeType;
-			AudioDevice = device;
-		}
-	}
-}

Essentials Core/PepperDashEssentialsBase/Display/DELETE IRDisplayBase.cs

@@ -1,105 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public abstract class IRDisplayBase : DisplayBase, IHasCueActionList
-//    {
-//        public IrOutputPortController IrPort { get; private set; }
-//        /// <summary>
-//        /// Default to 200ms
-//        /// </summary>
-//        public ushort IrPulseTime { get; set; }
-//        bool _PowerIsOn;
-//        bool _IsWarmingUp;
-//        bool _IsCoolingDown;
-
-//        /// <summary>
-//        /// FunctionList is pre-defined to have power commands.
-//        /// </summary>
-//        public IRDisplayBase(string key, string name, IROutputPort port, string irDriverFilepath)
-//            : base(key, name)
-//        {
-//            IrPort = new IrOutputPortController("ir-" + key, port, irDriverFilepath);
-//            IrPulseTime = 200;
-//            WarmupTime = 7000;
-//            CooldownTime = 10000;
-
-//            CueActionList = new List<CueActionPair>
-//            {
-//                new BoolCueActionPair(CommonBoolCue.Power, b=> PowerToggle()),
-//                new BoolCueActionPair(CommonBoolCue.PowerOn, b=> PowerOn()),
-//                new BoolCueActionPair(CommonBoolCue.PowerOff, b=> PowerOff()),
-//            };
-//        }
-
-//        public override void PowerOn()
-//        {
-//            if (!PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-//            {
-//                _IsWarmingUp = true;
-//                IsWarmingUpFeedback.FireUpdate();
-//                // Fake power-up cycle
-//                WarmupTimer = new CTimer(o =>
-//                {
-//                    _IsWarmingUp = false;
-//                    _PowerIsOn = true;
-//                    IsWarmingUpFeedback.FireUpdate();
-//                    PowerIsOnFeedback.FireUpdate();
-//                }, WarmupTime);
-//            }
-//            IrPort.Pulse(IROutputStandardCommands.IROut_POWER_ON, IrPulseTime);
-//        }
-
-//        public override void PowerOff()
-//        {
-//            // If a display has unreliable-power off feedback, just override this and
-//            // remove this check.
-//            if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-//            {
-//                _IsCoolingDown = true;
-//                _PowerIsOn = false;
-//                PowerIsOnFeedback.FireUpdate();
-//                IsCoolingDownFeedback.FireUpdate();
-//                // Fake cool-down cycle
-//                CooldownTimer = new CTimer(o =>
-//                {
-//                    _IsCoolingDown = false;
-//                    IsCoolingDownFeedback.FireUpdate();
-//                }, CooldownTime);
-//            }
-//            IrPort.Pulse(IROutputStandardCommands.IROut_POWER_OFF, IrPulseTime);
-//        }
-
-//        public override void PowerToggle()
-//        {
-//            // Not sure how to handle the feedback, but we should default to power off fb.
-//            // Does this need to trigger feedback??
-//            _PowerIsOn = false;
-//            IrPort.Pulse(IROutputStandardCommands.IROut_POWER, IrPulseTime);
-//        }
-
-//        #region IFunctionList Members
-
-//        public List<CueActionPair> CueActionList
-//        {
-//            get;
-//            private set;
-//        }
-
-//        #endregion
-
-//        protected override Func<bool> PowerIsOnOutputFunc { get { return () => _PowerIsOn; } }
-//        protected override Func<bool> IsCoolingDownOutputFunc { get { return () => _IsCoolingDown; } }
-//        protected override Func<bool> IsWarmingUpOutputFunc { get { return () => _IsWarmingUp; } }
-
-//        public override void ExecuteSwitch(object selector)
-//        {
-//            IrPort.Pulse((string)selector, IrPulseTime);
-//        }
-//    }
-//}

Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class DisplayBase : Device, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
-	{
-		public BoolFeedback PowerIsOnFeedback { get; protected set; }
-		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
-		public BoolFeedback IsWarmingUpFeedback { get; private set; }
-
-        public UsageTracking UsageTracker { get; set; }
-
-		public uint WarmupTime { get; set; }
-		public uint CooldownTime { get; set; }
-
-		/// <summary>
-		/// Bool Func that will provide a value for the PowerIsOn Output. Must be implemented
-		/// by concrete sub-classes
-		/// </summary>
-		abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
-		abstract protected Func<bool> IsCoolingDownFeedbackFunc { get; }
-		abstract protected Func<bool> IsWarmingUpFeedbackFunc { get; }
-        
-
-		protected CTimer WarmupTimer;
-		protected CTimer CooldownTimer;
-
-		#region IRoutingInputs Members
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-		#endregion
-
-		public DisplayBase(string key, string name)
-			: base(key, name)
-		{
-			PowerIsOnFeedback = new BoolFeedback(CommonBoolCue.PowerOnFeedback, PowerIsOnFeedbackFunc);
-			IsCoolingDownFeedback = new BoolFeedback(CommonBoolCue.IsCoolingDown, IsCoolingDownFeedbackFunc);
-			IsWarmingUpFeedback = new BoolFeedback(CommonBoolCue.IsWarmingUp, IsWarmingUpFeedbackFunc);
-
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-
-            PowerIsOnFeedback.OutputChange += new EventHandler<EventArgs>(PowerIsOnFeedback_OutputChange);
-		}
-
-        void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
-        {
-            if (UsageTracker != null)
-            {
-                if (PowerIsOnFeedback.BoolValue)
-                    UsageTracker.StartDeviceUsage();
-                else
-                    UsageTracker.EndDeviceUsage();
-            }
-        }
-
-		public abstract void PowerOn();
-		public abstract void PowerOff();
-		public abstract void PowerToggle();
-
-		public virtual List<Feedback> Feedbacks
-		{
-			get
-			{
-				return new List<Feedback>
-				{
-					PowerIsOnFeedback,
-					IsCoolingDownFeedback,
-					IsWarmingUpFeedback
-				};
-			}
-		}
-
-		public abstract void ExecuteSwitch(object selector);
-
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-    public abstract class TwoWayDisplayBase : DisplayBase
-	{
-        public StringFeedback CurrentInputFeedback { get; private set; }
-
-        abstract protected Func<string> CurrentInputFeedbackFunc { get; }
-
-
-        public static MockDisplay DefaultDisplay
-        { 
-			get 
-			{
-				if (_DefaultDisplay == null)
-					_DefaultDisplay = new MockDisplay("default", "Default Display");
-				return _DefaultDisplay;
-			} 
-		}
-		static MockDisplay _DefaultDisplay;
-
-		public TwoWayDisplayBase(string key, string name)
-			: base(key, name)
-		{
-            CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
-
-			WarmupTime = 7000;
-			CooldownTime = 15000;
-
-            Feedbacks.Add(CurrentInputFeedback);
-
-            
-		}
-
-	}
-}

Essentials Core/PepperDashEssentialsBase/Feedbacks/Feedbacks.cs

@@ -1,321 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-namespace PepperDash.Essentials.Core
-{
-	public abstract class Feedback
-	{
-		public event EventHandler<EventArgs> OutputChange;
-
-		public virtual bool BoolValue { get { return false; } }
-		public virtual int IntValue { get { return 0; } }
-		public virtual string StringValue { get { return ""; } }
-
-		public Cue Cue { get; private set; }
-
-		public abstract eCueType Type { get; }
-
-		/// <summary>
-		/// Feedbacks can be put into test mode for simulation of events without real data. 
-		/// Using JSON debugging methods and the Set/ClearTestValue methods, we can simulate
-		/// Feedback behaviors
-		/// </summary>
-		public bool InTestMode { get; protected set; }
-
-		/// <summary>
-		/// Base Constructor - empty
-		/// </summary>
-		protected Feedback()
-		{
-		}
-
-		protected Feedback(Cue cue)
-		{
-			Cue = cue;
-		}
-
-		/// <summary>
-		/// Clears test mode and fires update.
-		/// </summary>
-		public void ClearTestValue()
-		{
-			InTestMode = false;
-			FireUpdate();
-		}
-
-		/// <summary>
-		/// Fires an update synchronously
-		/// </summary>
-		public abstract void FireUpdate();
-
-		/// <summary>
-		/// Fires the update asynchronously within a CrestronInvoke
-		/// </summary>
-		public void InvokeFireUpdate()
-		{
-			CrestronInvoke.BeginInvoke(o => FireUpdate());
-		}
-
-		/// <summary>
-		/// Helper method that fires event. Use this intstead of calling OutputChange
-		/// </summary>
-		protected void OnOutputChange()
-		{
-			if (OutputChange != null) OutputChange(this, EventArgs.Empty);
-		}
-	}
-
-    /// <summary>
-    /// A Feedback whose output is derived from the return value of a provided Func.
-    /// </summary>
-	public class BoolFeedback : Feedback
-	{
-        /// <summary>
-        /// Returns the current value of the feedback, derived from the ValueFunc. The ValueFunc is 
-		/// evaluated whenever FireUpdate() is called
-        /// </summary>
-        public override bool BoolValue { get { return _BoolValue; } }
-        bool _BoolValue;
-
-		public override eCueType Type { get { return eCueType.Bool; } }
-
-		/// <summary>
-		/// Fake value to be used in test mode
-		/// </summary>
-		public bool TestValue { get; private set; }
-
-		/// <summary>
-		/// Func that evaluates on FireUpdate
-		/// </summary>
-		public Func<bool> ValueFunc { get; private set; }
-
-		List<BoolInputSig> LinkedInputSigs = new List<BoolInputSig>();
-		List<BoolInputSig> LinkedComplementInputSigs = new List<BoolInputSig>();
-
-		public BoolFeedback(Func<bool> valueFunc)
-			: this(Cue.DefaultBoolCue, valueFunc)
-		{
-		}
-
-		public BoolFeedback(Cue cue, Func<bool> valueFunc)
-			: base(cue)
-		{
-			if (cue == null) throw new ArgumentNullException("cue");
-			ValueFunc = valueFunc;
-		}
-
-		public override void FireUpdate()
-		{
-			bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();
-            if (newValue != _BoolValue)
-            {
-                _BoolValue = newValue;
-			    LinkedInputSigs.ForEach(s => UpdateSig(s));
-			    LinkedComplementInputSigs.ForEach(s => UpdateComplementSig(s));
-			    OnOutputChange();
-            }
-		}
-
-		public void LinkInputSig(BoolInputSig sig)
-		{
-			LinkedInputSigs.Add(sig);
-			UpdateSig(sig);
-		}
-
-		public void UnlinkInputSig(BoolInputSig sig)
-		{
-			LinkedInputSigs.Remove(sig);
-		}
-
-		public void LinkComplementInputSig(BoolInputSig sig)
-		{
-			LinkedComplementInputSigs.Add(sig);
-			UpdateComplementSig(sig);
-		}
-
-		public void UnlinkComplementInputSig(BoolInputSig sig)
-		{
-			LinkedComplementInputSigs.Remove(sig);
-		}
-
-        public override string ToString()
-        {
-			return (InTestMode ? "TEST -- " : "") + BoolValue.ToString();
-        }
-
-		/// <summary>
-		/// Puts this in test mode, sets the test value and fires an update.
-		/// </summary>
-		/// <param name="value"></param>
-		public void SetTestValue(bool value)
-		{
-			TestValue = value;
-			InTestMode = true;
-			FireUpdate();
-		}
-
-		void UpdateSig(BoolInputSig sig)
-		{
-			sig.BoolValue = _BoolValue;
-		}
-
-		void UpdateComplementSig(BoolInputSig sig)
-		{
-			sig.BoolValue = !_BoolValue;
-		}
-	}
-
-	//******************************************************************************
-	public class IntFeedback : Feedback
-	{
-        public override int IntValue { get { return _IntValue; } } // ValueFunc.Invoke(); } }
-        int _IntValue;
-        public ushort UShortValue { get { return (ushort)_IntValue; } }
-
-		public override eCueType Type { get { return eCueType.Int; } }
-
-		public int TestValue { get; private set; }
-
-		/// <summary>
-		/// Func evaluated on FireUpdate
-		/// </summary>
-		Func<int> ValueFunc;
-		List<UShortInputSig> LinkedInputSigs = new List<UShortInputSig>();
-
-		public IntFeedback(Func<int> valueFunc)
-			: this(Cue.DefaultIntCue, valueFunc)
-		{
-		}
-
-		public IntFeedback(Cue cue, Func<int> valueFunc)
-			: base(cue)
-		{
-			if (cue == null) throw new ArgumentNullException("cue");
-			ValueFunc = valueFunc;
-		}
-
-		public override void FireUpdate()
-		{
-			var newValue = InTestMode ? TestValue : ValueFunc.Invoke();
-            if (newValue != _IntValue)
-            {
-                _IntValue = newValue;
-                LinkedInputSigs.ForEach(s => UpdateSig(s));
-                OnOutputChange();
-            }
-		}
-
-		public void LinkInputSig(UShortInputSig sig)
-		{
-			LinkedInputSigs.Add(sig);
-			UpdateSig(sig);
-		}
-
-		public void UnlinkInputSig(UShortInputSig sig)
-		{
-			LinkedInputSigs.Remove(sig);
-		}
-
-        public override string ToString()
-        {
-			return (InTestMode ? "TEST -- " : "") + IntValue.ToString();
-        }
-
-		/// <summary>
-		/// Puts this in test mode, sets the test value and fires an update.
-		/// </summary>
-		/// <param name="value"></param>
-		public void SetTestValue(int value)
-		{
-			TestValue = value;
-			InTestMode = true;
-			FireUpdate();
-		}
-
-		void UpdateSig(UShortInputSig sig)
-		{
-            sig.UShortValue = UShortValue;
-		}
-	}
-
-
-	//******************************************************************************
-	public class StringFeedback : Feedback
-	{
-        public override string StringValue { get { return _StringValue; } } // ValueFunc.Invoke(); } }
-        string _StringValue;
-
-		public override eCueType Type { get { return eCueType.String; } }
-
-		/// <summary>
-		/// Used in testing.  Set/Clear functions
-		/// </summary>
-		public string TestValue { get; private set; }
-
-		/// <summary>
-		/// Evalutated on FireUpdate
-		/// </summary>
-		public Func<string> ValueFunc { get; private set; }
-		List<StringInputSig> LinkedInputSigs = new List<StringInputSig>();
-
-		public StringFeedback(Func<string> valueFunc)
-			: this(Cue.DefaultStringCue, valueFunc)
-		{
-		}
-
-		public StringFeedback(Cue cue, Func<string> valueFunc)
-			: base(cue)
-		{
-			if (cue == null) throw new ArgumentNullException("cue");
-			ValueFunc = valueFunc;
-
-		}
-
-		public override void FireUpdate()
-		{
-            var newValue = InTestMode ? TestValue : ValueFunc.Invoke();
-            if (newValue != _StringValue)
-            {
-                _StringValue = newValue;
-                LinkedInputSigs.ForEach(s => UpdateSig(s));
-                OnOutputChange();
-            }
-		}
-
-		public void LinkInputSig(StringInputSig sig)
-		{
-			LinkedInputSigs.Add(sig);
-			UpdateSig(sig);
-		}
-
-		public void UnlinkInputSig(StringInputSig sig)
-		{
-			LinkedInputSigs.Remove(sig);
-		}
-
-        public override string ToString()
-        {
-            return (InTestMode ? "TEST -- " : "") + StringValue;    
-        }
-
-		/// <summary>
-		/// Puts this in test mode, sets the test value and fires an update.
-		/// </summary>
-		/// <param name="value"></param>
-		public void SetTestValue(string value)
-		{
-			TestValue = value;
-			InTestMode = true;
-			FireUpdate();
-		}
-
-		void UpdateSig(StringInputSig sig)
-		{
-            sig.StringValue = _StringValue;
-		}
-	}
-}

Essentials Core/PepperDashEssentialsBase/Fusion/MOVED FusionSystemController.cs

@@ -1,377 +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.Fusion;
-//using PepperDash.Essentials.Core;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core.Fusion
-//{
-//    public class EssentialsHuddleSpaceFusionSystemController : Device
-//    {
-//        FusionRoom FusionRoom;
-//        Room Room;
-//        Dictionary<IPresentationSource, BoolInputSig> SourceToFeedbackSigs = new Dictionary<IPresentationSource, BoolInputSig>();
-
-//        StatusMonitorCollection ErrorMessageRollUp;
-
-//        public EssentialsHuddleSpaceFusionSystemController(HuddleSpaceRoom room, uint ipId)
-//            : base(room.Key + "-fusion")
-//        {
-//            Room = room;
-
-//            FusionRoom = new FusionRoom(ipId, Global.ControlSystem, room.Name, "awesomeGuid-" + room.Key);
-//            FusionRoom.Register();
-
-//            FusionRoom.FusionStateChange += new FusionStateEventHandler(FusionRoom_FusionStateChange);
-
-//            // Room to fusion room
-//            room.RoomIsOn.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
-//            var srcName = FusionRoom.CreateOffsetStringSig(50, "Source - Name", eSigIoMask.InputSigOnly);
-//            room.CurrentSourceName.LinkInputSig(srcName.InputSig);
-
-//            FusionRoom.SystemPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (b) room.RoomOn(null); });
-//            FusionRoom.SystemPowerOff.OutputSig.UserObject = new Action<bool>(b => { if (b) room.RoomOff(); });
-//            // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
-//            FusionRoom.ErrorMessage.InputSig.StringValue = "3: 7 Errors: This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;";
-
-//            // Sources
-//            foreach (var src in room.Sources)
-//            {
-//                var srcNum = src.Key;
-//                var pSrc = src.Value as IPresentationSource;
-//                var keyNum = ExtractNumberFromKey(pSrc.Key);
-//                if (keyNum == -1)
-//                {
-//                    Debug.Console(1, this, "WARNING: Cannot link source '{0}' to numbered Fusion attributes", pSrc.Key);
-//                    continue;
-//                }
-//                string attrName = null;
-//                uint attrNum = Convert.ToUInt32(keyNum);
-//                switch (pSrc.Type)
-//                {
-//                    case PresentationSourceType.None:
-//                        break;
-//                    case PresentationSourceType.SetTopBox:
-//                        attrName = "Source - TV " + keyNum;
-//                        attrNum += 115;	// TV starts at 116
-//                        break;
-//                    case PresentationSourceType.Dvd:
-//                        attrName = "Source - DVD " + keyNum;
-//                        attrNum += 120; // DVD starts at 121
-//                        break;
-//                    case PresentationSourceType.PC:
-//                        attrName = "Source - PC " + keyNum;
-//                        attrNum += 110; // PC starts at 111
-//                        break;
-//                    case PresentationSourceType.Laptop:
-//                        attrName = "Source - Laptop " + keyNum;
-//                        attrNum += 100; // Laptops start at 101
-//                        break;
-//                    case PresentationSourceType.VCR:
-//                        attrName = "Source - VCR " + keyNum;
-//                        attrNum += 125; // VCRs start at 126
-//                        break;
-//                }
-//                if (attrName == null)
-//                {
-//                    Debug.Console(1, this, "Source type {0} does not have corresponsing Fusion attribute type, skipping", pSrc.Type);
-//                    continue;
-//                }
-//                Debug.Console(2, this, "Creating attribute '{0}' with join {1} for source {2}", attrName, attrNum, pSrc.Key);
-//                var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputOutputSig);
-//                // Need feedback when this source is selected
-//                // Event handler, added below, will compare source changes with this sig dict
-//                SourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
-
-//                // And respond to selection in Fusion
-//                sigD.OutputSig.UserObject = new Action<bool>(b => { if(b) room.SelectSource(pSrc); });
-//            }
-
-//            // Attach to all room's devices with monitors.
-//            //foreach (var dev in DeviceManager.Devices)
-//            foreach (var dev in DeviceManager.GetDevices())
-//            {
-//                if (!(dev is ICommunicationMonitor))
-//                    continue;
-
-//                var keyNum = ExtractNumberFromKey(dev.Key);
-//                if (keyNum == -1)
-//                {
-//                    Debug.Console(1, this, "WARNING: Cannot link device '{0}' to numbered Fusion monitoring attributes", dev.Key);
-//                    continue;
-//                }
-//                string attrName = null;
-//                uint attrNum = Convert.ToUInt32(keyNum);
-
-//                //if (dev is SmartGraphicsTouchpanelControllerBase)
-//                //{
-//                //    if (attrNum > 10)
-//                //        continue;
-//                //    attrName = "Device Ok - Touch Panel " + attrNum;
-//                //    attrNum += 200;
-//                //}
-//                //// add xpanel here
-
-//                //else 
-//                    if (dev is DisplayBase)
-//                {
-//                    if (attrNum > 10)
-//                        continue;
-//                    attrName = "Device Ok - Display " + attrNum;
-//                    attrNum += 240;
-//                }
-//                //else if (dev is DvdDeviceBase)
-//                //{
-//                //    if (attrNum > 5)
-//                //        continue;
-//                //    attrName = "Device Ok - DVD " + attrNum;
-//                //    attrNum += 260;
-//                //}
-//                // add set top box
-
-//                // add Cresnet roll-up
-
-//                // add DM-devices roll-up
-
-//                if (attrName != null)
-//                {
-//                    // Link comm status to sig and update
-//                    var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputSigOnly);
-//                    var smd = dev as ICommunicationMonitor;
-//                    sigD.InputSig.BoolValue = smd.CommunicationMonitor.Status == MonitorStatus.IsOk;
-//                    smd.CommunicationMonitor.StatusChange += (o, a) => { sigD.InputSig.BoolValue = a.Status == MonitorStatus.IsOk; };
-//                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", dev.Key, attrName);
-//                }
-//            }
-
-//            // Don't think we need to get current status of this as nothing should be alive yet. 
-//            room.PresentationSourceChange += Room_PresentationSourceChange;
-
-//            // these get used in multiple places
-//            var display = room.Display;
-//            var dispPowerOnAction = new Action<bool>(b => { if (!b) display.PowerOn(); });
-//            var dispPowerOffAction = new Action<bool>(b => { if (!b) display.PowerOff(); });
-
-//            // Display to fusion room sigs
-//            FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
-//            FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
-//            display.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-//            if (display is IDisplayUsage)
-//                (display as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-
-//            // Roll up ALL device errors
-//            ErrorMessageRollUp = new StatusMonitorCollection(this);
-//            foreach (var dev in DeviceManager.GetDevices())
-//            {
-//                var md = dev as ICommunicationMonitor;
-//                if (md != null)
-//                {
-//                    ErrorMessageRollUp.AddMonitor(md.CommunicationMonitor);
-//                    Debug.Console(2, this, "Adding '{0}' to room's overall error monitor", md.CommunicationMonitor.Parent.Key);
-//                }
-//            }
-//            ErrorMessageRollUp.Start();
-//            FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message;
-//            ErrorMessageRollUp.StatusChange += (o, a) => {
-//                FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message; };
-
-
-//            // static assets --------------- testing
-
-//            // test assets --- THESE ARE BOTH WIRED TO AssetUsage somewhere internally.
-//            var ta1 = FusionRoom.CreateStaticAsset(1, "Test asset 1", "Awesome Asset", "Awesome123");
-//            ta1.AssetError.InputSig.StringValue = "This should be error";
-
-
-//            var ta2 = FusionRoom.CreateStaticAsset(2, "Test asset 2", "Awesome Asset", "Awesome1232");
-//            ta2.AssetUsage.InputSig.StringValue = "This should be usage";
-			
-
-//            // Make a display asset
-//            var dispAsset = FusionRoom.CreateStaticAsset(3, display.Name, "Display", "awesomeDisplayId" + room.Key);
-//            dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
-//            dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
-//            display.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
-//            // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
-//            // Use extension methods
-//            dispAsset.TrySetMakeModel(display);
-//            dispAsset.TryLinkAssetErrorToCommunication(display);
-		
-
-//            // Make it so!
-//            FusionRVI.GenerateFileForAllFusionDevices();
-//        }
-
-//        /// <summary>
-//        /// Helper to get the number from the end of a device's key string
-//        /// </summary>
-//        /// <returns>-1 if no number matched</returns>
-//        int ExtractNumberFromKey(string key)
-//        {
-//            var capture = System.Text.RegularExpressions.Regex.Match(key, @"\D+(\d+)");
-//            if (!capture.Success)
-//                return -1;
-//            else return Convert.ToInt32(capture.Groups[1].Value);
-//        }
-
-//        void Room_PresentationSourceChange(object sender, EssentialsRoomSourceChangeEventArgs e)
-//        {
-//            if (e.OldSource != null)
-//            {
-//                if (SourceToFeedbackSigs.ContainsKey(e.OldSource))
-//                    SourceToFeedbackSigs[e.OldSource].BoolValue = false;
-//            }
-//            if (e.NewSource != null)
-//            {
-//                if (SourceToFeedbackSigs.ContainsKey(e.NewSource))
-//                    SourceToFeedbackSigs[e.NewSource].BoolValue = true;
-//            }
-//        }
-
-//        void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventArgs args)
-//        {
-
-//            // The sig/UO method: Need separate handlers for fixed and user sigs, all flavors, 
-//            // even though they all contain sigs.
-
-//            var sigData = (args.UserConfiguredSigDetail as BooleanSigDataFixedName);
-//            if (sigData != null)
-//            {
-//                var outSig = sigData.OutputSig;
-//                if (outSig.UserObject is Action<bool>)
-//                    (outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
-//                else if (outSig.UserObject is Action<ushort>)
-//                    (outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
-//                else if (outSig.UserObject is Action<string>)
-//                    (outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
-//                return;
-//            }
-
-//            var attrData = (args.UserConfiguredSigDetail as BooleanSigData);
-//            if (attrData != null)
-//            {
-//                var outSig = attrData.OutputSig;
-//                if (outSig.UserObject is Action<bool>)
-//                    (outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
-//                else if (outSig.UserObject is Action<ushort>)
-//                    (outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
-//                else if (outSig.UserObject is Action<string>)
-//                    (outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
-//                return;
-//            }			
-
-//        }
-//    }
-
-
-//    public static class FusionRoomExtensions
-//    {
-//        /// <summary>
-//        /// Creates and returns a fusion attribute. The join number will match the established Simpl
-//        /// standard of 50+, and will generate a 50+ join in the RVI. It calls
-//        /// FusionRoom.AddSig with join number - 49
-//        /// </summary>
-//        /// <returns>The new attribute</returns>
-//        public static BooleanSigData CreateOffsetBoolSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-//        {
-//            if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-//            number -= 49;
-//            fr.AddSig(eSigType.Bool, number, name, mask);
-//            return fr.UserDefinedBooleanSigDetails[number];
-//        }
-
-//        /// <summary>
-//        /// Creates and returns a fusion attribute. The join number will match the established Simpl
-//        /// standard of 50+, and will generate a 50+ join in the RVI. It calls
-//        /// FusionRoom.AddSig with join number - 49
-//        /// </summary>
-//        /// <returns>The new attribute</returns>
-//        public static UShortSigData CreateOffsetUshortSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-//        {
-//            if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-//            number -= 49;
-//            fr.AddSig(eSigType.UShort, number, name, mask);
-//            return fr.UserDefinedUShortSigDetails[number];
-//        }
-
-//        /// <summary>
-//        /// Creates and returns a fusion attribute. The join number will match the established Simpl
-//        /// standard of 50+, and will generate a 50+ join in the RVI. It calls
-//        /// FusionRoom.AddSig with join number - 49
-//        /// </summary>
-//        /// <returns>The new attribute</returns>
-//        public static StringSigData CreateOffsetStringSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-//        {
-//            if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-//            number -= 49;
-//            fr.AddSig(eSigType.String, number, name, mask);
-//            return fr.UserDefinedStringSigDetails[number];
-//        }
-
-//        /// <summary>
-//        /// Creates and returns a static asset
-//        /// </summary>
-//        /// <returns>the new asset</returns>
-//        public static FusionStaticAsset CreateStaticAsset(this FusionRoom fr, uint number, string name, string type, string instanceId)
-//        {
-//            fr.AddAsset(eAssetType.StaticAsset, number, name, type, instanceId);
-//            return fr.UserConfigurableAssetDetails[number].Asset as FusionStaticAsset;
-//        }
-//    }
-
-//    //************************************************************************************************
-//    /// <summary>
-//    /// Extensions to enhance Fusion room, asset and signal creation.
-//    /// </summary>
-//    public static class FusionStaticAssetExtensions
-//    {
-//        /// <summary>
-//        /// Tries to set a Fusion asset with the make and model of a device.
-//        /// If the provided Device is IMakeModel, will set the corresponding parameters on the fusion static asset.
-//        /// Otherwise, does nothing.
-//        /// </summary>
-//        public static void TrySetMakeModel(this FusionStaticAsset asset, Device device)
-//        {
-//            var mm = device as IMakeModel;
-//            if (mm != null)
-//            {
-//                asset.ParamMake.Value = mm.DeviceMake;
-//                asset.ParamModel.Value = mm.DeviceModel;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Tries to attach the AssetError input on a Fusion asset to a Device's
-//        /// CommunicationMonitor.StatusChange event. Does nothing if the device is not 
-//        /// IStatusMonitor
-//        /// </summary>
-//        /// <param name="asset"></param>
-//        /// <param name="device"></param>
-//        public static void TryLinkAssetErrorToCommunication(this FusionStaticAsset asset, Device device)
-//        {
-//            if (device is ICommunicationMonitor)
-//            {
-//                var monitor = (device as ICommunicationMonitor).CommunicationMonitor;
-//                monitor.StatusChange += (o, a) =>
-//                {
-//                    // Link connected and error inputs on asset
-//                    asset.Connected.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
-//                    asset.AssetError.InputSig.StringValue = a.Status.ToString();
-//                };
-//                // set current value
-//                asset.Connected.InputSig.BoolValue = monitor.Status == MonitorStatus.IsOk;
-//                asset.AssetError.InputSig.StringValue = monitor.Status.ToString();
-//            }
-//        }
-//    }
-
-//}

Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -1,49 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
-using Crestron.SimplSharpPro;
-
-//using PepperDash.Essentials.Core.Http;
-using PepperDash.Essentials.License;
-
-
-
-namespace PepperDash.Essentials.Core
-{
-	public static class Global
-	{
-		public static CrestronControlSystem ControlSystem { get; set; }
-
-		public static LicenseManager LicenseManager { get; set; }
-
-        public static string FilePathPrefix { get; private set; }
-
-        public static char DirectorySeparator
-        {
-            get
-            {
-                return System.IO.Path.DirectorySeparatorChar;
-            }
-        }
-
-        /// <summary>
-        /// Sets the file path prefix
-        /// </summary>
-        /// <param name="prefix"></param>
-        public static void SetFilePathPrefix(string prefix)
-        {
-            FilePathPrefix = prefix;
-        }
-
-		static Global()
-		{
-			// Fire up CrestronDataStoreStatic
-			var err = CrestronDataStoreStatic.InitCrestronDataStore();
-			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-			{
-				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
-				return;
-			}
-		}
-
-	}
-}

Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs

@@ -1,7 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("PepperDashEssentialsBase")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PepperDashEssentialsBase")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyVersion("1.0.3.*")]

Essentials Core/PepperDashEssentialsBase/REMOVE SigId.cs

@@ -1,37 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharpPro;
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public class SigId
-//    {
-//        public uint Number { get; private set; }
-//        public eSigType Type { get; private set; }
-
-//        public SigId(eSigType type, uint number)
-//        {
-//            Type = type;
-//            Number = number;
-//        }
-
-//        public override bool Equals(object id)
-//        {
-//            if (id is SigId)
-//            {
-//                var sigId = id as SigId;
-//                return this.Number == sigId.Number && this.Type == sigId.Type;
-//            }
-//            else
-//                return base.Equals(id);
-//        }
-
-//        public override int GetHashCode()
-//        {
-//            return base.GetHashCode();
-//        }
-//    }
-
-//}

Essentials Core/PepperDashEssentialsBase/References/SSMonoIOLibrary.clz/SSMonoIOLibrary.config

@@ -1,16 +0,0 @@
-<ProgramInfo>
-  <RequiredInfo>
-    <FriendlyName>SSMonoIOLibrary</FriendlyName>
-    <SystemName>SSMonoIOLibrary</SystemName>
-    <EntryPoint>SSMonoIOLibrary</EntryPoint>
-    <MinFirmwareVersion>1.007.0017</MinFirmwareVersion>
-    <ProgramTool>SIMPL# Plugin</ProgramTool>
-    <DesignToolId>5</DesignToolId>
-    <ProgramToolId>5</ProgramToolId>
-    <ArchiveName />
-  </RequiredInfo>
-  <OptionalInfo>
-    <CompiledOn>4/6/2016 7:49:24 AM</CompiledOn>
-    <CompilerRev>1.0.0.14081</CompilerRev>
-  </OptionalInfo>
-</ProgramInfo>

Essentials Core/PepperDashEssentialsBase/References/SSMonoIOLibrary.clz/manifest.info

@@ -1,18 +0,0 @@
-MainAssembly=SSMonoIOLibrary.dll:6c69af117dca3f74ebca99f7a0e3181c
-MainAssemblyMinFirmwareVersion=1.007.0017
-ü
-DependencySource=SimplSharpCustomAttributesInterface.dll:9c4b4d4c519b655af90016edca2d66b9
-DependencyPath=SSMonoIOLibrary.clz:SimplSharpCustomAttributesInterface.dll
-DependencyMainAssembly=SimplSharpCustomAttributesInterface.dll:9c4b4d4c519b655af90016edca2d66b9
-ü
-DependencySource=SimplSharpHelperInterface.dll:aed72eb0e19559a3f56708be76445dcd
-DependencyPath=SSMonoIOLibrary.clz:SimplSharpHelperInterface.dll
-DependencyMainAssembly=SimplSharpHelperInterface.dll:aed72eb0e19559a3f56708be76445dcd
-ü
-DependencySource=SimplSharpReflectionInterface.dll:e3ff8edbba84ccd7155b9984e67488b2
-DependencyPath=SSMonoIOLibrary.clz:SimplSharpReflectionInterface.dll
-DependencyMainAssembly=SimplSharpReflectionInterface.dll:e3ff8edbba84ccd7155b9984e67488b2
-ü
-DependencySource=SSharpCrestronExtensionsLibrary.dll:655a49edee523f150d1c03bcb5db87d0
-DependencyPath=SSMonoIOLibrary.clz:SSharpCrestronExtensionsLibrary.dll
-DependencyMainAssembly=SSharpCrestronExtensionsLibrary.dll:655a49edee523f150d1c03bcb5db87d0

Essentials Core/PepperDashEssentialsBase/References/SSMonoProTaskLibrary.cplz/SSMonoProTaskLibrary.config

@@ -1,16 +0,0 @@
-<ProgramInfo>
-  <RequiredInfo>
-    <FriendlyName>SSMonoProTaskLibrary</FriendlyName>
-    <SystemName>SSMonoProTaskLibrary</SystemName>
-    <EntryPoint>SSMonoProTaskLibrary</EntryPoint>
-    <MinFirmwareVersion>1.009.0029</MinFirmwareVersion>
-    <ProgramTool>SIMPL# Plugin</ProgramTool>
-    <DesignToolId>5</DesignToolId>
-    <ProgramToolId>5</ProgramToolId>
-    <ArchiveName />
-  </RequiredInfo>
-  <OptionalInfo>
-    <CompiledOn>4/6/2016 7:55:41 AM</CompiledOn>
-    <CompilerRev>1.0.0.14269</CompilerRev>
-  </OptionalInfo>
-</ProgramInfo>

Essentials Core/PepperDashEssentialsBase/References/SSMonoProTaskLibrary.cplz/manifest.info

@@ -1,30 +0,0 @@
-MainAssembly=SSMonoProTaskLibrary.dll:5d3a301400516bd812bf1566c72ccbf2
-MainAssemblyMinFirmwareVersion=1.009.0029
-ü
-DependencySource=SimplSharpReflectionInterface.dll:e3ff8edbba84ccd7155b9984e67488b2
-DependencyPath=SSMonoProTaskLibrary.cplz:SimplSharpReflectionInterface.dll
-DependencyMainAssembly=SimplSharpReflectionInterface.dll:e3ff8edbba84ccd7155b9984e67488b2
-ü
-DependencySource=SSharpCrestronExtensionsLibrary.dll:776d0247d8d42164c46c7cc1dfadbd03
-DependencyPath=SSMonoProTaskLibrary.cplz:SSharpCrestronExtensionsLibrary.dll
-DependencyMainAssembly=SSharpCrestronExtensionsLibrary.dll:776d0247d8d42164c46c7cc1dfadbd03
-ü
-DependencySource=SSMonoConcurrentCollectionsLibrary.dll:b0afcd989b081899c9eb29f9e4c8b799
-DependencyPath=SSMonoProTaskLibrary.cplz:SSMonoConcurrentCollectionsLibrary.dll
-DependencyMainAssembly=SSMonoConcurrentCollectionsLibrary.dll:b0afcd989b081899c9eb29f9e4c8b799
-ü
-DependencySource=SSMonoProConcurrentCollectionsLibrary.dll:8b718ce29f938bbf9cb5b8fc2d89332f
-DependencyPath=SSMonoProTaskLibrary.cplz:SSMonoProConcurrentCollectionsLibrary.dll
-DependencyMainAssembly=SSMonoProConcurrentCollectionsLibrary.dll:8b718ce29f938bbf9cb5b8fc2d89332f
-ü
-DependencySource=SSMonoSupportLibrary.dll:59362515f2c1d61583b2e40793987917
-DependencyPath=SSMonoProTaskLibrary.cplz:SSMonoSupportLibrary.dll
-DependencyMainAssembly=SSMonoSupportLibrary.dll:59362515f2c1d61583b2e40793987917
-ü
-DependencySource=SSMonoThreadingLibrary.dll:ea2ae2e1d9c425236f39de9192591062
-DependencyPath=SSMonoProTaskLibrary.cplz:SSMonoThreadingLibrary.dll
-DependencyMainAssembly=SSMonoThreadingLibrary.dll:ea2ae2e1d9c425236f39de9192591062
-ü
-DependencySource=SSMonoTupleLibrary.dll:2a3b419fff4199838079879053fcb41d
-DependencyPath=SSMonoProTaskLibrary.cplz:SSMonoTupleLibrary.dll
-DependencyMainAssembly=SSMonoTupleLibrary.dll:2a3b419fff4199838079879053fcb41d

Essentials Core/PepperDashEssentialsBase/Room/MOVED RoomEventArgs.cs

@@ -1,41 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public class EssentialsRoomSourceChangeEventArgs : EventArgs
-//    {
-//        public EssentialsRoom Room { get; private set; }
-//        public IPresentationSource OldSource { get; private set; }
-//        public IPresentationSource NewSource { get; private set; }
-
-//        public EssentialsRoomSourceChangeEventArgs(EssentialsRoom room, 
-//            IPresentationSource oldSource, IPresentationSource newSource)
-//        {
-//            Room = room;
-//            OldSource = oldSource;
-//            NewSource = newSource;
-//        }
-//    }
-
-
-
-//    public class EssentialsRoomAudioDeviceChangeEventArgs : EventArgs
-//    {
-//        public EssentialsRoom Room { get; private set; }
-//        public IBasicVolumeControls OldDevice { get; private set; }
-//        public IBasicVolumeControls NewDevice { get; private set; }
-
-//        public EssentialsRoomAudioDeviceChangeEventArgs(EssentialsRoom room,
-//            IBasicVolumeControls oldDevice, IBasicVolumeControls newDevice)
-//        {
-//            Room = room;
-//            OldDevice = oldDevice;
-//            NewDevice = newDevice;
-//        }
-//    }
-
-//}

Essentials Core/PepperDashEssentialsBase/Room/RoomCues.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials
-{
-	public static class RoomCue
-	{
-		// Commands/
-		//bools
-		public static readonly Cue RoomOnToggle = Cue.BoolCue("RoomOnToggle", 2001);
-		public static readonly Cue RoomOn = Cue.BoolCue("RoomOn", 2002);
-		public static readonly Cue RoomOff = Cue.BoolCue("RoomOff", 2003);
-		public static readonly Cue VolumeUp = Cue.BoolCue("VolumeUp", 2011);
-		public static readonly Cue VolumeDown = Cue.BoolCue("VolumeDown", 2012);
-		public static readonly Cue VolumeDefault = Cue.BoolCue("VolumeDefault", 2013);
-		public static readonly Cue MuteToggle = Cue.BoolCue("MuteToggle", 2014);
-		public static readonly Cue MuteOn = Cue.BoolCue("MuteOn", 2015);
-		public static readonly Cue MuteOff = Cue.BoolCue("MuteOff", 2016);
-
-		//ushorts
-		public static readonly Cue SelectSourceByNumber = Cue.UShortCue("SelectSourceByNumber", 2001);
-		public static readonly Cue VolumeLevel = Cue.UShortCue("VolumeLevel", 2011);
-		public static readonly Cue VolumeLevelPercent = Cue.UShortCue("VolumeLevelPercent", 2012);
-
-		//strings
-		public static readonly Cue SelectSourceByKey = Cue.StringCue("SelectSourceByKey", 2001);
-
-		// Outputs
-		//Bools
-		public static readonly Cue RoomIsOn = Cue.BoolCue("RoomIsOn", 2002);
-		public static readonly Cue RoomIsOnStandby = Cue.BoolCue("RoomIsOnStandby", 2003);
-		public static readonly Cue RoomIsWarmingUp = Cue.BoolCue("RoomIsWarmingUp", 2004);
-		public static readonly Cue RoomIsCoolingDown = Cue.BoolCue("RoomIsCoolingDown", 2005);
-		public static readonly Cue RoomIsOccupied = Cue.BoolCue("RoomIsOccupied", 2006);
-
-		//Ushorts
-		public static readonly Cue SourcesCount = Cue.UShortCue("SourcesCount", 2001);
-		public static readonly Cue CurrentSourceNumber = Cue.UShortCue("CurrentSourceNumber", 2002);
-		public static readonly Cue CurrentSourceType = Cue.UShortCue("CurrentSourceType", 2003);
-
-		//Strings
-		public static readonly Cue CurrentSourceKey = Cue.StringCue("CurrentSourceKey", 2001);
-		public static readonly Cue CurrentSourceName = Cue.StringCue("CurrentSourceName", 2002);
-
-		public static readonly Cue VolumeLevelText = Cue.StringCue("VolumeLevelText", 2012);
-
-		public static readonly Cue Key = Cue.StringCue("RoomKey", 2021);
-		public static readonly Cue Name = Cue.StringCue("RoomName", 2022);
-		public static readonly Cue Description = Cue.StringCue("Description", 2023);
-		public static readonly Cue HelpMessage = Cue.StringCue("HelpMessage", 2024);
-
-		//Special
-		public static readonly Cue Source = new Cue("Source", 0, eCueType.Other);
-	}
-}

Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/IRoutingInputsExtensions.cs

@@ -1,300 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IRoutingInputsExtensions
-	{
-		/// <summary>
-		/// Gets any existing route for a destination, clears it, and then 
-		/// </summary>
-		public static void ReleaseAndMakeRoute(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType)
-		{
-			var sw = new Stopwatch();
-			sw.Start();
-
-			destination.ReleaseRoute();
-
-			if (source == null) return;
-			var newRoute = destination.GetRouteToSource(source, signalType);
-			if (newRoute == null) return;
-			RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(newRoute);
-			Debug.Console(2, destination, "Executing new route");
-			newRoute.ExecuteRoutes();
-			sw.Stop();
-			Debug.Console(2, destination, "Route took {0} ms", sw.ElapsedMilliseconds);
-		}
-
-		/// <summary>
-		/// Will release the existing route on the destination
-		/// </summary>
-		/// <param name="destination"></param>
-		/// <param name="signalType"></param>
-		public static void ReleaseRoute(this IRoutingInputs destination)
-		{
-			var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
-			if (current != null)
-			{
-				Debug.Console(2, destination, "Releasing current route: {0}", current.Source.Key);
-				current.ReleaseRoutes();
-			}
-		}
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="device"></param>
-		/// <param name="targetSource"></param>
-		/// <param name="signalType"></param>
-		/// <returns></returns>
-		public static RouteDescriptor GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType)
-		{
-			var routeTable = new RouteDescriptor (source, destination, signalType);
-
-			Debug.Console(0, destination, "Attempting to build source route from {0}***", source.Key);
-			if (!destination.GetRouteToSource(source, null, null, signalType, 0, routeTable))
-				routeTable = null;
-
-			Debug.Console(0, destination, "Route{0} discovered ***", routeTable == null ? " NOT" : "");
-			return routeTable;
-		}
-
-		/// <summary>
-		/// The recursive part of this.  Will stop on each device, search its inputs for the 
-		/// desired source and if not found, invoke this function for the each input port
-		/// hoping to find the source.
-		/// </summary>
-		/// <param name="destination"></param>
-		/// <param name="source"></param>
-		/// <param name="onSuccessOutputPort"></param>
-		/// <param name="alreadyCheckedDevices"></param>
-		/// <param name="signalType"></param>
-		/// <param name="cycle"></param>
-		/// <param name="routeTable"></param>
-		/// <returns>true if source is hit</returns>
-		static bool GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source,
-			RoutingOutputPort onSuccessOutputPort, List<IRoutingInputsOutputs> alreadyCheckedDevices, 
-				eRoutingSignalType signalType, int cycle, RouteDescriptor routeTable)
-		{
-			cycle++;
-			Debug.Console(0, destination, "SelectInput-cycle {1}. Finding {2} route back to {0}", source.Key, cycle, signalType);
-			var destDevInputTies = TieLineCollection.Default.Where(t =>
-				t.DestinationPort.ParentDevice == destination && (t.Type == signalType || t.Type == eRoutingSignalType.AudioVideo));
-
-			// find a direct tie
-			var directTie = destDevInputTies.FirstOrDefault(
-				t => !(t.SourcePort.ParentDevice is IRoutingInputsOutputs) 
-					&& t.DestinationPort.ParentDevice == destination 
-					&& t.SourcePort.ParentDevice == source);
-			RoutingInputPort inputPort = null;
-			if (directTie != null) // Found a tie directly to the source
-			{
-				Debug.Console(0, destination, "Found direct tie to {0}**", source.Key);
-				inputPort = directTie.DestinationPort;
-			}
-			else // no direct-connect.  Walk back devices.
-			{
-				Debug.Console(0, destination, "is not directly connected to {0}. Walking down tie lines", source.Key);
-
-				// No direct tie? Run back out on the inputs' attached devices... 
-				// Only the ones that are routing devices
-				var attachedMidpoints = destDevInputTies.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
-				foreach (var inputTieToTry in attachedMidpoints)
-				{
-					Debug.Console(0, destination, "Trying to find route on {0}", inputTieToTry.SourcePort.ParentDevice.Key);
-					var upstreamDeviceOutputPort = inputTieToTry.SourcePort;
-					var upstreamRoutingDevice = upstreamDeviceOutputPort.ParentDevice as IRoutingInputsOutputs;
-					// Check if this previous device has already been walked
-					if (!(alreadyCheckedDevices != null && alreadyCheckedDevices.Contains(upstreamRoutingDevice)))
-					{
-						// haven't seen this device yet.  Do it.  Pass the output port to the next
-						// level to enable switching on success
-						var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort, 
-							alreadyCheckedDevices, signalType, cycle, routeTable);
-						if (upstreamRoutingSuccess)
-						{
-							Debug.Console(0, destination, "Upstream device route found");
-							inputPort = inputTieToTry.DestinationPort;
-							break; // Stop looping the inputs in this cycle
-						}
-					}
-				}
-			}
-
-			// we have a route on corresponding inputPort. *** Do the route ***
-			if (inputPort != null) 
-			{
-				Debug.Console(0, destination, "adding route:");
-				if (onSuccessOutputPort == null)
-				{
-					// it's a sink device
-					routeTable.Routes.Add(new RouteSwitchDescriptor(inputPort));
-				}
-				else if (destination is IRouting)
-				{
-					routeTable.Routes.Add(new RouteSwitchDescriptor (onSuccessOutputPort, inputPort));
-				}
-				else // device is merely IRoutingInputOutputs
-					Debug.Console(0, destination, "    No routing. Passthrough device");
-				Debug.Console(0, destination, "Exiting cycle {0}", cycle);
-				return true;
-			}
-	
-			if(alreadyCheckedDevices == null)
-				alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
-			alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs);
-
-			Debug.Console(0, destination, "No route found to {0}", source.Key);
-			return false;
-		}
-	}
-
-
-
-
-
-	// MOVE MOVE MOVE MOVE MOVE MOVE MOVE  MOVE MOVE MOVE MOVE MOVE MOVE MOVE  MOVE MOVE MOVE MOVE MOVE MOVE MOVE 
-
-
-	/// <summary>
-	/// A collection of routes - typically the global DefaultCollection is used
-	/// </summary>
-	public class RouteDescriptorCollection
-	{
-		public static RouteDescriptorCollection DefaultCollection
-		{
-			get
-			{
-				if (_DefaultCollection == null)
-					_DefaultCollection = new RouteDescriptorCollection();
-				return _DefaultCollection;
-			}
-		}
-		static RouteDescriptorCollection _DefaultCollection;
-
-		List<RouteDescriptor> RouteDescriptors = new List<RouteDescriptor>();
-
-		public void AddRouteDescriptor(RouteDescriptor descriptor)
-		{
-			if (RouteDescriptors.Any(t => t.Destination == descriptor.Destination))
-			{
-				Debug.Console(1, descriptor.Destination, 
-					"Route to [{0}] already exists in global routes table", descriptor.Source.Key);
-				return;
-			}
-			RouteDescriptors.Add(descriptor);
-		}
-
-		public RouteDescriptor GetRouteDescriptorForDestination(IRoutingInputs destination)
-		{
-			return RouteDescriptors.FirstOrDefault(rd => rd.Destination == destination);
-		}
-
-		/// <summary>
-		/// Returns the RouteDescriptor for a given destination and removes it from collection.
-		/// Returns null if no route with the provided destination exists.
-		/// </summary>
-		public RouteDescriptor RemoveRouteDescriptor(IRoutingInputs destination)
-		{
-			var descr = GetRouteDescriptorForDestination(destination);
-			if (descr != null)
-				RouteDescriptors.Remove(descr);
-			return descr;
-		}
-	}
-
-	/// <summary>
-	/// Represents an collection of individual route steps between Source and Destination
-	/// </summary>
-	public class RouteDescriptor
-	{
-		public IRoutingInputs Destination { get; private set; }
-		public IRoutingOutputs Source { get; private set; }
-		public eRoutingSignalType SignalType { get; private set; }
-		public List<RouteSwitchDescriptor> Routes { get; private set; }
-
-
-		public RouteDescriptor(IRoutingOutputs source, IRoutingInputs destination, eRoutingSignalType signalType)
-		{
-			Destination = destination;
-			Source = source;
-			SignalType = signalType;
-			Routes = new List<RouteSwitchDescriptor>();
-		}
-
-		public void ExecuteRoutes()
-		{
-			foreach (var route in Routes)
-			{
-				Debug.Console(2, route.ToString());
-				if (route.SwitchingDevice is IRoutingSinkWithSwitching)
-					(route.SwitchingDevice as IRoutingSinkWithSwitching).ExecuteSwitch(route.InputPort.Selector);
-				else if (route.SwitchingDevice is IRouting)
-				{
-					(route.SwitchingDevice as IRouting).ExecuteSwitch(route.InputPort.Selector, route.OutputPort.Selector, SignalType);
-					route.OutputPort.InUseTracker.AddUser(Destination, "destination");
-				}
-			}
-		}
-
-		public void ReleaseRoutes()
-		{
-			foreach (var route in Routes)
-			{
-				if (route.SwitchingDevice is IRouting)
-				{
-					// Pull the route from the port.  Whatever is watching the output's in use tracker is
-					// responsible for responding appropriately.
-					route.OutputPort.InUseTracker.RemoveUser(Destination, "destination");
-				}
-			}
-		}
-
-		public override string ToString()
-		{
-			var routesText = Routes.Select(r => r.ToString()).ToArray();
-			return string.Format("Route table from {0} to {1}:\r{2}", Source.Key, Destination.Key, string.Join("\r", routesText));
-		}
-	}
-
-	/// <summary>
-	/// Represents an individual link for a route
-	/// </summary>
-	public class RouteSwitchDescriptor
-	{
-		public IRoutingInputs SwitchingDevice { get { return InputPort.ParentDevice; } }
-		public RoutingOutputPort OutputPort { get; set; }
-		public RoutingInputPort InputPort { get; set; }
-
-		public RouteSwitchDescriptor(RoutingInputPort inputPort)
-		{
-			InputPort = inputPort;
-		}
-
-		public RouteSwitchDescriptor(RoutingOutputPort outputPort, RoutingInputPort inputPort)
-		{
-			InputPort = inputPort;
-			OutputPort = outputPort;
-		}
-
-		public override string ToString()
-		{
-			if(OutputPort == null) // IRoutingSink
-				return string.Format("{0} switches to input '{1}'", SwitchingDevice.Key, InputPort.Selector);
-
-			return string.Format("{0} switches output '{1}' to input '{2}'", SwitchingDevice.Key, OutputPort.Selector, InputPort.Selector);
-		}
-	}
-}

Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/RoutingInterfaces.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	//*******************************************************************************************
-	// Interfaces
-
-	public interface IRoutingInputs : IKeyed
-	{
-		RoutingPortCollection<RoutingInputPort> InputPorts { get; }
-	}
-
-	public interface IRoutingOutputs : IKeyed
-	{
-		RoutingPortCollection<RoutingOutputPort> OutputPorts { get; }
-	}
-
-	/// <summary>
-	/// For fixed-source endpoint devices
-	/// </summary>
-	public interface IRoutingSinkNoSwitching : IRoutingInputs
-	{
-
-	}
-
-	public interface IRoutingSinkWithSwitching : IRoutingSinkNoSwitching
-	{
-		//void ClearRoute();
-		void ExecuteSwitch(object inputSelector);
-	}
-
-	/// <summary>
-	/// For devices like RMCs, baluns, other devices with no switching.
-	/// </summary>
-	public interface IRoutingInputsOutputs : IRoutingInputs, IRoutingOutputs
-	{
-	}
-
-	public interface IRouting : IRoutingInputsOutputs
-	{
-		//void ClearRoute(object outputSelector);
-		void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType);
-	}
-
-	public interface IRoutingSource : IRoutingOutputs
-	{
-	}
-}

Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/RoutingPort.cs

@@ -1,144 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// Base class for RoutingInput and Output ports
-	/// </summary>
-	public abstract class RoutingPort : IKeyed
-	{
-		public string Key { get; private set; }
-		public eRoutingSignalType Type { get; private set; }
-		public eRoutingPortConnectionType ConnectionType { get; private set; }
-		public readonly object Selector;
-		public bool IsInternal { get; private set; }
-
-		public RoutingPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType, object selector, bool isInternal)
-		{
-			Key = key;
-			Type = type;
-			ConnectionType = connType;
-			Selector = selector;
-			IsInternal = IsInternal;
-		}
-	}
-
-	public enum eRoutingSignalType
-	{
-		Audio,
-		Video,
-		AudioVideo
-	}
-
-	public enum eRoutingPortConnectionType
-	{
-		None, BackplaneOnly, Hdmi, Rgb, Vga, LineAudio, DigitalAudio, Sdi, Composite, Component, DmCat, DmMmFiber, DmSmFiber
-	}
-
-	/// <summary>
-	/// Basic RoutingInput with no statuses.
-	/// </summary>
-	public class RoutingInputPort : RoutingPort
-	{
-		/// <summary>
-		/// The IRoutingInputs object this lives on
-		/// </summary>
-		public IRoutingInputs ParentDevice { get; private set; }
-
-		/// <summary>
-		/// Constructor for a basic RoutingInputPort
-		/// </summary>
-		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-		/// May be string, number, whatever</param>
-		/// <param name="parent">The IRoutingInputs object this lives on</param>
-		public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingInputs parent)
-			: this (key, type, connType, selector, parent, false)
-		{
-		}
-
-		/// <summary>
-		/// Constructor for a virtual routing input port that lives inside a device. For example
-		/// the ports that link a DM card to a DM matrix bus
-		/// </summary>
-		/// <param name="isInternal">true for internal ports</param>
-		public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingInputs parent, bool isInternal)
-			: base(key, type, connType, selector, isInternal)
-		{
-			if (parent == null)
-				throw new ArgumentNullException("parent");
-			ParentDevice = parent;
-		}
-
-	}
-
-	/// <summary>
-	/// A RoutingInputPort for devices like DM-TX and DM input cards. 
-	/// Will provide video statistics on connected signals
-	/// </summary>
-	public class RoutingInputPortWithVideoStatuses : RoutingInputPort
-	{
-		/// <summary>
-		/// Video statuses attached to this port
-		/// </summary>
-		public VideoStatusOutputs VideoStatus { get; private set; }
-
-		/// <summary>
-		/// Constructor 
-		/// </summary>
-		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-		/// May be string, number, whatever</param>
-		/// <param name="parent">The IRoutingInputs object this lives on</param>
-		/// <param name="funcs">A VideoStatusFuncsWrapper used to assign the callback funcs that will get 
-		/// the values for the various stats</param>
-		public RoutingInputPortWithVideoStatuses(string key, 
-			eRoutingSignalType type, eRoutingPortConnectionType connType, object selector, 
-			IRoutingInputs parent, VideoStatusFuncsWrapper funcs) :
-			base(key, type, connType, selector, parent)
-		{
-			VideoStatus = new VideoStatusOutputs(funcs);
-		}
-	}
-
-	public class RoutingOutputPort : RoutingPort
-	{
-		/// <summary>
-		/// The IRoutingOutputs object this port lives on
-		/// </summary>
-		public IRoutingOutputs ParentDevice { get; private set; }
-
-		public InUseTracking InUseTracker { get; private set; }
-
-
-		/// <summary>
-		/// </summary>
-		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
-		/// May be string, number, whatever</param>
-		/// <param name="parent">The IRoutingOutputs object this port lives on</param>
-		public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingOutputs parent)
-			: this(key, type, connType, selector, parent, false)
-		{
-		}
-
-		public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
-			object selector, IRoutingOutputs parent, bool isInternal)
-			: base(key, type, connType, selector, isInternal)
-		{
-			if (parent == null)
-				throw new ArgumentNullException("parent");
-			ParentDevice = parent;
-			InUseTracker = new InUseTracking();
-		}
-
-		public override string ToString()
-		{
-			return ParentDevice.Key + ":" + Key;
-		}
-	}
-}

Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/TieLine.cs

@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	public class TieLine
-	{
-		public RoutingOutputPort SourcePort { get; private set; }
-		public RoutingInputPort DestinationPort { get; private set; }
-		public int InUseCount { get { return DestinationUsingThis.Count; } }
-
-		/// <summary>
-		/// Gets the type of this tie line.  Will either be the type of the desination port
-		/// or the type of OverrideType when it is set.
-		/// </summary>
-		public eRoutingSignalType Type
-		{
-			get
-			{
-				if (OverrideType.HasValue) return OverrideType.Value;
-				return DestinationPort.Type;
-			}
-		}
-
-		/// <summary>
-		/// Use this to override the Type property for the destination port. For example,
-		/// when the tie line is type AudioVideo, and the signal flow should be limited to
-		/// Audio-only or Video only, changing this type will alter the signal paths
-		/// available to the routing algorithm without affecting the actual Type
-		/// of the destination port.
-		/// </summary>
-		public eRoutingSignalType? OverrideType { get; set; }
-
-		List<IRoutingInputs> DestinationUsingThis = new List<IRoutingInputs>();
-
-		/// <summary>
-		/// For tie lines that represent internal links, like from cards to the matrix in a DM.
-		/// This property is true if SourcePort and DestinationPort IsInternal
-		/// property are both true
-		/// </summary>
-		public bool IsInternal { get { return SourcePort.IsInternal && DestinationPort.IsInternal; } }
-		public bool TypeMismatch { get { return SourcePort.Type != DestinationPort.Type; } }
-		public bool ConnectionTypeMismatch { get { return SourcePort.ConnectionType != DestinationPort.ConnectionType; } }
-		public string TypeMismatchNote { get; set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sourcePort"></param>
-		/// <param name="destinationPort"></param>
-		public TieLine(RoutingOutputPort sourcePort, RoutingInputPort destinationPort)
-		{
-			if (sourcePort == null || destinationPort == null)
-				throw new ArgumentNullException("source or destination port");
-			SourcePort = sourcePort;
-			DestinationPort = destinationPort;
-		}
-
-		/// <summary>
-		/// Creates a tie line with an overriding Type.  See help for OverrideType property for info
-		/// </summary>
-		/// <param name="overrideType">The signal type to limit the link to. Overrides DestinationPort.Type</param>
-		public TieLine(RoutingOutputPort sourcePort, RoutingInputPort destinationPort, eRoutingSignalType overrideType) :
-			this(sourcePort, destinationPort)
-		{
-			OverrideType = overrideType;
-		}
-
-		public static TieLine TieLineFromStrings(string sourceKey, string sourcePortKey, string destinationKey, string destinationPortKey)
-		{
-			var sourceDev = DeviceManager.GetDeviceForKey(sourceKey) as IRoutingOutputs;
-			if (sourceDev == null)
-			{
-				Debug.Console(1, "WARNING: Cannot create tie line, routable source '{0}' not found", sourceKey);
-				return null;
-			}
-			var destDev = DeviceManager.GetDeviceForKey(destinationKey) as IRoutingInputs;
-			if (destDev == null)
-			{
-				Debug.Console(1, "WARNING: Cannot create tie line, routable destination '{0}' not found", destinationKey);
-				return null;
-			}
-			var sourcePort = sourceDev.OutputPorts[sourcePortKey];
-			if (sourcePort == null)
-			{
-				Debug.Console(1, "WARNING: Cannot create tie line. Source '{0}' does not contain port '{1}'", sourceKey, sourcePortKey);
-				return null;
-			}
-			var destPort = destDev.InputPorts[destinationPortKey];
-			if (destPort == null)
-			{
-				Debug.Console(1, "WARNING: Cannot create tie line. Destination '{0}' does not contain port '{1}'", destinationKey, destinationPortKey);
-				return null;
-			}
-
-			return new TieLine(sourcePort, destPort);
-		}
-
-		/// <summary>
-		/// Will link up video status from supporting inputs to connected outputs
-		/// </summary>
-		public void Activate()
-		{
-			// Now does nothing
-		}
-
-		public void Deactivate()
-		{
-			// Now does nothing
-		}
-
-		public override string ToString()
-		{
-			return string.Format("Tie line: [{0}]{1} --> [{2}]{3}", SourcePort.ParentDevice.Key, SourcePort.Key,
-				DestinationPort.ParentDevice.Key, DestinationPort.Key);
-		}
-	}
-
-
-	//********************************************************************************
-
-	public class TieLineCollection : List<TieLine>
-	{
-		public static TieLineCollection Default
-		{
-			get
-			{
-				if (_Default == null)
-					_Default = new TieLineCollection();
-				return _Default;
-			}
-		}
-		static TieLineCollection _Default;
-	}
-}

Essentials Core/PepperDashEssentialsBase/Routing/RoutingPortCollection.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// Basically a List , with an indexer to find ports by key name
-	/// </summary>
-	public class RoutingPortCollection<T> : List<T> where T: RoutingPort
-	{
-		/// <summary>
-		/// Case-insensitive port lookup linked to ports' keys
-		/// </summary>
-		public T this[string key] 
-		{
-			get
-			{
-				return this.FirstOrDefault(i => i.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-			}
-		}
-	}
-}

Essentials Core/PepperDashEssentialsBase/Shades/Shade Interfaces.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Shades
-{
-    public interface IShades
-    {
-        List<ShadeBase> Shades { get; }
-    }
-
-    /// <summary>
-    /// Requirements for a device that implements basic Open/Close shade control
-    /// </summary>
-    public interface IShadesOpenClose
-    {
-        void Open();
-        void Close();
-    }
-
-    /// <summary>
-    /// Requirements for a device that implements basic Open/Close/Stop shade control (Uses 3 relays)
-    /// </summary>
-    public interface IShadesOpenCloseStop : IShadesOpenClose
-    {
-        void StopOrPreset();
-    }
-
-    /// <summary>
-    /// Requirements for a shade device that provides open/closed feedback
-    /// </summary>
-    public interface iShadesRaiseLowerFeedback
-    {
-        BoolFeedback ShadeIsOpenFeedback { get; }
-        BoolFeedback ShadeIsClosedFeedback { get; }
-    }
-
-}

Essentials Core/PepperDashEssentialsBase/SmartObjects/SmartObjectHelper.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public class SmartObjectHelper
-	{
-		public static uint GetSmartObjectJoinForTypeAndObject(uint sourceType, uint typeOffset)
-		{
-			return (uint)(10000 + (sourceType * 100) + typeOffset);
-		}
-
-		//public static void DumpSmartObject(SmartGraphicsTouchpanelControllerBase tp, uint id)
-		//{
-		//    if (!tp.TriList.SmartObjects.Contains(id))
-		//    {
-		//        Debug.Console(0, tp, "does not contain smart object ID {0}", id);
-		//        return;
-		//    }
-		//    var so = tp.TriList.SmartObjects[id];
-		//    Debug.Console(0, tp, "Signals for smart object ID {0}", id);
-		//    Debug.Console(0, "BooleanInput -------------------------------");
-		//    foreach (var s in so.BooleanInput)
-		//        Debug.Console(0, "  {0,5} {1}", s.Number, s.Name);
-		//    Debug.Console(0, "UShortInput -------------------------------");
-		//    foreach (var s in so.UShortInput)
-		//        Debug.Console(0, "  {0,5} {1}", s.Number, s.Name);
-		//    Debug.Console(0, "StringInput -------------------------------");
-		//    foreach (var s in so.StringInput)
-		//        Debug.Console(0, "  {0,5} {1}", s.Number, s.Name);
-		//    Debug.Console(0, "BooleanOutput -------------------------------");
-		//    foreach (var s in so.BooleanOutput)
-		//        Debug.Console(0, "  {0,5} {1}", s.Number, s.Name);
-		//    Debug.Console(0, "UShortOutput -------------------------------");
-		//    foreach (var s in so.UShortOutput)
-		//        Debug.Console(0, "  {0,5} {1}", s.Number, s.Name);
-		//    Debug.Console(0, "StringOutput -------------------------------");
-		//    foreach (var s in so.StringOutput)
-		//        Debug.Console(0, "  {0,5} {1}", s.Number, s.Name);
-		//}
-	
-		///// <summary>
-		///// Inserts/removes the appropriate UO's onto sigs 
-		///// </summary>
-		///// <param name="triList"></param>
-		///// <param name="smartObjectId"></param>
-		///// <param name="deviceUserObjects"></param>
-		///// <param name="state"></param>
-		//public static void LinkNumpadWithUserObjects(BasicTriListWithSmartObject triList,
-		//    uint smartObjectId, List<CueActionPair> deviceUserObjects, Cue Misc_1Function, Cue Misc_2Function, bool state)
-		//{
-		//    var sigDict = new Dictionary<string, Cue>
-		//    {
-		//        { "0", CommonBoolCue.Digit0 },
-		//        { "1", CommonBoolCue.Digit1 },
-		//        { "2", CommonBoolCue.Digit2 },
-		//        { "3", CommonBoolCue.Digit3 },
-		//        { "4", CommonBoolCue.Digit4 },
-		//        { "5", CommonBoolCue.Digit5 },
-		//        { "6", CommonBoolCue.Digit6 },
-		//        { "7", CommonBoolCue.Digit7 },
-		//        { "8", CommonBoolCue.Digit8 },
-		//        { "9", CommonBoolCue.Digit9 },
-		//        { "Misc_1", Misc_1Function },
-		//        { "Misc_2", Misc_2Function },
-		//    };
-		//    LinkSmartObjectWithUserObjects(triList, smartObjectId, deviceUserObjects, sigDict, state);
-		//}
-
-		//public static void LinkDpadWithUserObjects(BasicTriListWithSmartObject triList,
-		//    uint smartObjectId, List<CueActionPair> deviceUserObjects, bool state)
-		//{
-		//    var sigDict = new Dictionary<string, Cue>
-		//    {
-		//        { "Up", CommonBoolCue.Up },
-		//        { "Down", CommonBoolCue.Down },
-		//        { "Left", CommonBoolCue.Left },
-		//        { "Right", CommonBoolCue.Right },
-		//        { "OK", CommonBoolCue.Select },
-		//    };
-		//    LinkSmartObjectWithUserObjects(triList, smartObjectId, deviceUserObjects, sigDict, state);
-		//}
-
-
-		///// <summary>
-		///// MOVE TO HELPER CLASS
-		///// </summary>
-		///// <param name="triList"></param>
-		///// <param name="smartObjectId"></param>
-		///// <param name="deviceUserObjects"></param>
-		///// <param name="smartObjectSigMap"></param>
-		///// <param name="state"></param>
-		//public static void LinkSmartObjectWithUserObjects(BasicTriListWithSmartObject triList,
-		//    uint smartObjectId, List<CueActionPair> deviceUserObjects, Dictionary<string, Cue> smartObjectSigMap, bool state)
-		//{
-		//    // Hook up smart objects if applicable
-		//    if (triList.SmartObjects.Contains(smartObjectId))
-		//    {
-		//        var smartObject = triList.SmartObjects[smartObjectId];
-		//        foreach (var kvp in smartObjectSigMap)
-		//        {
-		//            if (smartObject.BooleanOutput.Contains(kvp.Key))
-		//            {
-		//                if (state)
-		//                {
-		//                    // look for a user object and if so, attach/detach it to/from the sig.
-		//                    var uo = deviceUserObjects.FirstOrDefault(ao => ao.Cue == kvp.Value);
-		//                    if (uo != null)
-		//                        smartObject.BooleanOutput[kvp.Key].UserObject = uo;
-		//                }
-		//                else
-		//                    smartObject.BooleanOutput[kvp.Key].UserObject = null;
-		//            }
-		//            else
-		//                Debug.Console(0, "Smart object {0} does not contain Sig {1}", smartObject.ID, kvp.Key);
-		//        }
-		//    }
-		//    else
-		//        Debug.Console(0, "ERROR Smart object {0} not found on {1:X2}", smartObjectId, triList.ID);
-		//}
-	}
-}

Essentials Core/PepperDashEssentialsBase/Touchpanels/MOVED LargeTouchpanelControllerBase.cs

@@ -1,275 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public class LargeTouchpanelControllerBase : SmartGraphicsTouchpanelControllerBase
-//    {
-//        public string PresentationShareButtonInVideoText = "Share";
-//        public string PresentationShareButtonNotInVideoText = "Presentation";
-	
-//        SourceListSubpageReferenceList SourceSelectSRL;
-//        DevicePageControllerBase CurrentPresentationSourcePageController;
-
-//        public LargeTouchpanelControllerBase(string key, string name, 
-//            BasicTriListWithSmartObject triList, string sgdFilePath)
-//            : base(key, name, triList, sgdFilePath)
-//        {
-//        }
-
-//        public override bool CustomActivate()
-//        {
-//            var baseSuccess = base.CustomActivate();
-//            if (!baseSuccess) return false;
-
-//            SourceSelectSRL = new SourceListSubpageReferenceList(this.TriList, n =>
-//            { if (CurrentRoom != null) CurrentRoom.SelectSource(n); });
-
-//            var lm = Global.LicenseManager;
-//            if (lm != null)
-//            {
-//                lm.LicenseIsValid.LinkInputSig(TriList.BooleanInput[UiCue.ShowLicensed.Number]);
-//                //others
-//            }
-
-//            // Temp things -----------------------------------------------------------------------
-//            TriList.StringInput[UiCue.SplashMessage.Number].StringValue = SplashMessage;
-//            //------------------------------------------------------------------------------------
-
-//            // Initialize initial view
-//            ShowSplashOrMain();
-//            return true;
-//        }
-
-//        /// <summary>
-//        /// In Essentials, this should NEVER be called, since it's a one-room solution
-//        /// </summary>
-//        protected override void HideRoomUI()
-//        {
-//            // UI Cleanup here????
-
-//            //SwapAudioDeviceControls(CurrentRoom.CurrentAudioDevice, null);
-//            //CurrentRoom.AudioDeviceWillChange -= CurrentRoom_AudioDeviceWillChange;
-
-//            CurrentRoom.IsCoolingDown.OutputChange -= CurrentRoom_IsCoolingDown_OutputChange;
-//            CurrentRoom.IsWarmingUp.OutputChange -= CurrentRoom_IsWarmingUp_OutputChange;
-			
-//            SourceSelectSRL.DetachFromCurrentRoom();
-//        }
-
-//        /// <summary>
-//        /// Ties this panel controller to the Room and gets updates.
-//        /// </summary>
-//        protected override void ShowRoomUI()
-//        {
-//            Debug.Console(1, this, "connecting to system '{0}'", CurrentRoom.Key);
-			
-//            TriList.StringInput[RoomCue.Name.Number].StringValue = CurrentRoom.Name;
-//            TriList.StringInput[RoomCue.Description.Number].StringValue = CurrentRoom.Description;
-
-//            CurrentRoom.IsCoolingDown.OutputChange -= CurrentRoom_IsCoolingDown_OutputChange;
-//            CurrentRoom.IsWarmingUp.OutputChange -= CurrentRoom_IsWarmingUp_OutputChange;
-//            CurrentRoom.IsCoolingDown.OutputChange += CurrentRoom_IsCoolingDown_OutputChange;
-//            CurrentRoom.IsWarmingUp.OutputChange += CurrentRoom_IsWarmingUp_OutputChange;
-
-//            SourceSelectSRL.AttachToRoom(CurrentRoom);
-//        }
-
-//        void CurrentRoom_IsCoolingDown_OutputChange(object sender, EventArgs e)
-//        {
-//            Debug.Console(2, this, "Received room in cooldown={0}", CurrentRoom.IsCoolingDown.BoolValue);
-//            if (CurrentRoom.IsCoolingDown.BoolValue) // When entering cooldown
-//            {
-//                // Do we need to check for an already-running cooldown - like in the case of room switches?
-//                new ModalDialog(TriList).PresentModalTimerDialog(0, "Power Off", "Power", "Please wait, shutting down",
-//                    "", "", CurrentRoom.CooldownTime, true, b =>
-//                    {
-//                        ShowSplashOrMain();
-//                    });
-//            }
-//        }
-	
-//        void CurrentRoom_IsWarmingUp_OutputChange(object sender, EventArgs e)
-//        {
-//            Debug.Console(2, this, "Received room in warmup={0}", CurrentRoom.IsWarmingUp.BoolValue);
-//            if (CurrentRoom.IsWarmingUp.BoolValue) // When entering warmup
-//            {
-//                // Do we need to check for an already-running cooldown - like in the case of room switches?
-//                new ModalDialog(TriList).PresentModalTimerDialog(0, "Power On", "Power", "Please wait, powering on",
-//                    "", "", CurrentRoom.WarmupTime, false, b =>
-//                    {
-//                        // Reveal sources - or has already been done behind modal
-//                    });
-//            }
-//        }
-
-//        // Handler for source change events.
-//        void CurrentRoom_PresentationSourceChange(object sender, EssentialsRoomSourceChangeEventArgs args)
-//        {
-//            // Put away the old source and set up the new source.
-//            Debug.Console(2, this, "Received source change={0}", args.NewSource != null ? args.NewSource.Key : "none");
-			
-//            // If we're in tech, don't switch screen modes.  Add any other modes we may want to switch away from
-//            // inside the if below.
-//            if (MainMode == eMainModeType.Splash)
-//                setMainMode(eMainModeType.Presentation);
-//            SetControlSource(args.NewSource);	
-//        }
-
-//        //***********************************************************************
-//        //** UI Manipulation
-//        //***********************************************************************
-
-//        /// <summary>
-//        /// Shows the splash page or the main presentation page, depending on config setting
-//        /// </summary>
-//        void ShowSplashOrMain()
-//        {
-//            if (UsesSplashPage)
-//                setMainMode(eMainModeType.Splash);
-//            else
-//                setMainMode(eMainModeType.Presentation);
-//        }
-
-//        /// <summary>
-//        /// Switches between main modes
-//        /// </summary>
-//        void setMainMode(eMainModeType mode)
-//        {
-//            MainMode = mode;
-//            switch (mode)
-//            {
-//                case eMainModeType.Presentation:
-//                    TriList.BooleanInput[UiCue.VisibleCommonFooter.Number].BoolValue = true;
-//                    TriList.BooleanInput[UiCue.VisibleCommonHeader.Number].BoolValue = true;
-//                    TriList.BooleanInput[UiCue.VisibleSplash.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisiblePresentationSourceList.Number].BoolValue = true;
-//                    ShowCurrentPresentationSourceUi();
-//                    break;
-//                case eMainModeType.Splash:
-//                    TriList.BooleanInput[UiCue.VisibleCommonFooter.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisibleCommonHeader.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisiblePresentationSourceList.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisibleSplash.Number].BoolValue = true;
-//                    HideCurrentPresentationSourceUi();
-//                    break;
-//                case eMainModeType.Tech:
-//                    new ModalDialog(TriList).PresentModalTimerDialog(1, "Tech page", "Info", 
-//                        "Tech page will be here soon!<br>I promise",
-//                        "Bueno!", "", 0, false, null);
-//                    MainMode = eMainModeType.Presentation;
-//                    break;
-//                default:
-//                    break;
-//            }
-//        }
-
-//        void PowerOffWithConfirmPressed()
-//        {
-//            if (!CurrentRoom.RoomIsOn.BoolValue) return;
-//            // Timeout or button 1 press will shut down
-//            var modal = new ModalDialog(TriList);
-//            uint seconds = CurrentRoom.UnattendedShutdownTimeMs / 1000;
-//            var message = string.Format("Meeting will end in {0} seconds", seconds);
-//            modal.PresentModalTimerDialog(2, "End Meeting", "Info", message, 
-//                "End Meeting Now", "Cancel", CurrentRoom.UnattendedShutdownTimeMs, true,
-//                but => { if (but != 2) CurrentRoom.RoomOff(); });
-//        }
-
-//        /// <summary>
-//        /// Reveals the basic UI for the current device
-//        /// </summary>
-//        protected override void ShowCurrentPresentationSourceUi()
-//        {
-//            if (MainMode == eMainModeType.Splash && CurrentRoom.RoomIsOn.BoolValue)
-//                setMainMode(eMainModeType.Presentation);
-
-//            if (CurrentPresentationControlDevice == null)
-//            {
-//                // If system is off, do one thing
-
-//                // Otherwise, do something else - shouldn't be in this condition
-
-//                return;
-//            }
-
-//            // If a controller is already loaded, use it
-//            if (LoadedPageControllers.ContainsKey(CurrentPresentationControlDevice))
-//                CurrentPresentationSourcePageController = LoadedPageControllers[CurrentPresentationControlDevice];
-//            else
-//            {
-//                // This is by no means optimal, but for now....
-//                if (CurrentPresentationControlDevice.Type == PresentationSourceType.SetTopBox
-//                    && CurrentPresentationControlDevice is IHasSetTopBoxProperties)
-//                    CurrentPresentationSourcePageController = new PageControllerLargeSetTopBoxGeneric(TriList,
-//                        CurrentPresentationControlDevice as IHasSetTopBoxProperties);
-
-//                else if (CurrentPresentationControlDevice.Type == PresentationSourceType.Laptop)
-//                    CurrentPresentationSourcePageController = new PageControllerLaptop(TriList);
-
-//                // separate these...
-//                else if (CurrentPresentationControlDevice.Type == PresentationSourceType.Dvd)
-//                    CurrentPresentationSourcePageController = 
-//                        new PageControllerLargeDvd(TriList, CurrentPresentationControlDevice as IHasCueActionList);
-
-//                else
-//                    CurrentPresentationSourcePageController = null;
-
-//                // Save it.
-//                if (CurrentPresentationSourcePageController != null)
-//                    LoadedPageControllers[CurrentPresentationControlDevice] = CurrentPresentationSourcePageController;
-//            }
-
-//            if (CurrentPresentationSourcePageController != null)
-//                CurrentPresentationSourcePageController.SetVisible(true);
-//        }
-
-//        protected override void HideCurrentPresentationSourceUi()
-//        {
-//            if (CurrentPresentationControlDevice != null && CurrentPresentationSourcePageController != null)
-//                CurrentPresentationSourcePageController.SetVisible(false);
-//        }
-
-
-
-//        void ShowHelp()
-//        {
-//            new ModalDialog(TriList).PresentModalTimerDialog(1, "Help", "Help", CurrentRoom.HelpMessage,
-//                    "OK", "", 0, false, null);
-//        }
-
-//        protected void ListSmartObjects()
-//        {
-//            Debug.Console(0, this, "Smart objects IDs:");
-//            var list = TriList.SmartObjects.OrderBy(s => s.Key);
-//            foreach (var kvp in list)
-//                Debug.Console(0, "  {0}", kvp.Key);
-//        }
-
-//        public override List<CueActionPair> FunctionList
-//        {
-//            get
-//            {
-//                return new List<CueActionPair>
-//                {
-//                    new BoolCueActionPair(UiCue.PressSplash, b => { if(!b) setMainMode(eMainModeType.Presentation); }),
-//                    new BoolCueActionPair(UiCue.PressRoomOffWithConfirm, b => { if(!b) PowerOffWithConfirmPressed(); }),
-//                    new BoolCueActionPair(UiCue.PressModePresentationShare, b => { if(!b) setMainMode(eMainModeType.Presentation); }),
-//                    new BoolCueActionPair(UiCue.PressHelp, b => { if(!b) ShowHelp(); }),
-//                    new BoolCueActionPair(UiCue.PressSettings, b => { if(!b) setMainMode(eMainModeType.Tech); }),
-//                };
-//            }
-//        }
-//        //#endregion
-//    }
-//}

Essentials Core/PepperDashEssentialsBase/Touchpanels/MOVED UIControllers/DevicePageControllerBase.cs

@@ -1,244 +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 PepperDash.Essentials.Core.Presets;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public abstract class DevicePageControllerBase
-//    {
-	
-//        protected BasicTriListWithSmartObject TriList;
-//        protected List<BoolInputSig> FixedObjectSigs;
-
-//        public DevicePageControllerBase(BasicTriListWithSmartObject triList)
-//        {
-//            TriList = triList;
-//        }
-
-//        public void SetVisible(bool state)
-//        {
-//            foreach (var sig in FixedObjectSigs)
-//            {
-//                Debug.Console(2, "set visible {0}={1}", sig.Number, state);
-//                sig.BoolValue = state;
-//            }
-//            CustomSetVisible(state);
-//        }
-
-//        /// <summary>
-//        /// Add any specialized show/hide logic here - beyond FixedObjectSigs. Overriding
-//        /// methods do not need to call this base method
-//        /// </summary>
-//        protected virtual void CustomSetVisible(bool state)
-//        {
-//        }
-//    }
-
-//    //public class InterlockedDevicePageController
-//    //{
-//    //    public List<uint> ObjectBoolJoins { get; set; }
-//    //    public uint DefaultJoin { get; set; }
-//    //}
-
-
-	
-
-//    ///// <summary>
-//    ///// 
-//    ///// </summary>
-//    //public interface IHasSetTopBoxProperties
-//    //{
-//    //    bool HasDpad { get; }
-//    //    bool HasPreset { get; }
-//    //    bool HasDvr { get; }
-//    //    bool HasNumbers { get; }
-//    //    DevicePresetsModel PresetsModel { get; }
-//    //    void LoadPresets(string filePath);
-//    //}
-
-//    public class PageControllerLaptop : DevicePageControllerBase
-//    {
-//        public PageControllerLaptop(BasicTriListWithSmartObject tl)
-//            : base(tl)
-//        {
-//            FixedObjectSigs = new List<BoolInputSig> 
-//            {
-//                tl.BooleanInput[10092], // well
-//                tl.BooleanInput[11001] // Laptop info
-//            };
-//        }
-//    }
-	
-//    ///// <summary>
-//    ///// 
-//    ///// </summary>
-//    //public class PageControllerLargeDvd : DevicePageControllerBase
-//    //{
-//    //    IHasCueActionList Device;
-
-//    //    public PageControllerLargeDvd(BasicTriListWithSmartObject tl, IHasCueActionList device)
-//    //        : base(tl)
-//    //    {
-
-//    //        Device = device;
-//    //        FixedObjectSigs = new List<BoolInputSig>
-//    //        {
-//    //            tl.BooleanInput[10093],		// well
-//    //            tl.BooleanInput[10411],		// DVD Dpad
-//    //            tl.BooleanInput[10412]		// everything else
-//    //        };
-//    //    }
-
-//    //    protected override void CustomSetVisible(bool state)
-//    //    {
-//    //        // Hook up smart objects if applicable
-//    //        if (Device != null)
-//    //        {
-//    //            var uos = (Device as IHasCueActionList).CueActionList;
-//    //            SmartObjectHelper.LinkDpadWithUserObjects(TriList, 10411, uos, state);
-//    //        }
-//    //    }
-//    //}
-
-
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    //public class PageControllerLargeSetTopBoxGeneric : DevicePageControllerBase
-//    //{
-//    //    // To-DO: Add properties for component subpage names. DpadPos1, DpadPos2...
-//    //    // Derived classes can then insert special subpages for variations on given
-//    //    // device types.  Like DirecTV vs Comcast
-		
-//    //    public uint DpadSmartObjectId { get; set; }
-//    //    public uint NumberPadSmartObjectId { get; set; }
-//    //    public uint PresetsSmartObjectId { get; set; }
-//    //    public uint Position5TabsId { get; set; }
-
-//    //    IHasSetTopBoxProperties Device;
-//    //    DevicePresetsView PresetsView;
-		
-
-//    //    bool ShowPosition5Tabs;
-//    //    uint CurrentVisiblePosition5Item = 1;
-//    //    Dictionary<uint, uint> Position5SubpageJoins = new Dictionary<uint, uint>
-//    //    {
-//    //        { 1, 10053 },
-//    //        { 2, 10054 }
-//    //    };
-
-//    //    public PageControllerLargeSetTopBoxGeneric(BasicTriListWithSmartObject tl, IHasSetTopBoxProperties device)
-//    //        : base(tl)
-//    //    {
-//    //        Device = device;
-//    //        DpadSmartObjectId = 10011;
-//    //        NumberPadSmartObjectId = 10014;
-//    //        PresetsSmartObjectId = 10012;
-//    //        Position5TabsId = 10081;
-
-//    //        bool dpad = device.HasDpad;
-//    //        bool preset = device.HasPreset;
-//    //        bool dvr = device.HasDvr;
-//    //        bool numbers = device.HasNumbers;
-//    //        uint[] joins = null;
-
-//    //        if (dpad && !preset && !dvr && !numbers) joins = new uint[] { 10031, 10091 };
-//    //        else if (!dpad && preset && !dvr && !numbers) joins = new uint[] { 10032, 10091 };
-//    //        else if (!dpad && !preset && dvr && !numbers) joins = new uint[] { 10033, 10091 };
-//    //        else if (!dpad && !preset && !dvr && numbers) joins = new uint[] { 10034, 10091 };
-
-//    //        else if (dpad && preset && !dvr && !numbers) joins = new uint[] { 10042, 10021, 10092 };
-//    //        else if (dpad && !preset && dvr && !numbers) joins = new uint[] { 10043, 10021, 10092 };
-//    //        else if (dpad && !preset && !dvr && numbers) joins = new uint[] { 10044, 10021, 10092 };
-//    //        else if (!dpad && preset && dvr && !numbers) joins = new uint[] { 10043, 10022, 10092 };
-//    //        else if (!dpad && preset && !dvr && numbers) joins = new uint[] { 10044, 10022, 10092 };
-//    //        else if (!dpad && !preset && dvr && numbers) joins = new uint[] { 10044, 10023, 10092 };
-
-//    //        else if (dpad && preset && dvr && !numbers) joins = new uint[] { 10053, 10032, 10011, 10093 };
-//    //        else if (dpad && preset && !dvr && numbers) joins = new uint[] { 10054, 10032, 10011, 10093 };
-//    //        else if (dpad && !preset && dvr && numbers) joins = new uint[] { 10054, 10033, 10011, 10093 };
-//    //        else if (!dpad && preset && dvr && numbers) joins = new uint[] { 10054, 10033, 10012, 10093 };
-
-//    //        else if (dpad && preset && dvr && numbers)
-//    //        {
-//    //            joins = new uint[] { 10081, 10032, 10011, 10093 }; // special case
-//    //            ShowPosition5Tabs = true;
-//    //        }
-//    //        // Project the joins into corresponding sigs.
-//    //        FixedObjectSigs = joins.Select(u => TriList.BooleanInput[u]).ToList();
-
-//    //        // Build presets
-//    //        if (device.HasPreset)
-//    //        {
-//    //            PresetsView = new DevicePresetsView(tl, device.PresetsModel);
-//    //        }
-
-
-//    //    }
-
-//    //    protected override void CustomSetVisible(bool state)
-//    //    {
-//    //        if (ShowPosition5Tabs)
-//    //        {
-//    //            // Show selected tab
-//    //            TriList.BooleanInput[Position5SubpageJoins[CurrentVisiblePosition5Item]].BoolValue = state;
-
-//    //            var tabSo = TriList.SmartObjects[Position5TabsId];
-//    //            if (state) // Link up the tab object
-
-//    //            {
-//    //                tabSo.BooleanOutput["Tab Button 1 Press"].UserObject = new BoolCueActionPair(b => ShowTab(1));
-//    //                tabSo.BooleanOutput["Tab Button 2 Press"].UserObject = new BoolCueActionPair(b => ShowTab(2));
-//    //            }
-//    //            else // Disco tab object
-//    //            {
-//    //                tabSo.BooleanOutput["Tab Button 1 Press"].UserObject = null;
-//    //                tabSo.BooleanOutput["Tab Button 2 Press"].UserObject = null;
-//    //            }
-//    //        }
-
-//    //        // Hook up smart objects if applicable
-//    //        if (Device is IHasCueActionList)
-//    //        {
-//    //            var uos = (Device as IHasCueActionList).CueActionList;
-//    //            SmartObjectHelper.LinkDpadWithUserObjects(TriList, DpadSmartObjectId, uos, state);
-//    //            SmartObjectHelper.LinkNumpadWithUserObjects(TriList, NumberPadSmartObjectId,
-//    //                uos, CommonBoolCue.Dash, CommonBoolCue.Last, state);
-//    //        }
-
-
-//    //        // Link, unlink presets
-//    //        if (Device.HasPreset && state)
-//    //            PresetsView.Attach();
-//    //        else if (Device.HasPreset && !state)
-//    //            PresetsView.Detach();
-//    //    }
-
-//    //    void ShowTab(uint number)
-//    //    {
-//    //        // Ignore re-presses
-//    //        if (CurrentVisiblePosition5Item == number) return;
-//    //        // Swap subpage
-//    //        var bi = TriList.BooleanInput;
-//    //        if(CurrentVisiblePosition5Item > 0)
-//    //            bi[Position5SubpageJoins[CurrentVisiblePosition5Item]].BoolValue = false;
-//    //        CurrentVisiblePosition5Item = number;
-//    //        bi[Position5SubpageJoins[CurrentVisiblePosition5Item]].BoolValue = true;
-
-//    //        // Show feedback on buttons
-//    //    }
-
-//    //}
-//}

Essentials Core/PepperDashEssentialsBase/Touchpanels/REMOVE Tsr302Controller.cs

@@ -1,135 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using Crestron.SimplSharpPro.UI;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//[Obsolete("Replaced, initially with CrestronTsr302Controller in Resissentials")] 
-//    public class Tsr302Controller : SmartGraphicsTouchpanelControllerBase
-//    {
-//        //public override List<CueActionPair> FunctionList
-//        //{
-//        //    get
-//        //    {
-//        //        return new List<CueActionPair>
-//        //            {
-
-//        //            };
-//        //    }
-//        //}
-
-//        public Tsr302 Remote { get; private set; }
-
-//        SourceListSubpageReferenceList SourceSelectSRL;
-//        DevicePageControllerBase CurrentPresentationSourcePageController;
-//        CTimer VolumeFeedbackTimer;
-
-
-//        public Tsr302Controller(string key, string name, Tsr302 device, string sgdFilePath) :
-//            base(key, name, device, sgdFilePath)
-//        {				
-//            // Base takes care of TriList
-//            Remote = device;
-//            Remote.Home.UserObject = new BoolCueActionPair(b => { if (!b) PressHome(); });
-//            Remote.VolumeUp.UserObject = new BoolCueActionPair(b => { if (!b) PressHome(); });
-//            Remote.ButtonStateChange += Remote_ButtonStateChange;
-//        }
-
-//        public override bool CustomActivate()
-//        {
-//            var baseSuccess = base.CustomActivate();
-//            if (!baseSuccess) return false;
-
-//            SourceSelectSRL = new SourceListSubpageReferenceList(this.TriList, n =>
-//            { if (CurrentRoom != null) CurrentRoom.SelectSource(n); });
-
-
-//            return true;
-//        }
-
-//        protected override void SwapAudioDeviceControls(IVolumeFunctions oldDev, IVolumeFunctions newDev)
-//        {
-//            // stop presses
-//            if (oldDev != null)
-//            {
-//                ReleaseAudioPresses();
-//                if (oldDev is IVolumeTwoWay)
-//                {
-//                    (newDev as IVolumeTwoWay).VolumeLevelFeedback.OutputChange -= VolumeLevelOutput_OutputChange;
-//                    (oldDev as IVolumeTwoWay).VolumeLevelFeedback
-//                        .UnlinkInputSig(TriList.UShortInput[CommonIntCue.MainVolumeLevel.Number]);
-//                }
-//            }
-
-//            if (newDev != null)
-//            {
-//                Remote.VolumeDown.UserObject = newDev.VolumeDownCueActionPair;
-//                Remote.VolumeUp.UserObject = newDev.VolumeUpCueActionPair;
-//                Remote.Mute.UserObject = newDev.MuteToggleCueActionPair;
-//                if (newDev is IVolumeTwoWay)
-//                {
-//                    var vOut = (newDev as IVolumeTwoWay).VolumeLevelFeedback;
-//                    vOut.OutputChange += VolumeLevelOutput_OutputChange;
-//                    TriList.UShortInput[CommonIntCue.MainVolumeLevel.Number].UShortValue = vOut.UShortValue;
-//                }
-//            }
-//            else
-//            {
-//                Remote.VolumeDown.UserObject = null;
-//                Remote.VolumeUp.UserObject = null;
-//                Remote.Mute.UserObject = null;
-//            }
-
-//            base.SwapAudioDeviceControls(oldDev, newDev);
-//        }
-
-//        void PressHome()
-//        {
-
-//        }
-
-//        void VolumeLevelOutput_OutputChange(object sender, EventArgs e)
-//        {
-//            // Set level and show popup on timer
-//            TriList.UShortInput[CommonIntCue.MainVolumeLevel.Number].UShortValue =
-//                (sender as IntFeedback).UShortValue;
-
-//            if (VolumeFeedbackTimer == null)
-//            {
-//                TriList.BooleanInput[CommonBoolCue.ShowVolumeSlider.Number].BoolValue = true;
-//                VolumeFeedbackTimer = new CTimer(o => {
-//                    TriList.BooleanInput[CommonBoolCue.ShowVolumeSlider.Number].BoolValue = false;
-//                }, 1000);
-//            }
-
-//        }
-
-//        void ReleaseAudioPresses()
-//        {
-//            if (Remote.VolumeDown.UserObject is BoolCueActionPair && Remote.VolumeDown.State == eButtonState.Pressed)
-//                (Remote.VolumeDown.UserObject as BoolCueActionPair).Invoke(false);
-//            if (Remote.VolumeUp.UserObject is BoolCueActionPair && Remote.VolumeUp.State == eButtonState.Pressed)
-//                (Remote.VolumeUp.UserObject as BoolCueActionPair).Invoke(false);
-//            if (Remote.Mute.UserObject is BoolCueActionPair && Remote.Mute.State == eButtonState.Pressed)
-//                (Remote.Mute.UserObject as BoolCueActionPair).Invoke(false);
-//        }
-
-//        /// <summary>
-//        /// Handler.  Run UO's stored in buttons
-//        /// </summary>
-//        void Remote_ButtonStateChange(GenericBase device, ButtonEventArgs args)
-//        {
-//            Debug.Console(2, this, "{0}={1}", args.Button.Name, args.Button.State);
-//            var uo = args.Button.UserObject as BoolCueActionPair;
-//            if (uo != null)
-//                uo.Invoke(args.NewButtonState == eButtonState.Pressed);
-//        }
-//    }
-//}

Essentials Core/PepperDashEssentialsBase/Touchpanels/SmartGraphicsTouchpanelControllerBase.cs

@@ -1,309 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public abstract class SmartGraphicsTouchpanelControllerBase : CrestronGenericBaseDevice
-//    {
-//        public BasicTriListWithSmartObject TriList { get; protected set; }
-//        public bool UsesSplashPage { get; set; }
-//        public string SplashMessage { get; set; }
-//        public bool ShowDate
-//        {
-//            set { TriList.BooleanInput[UiCue.ShowDate.Number].BoolValue = value; }
-//        }
-//        public bool ShowTime
-//        {
-//            set { TriList.BooleanInput[UiCue.ShowTime.Number].BoolValue = value; }
-//        }
-
-//        public abstract List<CueActionPair> FunctionList { get; }
-
-
-//        protected eMainModeType MainMode;
-//        protected IPresentationSource CurrentPresentationControlDevice;
-
-//        /// <summary>
-//        /// Defines the signal offset for the presentation device.  Defaults to 100
-//        /// </summary>
-//        public uint PresentationControlDeviceJoinOffset { get { return 100; } }
-
-//        public enum eMainModeType
-//        {
-//            Presentation, Splash, Tech
-//        }
-
-//        protected string SgdFilePath;
-//        public EssentialsRoom CurrentRoom { get; protected set; }
-//        protected Dictionary<IPresentationSource, DevicePageControllerBase> LoadedPageControllers
-//            = new Dictionary<IPresentationSource, DevicePageControllerBase>();
-
-//        static object RoomChangeLock = new object();
-
-//        /// <summary>
-//        /// Constructor
-//        /// </summary>
-//        public SmartGraphicsTouchpanelControllerBase(string key, string name, BasicTriListWithSmartObject triList,
-//            string sgdFilePath)
-//            : base(key, name, triList)
-//        {
-//            TriList = triList;
-//            if (string.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
-//            if (string.IsNullOrEmpty(sgdFilePath)) throw new ArgumentNullException("sgdFilePath");
-//            SgdFilePath = sgdFilePath;
-//            TriList.LoadSmartObjects(SgdFilePath);
-//            UsesSplashPage = true;
-//            SplashMessage = "Welcome";
-//            TriList.SigChange += Tsw_AnySigChange;
-//            foreach (var kvp in TriList.SmartObjects)
-//                kvp.Value.SigChange += this.Tsw_AnySigChange;
-//        }
-
-//        public override bool CustomActivate()
-//        {
-//            var baseSuccess = base.CustomActivate();
-//            if (!baseSuccess) return false;
-
-//            // Wiring up the buttons with UOs 
-//            foreach (var uo in this.FunctionList)
-//            {
-//                if (uo.Cue.Number == 0) continue;
-//                if (uo is BoolCueActionPair)
-//                    TriList.BooleanOutput[uo.Cue.Number].UserObject = uo;
-//                else if (uo is UShortCueActionPair)
-//                    TriList.UShortOutput[uo.Cue.Number].UserObject = uo;
-//                else if (uo is StringCueActionPair)
-//                    TriList.StringOutput[uo.Cue.Number].UserObject = uo;
-//            }
-
-//            return true;
-//        }
-
-//        //public void SetCurrentRoom(EssentialsRoom room)
-//        //{
-//        //    if (CurrentRoom != null)
-//        //        HideRoomUI();
-//        //    CurrentRoom = room;
-//        //    ShowRoomUI();
-//        //}
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        /// <param name="room"></param>
-//        public void SetCurrentRoom(EssentialsRoom room)
-//        {
-//            if (CurrentRoom == room) return;
-
-//            IVolumeFunctions oldAudio = null;
-//            //Disconnect current room and audio device
-//            if (CurrentRoom != null)
-//            {
-//                HideRoomUI();
-//                CurrentRoom.AudioDeviceWillChange -= CurrentRoom_AudioDeviceWillChange;
-//                CurrentRoom.PresentationSourceChange -= CurrentRoom_PresentationSourceChange;
-//                oldAudio = CurrentRoom.CurrentAudioDevice;
-//            }
-
-//            CurrentRoom = room;
-//            IVolumeFunctions newAudio = null;
-//            if (CurrentRoom != null)
-//            {
-//                CurrentRoom.AudioDeviceWillChange += this.CurrentRoom_AudioDeviceWillChange;
-//                CurrentRoom.PresentationSourceChange += this.CurrentRoom_PresentationSourceChange;
-//                SetControlSource(CurrentRoom.CurrentPresentationSource);
-//                newAudio = CurrentRoom.CurrentAudioDevice;
-//                ShowRoomUI();
-//            }
-
-//            SwapAudioDeviceControls(oldAudio, newAudio);
-//        }
-
-//        /// <summary>
-//        /// Detaches and attaches an IVolumeFunctions device to the appropriate TP TriList signals.
-//        /// This will also add IVolumeNumeric if the device implements it.
-//        /// Overriding classes should call this. Overriding classes are responsible for
-//        /// linking up to hard keys, etc.
-//        /// </summary>
-//        /// <param name="oldDev">May be null</param>
-//        /// <param name="newDev">May be null</param>
-//        protected virtual void SwapAudioDeviceControls(IVolumeFunctions oldDev, IVolumeFunctions newDev)
-//        {
-//            // Disconnect
-//            if (oldDev != null)
-//            {
-//                TriList.BooleanOutput[CommonBoolCue.VolumeDown.Number].UserObject = null;
-//                TriList.BooleanOutput[CommonBoolCue.VolumeUp.Number].UserObject = null;
-//                TriList.BooleanOutput[CommonBoolCue.MuteToggle.Number].UserObject = null;
-//                TriList.BooleanInput[CommonBoolCue.ShowVolumeButtons.Number].BoolValue = false;
-//                TriList.BooleanInput[CommonBoolCue.ShowVolumeSlider.Number].BoolValue = false;
-//                if (oldDev is IVolumeTwoWay)
-//                {
-//                    TriList.UShortOutput[CommonIntCue.MainVolumeLevel.Number].UserObject = null;
-//                    (oldDev as IVolumeTwoWay).IsMutedFeedback
-//                        .UnlinkInputSig(TriList.BooleanInput[CommonBoolCue.MuteOn.Number]);
-//                    (oldDev as IVolumeTwoWay).VolumeLevelFeedback
-//                        .UnlinkInputSig(TriList.UShortInput[CommonIntCue.MainVolumeLevel.Number]);
-//                }
-//            }
-//            if (newDev != null)
-//            {
-//                TriList.BooleanInput[CommonBoolCue.ShowVolumeSlider.Number].BoolValue = true;
-//                TriList.BooleanOutput[CommonBoolCue.VolumeDown.Number].UserObject = newDev.VolumeDownCueActionPair;
-//                TriList.BooleanOutput[CommonBoolCue.VolumeUp.Number].UserObject = newDev.VolumeUpCueActionPair;
-//                TriList.BooleanOutput[CommonBoolCue.MuteToggle.Number].UserObject = newDev.MuteToggleCueActionPair;
-//                if (newDev is IVolumeTwoWay)
-//                {
-//                    TriList.BooleanInput[CommonBoolCue.ShowVolumeSlider.Number].BoolValue = true;
-//                    var numDev = newDev as IVolumeTwoWay;
-//                    TriList.UShortOutput[CommonIntCue.MainVolumeLevel.Number].UserObject = numDev.VolumeLevelCueActionPair;
-//                    numDev.VolumeLevelFeedback
-//                        .LinkInputSig(TriList.UShortInput[CommonIntCue.MainVolumeLevel.Number]);
-//                }
-//            }
-//        }
-
-
-//        /// <summary>
-//        /// Does nothing. Override to add functionality when calling SetCurrentRoom
-//        /// </summary>
-//        protected virtual void HideRoomUI() { }
-
-//        /// <summary>
-//        /// Does nothing. Override to add functionality when calling SetCurrentRoom
-//        /// </summary>		
-//        protected virtual void ShowRoomUI() { }
-
-//        /// <summary>
-//        /// Sets up the current presentation device and updates statuses if the device is capable.
-//        /// </summary>
-//        protected void SetControlSource(IPresentationSource newSource)
-//        {
-//            if (CurrentPresentationControlDevice != null)
-//            {
-//                HideCurrentPresentationSourceUi();
-
-//                // Unhook presses and things
-//                if (CurrentPresentationControlDevice is IHasCueActionList)
-//                {
-//                    foreach (var uo in (CurrentPresentationControlDevice as IHasCueActionList).CueActionList)
-//                    {
-//                        if (uo.Cue.Number == 0) continue;
-//                        if (uo is BoolCueActionPair)
-//                        {
-//                            var bSig = TriList.BooleanOutput[uo.Cue.Number];
-//                            // Disconnection should also clear bool sigs in case they are pressed and
-//                            // might be orphaned
-//                            if (bSig.BoolValue)
-//                                (bSig.UserObject as BoolCueActionPair).Invoke(false);
-//                            bSig.UserObject = null;
-//                        }
-//                        else if (uo is UShortCueActionPair)
-//                            TriList.UShortOutput[uo.Cue.Number].UserObject = null;
-//                        else if (uo is StringCueActionPair)
-//                            TriList.StringOutput[uo.Cue.Number].UserObject = null;
-//                    }
-//                }
-//                // unhook outputs
-//                if (CurrentPresentationControlDevice is IHasFeedback)
-//                {
-//                    foreach (var output in (CurrentPresentationControlDevice as IHasFeedback).Feedbacks)
-//                    {
-//                        if (output.Cue.Number == 0) continue;
-//                        if (output is BoolFeedback)
-//                            (output as BoolFeedback).UnlinkInputSig(TriList.BooleanInput[output.Cue.Number]);
-//                        else if (output is IntFeedback)
-//                            (output as IntFeedback).UnlinkInputSig(TriList.UShortInput[output.Cue.Number]);
-//                        else if (output is StringFeedback)
-//                            (output as StringFeedback).UnlinkInputSig(TriList.StringInput[output.Cue.Number]);
-//                    }
-//                }
-//            }
-//            CurrentPresentationControlDevice = newSource;
-//            //connect presses and things
-//            if (newSource is IHasCueActionList) // This has functions, get 'em
-//            {
-//                foreach (var ao in (newSource as IHasCueActionList).CueActionList)
-//                {
-//                    if (ao.Cue.Number == 0) continue;
-//                    if (ao is BoolCueActionPair)
-//                        TriList.BooleanOutput[ao.Cue.Number].UserObject = ao;
-//                    else if (ao is UShortCueActionPair)
-//                        TriList.UShortOutput[ao.Cue.Number].UserObject = ao;
-//                    else if (ao is StringCueActionPair)
-//                        TriList.StringOutput[ao.Cue.Number].UserObject = ao;
-//                }
-//            }
-//            // connect outputs (addInputSig should update sig)
-//            if (CurrentPresentationControlDevice is IHasFeedback)
-//            {
-//                foreach (var output in (CurrentPresentationControlDevice as IHasFeedback).Feedbacks)
-//                {
-//                    if (output.Cue.Number == 0) continue;
-//                    if (output is BoolFeedback)
-//                        (output as BoolFeedback).LinkInputSig(TriList.BooleanInput[output.Cue.Number]);
-//                    else if (output is IntFeedback)
-//                        (output as IntFeedback).LinkInputSig(TriList.UShortInput[output.Cue.Number]);
-//                    else if (output is StringFeedback)
-//                        (output as StringFeedback).LinkInputSig(TriList.StringInput[output.Cue.Number]);
-//                }
-//            }
-//            ShowCurrentPresentationSourceUi();
-//        }
-
-//        /// <summary>
-//        /// Reveals the basic UI for the current device
-//        /// </summary>
-//        protected virtual void ShowCurrentPresentationSourceUi()
-//        {
-//        }
-
-//        /// <summary>
-//        /// Hides the UI for the current device and calls for a feedback signal cleanup
-//        /// </summary>
-//        protected virtual void HideCurrentPresentationSourceUi()
-//        {
-//        }
-
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        void CurrentRoom_PresentationSourceChange(object sender, EssentialsRoomSourceChangeEventArgs args)
-//        {
-//            SetControlSource(args.NewSource);
-//        }
-
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        void CurrentRoom_AudioDeviceWillChange(object sender, EssentialsRoomAudioDeviceChangeEventArgs e)
-//        {
-//            SwapAudioDeviceControls(e.OldDevice, e.NewDevice);
-//        }
-
-
-
-//        /// <summary>
-//        /// Panel event handler
-//        /// </summary>
-//        void Tsw_AnySigChange(object currentDevice, SigEventArgs args)
-//        {
-//            // plugged in commands
-//            object 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);
-//        }
-//    }
-//}

Essentials Core/PepperDashEssentialsBase/VideoStatus/VideoStatusCues.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-namespace PepperDash.Essentials.Core
-{
-	public static class VideoStatusCues
-	{
-		public static readonly Cue HasVideoStatusFeedback = Cue.BoolCue("HasVideoStatusFeedback", 1);
-		public static readonly Cue VideoSyncFeedback = Cue.BoolCue("VideoSyncFeedback", 2);
-		public static readonly Cue HdcpActiveFeedback = Cue.BoolCue("HdcpActiveFeedback", 3);
-		public static readonly Cue HdcpStateFeedback = Cue.StringCue("HdcpStateFeedback", 3);
-		public static readonly Cue VideoResolutionFeedback = Cue.StringCue("VideoResolutionFeedback", 2);
-		public static readonly Cue VideoStatusDeviceKey = Cue.StringCue("VideoStatusDeviceKey", 0);
-		public static readonly Cue VideoStatusDeviceName = Cue.StringCue("VideoStatusDeviceName", 4);
-	}
-}

Essentials DM/Essentials_DM/Cards REMOVE/DmInputCardBase.cs

@@ -1,62 +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.DM;
-//using Crestron.SimplSharpPro.DM.Cards;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.DM;
-
-//namespace PepperDash.Essentials.DM.Cards
-//{
-//    public class DmInputCardControllerBase : IRoutingInputsOutputs
-//    {
-//        public string Key { get; private set; }
-//        public uint Slot { get; private set; }
-//        public abstract eDmInputCardType Type { get; }
-
-//        //public RoutingOutputPort BackplaneVideoOut { get; private set; }
-//        //public RoutingOutputPort BackplaneAudioOut { get; private set; }
-
-//        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-//        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-//        public DmInputCardControllerBase(string key, uint slot)
-//        {
-//            Key = key;
-//            Slot = slot;
-//            //BackplaneAudioOut = new RoutingOutputPort("backplaneAudioOut", eRoutingSignalType.Audio,
-//            //    eRoutingPortConnectionType.BackplaneOnly, slot, this);
-//            //BackplaneVideoOut = new RoutingOutputPort("backplaneVideoOut", eRoutingSignalType.Video,
-//            //    eRoutingPortConnectionType.BackplaneOnly, slot, this);
-//            //InputPorts = new RoutingPortCollection<RoutingInputPort>();
-//            //OutputPorts = new RoutingPortCollection<RoutingOutputPort> { BackplaneAudioOut, BackplaneVideoOut };
-//        }
-
-//        ///// <summary>
-//        ///// Gets a physical port by name.  Returns null if doesn't exist
-//        ///// </summary>
-//        //public RoutingInputPort GetInputPort(string key)
-//        //{
-//        //    return InputPorts.FirstOrDefault(p => p.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-//        //}
-
-//        ///// <summary>
-//        ///// Gets a physical port by name.  Returns null if doesn't exist
-//        ///// </summary>
-//        //public RoutingOutputPort GetOutputPort(string key)
-//        //{
-//        //    return OutputPorts.FirstOrDefault(p => p.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-//        //}
-//    }
-
-//    public enum eDmInputCardType
-//    {
-//        None, DmcHd, DmcHdDsp, Dmc4kHd, Dmc4kHdDsp, Dmc4kC, Dmc4kCDsp
-//    }
-//}

Essentials DM/Essentials_DM/Cards REMOVE/DmOutputCardBase.cs

@@ -1,79 +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.DM;
-using Crestron.SimplSharpPro.DM.Cards;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM;
-
-namespace PepperDash.Essentials.DM.Cards
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class DmSingleOutputCardControllerBase// : IRoutingInputsOutputs
-	{
-		public string Key { get; private set; }
-		public uint Slot { get; private set; }
-		public abstract eDmOutputCardType Type { get; }
-
-        //public RoutingInputPort BackplaneAudioIn1 { get; private set; }
-        //public RoutingInputPort BackplaneVideoIn1 { get; private set; }
-        //public RoutingInputPort BackplaneAudioIn2 { get; private set; }
-        //public RoutingInputPort BackplaneVideoIn2 { get; private set; }
-
-        //public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-        //public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-		public DmSingleOutputCardControllerBase(string key, uint cardSlot)
-		{
-			Key = key;
-			Slot = cardSlot;
-            //BackplaneAudioIn1 = new RoutingInputPort("backplaneAudioIn1", eRoutingSignalType.Audio,
-            //    eRoutingPortConnectionType.BackplaneOnly, cardSlot, this);
-            //BackplaneVideoIn1 = new RoutingInputPort("backplaneVideoIn1", eRoutingSignalType.Video,
-            //    eRoutingPortConnectionType.BackplaneOnly, cardSlot, this);
-            //BackplaneAudioIn2 = new RoutingInputPort("backplaneAudioIn2", eRoutingSignalType.Audio,
-            //    eRoutingPortConnectionType.BackplaneOnly, cardSlot + 1, this);
-            //BackplaneVideoIn2 = new RoutingInputPort("backplaneVideoIn2", eRoutingSignalType.Video,
-            //    eRoutingPortConnectionType.BackplaneOnly, cardSlot + 1, this);
-            //InputPorts = new RoutingPortCollection<RoutingInputPort>
-            //{
-            //    BackplaneAudioIn1,
-            //    BackplaneAudioIn2,
-            //    BackplaneVideoIn1,
-            //    BackplaneVideoIn2
-            //};
-            //OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-		}
-
-		///// <summary>
-		///// Gets a physical port by name.  Returns null if doesn't exist
-		///// </summary>
-		//public RoutingInputPort GetInputPort(string key)
-		//{
-		//    return InputPorts.FirstOrDefault(p => p.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-		//}
-
-        ///// <summary>
-        ///// Gets a physical port by name.  Returns null if doesn't exist
-        ///// </summary>
-        //public RoutingOutputPort GetOutputPort(string key)
-        //{
-        //    return OutputPorts.FirstOrDefault(p => p.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-        //}
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public enum eDmOutputCardType
-	{
-        None, Dmc4kCoHd, Dmc4kHdo, DmcCoHd, DmcSoHd
-	}
-}

Essentials DM/Essentials_DM/Cards REMOVE/Dmc4kCoHdSingleOutputCard.cs

@@ -1,43 +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.DM;
-using Crestron.SimplSharpPro.DM.Cards;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM;
-
-namespace PepperDash.Essentials.DM.Cards
-{
-	public class Dmc4kCoHdSingleOutputCard : DmSingleOutputCardControllerBase
-	{
-		public override eDmOutputCardType Type
-		{
-			get { return eDmOutputCardType.Dmc4kCoHd; }
-		}
-		public Dmc4kCoHdSingle Card { get; private set; }
-
-        //public RoutingOutputPort DmOut1 { get; private set; }
-        //public RoutingOutputPort DmOut2 { get; private set; }
-        //public RoutingOutputPort HdmiOut1 { get; private set; }
-
-		public Dmc4kCoHdSingleOutputCard(string key, Dmc4kCoHdSingle card, uint slot)
-			: base(key, slot)
-		{
-			Card = card;
-            //DmOut1 = new RoutingOutputPort(DmPortName.DmOut1, eRoutingSignalType.AudioVideo,
-            //    eRoutingPortConnectionType.DmCat, null, this);
-            //DmOut2 = new RoutingOutputPort(DmPortName.DmOut2, eRoutingSignalType.AudioVideo,
-            //    eRoutingPortConnectionType.DmCat, null, this);
-            //HdmiOut1 = new RoutingOutputPort(DmPortName.HdmiOut1, eRoutingSignalType.AudioVideo,
-            //    eRoutingPortConnectionType.Hdmi, null, this);
-
-            //OutputPorts.AddRange(new[] { DmOut1, DmOut2, HdmiOut1 });
-		}
-	}
-}

Essentials DM/Essentials_DM/Cards REMOVE/Dmc4kHdoSingleOutputCard.cs

@@ -1,46 +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.DM;
-//using Crestron.SimplSharpPro.DM.Cards;
-
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.DM;
-
-//namespace PepperDash.Essentials.DM.Cards
-//{
-//    public class Dmc4kHdoSingleOutputCard : DmSingleOutputCardControllerBase
-//    {
-//        public override eDmOutputCardType Type
-//        {
-//            get { return eDmOutputCardType.Dmc4kHdo; }
-//        }
-//        public Dmc4kHdoSingle Card { get; private set; }
-
-//        //public RoutingOutputPort AudioOut1 { get; private set; }
-//        //public RoutingOutputPort AudioOut2 { get; private set; }
-//        //public RoutingOutputPort HdmiOut1 { get; private set; }
-//        //public RoutingOutputPort HdmiOut2 { get; private set; }
-
-//        public Dmc4kHdoSingleOutputCard(string key, Dmc4kHdoSingle card, uint slot)
-//            : base(key, slot)
-//        {
-//            Card = card;
-//            //AudioOut1 = new RoutingOutputPort(DmPortName.BalancedAudioOut1, eRoutingSignalType.Audio,
-//            //    eRoutingPortConnectionType.LineAudio, null, this);
-//            //AudioOut2 = new RoutingOutputPort(DmPortName.BalancedAudioOut2, eRoutingSignalType.Audio,
-//            //    eRoutingPortConnectionType.LineAudio, null, this);
-//            //HdmiOut1 = new RoutingOutputPort(DmPortName.HdmiOut1, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-//            //HdmiOut2 = new RoutingOutputPort(DmPortName.HdmiOut2, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-
-//            //OutputPorts.AddRange(new[] { AudioOut1, AudioOut2, HdmiOut1, HdmiOut2 });
-//        }
-//    }
-//}

Essentials DM/Essentials_DM/Cards REMOVE/DmcC4kInputCard.cs

@@ -1,76 +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.DM;
-//using Crestron.SimplSharpPro.DM.Cards;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.DM;
-
-//namespace PepperDash.Essentials.DM.Cards
-//{
-//    public class Dmc4kCController : DmInputCardControllerBase
-//    {
-//        public override eDmInputCardType Type
-//        {
-//            get { return eDmInputCardType.Dmc4kC; }
-//        }
-//        public Dmc4kC Card { get; private set; }
-
-//        //public RoutingInputPortWithVideoStatuses DmIn { get; private set; }
-//        //public RoutingOutputPort HdmiLoopOut { get; private set; }
-//        //public RoutingOutputPort AudioLoopOut { get; private set; }
-		
-//        public Dmc4kCController(string key, Dmc4kC card, uint slot)
-//            : base(key, slot)
-//        {
-//            Card = card;
-//            //DmIn = new RoutingInputPortWithVideoStatuses(DmPortName.DmIn, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.DmCat, null, this, 
-//            //    VideoStatusHelper.GetDmInputStatusFuncs(Card.DmInput));
-
-//            //HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-//            //AudioLoopOut = new RoutingOutputPort(DmPortName.AudioLoopOut, eRoutingSignalType.Audio,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-
-//            //InputPorts.Add(DmIn);
-//            //OutputPorts.AddRange(new[] { HdmiLoopOut, AudioLoopOut });
-//        }
-//    }
-
-//    public class Dmc4kCDspController : DmInputCardControllerBase
-//    {
-//        public override eDmInputCardType Type
-//        {
-//            get { return eDmInputCardType.Dmc4kCDsp; }
-//        }
-//        public Dmc4kCDsp Card { get; private set; }
-
-//        //public RoutingInputPortWithVideoStatuses DmIn { get; private set; }
-//        //public RoutingOutputPort HdmiLoopOut { get; private set; }
-//        //public RoutingOutputPort AudioLoopOut { get; private set; }
-
-//        public Dmc4kCDspController(string key, Dmc4kCDsp card, uint slot)
-//            : base(key, slot)
-//        {
-//            Card = card;
-//            //DmIn = new RoutingInputPortWithVideoStatuses(DmPortName.DmIn, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.DmCat, null, this,
-//            //    VideoStatusHelper.GetDmInputStatusFuncs(Card.DmInput));
-
-//            //HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-//            //AudioLoopOut = new RoutingOutputPort(DmPortName.AudioLoopOut, eRoutingSignalType.Audio,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-
-//            //InputPorts.Add(DmIn);
-//            //OutputPorts.AddRange(new[] { HdmiLoopOut, AudioLoopOut });
-//        }
-//    }
-
-//}

Essentials DM/Essentials_DM/Cards REMOVE/DmcHD4kInputCard.cs

@@ -1,82 +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.DM;
-//using Crestron.SimplSharpPro.DM.Cards;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.DM;
-
-//namespace PepperDash.Essentials.DM.Cards
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public class Dmc4kHdController : DmInputCardControllerBase
-//    {
-//        public Dmc4kHd Card { get; private set; }
-//        public override eDmInputCardType Type
-//        {
-//            get { return eDmInputCardType.Dmc4kHd; }
-//        }
-
-//        public RoutingInputPortWithVideoStatuses HdmiIn { get; private set; }
-//        public RoutingOutputPort HdmiLoopOut { get; private set; }
-//        public RoutingOutputPort AudioLoopOut { get; private set; }
-
-//        public Dmc4kHdController(string key, Dmc4kHd card, uint slot)
-//            : base(key, slot)
-//        {
-//            Card = card;
-//            HdmiIn = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn, eRoutingSignalType.AudioVideo,
-//                eRoutingPortConnectionType.Hdmi, null, this,
-//                VideoStatusHelper.GetHdmiInputStatusFuncs(Card.HdmiInput));
-
-//            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.AudioVideo,
-//                eRoutingPortConnectionType.Hdmi, null, this);
-//            AudioLoopOut = new RoutingOutputPort(DmPortName.AudioLoopOut, eRoutingSignalType.Audio,
-//                eRoutingPortConnectionType.Hdmi, null, this);
-
-//            InputPorts.Add(HdmiIn);
-//            OutputPorts.AddRange(new[] { HdmiLoopOut, AudioLoopOut });
-//        }
-//    }
-
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public class Dmc4kHdDspController : DmInputCardControllerBase
-//    {
-//        public Dmc4kHdDsp Card { get; private set; }
-//        public override eDmInputCardType Type
-//        {
-//            get { return eDmInputCardType.Dmc4kHdDsp; }
-//        }
-
-//        //public RoutingInputPortWithVideoStatuses HdmiIn { get; private set; }
-//        //public RoutingOutputPort HdmiLoopOut { get; private set; }
-//        //public RoutingOutputPort AudioLoopOut { get; private set; }
-
-//        public Dmc4kHdDspController(string key, Dmc4kHdDsp card, uint slot)
-//            : base(key, slot)
-//        {
-//            Card = card;
-//            //HdmiIn = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.Hdmi, null, this,
-//            //    VideoStatusHelper.GetHdmiInputStatusFuncs(Card.HdmiInput));
-
-//            //HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.AudioVideo,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-//            //AudioLoopOut = new RoutingOutputPort(DmPortName.AudioLoopOut, eRoutingSignalType.Audio,
-//            //    eRoutingPortConnectionType.Hdmi, null, this);
-
-//            //InputPorts.Add(HdmiIn);
-//            //OutputPorts.AddRange(new[] { HdmiLoopOut, AudioLoopOut });
-//        }
-//    }
-//}
-

Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -1,569 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Cards;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Cards;
-
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	/// <summary>
-	/// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
-	/// 
-	/// </summary>
-	public class DmChassisController : CrestronGenericBaseDevice, IRoutingInputsOutputs, IRouting//, ICardPortsDevice
-	{
-		public DmMDMnxn Chassis { get; private set; }
-
-		// Need a couple Lists of generic Backplane ports
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-        //public Dictionary<uint, DmInputCardControllerBase> InputCards { get; private set; }
-        //public Dictionary<uint, DmSingleOutputCardControllerBase> OutputCards { get; private set; }
-
-		public Dictionary<uint, string> InputNames { get; set; }
-		public Dictionary<uint, string> OutputNames { get; set; }
-        public Dictionary<uint, DmCardAudioOutputController> VolumeControls { get; private set; }
-
-		public const int RouteOffTime = 500;
-		Dictionary<PortNumberType, CTimer> RouteOffTimers = new Dictionary<PortNumberType, CTimer>();
-
-		/// <summary>
-		/// Factory method to create a new chassis controller from config data. Limited to 8x8 right now
-		/// </summary>
-		public static DmChassisController GetDmChassisController(string key, string name,
-			string type, DMChassisPropertiesConfig properties)
-		{
-			try
-			{
-				type = type.ToLower();
-				uint ipid = properties.Control.IpIdInt; // Convert.ToUInt16(properties.Id, 16);
-				DmChassisController controller = null;
-				if (type == "dmmd8x8")
-				{
-					controller = new DmChassisController(key, name, new DmMd8x8(ipid, Global.ControlSystem));
-                    // add the cards and port names
-                    foreach (var kvp in properties.InputSlots)
-                        controller.AddInputCard(kvp.Value, kvp.Key);
-    				foreach (var kvp in properties.OutputSlots)
-                        controller.AddOutputCard(kvp.Value, kvp.Key);
-                    foreach (var kvp in properties.VolumeControls)
-                    {
-                        // get the card
-                        // check it for an audio-compatible type
-                        // make a something-something that will make it work
-                        // retire to mountain village
-                        var outNum = kvp.Key;
-                        var card = controller.Chassis.Outputs[outNum].Card;
-                        Audio.Output audio = null;
-                        if (card is DmcHdo)
-                            audio = (card as DmcHdo).Audio;
-                        else if (card is Dmc4kHdo)
-                            audio = (card as Dmc4kHdo).Audio;
-                        if (audio == null)
-                            continue;
-                        // wire up the audio to something here...
-                        controller.AddVolumeControl(outNum, audio);
-                    }
-
-					controller.InputNames = properties.InputNames;
-					controller.OutputNames = properties.OutputNames;
-					return controller;
-				}
-			}
-			catch (System.Exception e)
-			{
-				Debug.Console(0, "Error creating DM chassis:\r{0}", e);
-			}
-			return null;
-		}
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="chassis"></param>
-		public DmChassisController(string key, string name, DmMDMnxn chassis)
-			: base(key, name, chassis)
-		{
-			Chassis = chassis;
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-            VolumeControls = new Dictionary<uint, DmCardAudioOutputController>();
-            IsOnline.OutputChange += new EventHandler<EventArgs>(IsOnline_OutputChange);
-            Chassis.DMOutputChange += new DMOutputEventHandler(Chassis_DMOutputChange);
-		}
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="number"></param>
-        public void AddInputCard(string type, uint number)
-        {
-            Debug.Console(2, this, "Adding input card '{0}', slot {1}", type, number);
-            if (type == "dmc4kHd")
-            {
-                new Dmc4kHd(number, this.Chassis);
-                AddHdmiInCardPorts(number);
-            }
-            else if (type == "dmc4kHdDsp")
-            {
-                new Dmc4kHdDsp(number, this.Chassis);
-                AddHdmiInCardPorts(number);
-            }
-            else if (type == "dmc4kC")
-            {
-                new Dmc4kC(number, this.Chassis);
-                AddDmInCardPorts(number);
-            }
-            else if (type == "dmc4kCDsp")
-            {
-                new Dmc4kCDsp(number, this.Chassis);
-                AddDmInCardPorts(number);
-            }
-            else if (type == "dmcHd")
-            {
-                new DmcHd(number, this.Chassis);
-                AddHdmiInCardPorts(number);
-            }
-            else if (type == "dmcHdDsp")
-            {
-                new DmcHdDsp(number, this.Chassis);
-                AddHdmiInCardPorts(number);
-            }
-
-            else if (type == "dmcC")
-            {
-                new DmcC(number, this.Chassis);
-                AddDmInCardPorts(number);
-            }
-            else if (type == "dmcCDsp")
-            {
-                new DmcCDsp(number, this.Chassis);
-                AddDmInCardPorts(number);
-            }
-            else if (type == "dmcS")
-            {
-                new DmcS(number, Chassis);
-                AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmMmFiber);
-                AddInCardLoopPorts(number);
-            }
-            else if (type == "dmcSDsp")
-            {
-                new DmcSDsp(number, Chassis);
-                AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmMmFiber);
-                AddInCardLoopPorts(number);
-            }
-            else if (type == "dmcS2")
-            {
-                new DmcS2(number, Chassis);
-                AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmSmFiber);
-                AddInCardLoopPorts(number);
-            }
-            else if (type == "dmcS2Dsp")
-            {
-                new DmcS2Dsp(number, Chassis);
-                AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmSmFiber);
-                AddInCardLoopPorts(number);
-            }
-            else if (type == "dmcSdi")
-            {
-                new DmcSdi(number, Chassis);
-                AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Sdi);
-                AddOutputPortWithDebug(number, "sdiOut", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Sdi, null);
-                AddInCardLoopPorts(number);
-            }
-        }
-
-        void AddDmInCardPorts(uint number)
-        {
-            AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmCat);
-            AddInCardLoopPorts(number);
-        }
-
-        void AddHdmiInCardPorts(uint number)
-        {
-            AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi);
-            AddInCardLoopPorts(number);
-        }
-
-        void AddInCardLoopPorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "hdmiLoopOut", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null);
-            AddOutputPortWithDebug(number, "audioLoopOut", eRoutingSignalType.Audio, eRoutingPortConnectionType.Hdmi, null);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="number"></param>
-        public void AddOutputCard(string type, uint number)
-        {
-            Debug.Console(2, this, "Adding output card '{0}', slot {1}", type, number);
-            if (type == "dmc4kHdo")
-            {
-                new Dmc4kHdoSingle(number, Chassis);
-                AddDmcHdoPorts(number);
-            }
-            else if (type == "dmcHdo")
-            {
-                new DmcHdoSingle(number, Chassis);
-                AddDmcHdoPorts(number);
-            }
-            else if (type == "dmc4kCoHd")
-            {
-                new Dmc4kCoHdSingle(number, Chassis);
-                AddDmcCoPorts(number);
-            }
-            else if (type == "dmcCoHd")
-            {
-                new DmcCoHdSingle(number, Chassis);
-                AddDmcCoPorts(number);
-            }
-            else if (type == "dmcSoHd")
-            {
-                new DmcSoHdSingle(number, Chassis);
-                AddOutputPortWithDebug(number, "dmOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmMmFiber, 2 * (number - 1) + 1);
-                AddOutputPortWithDebug(number, "hdmiOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2 * (number - 1) + 1);
-                AddOutputPortWithDebug(number, "dmOut2", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmMmFiber, 2 * (number - 1) + 2);
-
-            }
-            else if (type == "dmcS2oHd")
-            {
-                new DmcS2oHdSingle(number, Chassis);
-                AddOutputPortWithDebug(number, "dmOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmSmFiber, 2 * (number - 1) + 1);
-                AddOutputPortWithDebug(number, "hdmiOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2 * (number - 1) + 1);
-                AddOutputPortWithDebug(number, "dmOut2", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmSmFiber, 2 * (number - 1) + 2);
-            }
-
-            else
-                Debug.Console(1, this, "  WARNING: Output card type '{0}' is not available", type);
-        }
-
-        void AddDmcHdoPorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "hdmiOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2 * (number - 1) + 1);
-            AddOutputPortWithDebug(number, "audioOut1", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio, 2 * (number - 1) + 1);
-            AddOutputPortWithDebug(number, "hdmiOut2", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2 * (number - 1) + 2);
-            AddOutputPortWithDebug(number, "audioOut2", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio, 2 * (number - 1) + 2);
-
-        }
-
-        void AddDmcCoPorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmCat, 2 * (number - 1) + 1);
-            AddOutputPortWithDebug(number, "hdmiOut1", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2 * (number - 1) + 1);
-            AddOutputPortWithDebug(number, "dmOut2", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmCat, 2 * (number - 1) + 2);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType)
-        {
-            Debug.Console(2, this, "  Adding input port '{0}'", portName);
-            InputPorts.Add(new RoutingInputPort(string.Format("card{0}--{1}", cardNum, portName),
-                sigType, portType, cardNum, this));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void AddOutputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector)
-        {
-            Debug.Console(2, this, "  Adding output port '{0}'", portName);
-            OutputPorts.Add(new RoutingOutputPort(string.Format("card{0}--{1}", cardNum, portName),
-                sigType, portType, selector, this));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void AddVolumeControl(uint number, Audio.Output audio)
-        {
-            VolumeControls.Add(number, new DmCardAudioOutputController(audio));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
-        {
-            if (args.EventId == DMOutputEventIds.VolumeEventId &&
-                VolumeControls.ContainsKey(args.Number))
-                VolumeControls[args.Number].VolumeEventFromChassis();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pnt"></param>
-		void StartOffTimer(PortNumberType pnt)
-		{
-			if (RouteOffTimers.ContainsKey(pnt))
-				return;
-			RouteOffTimers[pnt] = new CTimer(o =>
-			{
-				ExecuteSwitch(0, pnt.Number, pnt.Type);
-			}, RouteOffTime);
-		}
-
-		// Send out sigs when coming online
-		void IsOnline_OutputChange(object sender, EventArgs e)
-		{
-			if (IsOnline.BoolValue)
-			{
-				if (InputNames != null)
-					foreach (var kvp in InputNames)
-						Chassis.Inputs[kvp.Key].Name.StringValue = kvp.Value;
-				if (OutputNames != null)
-					foreach(var kvp in OutputNames)
-						Chassis.Outputs[kvp.Key].Name.StringValue = kvp.Value;
-			}
-		}
-
-		#region IRouting Members
-
-		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType)
-		{
-			Debug.Console(0, this, "Making an awesome DM route from {0} to {1} {2}", inputSelector, outputSelector, sigType);
-
-			var input = Convert.ToUInt32(inputSelector); // Cast can sometimes fail
-			var output = Convert.ToUInt32(outputSelector);
-			// Check to see if there's an off timer waiting on this and if so, cancel
-			var key = new PortNumberType(output, sigType);
-            if (input == 0)
-            {
-                StartOffTimer(key);
-            }
-            else
-			{
-				if(RouteOffTimers.ContainsKey(key))
-				{
-					Debug.Console(2, this, "{0} cancelling route off due to new source", output);
-					RouteOffTimers[key].Stop();
-					RouteOffTimers.Remove(key);
-				}
-			}
-
-			Card.DMICard inCard = input == 0 ? null : Chassis.Inputs[input];
-
-			// NOTE THAT THESE ARE NOTS - TO CATCH THE AudioVideo TYPE
-			if (sigType != eRoutingSignalType.Audio)
-			{
-				Chassis.VideoEnter.BoolValue = true;
-				Chassis.Outputs[output].VideoOut = inCard;
-			}
-
-			if (sigType != eRoutingSignalType.Video)
-			{
-				Chassis.AudioEnter.BoolValue = true;
-				Chassis.Outputs[output].AudioOut = inCard;
-			}
-		}
-
-		#endregion
-//        void AddInUseTrackerToPort(RoutingOutputPort port, eRoutingSignalType sigType)
-//        {
-//            port.InUseTracker.InUseFeedback.OutputChange += (o, a) =>
-//            {
-//#warning Can we add something here that will de-route based on breakaway, or does it even matter?
-//                if (!port.InUseTracker.InUseFeedback.BoolValue)
-//                    this.ExecuteSwitch(0, port.Selector, sigType);
-//            };
-//        }
-
-           
-        //[Obsolete]
-        //public void AddInputCard(uint slot, eDmInputCardType type)
-        //{
-        //    var cardKey = Key + "-inputCard" + slot;
-        //    switch (type)
-        //    {
-        //        case eDmInputCardType.Dmc4kHd:
-        //            InputCards[slot] = new Dmc4kHdController(cardKey, 
-        //                new Dmc4kHd(slot, this.Chassis), slot);
-        //            break;
-        //        case eDmInputCardType.Dmc4kHdDsp:
-        //            InputCards[slot] = new Dmc4kHdDspController(cardKey,
-        //                new Dmc4kHdDsp(slot, this.Chassis), slot);
-        //            break;
-        //        case eDmInputCardType.Dmc4kC:
-        //            InputCards[slot] = new Dmc4kCController(cardKey,
-        //                new Dmc4kC(slot, this.Chassis), slot);
-        //            break;
-        //        case eDmInputCardType.Dmc4kCDsp:
-        //            InputCards[slot] = new Dmc4kCDspController(cardKey,
-        //                new Dmc4kCDsp(slot, this.Chassis), slot);
-        //            break;
-        //    }
-        //}
-
-        //[Obsolete]
-        //public void AddOutputCard(uint cardSlot, eDmOutputCardType type)
-        //{
-        //    var cardKey = Key + "-outputCard" + cardSlot;
-        //    switch (type)
-        //    {
-        //        case eDmOutputCardType.Dmc4kCoHd:
-        //            OutputCards[cardSlot] = new Dmc4kCoHdSingleOutputCard(cardKey,
-        //                new Dmc4kCoHdSingle(cardSlot, this.Chassis), cardSlot);
-        //            break;
-        //        case eDmOutputCardType.DmcCoHd:
-        //            OutputCards[cardSlot] = new Dmc4kHdoSingleOutputCard(cardKey,
-        //                new Dmc4kHdoSingle(cardSlot, this.Chassis), cardSlot);
-        //            break;
-        //        default:
-        //            break;
-        //    }
-        //}
-
-        ///// <summary>
-        ///// Helper to get a specific port from a given attached card
-        ///// </summary>
-        ///// <param name="card">Named 'input-N' ('output-N' is not valid, as output cards have no inputs)</param>
-        ///// <param name="port">The port name on the card, for example 'hdmiOut'</param>
-        ///// <returns>Returns port or null if doesn't exist</returns>
-        //public RoutingInputPort GetChildInputPort(string card, string port)
-        //{
-        //    return GetChildPort(card, port, false) as RoutingInputPort;
-        //}
-
-        ///// <summary>
-        ///// Helper to get a specific port from a given attached card
-        ///// </summary>
-        ///// <param name="card">Named 'input-N' or 'output-N'</param>
-        ///// <param name="port">The port name on the card, for example 'hdmiOut'</param>
-        ///// <returns>Returns port or null if doesn't exist</returns>
-        //public RoutingOutputPort GetChildOutputPort(string card, string port)
-        //{
-        //    return GetChildPort(card, port, true) as RoutingOutputPort;
-        //}
-
-        ///// <summary>
-        ///// Helper for above methods
-        ///// </summary>
-        //RoutingPort GetChildPort(string cardKey, string portKey, bool portIsOutput)
-        //{
-        //    var cardTokens = cardKey.Split('-');
-        //    if (cardTokens.Length != 2)
-        //    {
-        //        Debug.Console(0, this, "WARNING: GetChildPort cannot get port. Card parameter must be 'input-N' or 'output-N'");
-        //        return null;
-        //    }
-        //    try
-        //    {
-        //        uint slotNum = Convert.ToUInt32(cardTokens[1]);
-        //        var cardType = cardTokens[0].ToLower();
-        //        if (cardType == "input" && InputCards.ContainsKey(slotNum))
-        //        {
-        //            var card = InputCards[slotNum];
-        //            if (portIsOutput)
-        //                return card.GetOutputPort(portKey);
-        //            else
-        //                return card.GetInputPort(portKey);
-        //        }
-        //        if (cardType == "output" && OutputCards.ContainsKey(slotNum))
-        //        {
-        //            var card = OutputCards[slotNum];
-        //            return card.GetOutputPort(portKey);
-        //        }
-        //    }
-        //    catch (Exception)
-        //    {
-        //        Debug.Console(0, this, "WARNING: GetChildPort cannot get port. Only integer card numbers are valid.");
-        //    }
-        //    return null;
-        //}
-
-        //public override bool CustomActivate()
-        //{
-        //    var tlc = TieLineCollection.Default;
-        //    // Take all cards and TieLine them together with the internal ports
-        //    for (uint i = 1; i <= Chassis.NumberOfInputs; i++)
-        //    {
-        //        // If there's a matching input card for a given input number...
-        //        // This test *shouldn't* be necessary if data is consistent
-        //        if (InputCards.ContainsKey(i))
-        //        {
-        //            // Get the ports to link
-        //            var cardAudio = InputCards[i].BackplaneAudioOut;
-        //            var chassisAudio = InputPorts.FirstOrDefault(p => 
-        //                (uint)p.Selector == i && p.Type == eRoutingSignalType.Audio);
-        //            if (chassisAudio != null)
-        //                tlc.Add(new TieLine(cardAudio, chassisAudio));
-        //            else
-        //                Debug.Console(0, this, Debug.ErrorLogLevel.Warning,
-        //                    "Backplane audio tie line creation for input card {0} failed", i);
-
-        //            // Repeat for video link
-        //            var cardVideo = InputCards[i].BackplaneVideoOut;
-        //            var chassisVideo = InputPorts.FirstOrDefault(p => 
-        //                (uint)p.Selector == i && p.Type == eRoutingSignalType.Video);
-        //            if (cardVideo != null)
-        //                tlc.Add(new TieLine(cardVideo, chassisVideo));
-        //            else
-        //                Debug.Console(0, this, Debug.ErrorLogLevel.Warning,
-        //                    "Backplane video tie line creation for input card {0} failed", i);
-        //        }
-        //    }
-
-        //    // Loop through outputs and do it again - in pairs, because FYC
-        //    for (uint i = 1; i <= Chassis.NumberOfOutputs / 2; i += 1)
-        //    {
-        //        if (OutputCards.ContainsKey(i))
-        //        {
-        //            //Debug.Console(0, this, "Adding internal TieLines on output card {0}", OutputCards[i].Key);
-        //            // Left side of card
-        //            uint a = i * 2 - 1;
-        //            tlc.Add(new TieLine(
-        //                OutputPorts.First(p => (uint)p.Selector == a && p.Type == eRoutingSignalType.Audio), 
-        //                OutputCards[i].BackplaneAudioIn1));
-        //            tlc.Add(new TieLine(
-        //                OutputPorts.First(p => (uint)p.Selector == a && p.Type == eRoutingSignalType.Video), 
-        //                OutputCards[i].BackplaneVideoIn1));
-
-        //            // Right side of card
-        //            uint b = i * 2;
-        //            tlc.Add(new TieLine(
-        //                OutputPorts.First(p => (uint)p.Selector == b && p.Type == eRoutingSignalType.Audio),
-        //                OutputCards[i].BackplaneAudioIn2));
-        //            tlc.Add(new TieLine(
-        //                OutputPorts.First(p => (uint)p.Selector == b && p.Type == eRoutingSignalType.Video),
-        //                OutputCards[i].BackplaneVideoIn2));
-        //        }
-        //    }
-
-        //    // Base does register and sets up comm monitoring.
-        //    return base.CustomActivate();
-        //}
-
-	}
-
-	public struct PortNumberType
-	{
-		public uint Number { get; private set; }
-		public eRoutingSignalType Type { get; private set; }
-
-		public PortNumberType(uint number, eRoutingSignalType type) : this()
-		{
-			Number = number;
-			Type = type;
-		}
-	}
-}

Essentials DM/Essentials_DM/Config/DeviceFactory.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	public class DeviceFactory
-	{
-		public static IKeyed GetDevice(DeviceConfig dc)
-		{
-			var key = dc.Key;
-			var name = dc.Name;
-			var type = dc.Type;
-			var properties = dc.Properties;
-
-			var typeName = dc.Type.ToLower();
-
-			if (typeName == "dmmd8x8")
-			{
-				var props = JsonConvert.DeserializeObject
-					<PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(properties.ToString());
-				return PepperDash.Essentials.DM.DmChassisController.
-					GetDmChassisController(key, name, type, props);
-			}
-
-			// Hand off to DmTxHelper class
-			else if (typeName.StartsWith("dmtx"))
-			{
-				var props = JsonConvert.DeserializeObject
-					<PepperDash.Essentials.DM.Config.DmTxPropertiesConfig>(properties.ToString());
-				return PepperDash.Essentials.DM.DmTxHelper.GetDmTxController(key, name, type, props);
-			}
-
-			// Hand off to DmRmcHelper class
-			else if (typeName.StartsWith("dmrmc"))
-			{
-				var props = JsonConvert.DeserializeObject
-					<PepperDash.Essentials.DM.Config.DmRmcPropertiesConfig>(properties.ToString());
-				return PepperDash.Essentials.DM.DmRmcHelper.GetDmRmcController(key, name, type, props);
-			}
-
-			else if (typeName.Equals("hdmd4x14ke"))
-			{
-				var props = JsonConvert.DeserializeObject
-					<PepperDash.Essentials.DM.Config.HdMdNxM4kEPropertiesConfig>(properties.ToString());
-				return PepperDash.Essentials.DM.Chassis.HdMdNxM4kEController.GetController(key, name, type, props);
-			}
-
-			return null;
-		}
-
-
-	}
-
-}

Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc100CController.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.DM
-{
-	/// <summary>
-	/// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
-	/// 
-	/// </summary>
-	public class DmRmc100CController : DmRmcControllerBase, IRoutingInputsOutputs, 
-		IIROutputPorts, IComPorts, ICec
-	{
-		public DmRmc100C Rmc { get; private set; }
-
-		public RoutingInputPort DmIn { get; private set; }
-		public RoutingOutputPort HdmiOut { get; private set; }
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts
-		{
-			get { return new RoutingPortCollection<RoutingInputPort> { DmIn }; }
-		}
-
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts
-		{
-			get { return new RoutingPortCollection<RoutingOutputPort> { HdmiOut }; }
-		}
-
-		/// <summary>
-		///  Make a Crestron RMC and put it in here
-		/// </summary>
-		public DmRmc100CController(string key, string name, DmRmc100C rmc)
-			: base(key, name, rmc)
-		{
-			Rmc = rmc;
-			DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.Hdmi, null, this);
-		}
-
-		public override bool CustomActivate()
-		{
-			// Base does register and sets up comm monitoring.
-			return base.CustomActivate();
-		}
-
-		#region IIROutputPorts Members
-		public CrestronCollection<IROutputPort> IROutputPorts { get { return Rmc.IROutputPorts; } }
-		public int NumberOfIROutputPorts { get { return Rmc.NumberOfIROutputPorts; } }
-		#endregion
-
-		#region IComPorts Members
-		public CrestronCollection<ComPort> ComPorts { get { return Rmc.ComPorts; } }
-		public int NumberOfComPorts { get { return Rmc.NumberOfComPorts; } }
-		#endregion
-
-		#region ICec Members
-		public Cec StreamCec { get { return Rmc.StreamCec; } }
-		#endregion
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4KScalerCController.cs

@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.DM
-{
-	/// <summary>
-	/// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
-	/// 
-	/// </summary>
-	public class DmRmc4kScalerCController : DmRmcControllerBase, IRoutingInputsOutputs, IBasicVolumeWithFeedback,
-		IIROutputPorts, IComPorts, ICec, IRelayPorts
-	{
-		public DmRmc4kScalerC Rmc { get; private set; }
-
-		public RoutingInputPort DmIn { get; private set; }
-		public RoutingOutputPort HdmiOut { get; private set; }
-		public RoutingOutputPort BalancedAudioOut { get; private set; }
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts
-		{
-			get { return new RoutingPortCollection<RoutingInputPort> { DmIn }; }
-		}
-
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts
-		{
-			get { return new RoutingPortCollection<RoutingOutputPort> { HdmiOut, BalancedAudioOut }; }
-		}
-
-		/// <summary>
-		///  Make a Crestron RMC and put it in here
-		/// </summary>
-		public DmRmc4kScalerCController(string key, string name, DmRmc4kScalerC rmc)
-			: base(key, name, rmc)
-		{
-			Rmc = rmc;
-			DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.Hdmi, null, this);
-			BalancedAudioOut = new RoutingOutputPort(DmPortName.BalancedAudioOut, eRoutingSignalType.Audio,
-				eRoutingPortConnectionType.LineAudio, null, this);
-
-			MuteFeedback = new BoolFeedback(() => false);
-			VolumeLevelFeedback = new IntFeedback(CommonIntCue.MainVolumeLevelFeedback, () => 
-				rmc.AudioOutput.VolumeFeedback.UShortValue);
-		}
-
-		public override bool CustomActivate()
-		{
-			// Base does register and sets up comm monitoring.
-			return base.CustomActivate();
-		}
-
-		#region IIROutputPorts Members
-		public CrestronCollection<IROutputPort> IROutputPorts { get { return Rmc.IROutputPorts; } }
-		public int NumberOfIROutputPorts { get { return Rmc.NumberOfIROutputPorts; } }
-		#endregion
-
-		#region IComPorts Members
-		public CrestronCollection<ComPort> ComPorts { get { return Rmc.ComPorts; } }
-		public int NumberOfComPorts { get { return Rmc.NumberOfComPorts; } }
-		#endregion
-
-		#region ICec Members
-		/// <summary>
-		/// Gets the CEC stream directly from the HDMI port.
-		/// </summary>
-		public Cec StreamCec { get { return Rmc.HdmiOutput.StreamCec; } }
-		#endregion
-
-		#region IRelayPorts Members
-
-		public int NumberOfRelayPorts
-		{
-			get { return Rmc.NumberOfRelayPorts; }
-		}
-
-		public CrestronCollection<Relay> RelayPorts
-		{
-			get { return Rmc.RelayPorts; }
-		}
-
-		#endregion
-
-		#region IBasicVolumeWithFeedback Members
-
-		public BoolFeedback MuteFeedback
-		{
-			get;
-			private set;
-		}
-
-		/// <summary>
-		/// Not implemented
-		/// </summary>
-		public void MuteOff()
-		{	
-		}
-
-		/// <summary>
-		/// Not implemented
-		/// </summary>
-		public void MuteOn()
-		{
-		}
-
-		public void SetVolume(ushort level)
-		{
-			Rmc.AudioOutput.Volume.UShortValue = level;
-		}
-
-		public IntFeedback VolumeLevelFeedback
-		{
-			get;
-			private set;
-		}
-
-		#endregion
-
-		#region IBasicVolumeControls Members
-
-		/// <summary>
-		/// Not implemented
-		/// </summary>
-		public void MuteToggle()
-		{
-		}
-
-		public void VolumeDown(bool pressRelease)
-		{
-			if (pressRelease)
-				SigHelper.RampTimeScaled(Rmc.AudioOutput.Volume, 0, 4000);
-			else
-				Rmc.AudioOutput.Volume.StopRamp();
-		}
-
-		public void VolumeUp(bool pressRelease)
-		{
-			if (pressRelease)
-				SigHelper.RampTimeScaled(Rmc.AudioOutput.Volume, 65535, 4000);
-			else
-				Rmc.AudioOutput.Volume.StopRamp();
-		}
-
-		#endregion
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	public abstract class DmRmcControllerBase : CrestronGenericBaseDevice
-	{
-		public DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
-			: base(key, name, device)
-		{ }
-	}
-
-	public class DmRmcHelper
-	{
-		/// <summary>
-		/// A factory method for various DmTxControllers
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="props"></param>
-		/// <returns></returns>
-		public static DmRmcControllerBase GetDmRmcController(string key, string name, string typeName, DmRmcPropertiesConfig props)
-		{
-			// switch on type name... later...
-
-			typeName = typeName.ToLower();
-			uint ipid = props.Control.IpIdInt; // Convert.ToUInt16(props.Id, 16);
-
-
-
-            // right here, we need to grab the tie line that associates this
-            // RMC with a chassis or processor.  If the RMC input's tie line is not
-            // connected to a chassis, then it's parent is the processor.
-            // If the RMC is connected to a chassis, then we need to grab the 
-            // output number from the tie line and use that to plug it in.
-            // Example of chassis-connected:
-            //{
-            //  "sourceKey": "dmMd8x8-1",
-            //  "sourcePort": "anyOut2",
-            //  "destinationKey": "dmRmc100C-2",
-            //  "destinationPort": "DmIn"
-            //}
-
-            // Tx -> RMC link:
-            //{
-            //  "sourceKey": "dmTx201C-1",
-            //  "sourcePort": "DmOut",
-            //  "destinationKey": "dmRmc100C-2",
-            //  "destinationPort": "DmIn"
-            //}
-
-            var tlc = TieLineCollection.Default;
-            // grab the tie line that has this key as 
-            // THIS DOESN'T WORK BECAUSE THE RMC THAT WE NEED (THIS) HASN'T BEEN MADE
-            // YET AND THUS WILL NOT HAVE A TIE LINE...
-            var inputTieLine = tlc.FirstOrDefault(t => 
-                {
-                    var d = t.DestinationPort.ParentDevice;
-                    return d.Key.Equals(key, StringComparison.OrdinalIgnoreCase)
-                        && d is DmChassisController;
-                });
-
-			var pKey = props.ParentDeviceKey.ToLower();
-
-
-
-
-			// Non-DM-chassis endpoints
-			if (pKey == "processor")
-			{
-				// Catch constructor failures, mainly dues to IPID
-				try
-				{
-					if (typeName.StartsWith("dmrmc100c"))
-						return new DmRmc100CController(key, name, new DmRmc100C(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmrmcscalerc"))
-						return new DmRmcScalerCController(key, name, new DmRmcScalerC(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmrmc4kscalerc"))
-						return new DmRmc4kScalerCController(key, name, new DmRmc4kScalerC(ipid, Global.ControlSystem));
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-RMC device: {1}", key, e.Message);
-				}
-
-
-				Debug.Console(0, "Cannot create DM-RMC of type: '{0}'", typeName);
-			}
-			// Endpoints attached to DM Chassis
-			else
-			{
-				var parentDev = DeviceManager.GetDeviceForKey(pKey);
-				if (!(parentDev is DmChassisController))
-				{
-					Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
-						key, pKey);
-					return null;
-				}
-
-				var chassis = (parentDev as DmChassisController).Chassis;
-				var num = props.ParentOutputNumber;
-				if (num <= 0 || num > chassis.NumberOfOutputs)
-				{
-					Debug.Console(0, "Cannot create DM device '{0}'. Output number '{1}' is out of range",
-						key, num);
-					return null;
-				}
-
-				try
-				{
-					if (typeName.StartsWith("dmrmc100c"))
-						return new DmRmc100CController(key, name, new DmRmc100C(ipid, chassis.Outputs[num]));
-					if (typeName.StartsWith("dmrmcscalerc"))
-						return new DmRmcScalerCController(key, name, new DmRmcScalerC(ipid, chassis.Outputs[num]));
-					if (typeName.StartsWith("dmrmc4kscalerc"))
-						return new DmRmc4kScalerCController(key, name, new DmRmc4kScalerC(ipid, chassis.Outputs[num]));
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-RMC device: {1}", key, e.Message);
-				}
-			}
-
-			return null;
-		}
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcScalerCController.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.DM
-{
-	/// <summary>
-	/// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
-	/// 
-	/// </summary>
-	public class DmRmcScalerCController : DmRmcControllerBase, IRoutingInputsOutputs, 
-		IIROutputPorts, IComPorts, ICec
-	{
-		public DmRmcScalerC Rmc { get; private set; }
-
-		public RoutingInputPort DmIn { get; private set; }
-		public RoutingOutputPort HdmiOut { get; private set; }
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts
-		{
-			get { return new RoutingPortCollection<RoutingInputPort> { DmIn }; }
-		}
-
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts
-		{
-			get { return new RoutingPortCollection<RoutingOutputPort> { HdmiOut }; }
-		}
-
-		/// <summary>
-		///  Make a Crestron RMC and put it in here
-		/// </summary>
-		public DmRmcScalerCController(string key, string name, DmRmcScalerC rmc)
-			: base(key, name, rmc)
-		{
-			Rmc = rmc;
-			DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.Hdmi, null, this);
-		}
-
-		public override bool CustomActivate()
-		{
-			// Base does register and sets up comm monitoring.
-			return base.CustomActivate();
-		}
-
-		#region IIROutputPorts Members
-		public CrestronCollection<IROutputPort> IROutputPorts { get { return Rmc.IROutputPorts; } }
-		public int NumberOfIROutputPorts { get { return Rmc.NumberOfIROutputPorts; } }
-		#endregion
-
-		#region IComPorts Members
-		public CrestronCollection<ComPort> ComPorts { get { return Rmc.ComPorts; } }
-		public int NumberOfComPorts { get { return Rmc.NumberOfComPorts; } }
-		#endregion
-
-		#region ICec Members
-		/// <summary>
-		/// Gets the CEC stream directly from the HDMI port.
-		/// </summary>
-		public Cec StreamCec { get { return Rmc.HdmiOutput.StreamCec; } }
-		#endregion
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs

@@ -1,196 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	public class DmTx201SBasicController : DmTxControllerBase, IRoutingInputsOutputs, IHasFeedback
-	{
-		public DmTx201S Tx { get; private set; }
-
-		public RoutingInputPortWithVideoStatuses AnyVideoInput { get; private set; }
-		public RoutingInputPortWithVideoStatuses HdmiInput { get; private set; }
-		public RoutingInputPortWithVideoStatuses VgaInput { get; private set; }
-		public RoutingOutputPort DmOutput { get; private set; }
-		public StringFeedback ActiveVideoInputFeedback { get; private set; }
-
-		/// <summary>
-		/// Helps get the "real" inputs, including when in Auto
-		/// </summary>
-		public DmTx200Base.eSourceSelection ActualVideoInput
-		{
-			get
-			{
-				if (Tx.VideoSourceFeedback == DmTx200Base.eSourceSelection.Digital ||
-						Tx.VideoSourceFeedback == DmTx200Base.eSourceSelection.Analog ||
-						Tx.VideoSourceFeedback == DmTx200Base.eSourceSelection.Disable)
-					return Tx.VideoSourceFeedback;
-				else // auto
-				{
-					if (Tx.HdmiInput.SyncDetectedFeedback.BoolValue)
-						return DmTx200Base.eSourceSelection.Digital;
-					else if (Tx.VgaInput.SyncDetectedFeedback.BoolValue)
-						return DmTx200Base.eSourceSelection.Analog;
-					else
-						return DmTx200Base.eSourceSelection.Disable;
-				}
-			}
-		}
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts
-		{
-			get
-			{
-				return new RoutingPortCollection<RoutingInputPort> 
-				{ 
-					HdmiInput, 
-					VgaInput, 
-					AnyVideoInput 
-				};
-			}
-		}
-
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts
-		{
-			get
-			{
-				return new RoutingPortCollection<RoutingOutputPort> { DmOutput };
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="tx"></param>
-		public DmTx201SBasicController(string key, string name, DmTx201S tx)
-			: base(key, name, tx)
-		{
-			Tx = tx;
-
-			//Can this be combined into helper somehow??
-			var combinedFuncs = new VideoStatusFuncsWrapper
-			{
-				HdcpActiveFeedbackFunc = () =>
-					ActualVideoInput == DmTx200Base.eSourceSelection.Digital
-					&& tx.HdmiInput.VideoAttributes.HdcpActiveFeedback.BoolValue,
-
-				HdcpStateFeedbackFunc = () =>
-					ActualVideoInput == DmTx200Base.eSourceSelection.Digital
-					? tx.HdmiInput.VideoAttributes.HdcpStateFeedback.ToString()
-					: "",
-
-				VideoResolutionFeedbackFunc = () =>
-					ActualVideoInput == DmTx200Base.eSourceSelection.Digital
-					? Tx.HdmiInput.VideoAttributes.GetVideoResolutionString()
-					: Tx.VgaInput.VideoAttributes.GetVideoResolutionString(),
-
-				VideoSyncFeedbackFunc = () =>
-					ActualVideoInput == DmTx200Base.eSourceSelection.Digital
-					? HdmiInput.VideoStatus.VideoSyncFeedback.BoolValue
-					: VgaInput.VideoStatus.VideoSyncFeedback.BoolValue
-			};
-			HdmiInput = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 1, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput));
-			VgaInput = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
-				eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, 2, this, 
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
-			AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
-
-			DmOutput = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.DmCat, null, this);
-			
-			ActiveVideoInputFeedback = new StringFeedback(new Cue("ActiveVideoInput", 0, eCueType.String),
-				() => ActualVideoInput.ToString());
-		}
-
-		public override bool CustomActivate()
-		{
-			Tx.HdmiInput.InputStreamChange += (o, a) => FireInputStreamChange(HdmiInput, a.EventId);
-			Tx.HdmiInput.VideoAttributes.AttributeChange += (o, a) => FireVideoAttributeChange(HdmiInput, a.EventId);
-
-			Tx.VgaInput.InputStreamChange += (o, a) => FireInputStreamChange(VgaInput, a.EventId);
-			Tx.VgaInput.VideoAttributes.AttributeChange += (o, a) => FireVideoAttributeChange(VgaInput, a.EventId);
-
-			// Base does register and sets up comm monitoring.
-			return base.CustomActivate();
-		}
-
-		void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-		{
-			var id = args.EventId;
-			if (id == DmTx201S.VideoSourceFeedbackEventID)
-			{
-				Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
-			}
-
-			// ------------------------------ incomplete -----------------------------------------
-			else if (id == DmTx201S.AudioSourceFeedbackEventID)
-			{
-				Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-			}
-		}
-
-		/// <summary>
-		/// Relays the input stream change to the appropriate RoutingInputPort.
-		/// </summary>
-		void FireInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-		{
-			if (eventId == EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
-			{
-				inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
-				AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
-			}
-		}
-		
-		/// <summary>
-		/// Relays the VideoAttributes change to a RoutingInputPort
-		/// </summary>
-		void FireVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-		{
-			//// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
-			//Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
-			//    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
-			switch (eventId)
-			{
-				case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
-					inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
-					break;
-				case VideoAttributeEventIds.HdcpStateFeedbackEventId:
-					inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
-					break;
-				case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
-				case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
-					inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-					break;
-			}
-		}
-
-		public override List<Feedback> Feedbacks
-		{
-			get
-			{
-				List<Feedback> list = AnyVideoInput.VideoStatus.ToList();
-				list.AddRange(base.Feedbacks);
-				list.Add(ActiveVideoInputFeedback);
-				return list;
-			}
-		}
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs

@@ -1,246 +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.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	using eVst = DmTx401C.eSourceSelection;
-
-	public class DmTx401CController : DmTxControllerBase, IRoutingInputsOutputs, IHasFeedback, IIROutputPorts, IComPorts
-	{
-		public DmTx401C Tx { get; private set; }
-
-		public RoutingInputPortWithVideoStatuses AnyVideoInput { get; private set; }
-		public RoutingInputPortWithVideoStatuses HdmiIn { get; private set; }
-		public RoutingInputPortWithVideoStatuses DisplayPortIn { get; private set; }
-		public RoutingInputPortWithVideoStatuses VgaIn { get; private set; }
-		public RoutingInputPortWithVideoStatuses CompositeIn { get; private set; }
-		public RoutingOutputPort DmOut { get; private set; }
-
-		public StringFeedback ActiveVideoInputFeedback { get; private set; }
-
-		/// <summary>
-		/// Helps get the "real" inputs, including when in Auto
-		/// </summary>
-		public BaseDmTx401.eSourceSelection ActualVideoInput
-		{
-			get
-			{
-				if (Tx.VideoSourceFeedback != BaseDmTx401.eSourceSelection.Auto)
-					return Tx.VideoSourceFeedback;
-				else // auto
-				{
-					if (Tx.HdmiInput.SyncDetectedFeedback.BoolValue)
-						return BaseDmTx401.eSourceSelection.HDMI;
-					else if (Tx.VgaInput.SyncDetectedFeedback.BoolValue)
-						return BaseDmTx401.eSourceSelection.VGA;
-					else if (Tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
-						return BaseDmTx401.eSourceSelection.DisplayPort;
-					else if (Tx.CvbsInput.SyncDetectedFeedback.BoolValue)
-						return BaseDmTx401.eSourceSelection.Composite;
-					else
-						return BaseDmTx401.eSourceSelection.Disabled;
-				}
-			}
-		}
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts
-		{
-			get
-			{
-				return new RoutingPortCollection<RoutingInputPort> 
-				{ 
-					HdmiIn,
-					DisplayPortIn,
-					VgaIn, 
-					CompositeIn,
-					AnyVideoInput 
-				};
-			}
-		}
-
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts
-		{
-			get
-			{
-				return new RoutingPortCollection<RoutingOutputPort> { DmOut };
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="tx"></param>
-		public DmTx401CController(string key, string name, DmTx401C tx)
-			: base(key, name, tx)
-		{
-			Tx = tx;
-
-			HdmiIn = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 1, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput));
-			DisplayPortIn = new RoutingInputPortWithVideoStatuses(DmPortName.DisplayPortIn,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2, this,
-				VideoStatusHelper.GetDisplayPortInputStatusFuncs(tx.DisplayPortInput));
-			VgaIn = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
-				eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, 3, this, 
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
-			CompositeIn = new RoutingInputPortWithVideoStatuses(DmPortName.CompositeIn,
-				eRoutingSignalType.Video, eRoutingPortConnectionType.Composite, 3, this,
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
-
-			ActiveVideoInputFeedback = new StringFeedback(new Cue("ActiveVideoInput", 0, eCueType.String),
-				() => ActualVideoInput.ToString());
-
-
-			var combinedFuncs = new VideoStatusFuncsWrapper
-			{
-				HdcpActiveFeedbackFunc = () =>
-					(ActualVideoInput == eVst.HDMI
-					&& tx.HdmiInput.VideoAttributes.HdcpActiveFeedback.BoolValue)
-					|| (ActualVideoInput == eVst.DisplayPort
-					&& tx.DisplayPortInput.VideoAttributes.HdcpActiveFeedback.BoolValue),
-
-				HdcpStateFeedbackFunc = () =>
-				{
-					if (ActualVideoInput == eVst.HDMI)
-						return tx.HdmiInput.VideoAttributes.HdcpStateFeedback.ToString();
-					if (ActualVideoInput == eVst.DisplayPort)
-						return tx.DisplayPortInput.VideoAttributes.HdcpStateFeedback.ToString();
-					return "";
-				},
-
-				VideoResolutionFeedbackFunc = () =>
-				{
-					if (ActualVideoInput == eVst.HDMI)
-						return tx.HdmiInput.VideoAttributes.GetVideoResolutionString();
-					if (ActualVideoInput == eVst.DisplayPort)
-						return tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString();
-					if (ActualVideoInput == eVst.VGA)
-						return tx.VgaInput.VideoAttributes.GetVideoResolutionString();
-					if (ActualVideoInput == eVst.Composite)
-						return tx.CvbsInput.VideoAttributes.GetVideoResolutionString();
-					return "";
-				},
-				VideoSyncFeedbackFunc = () =>
-					(ActualVideoInput == eVst.HDMI
-					&& tx.HdmiInput.SyncDetectedFeedback.BoolValue)
-					|| (ActualVideoInput == eVst.DisplayPort
-					&& tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
-					|| (ActualVideoInput == eVst.VGA
-					&& tx.VgaInput.SyncDetectedFeedback.BoolValue)
-					|| (ActualVideoInput == eVst.Composite
-					&& tx.CvbsInput.SyncDetectedFeedback.BoolValue)
-			};
-
-			AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
-
-			DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.DmCat, null, this);
-		}
-
-		public override bool CustomActivate()
-		{
-			// Link up all of these damned events to the various RoutingPorts via a helper handler
-			Tx.HdmiInput.InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn, a.EventId);
-			Tx.HdmiInput.VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn, a.EventId);
-
-			Tx.DisplayPortInput.InputStreamChange += (o, a) => FowardInputStreamChange(DisplayPortIn, a.EventId);
-			Tx.DisplayPortInput.VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(DisplayPortIn, a.EventId);
-
-			Tx.VgaInput.InputStreamChange += (o, a) => FowardInputStreamChange(VgaIn, a.EventId);
-			Tx.VgaInput.VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(VgaIn, a.EventId);
-
-			// Base does register and sets up comm monitoring.
-			return base.CustomActivate();
-		}
-
-		void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-		{
-			var id = args.EventId;
-			if (id == EndpointTransmitterBase.VideoSourceFeedbackEventId)
-			{
-				Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
-			}
-
-			// ------------------------------ incomplete -----------------------------------------
-			else if (id == EndpointTransmitterBase.AudioSourceFeedbackEventId)
-			{
-				Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-			}
-		}
-
-		/// <summary>
-		/// Relays the input stream change to the appropriate RoutingInputPort.
-		/// </summary>
-		void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-		{
-			if (eventId == EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
-			{
-				inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
-				AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
-			}
-		}
-		
-		/// <summary>
-		/// Relays the VideoAttributes change to a RoutingInputPort
-		/// </summary>
-		void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-		{
-			//// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
-			//Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
-			//    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
-			switch (eventId)
-			{
-				case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
-					inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
-					break;
-				case VideoAttributeEventIds.HdcpStateFeedbackEventId:
-					inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
-					break;
-				case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
-				case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
-					inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-					break;
-			}
-		}
-
-		public override List<Feedback> Feedbacks
-		{
-			get
-			{
-				List<Feedback> list = AnyVideoInput.VideoStatus.ToList();
-				list.AddRange(base.Feedbacks);
-				list.Add(ActiveVideoInputFeedback);
-				return list;
-			}
-		}
-
-		#region IIROutputPorts Members
-		public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
-		public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
-		#endregion
-
-		#region IComPorts Members
-		public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
-		public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
-		#endregion
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k302CController.cs

@@ -1,237 +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.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	using eVst = Crestron.SimplSharpPro.DeviceSupport.eX02VideoSourceType;
-
-	public class DmTx4k302CController : DmTxControllerBase, IRoutingInputsOutputs, IHasFeedback, 
-		IIROutputPorts, IComPorts
-	{
-		public DmTx4k302C Tx { get; private set; }
-
-		public RoutingInputPortWithVideoStatuses AnyVideoInput { get; private set; }
-		public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
-		public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
-		public RoutingInputPortWithVideoStatuses VgaIn { get; private set; }
-		public RoutingOutputPort DmOut { get; private set; }
-		public RoutingOutputPort HdmiLoopOut { get; private set; }
-
-		public StringFeedback ActiveVideoInputFeedback { get; private set; }
-
-		/// <summary>
-		/// Helps get the "real" inputs, including when in Auto
-		/// </summary>
-		public Crestron.SimplSharpPro.DeviceSupport.eX02VideoSourceType ActualActiveVideoInput
-		{
-			get
-			{
-				if (Tx.VideoSourceFeedback != eVst.Auto)
-					return Tx.VideoSourceFeedback;
-				else // auto
-				{
-					if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-						return eVst.Hdmi1;
-					else if (Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-						return eVst.Hdmi2;
-					else if (Tx.VgaInput.SyncDetectedFeedback.BoolValue)
-						return eVst.Vga;
-					else
-						return eVst.AllDisabled;
-				}
-			}
-		}
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts
-		{
-			get
-			{
-				return new RoutingPortCollection<RoutingInputPort> 
-				{ 
-					HdmiIn1,
-					HdmiIn2,
-					VgaIn, 
-					AnyVideoInput 
-				};
-			}
-		}
-
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts
-		{
-			get
-			{
-				return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="tx"></param>
-		public DmTx4k302CController(string key, string name, DmTx4k302C tx)
-			: base(key, name, tx)
-		{
-			Tx = tx;
-
-			HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 1, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]));
-			HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, 2, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]));
-			VgaIn = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
-				eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, 3, this, 
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
-			ActiveVideoInputFeedback = new StringFeedback(new Cue("ActiveVideoInput", 0, eCueType.String),
-				() => ActualActiveVideoInput.ToString());
-
-			var combinedFuncs = new VideoStatusFuncsWrapper
-			{
-				HdcpActiveFeedbackFunc = () =>
-					(ActualActiveVideoInput == eVst.Hdmi1
-					&& tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
-					|| (ActualActiveVideoInput == eVst.Hdmi2
-					&& tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-
-				HdcpStateFeedbackFunc = () =>
-					{
-						if (ActualActiveVideoInput == eVst.Hdmi1)
-							return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-						if (ActualActiveVideoInput == eVst.Hdmi2)
-							return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-						return "";
-					},
-
-				VideoResolutionFeedbackFunc = () =>
-					{
-						if (ActualActiveVideoInput == eVst.Hdmi1)
-							return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
-						if (ActualActiveVideoInput == eVst.Hdmi2)
-							return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-						if (ActualActiveVideoInput == eVst.Vga)
-							return tx.VgaInput.VideoAttributes.GetVideoResolutionString();
-						return "";
-					},
-				VideoSyncFeedbackFunc = () =>
-					(ActualActiveVideoInput == eVst.Hdmi1
-					&& tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-					|| (ActualActiveVideoInput == eVst.Hdmi2
-					&& tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-					|| (ActualActiveVideoInput == eVst.Vga
-					&& tx.VgaInput.SyncDetectedFeedback.BoolValue)
-			};
-
-			AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-				eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
-
-			DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.AudioVideo, 
-				eRoutingPortConnectionType.DmCat, null, this);
-			HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.AudioVideo,
-				eRoutingPortConnectionType.Hdmi, null, this);
-		}
-
-		public override bool CustomActivate()
-		{
-			// Link up all of these damned events to the various RoutingPorts via a helper handler
-			Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
-			Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
-
-			Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
-			Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
-
-			Tx.VgaInput.InputStreamChange += (o, a) => FowardInputStreamChange(VgaIn, a.EventId);
-			Tx.VgaInput.VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(VgaIn, a.EventId);
-
-			// Base does register and sets up comm monitoring.
-			return base.CustomActivate();
-		}
-
-		void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-		{
-			var id = args.EventId;
-			if (id == DmTx4k302C.VideoSourceFeedbackEventId)
-			{
-				Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
-			}
-
-			// ------------------------------ incomplete -----------------------------------------
-			else if (id == DmTx4k302C.AudioSourceFeedbackEventId)
-			{
-				Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-			}
-		}
-
-		/// <summary>
-		/// Relays the input stream change to the appropriate RoutingInputPort.
-		/// </summary>
-		void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-		{
-			if (eventId == EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
-			{
-				inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
-				AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
-			}
-		}
-		
-		/// <summary>
-		/// Relays the VideoAttributes change to a RoutingInputPort
-		/// </summary>
-		void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-		{
-			//// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
-			//Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
-			//    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
-			switch (eventId)
-			{
-				case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
-					inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
-					break;
-				case VideoAttributeEventIds.HdcpStateFeedbackEventId:
-					inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
-					break;
-				case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
-				case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
-					inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-					AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-					break;
-			}
-		}
-
-		public override List<Feedback> Feedbacks
-		{
-			get
-			{
-				List<Feedback> list = AnyVideoInput.VideoStatus.ToList();
-				list.AddRange(base.Feedbacks);
-				list.Add(ActiveVideoInputFeedback);
-				return list;
-			}
-		}
-
-		#region IIROutputPorts Members
-		public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
-		public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
-		#endregion
-
-		#region IComPorts Members
-		public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
-		public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
-		#endregion
-	}
-}

Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	public class DmTxHelper
-	{
-		/// <summary>
-		/// A factory method for various DmTxControllers
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="props"></param>
-		/// <returns></returns>
-		public static DmTxControllerBase GetDmTxController(string key, string name, string typeName, DmTxPropertiesConfig props)
-		{
-			// switch on type name... later...
-
-			typeName = typeName.ToLower();
-			//uint ipid = Convert.ToUInt16(props.Id, 16);
-			var ipid = props.Control.IpIdInt;
-			var pKey = props.ParentDeviceKey.ToLower();
-
-			if (pKey == "processor")
-			{
-				// Catch constructor failures, mainly dues to IPID
-				try
-				{
-					if (typeName.StartsWith("dmtx201"))
-						return new DmTx201SBasicController(key, name, new DmTx201C(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmtx4k302"))
-						return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmtx401"))
-						return new DmTx401CController(key, name, new DmTx401C(ipid, Global.ControlSystem));
-					Debug.Console(0, "{1} WARNING: Cannot create DM-TX of type: '{0}'", typeName, key);
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e.Message);
-				}
-			}
-			else
-			{
-				var parentDev = DeviceManager.GetDeviceForKey(pKey);
-				if (!(parentDev is DmChassisController))
-				{
-					Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
-						key, pKey);
-					return null;
-				}
-
-                // Get the Crestron chassis and link stuff up
-				var switchDev = parentDev as DmChassisController;
-				var chassis = switchDev.Chassis;
-
-				var num = props.ParentInputNumber;
-				if (num <= 0 || num > chassis.NumberOfInputs)
-				{
-					Debug.Console(0, "Cannot create DM device '{0}'.  Input number '{1}' is out of range",
-						key, num);
-					return null;
-				}
-
-				// Catch constructor failures, mainly dues to IPID
-				try
-				{
-					if (typeName.StartsWith("dmtx201"))
-						return new DmTx201SBasicController(key, name, new DmTx201S(ipid, chassis.Inputs[num]));
-
-					if (typeName.StartsWith("dmtx4k302"))
-						return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, chassis.Inputs[num]));
-
-					if (typeName.StartsWith("dmtx401"))
-						return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e.Message);
-				}
-			}
-			
-			return null;
-		}
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class DmTxControllerBase : CrestronGenericBaseDevice
-	{
-		public DmTxControllerBase(string key, string name, EndpointTransmitterBase hardware)
-			: base(key, name, hardware) { }
-	}
-}

Essentials DM/Essentials_DM/Extensions.cs

@@ -1,27 +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.DM;
-using Crestron.SimplSharpPro.DM.Cards;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.DM
-{
-	public static class VideoAttributesBasicExtensions
-	{
-		public static string GetVideoResolutionString(this VideoAttributesBasic va)
-		{
-			ushort h = va.HorizontalResolutionFeedback.UShortValue;
-			ushort v = va.VerticalResolutionFeedback.UShortValue;
-			if (h == 0 || v == 0)
-				return "n/a";
-			else
-				return string.Format("{0}x{1}", h, v);
-		}
-	}
-}

Essentials DM/Essentials_DM/MOVE IBasicVideoStatusFeedbacks.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.DM
-{
-    public interface IBasicVideoStatusFeedbacks 
-    {
-		BoolFeedback HasVideoStatusFeedback { get; }
-		BoolFeedback HdcpActiveFeedback { get; }
-		StringFeedback HdcpStateFeedback { get; }
-		StringFeedback VideoResolutionFeedback { get; }
-		BoolFeedback VideoSyncFeedback { get; }
-    }
-}

Essentials DM/Essentials_DM/Properties/AssemblyInfo.cs

@@ -1,7 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("Essentials_DM")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Essentials_DM")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyVersion("1.0.3.*")]

Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-    public interface IHasDirectory
-    {
-        event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
-
-        CodecDirectory DirectoryRoot { get; }
-
-        CodecPhonebookSyncState PhonebookSyncState { get; }
-
-        void SearchDirectory(string searchString);
-
-        void GetDirectoryFolderContents(string folderId);
-    }
-
-    public class DirectoryEventArgs : EventArgs
-    {
-        public CodecDirectory Directory { get; set; }
-    }
-
-    public class CodecDirectory
-    {
-        public List<DirectoryItem> DirectoryResults { get; private set; }
-
-        public string ResultsFolderId { get; set; }
-
-        //public int Limit { get; private set; }
-
-        public CodecDirectory()
-        {
-            DirectoryResults = new List<DirectoryItem>();
-        }
-
-        public void AddFoldersToDirectory(List<DirectoryItem> folders)
-        {
-            if(folders != null)
-                DirectoryResults.AddRange(folders);
-
-            SortDirectory();
-        }
-
-        public void AddContactsToDirectory(List<DirectoryItem> contacts)
-        {
-            if(contacts != null)
-                DirectoryResults.AddRange(contacts);
-
-            SortDirectory();
-        }
-
-        /// <summary>
-        /// Formats the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
-        /// </summary>
-        private void SortDirectory()
-        {
-            var sortedFolders = new List<DirectoryItem>();
-
-            sortedFolders.AddRange(DirectoryResults.Where(f => f is DirectoryFolder));
-
-            sortedFolders.OrderBy(f => f.Name);
-
-            var sortedContacts = new List<DirectoryItem>();
-
-            sortedContacts.AddRange(DirectoryResults.Where(c => c is DirectoryContact));
-
-            sortedFolders.OrderBy(c => c.Name);
-
-            DirectoryResults.Clear();
-
-            DirectoryResults.AddRange(sortedFolders);
-
-            DirectoryResults.AddRange(sortedContacts);
-        }
-    }
-
-    public class DirectoryItem
-    {
-        public string Name { get; set; }
-    }
-
-    public class DirectoryFolder : DirectoryItem
-    {
-        public List<DirectoryContact> Contacts { get; set; }
-        public string FolderId { get; set; }
-        public string ParentFolderId { get; set; }
-
-        public DirectoryFolder()
-        {
-            Contacts = new List<DirectoryContact>();
-        }
-    }
-
-    public class DirectoryContact : DirectoryItem
-    {
-        public string ContactId { get; set; }
-        public string FolderId { get; set; }   
-        public string Title { get; set; }
-        public List<ContactMethod> ContactMethods { get; set; }
-
-        public DirectoryContact()
-        {
-            ContactMethods = new List<ContactMethod>();
-        }
-    }
-
-    public class ContactMethod
-    {
-        public string ContactMethodId { get; set; }
-        public string Number { get; set; }
-        public eContactMethodDevice Device { get; set; }
-        public eContactMethodCallType CallType { get; set; }
-    }
-
-    public enum eContactMethodDevice
-    {
-        Unknown = 0,
-        Mobile,
-        Other,
-        Telephone,
-        Video
-    }
-
-    public enum eContactMethodCallType
-    {
-        Unknown = 0,
-        Audio,
-        Video
-    }
-
-    public class DirectorySearchResultEventArgs : EventArgs
-    {
-        public CodecDirectory Directory { get; set; }
-    }
-}

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

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.DSP
-{
-	public abstract class DspBase : Device
-	{
-		public Dictionary<string, DspControlPoint> LevelControlPoints { get; private set; }
-
-        public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
-
-        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
-
-		public abstract void RunPreset(string name);
-
-		public DspBase(string key, string name) :
-			base(key, name) { }
-
-
-		// in audio call feedback
-
-		// VOIP
-		// Phone dialer
-	}
-
-	// Fusion
-	// Privacy state
-	// Online state
-	// level/mutes ?
-	
-	// AC Log call stats
-	
-		// Typical presets:
-		// call default preset to restore levels and mutes
-
-	public abstract class DspControlPoint
-	{
-        //string Key { get; protected set; }
-	}
-
-
-
-	// Main program 
-	// VTC 
-	// ATC
-	// Mics, unusual
-
-    public interface IDspLevelControl : IBasicVolumeWithFeedback
-    {
-        /// <summary>
-        /// In BiAmp: Instance Tag, QSC: Named Control, Polycom: 
-        /// </summary>
-        string ControlPointTag { get; }
-        int Index1 { get; }
-        int Index2 { get; }
-        bool HasMute { get; }
-        bool HasLevel { get; }
-        bool AutomaticUnmuteOnVolumeUp { get; }
-    }
-
-    //public abstract class DspLevelControl : DspControlPoint, IBasicVolumeWithFeedback
-    //{
-    //    protected abstract Func<bool> MuteFeedbackFunc { get; }
-    //    protected abstract Func<int> VolumeLevelFeedbackFunc { get; }
-
-    //    public DspLevelControl(string id)
-    //    {
-    //        MuteFeedback = new BoolFeedback(MuteFeedbackFunc);
-    //        VolumeLevelFeedback = new IntFeedback(VolumeLevelFeedbackFunc);
-    //    }
-
-    //    // Poll and listen for these
-    //    // Max value
-    //    // Min value
-    //    #region IBasicVolumeWithFeedback Members
-
-    //    public BoolFeedback MuteFeedback { get; private set; }
-
-    //    public abstract void MuteOff();
-
-    //    public abstract void MuteOn();
-
-    //    public abstract void SetVolume(ushort level);
-
-    //    public IntFeedback VolumeLevelFeedback { get; private set; }
-
-    //    #endregion
-
-    //    #region IBasicVolumeControls Members
-
-    //    public abstract void MuteToggle();
-
-    //    public abstract void VolumeDown(bool pressRelease);
-
-    //    public abstract void VolumeUp(bool pressRelease);
-
-    //    #endregion
-    //}
-
-	// Privacy mute
-	public abstract class DspMuteControl : DspControlPoint
-	{
-		protected abstract Func<bool> MuteFeedbackFunc { get; }
-
-		public DspMuteControl(string id)
-		{
-			MuteFeedback = new BoolFeedback(MuteFeedbackFunc);
-		}
-
-		public BoolFeedback MuteFeedback { get; private set; }
-
-		public abstract void MuteOff();
-
-		public abstract void MuteOn();
-		
-		public abstract void MuteToggle();
-	}
-}

Essentials Devices Common/Essentials Devices Common/Display/DeviceFactory.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Devices.Displays
-{
-	public class DisplayDeviceFactory
-	{
-		public static IKeyed GetDevice(DeviceConfig dc)
-		{
-			var key = dc.Key;
-			var name = dc.Name;
-			var type = dc.Type;
-			var properties = dc.Properties;
-
-			var typeName = dc.Type.ToLower();
-
-			try
-			{
-				if (typeName == "necmpsx")
-				{
-					var comm = CommFactory.CreateCommForDevice(dc);
-					if (comm != null)
-						return new NecPSXMDisplay(dc.Key, dc.Name, comm);
-				}
-                else if(typeName == "samsungmdc")
-                {
-                    var comm = CommFactory.CreateCommForDevice(dc);
-                    if (comm != null)
-                        return new SamsungMDC(dc.Key, dc.Name, comm, dc.Properties["id"].Value<string>());
-                }
-                if (typeName == "avocorvtf")
-                {
-                    var comm = CommFactory.CreateCommForDevice(dc);
-                    if (comm != null)
-                        return new AvocorDisplay(dc.Key, dc.Name, comm, null);
-                }
-                   
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, "Displays factory: Exception creating device type {0}, key {1}: \nCONFIG JSON: {2} \nERROR: {3}\n\n", 
-                    dc.Type, dc.Key, JsonConvert.SerializeObject(dc), e);
-				return null;
-			}
-
-			return null;
-		}
-	}
-}

Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs

@@ -1,332 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Devices.Common.DSP;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.Occupancy;
-using PepperDash.Essentials.Devices.Common.Environment;
-
-
-
-namespace PepperDash.Essentials.Devices.Common
-{
-	public class DeviceFactory
-	{
-		public static IKeyed GetDevice(DeviceConfig dc)
-		{
-			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();
-
-			if (typeName == "appletv")
-			{
-				//var ir = IRPortHelper.GetIrPort(properties);
-				//if (ir != null)
-				//    return new AppleTV(key, name, ir.Port, ir.FileName);
-
-				var irCont = IRPortHelper.GetIrOutputPortController(dc);
-				return new AppleTV(key, name, irCont);
-			}
-
-			else if (typeName == "basicirdisplay")
-			{
-				var ir = IRPortHelper.GetIrPort(properties);
-				if (ir != null)
-					return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
-			}
-
-            else if (typeName == "biamptesira")
-            {
-                var comm = CommFactory.CreateCommForDevice(dc);
-                var props = JsonConvert.DeserializeObject<BiampTesiraFortePropertiesConfig>(
-                    properties.ToString());
-                return new BiampTesiraForteDsp(key, name, comm, props);
-            }
-
-			else if (typeName == "cenrfgwex")
-			{
-				return CenRfgwController.GetNewExGatewayController(key, name,
-					properties.Value<string>("id"), properties.Value<string>("gatewayType"));
-			}
-
-			else if (typeName == "cenerfgwpoe")
-			{
-				return CenRfgwController.GetNewErGatewayController(key, name,
-					properties.Value<string>("id"), properties.Value<string>("gatewayType"));
-			}
-
-            else if (groupName == "discplayer") // (typeName == "irbluray")
-            {
-                if (properties["control"]["method"].Value<string>() == "ir")
-                {
-                    var irCont = IRPortHelper.GetIrOutputPortController(dc);
-                    return new IRBlurayBase(key, name, irCont);
-                }
-                else if (properties["control"]["method"].Value<string>() == "com")
-                {
-                    Debug.Console(0, "[{0}] COM Device type not implemented YET!", key);
-                }
-            }
-
-			else if (typeName == "genericaudiooutwithvolume")
-			{
-				var zone = dc.Properties.Value<uint>("zone");
-				return new GenericAudioOutWithVolume(key, name,
-					dc.Properties.Value<string>("volumeDeviceKey"), zone);
-			}
-
-            else if (groupName == "genericsource")
-            {
-                return new GenericSource(key, name);
-            }
-
-            else if (typeName == "inroompc")
-            {
-                return new InRoomPc(key, name);
-            }
-
-            else if (typeName == "laptop")
-            {
-                return new Laptop(key, name);
-            }
-
-            else if (typeName == "mockvc")
-            {
-				var props = JsonConvert.DeserializeObject<VideoCodec.MockVcPropertiesConfig>(properties.ToString());
-				return new VideoCodec.MockVC(key, name, props);
-            }
-
-            else if (typeName.StartsWith("ciscospark"))
-            {
-                var comm = CommFactory.CreateCommForDevice(dc);
-                var props = JsonConvert.DeserializeObject<Codec.CiscoSparkCodecPropertiesConfig>(properties.ToString());
-                return new VideoCodec.Cisco.CiscoSparkCodec(key, name, comm, props);
-            }
-
-            else if (typeName == "digitalinput")
-            {
-                var props = JsonConvert.DeserializeObject<IOPortConfig>(properties.ToString());
-				
-                IDigitalInputPorts portDevice;
-
-                if (props.PortDeviceKey == "processor")
-                    portDevice = Global.ControlSystem as IDigitalInputPorts;
-                else
-                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IDigitalInputPorts;
-
-                if (portDevice == null)
-                    Debug.Console(0, "ERROR: Unable to add digital input device with key '{0}'. Port Device does not support digital inputs", key);
-                else
-                {
-                    var cs = (portDevice as CrestronControlSystem);
-					if (cs == null)
-					{
-						Debug.Console(0, "ERROR: Port device for [{0}] is not control system", props.PortDeviceKey);
-						return null;
-					}
-
-                    if (cs.SupportsVersiport)
-					{
-                        Debug.Console(1, "Attempting to add Digital Input device to Versiport port '{0}'", props.PortNumber);
-
-						if (props.PortNumber > cs.NumberOfVersiPorts)
-						{
-							Debug.Console(0, "WARNING: Cannot add Vesiport {0} on {1}. Out of range",
-								props.PortNumber, props.PortDeviceKey);
-							return null;
-						}
-
-						Versiport vp = cs.VersiPorts[props.PortNumber];
-
-						if (!vp.Registered)
-						{
-							var regSuccess = vp.Register();
-							if (regSuccess == eDeviceRegistrationUnRegistrationResponse.Success)
-							{                                    
-                                Debug.Console(1, "Successfully Created Digital Input Device on Versiport");
-								return new GenericVersiportDigitalInputDevice(key, vp, props);
-							}
-							else
-							{
-								Debug.Console(0, "WARNING: Attempt to register versiport {0} on device with key '{1}' failed: {2}",
-									props.PortNumber, props.PortDeviceKey, regSuccess);
-								return null;
-							}
-						}
-					}
-                    else if (cs.SupportsDigitalInput)
-                        {
-                            Debug.Console(1, "Attempting to add Digital Input device to Digital Input port '{0}'", props.PortNumber);
-
-                            if (props.PortNumber > cs.NumberOfDigitalInputPorts)
-                            {
-                                Debug.Console(0, "WARNING: Cannot register DIO port {0} on {1}. Out of range",
-                                    props.PortNumber, props.PortDeviceKey);
-                                return null;
-                            }
-
-                            DigitalInput digitalInput = cs.DigitalInputPorts[props.PortNumber];
-
-                            if (!digitalInput.Registered)
-                            {
-                                if (digitalInput.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
-                                {
-                                    Debug.Console(1, "Successfully Created Digital Input Device on Digital Input");
-                                    return new GenericDigitalInputDevice(key, digitalInput);
-                                }
-                                else
-                                    Debug.Console(0, "WARNING: Attempt to register digital input {0} on device with key '{1}' failed.",
-                                        props.PortNumber, props.PortDeviceKey);
-                            }
-                        }
-                }
-            }
-
-            else if (typeName == "relayoutput")
-            {
-                var props = JsonConvert.DeserializeObject<IOPortConfig>(properties.ToString());
-
-                IRelayPorts portDevice;
-
-                if (props.PortDeviceKey == "processor")
-                    portDevice = Global.ControlSystem as IRelayPorts;
-                else
-                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
-
-                if (portDevice == null)
-                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
-                else
-                {
-                    var cs = (portDevice as CrestronControlSystem);
-
-                    if (cs != null)
-                        if (cs.SupportsRelay && props.PortNumber <= cs.NumberOfRelayPorts)
-                        {
-                            Relay relay = cs.RelayPorts[props.PortNumber];
-
-                            if (!relay.Registered)
-                            {
-                                if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
-                                    return new GenericRelayDevice(key, relay);
-                                else
-                                    Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
-                            }
-                        }
-
-                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
-                }
-            }
-
-            else if (typeName == "microphoneprivacycontroller")
-            {
-                var props = JsonConvert.DeserializeObject<Microphones.MicrophonePrivacyControllerConfig>(properties.ToString());
-
-                return new Microphones.MicrophonePrivacyController(key, props);
-            }
-
-            else if (groupName == "settopbox") //(typeName == "irstbbase")
-            {
-                var irCont = IRPortHelper.GetIrOutputPortController(dc);
-                var config = dc.Properties.ToObject<SetTopBoxPropertiesConfig>();
-                var stb = new IRSetTopBoxBase(key, name, irCont, config);
-
-                //stb.HasDvr = properties.Value<bool>("hasDvr");
-                var listName = properties.Value<string>("presetsList");
-                if (listName != null)
-                    stb.LoadPresets(listName);
-                return stb;
-            }
-
-            else if (typeName == "roku")
-            {
-                var irCont = IRPortHelper.GetIrOutputPortController(dc);
-                return new Roku2(key, name, irCont);
-            }
-
-            else if (typeName == "glsoirccn")
-            {
-                var comm = CommFactory.GetControlPropertiesConfig(dc);
-
-                GlsOccupancySensorBase occSensor = null;
-
-                occSensor = new GlsOirCCn(comm.CresnetIdInt, Global.ControlSystem);
-
-                if (occSensor != null)
-                    return new EssentialsGlsOccupancySensorBaseController(key, name, occSensor);
-                else
-                    Debug.Console(0, "ERROR: Unable to create Occupancy Sensor Device. Key: '{0}'", key);
-            }
-
-            else if (typeName == "glsodtccn")
-            {
-                var comm = CommFactory.GetControlPropertiesConfig(dc);
-
-                GlsOccupancySensorBase occSensor = null;
-
-                occSensor = new GlsOdtCCn(comm.CresnetIdInt, Global.ControlSystem);
-
-                if (occSensor != null)
-                    return new EssentialsGlsOccupancySensorBaseController(key, name, occSensor);
-                else
-                    Debug.Console(0, "ERROR: Unable to create Occupancy Sensor Device. Key: '{0}'", key);
-            }
-
-            else if (groupName == "lighting")
-            {
-                if (typeName == "lutronqs")
-                {
-                    var comm = CommFactory.CreateCommForDevice(dc);
-
-                    var props = JsonConvert.DeserializeObject<Environment.Lutron.LutronQuantumPropertiesConfig>(properties.ToString());
-
-                    return new Environment.Lutron.LutronQuantumArea(key, name, comm, props);
-                }
-                else if (typeName == "din8sw8")
-                {
-                    var comm = CommFactory.GetControlPropertiesConfig(dc);
-
-                    return new Environment.Lighting.Din8sw8Controller(key, comm.CresnetIdInt);
-                }
-
-            }
-
-            else if (groupName == "environment")
-            {
-                if (typeName == "shadecontroller")
-                {
-                    var props = JsonConvert.DeserializeObject<Core.Shades.ShadeControllerConfigProperties>(properties.ToString());
-
-                    return new Core.Shades.ShadeController(key, name, props);
-                }
-                else if (typeName == "relaycontrolledshade")
-                {
-                    var props = JsonConvert.DeserializeObject<Environment.Somfy.RelayControlledShadeConfigProperties>(properties.ToString());
-
-                    return new Environment.Somfy.RelayControlledShade(key, name, props);
-                }
-
-            }
-            
-
-			return null;
-		}
-	}
-}

Essentials Devices Common/Essentials Devices Common/Occupancy/EssentialsGlsOccupancySensorBaseController.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.GeneralIO;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Occupancy
-{
-    public class EssentialsGlsOccupancySensorBaseController : CrestronGenericBaseDevice, IOccupancyStatusProvider
-    {
-        public GlsOccupancySensorBase OccSensor { get; private set; }
-
-        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
-
-        // Debug properties
-        public bool InTestMode { get; private set; }
-
-        public bool TestRoomIsOccupiedFeedback { get; private set; }
-
-        public Func<bool> RoomIsOccupiedFeedbackFunc
-        {
-            get
-            {
-                return () => InTestMode ? TestRoomIsOccupiedFeedback : OccSensor.OccupancyDetectedFeedback.BoolValue;
-            }
-        }
-
-        public EssentialsGlsOccupancySensorBaseController(string key, string name, GlsOccupancySensorBase sensor)
-            : base(key, name, sensor)
-        {
-            OccSensor = sensor;
-
-			RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
-
-            OccSensor.GlsOccupancySensorChange += new GlsOccupancySensorChangeEventHandler(sensor_GlsOccupancySensorChange);
-        }
-
-        void sensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
-        {
-            RoomIsOccupiedFeedback.FireUpdate();
-        }
-
-        public void SetTestMode(bool mode)
-        {
-            InTestMode = mode;
-
-            Debug.Console(1, this, "In Mock Mode: '{0}'", InTestMode);
-        }
-
-        public void SetTestOccupiedState(bool state)
-        {
-            if (!InTestMode)
-                Debug.Console(1, "Mock mode not enabled");
-            else
-            {
-                TestRoomIsOccupiedFeedback = state;
-
-                RoomIsOccupiedFeedback.FireUpdate();
-            }
-        }
-    }
-}

Essentials Devices Common/Essentials Devices Common/Properties/AssemblyInfo.cs

@@ -1,7 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("Essentials_Devices_Common")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Essentials_Devices_Common")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyVersion("1.0.3.*")]

Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CameraConverter.cs

@@ -1,53 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-
-//namespace PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec
-//{
-//    /// <summary>
-//    /// This helps convert the camera section differences between Spark and Spark+
-//    /// One of them returns an object. One returns an array.
-//    /// </summary>
-//    public class CameraConverter : JsonConverter
-//    {
-
-//        public override bool CanConvert(System.Type objectType)
-//        {
-//            return objectType == typeof(Camera) || objectType == typeof(List<Camera>);
-//        }
-
-//        public override object ReadJson(JsonReader reader, System.Type objectType, object existingValue, JsonSerializer serializer)
-//        {
-//            if (reader.TokenType == JsonToken.StartArray)
-//            {
-//                var l = new List<Camera>();
-//                reader.Read();
-//                while (reader.TokenType != JsonToken.EndArray)
-//                {
-//                    l.Add(reader.Value as Camera);
-//                    reader.Read();
-//                }
-//                return l;
-//            }
-//            else
-//            {
-//                return new List<Camera> { reader.Value as Camera };
-//            }
-//        }
-
-//        public override bool CanWrite
-//        {
-//            get
-//            {
-//                return false;
-//            }
-//        }
-
-//        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-//        {
-//            throw new NotImplementedException("SOD OFF HOSER");
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/Config/ConfigReader.cs

@@ -1,188 +0,0 @@
-using System;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// Loads the ConfigObject from the file
-	/// </summary>
-	public class ConfigReader
-	{
-		public static EssentialsConfig ConfigObject { get; private set; }
-
-		public static bool LoadConfig2()
-		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
-			try
-			{
-                var filePath = Global.FilePathPrefix + "configurationFile.json";
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load config file: '{0}'", filePath);
-
-                if (!File.Exists(filePath))
-				{
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, 
-                            "ERROR: Configuration file not present. Please load file to {0} and reset program", filePath);
-                        return false;
-				}
-
-				using (StreamReader fs = new StreamReader(filePath))
-				{
-					var doubleObj = JObject.Parse(fs.ReadToEnd());
-					ConfigObject = MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
-
-                    // Extract SystemUrl and TemplateUrl into final config output
-
-                    if (doubleObj["system_url"] != null)
-                    {
-                        ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
-                    }
-
-                    if (doubleObj["template_url"] != null)
-                    {
-                        ConfigObject.TemplateUrl= doubleObj["template_url"].Value<string>();
-                    }
-				}
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
-
-				return true;
-			}
-			catch (Exception e)
-			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
-				return false;
-			}
-		}
-
-
-		static JObject MergeConfigs(JObject doubleConfig)
-		{
-			var system = JObject.FromObject(doubleConfig["system"]);
-			var template = JObject.FromObject(doubleConfig["template"]);
-			var merged = new JObject();
-
-			// Put together top-level objects
-			// skip any objects that don't have template objects
-
-			if (system["info"] != null)
-				merged.Add("info", Merge(template["info"], system["info"]));
-			else
-				merged.Add("info", template["info"]);
-
-			merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray, 
-                system["devices"] as JArray, "uid"));
-
-			if (template["rooms"] != null)
-			{
-				if (system["rooms"] == null)
-					merged.Add("rooms", template["rooms"]);
-				else
-					merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray,
-						system["rooms"] as JArray, "key"));
-			}
-
-			if (template["sourceLists"] != null)
-			{
-				if (system["sourceLists"] == null)
-					merged.Add("sourceLists", template["sourceLists"]);
-				else
-					merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"]));
-			}
-
-            // Template tie lines take precdence.  Config tool doesn't do them at system
-            // level anyway...
-			if (template["tieLines"] != null)
-				merged.Add("tieLines", template["tieLines"]);
-			//else if (system["tieLines"] != null)
-			//    merged.Add("tieLines", system["tieLines"]);
-			//else
-			//    merged.Add("tieLines", new JArray());
-
-			Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
-			return merged;
-		}
-
-		/// <summary>
-		/// Merges the contents of a base and a delta array, matching the entries on a top-level property
-		/// given by propertyName.  Returns a merge of them. Items in the delta array that do not have
-		/// a matched item in base array will not be merged. 
-		/// </summary>
-		static JArray MergeArraysOnTopLevelProperty(JArray a1, JArray a2, string propertyName)
-		{
-			var result = new JArray();
-			if (a2 == null)
-				result = a1;
-			else if (a1 != null)
-			{
-				for (int i = 0; i < a1.Count(); i++)
-				{
-					var a1Dev = a1[i];
-					// Try to get a system device and if found, merge it onto template
-					var a2Match = a2.FirstOrDefault(t => t[propertyName].Equals(a1Dev[propertyName]));// t.Value<int>("uid") == tmplDev.Value<int>("uid"));
-					if (a2Match != null)
-					{
-						var mergedItem = Merge(a1Dev, a2Match);// Merge(JObject.FromObject(a1Dev), JObject.FromObject(a2Match));
-						result.Add(mergedItem);
-					}
-					else
-						result.Add(a1Dev);
-				}
-			}
-			return result;
-		}
-
-
-		/// <summary>
-		/// Helper for using with JTokens.  Converts to JObject 
-		/// </summary>
-		static JObject Merge(JToken t1, JToken t2)
-		{
-			return Merge(JObject.FromObject(t1), JObject.FromObject(t2));
-		}
-
-		/// <summary>
-		/// Merge b ONTO a
-		/// </summary>
-		/// <param name="a"></param>
-		/// <param name="b"></param>
-		static JObject Merge(JObject o1, JObject o2)
-		{
-			foreach (var o2Prop in o2)
-			{
-				var o1Value = o1[o2Prop.Key];
-				if (o1Value == null)
-					o1.Add(o2Prop.Key, o2Prop.Value);
-				else
-				{
-					JToken replacement = null;
-					if (o2Prop.Value.HasValues && o1Value.HasValues) // Drill down
-						replacement = Merge(JObject.FromObject(o1Value), JObject.FromObject(o2Prop.Value));
-					else
-						replacement = o2Prop.Value;
-					o1[o2Prop.Key].Replace(replacement);
-				}
-			}
-			return o1;
-		}
-
-		/// <summary>
-		/// Returns the group for a given device key in config
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-        public static string GetGroupForDeviceKey(string key)
-        {
-            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-            return dev == null ? null : dev.Group;
-        }
-
-	}
-}

Essentials/PepperDashEssentials/Configuration Original/Builders/TPConfig.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials
-{
-
-    //public class TPConfig : DeviceConfig
-    //{
-    //    new public TPConfigProperties Properties { get; set; }
-    //}
-
-    //public class TPConfigProperties
-    //{
-    //    /* 
-    //    "properties": {
-    //      "ipId": "aa",
-    //      "defaultSystemKey": "system1",
-    //      "sgdPath": "\\NVRAM\\Program1\\Sgds\\PepperDash Essentials TSW1050_v0.9.sgd",
-    //      "usesSplashPage": true,
-    //      "showDate": true,
-    //      "showTime": false 
-    //    }
-    //    */
-    //    public uint IpId { get; set; }
-    //    public string deafultSystemKey { get; set; }
-    //    public string SgdPath { get; set; }
-    //    public bool UsesSplashPage { get; set; }
-    //    public bool ShowDate { get; set; }
-    //    public bool ShowTime { get; set; }
-
-    //}
-
-
-
-
-    ///// <summary>
-    ///// The gist of this converter: The comspec JSON comes in with normal values that need to be converted
-    ///// into enum names.  This converter takes the value and applies the appropriate enum's name prefix to the value
-    ///// and then returns the enum value using Enum.Parse
-    ///// </summary>
-    //public class TPPropertiesConverter : JsonConverter
-    //{
-    //    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-    //    {
-    //        return JObject.Load(reader);
-    //    }
-
-    //    /// <summary>
-    //    /// This will be hit with every value in the ComPortConfig class.  We only need to
-    //    /// do custom conversion on the comspec items.
-    //    /// </summary>
-    //    public override bool CanConvert(Type objectType) 
-    //    {
-    //        return true;
-    //    }
-
-    //    public override bool CanRead { get { return true; } }
-    //    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-    //    {
-    //        throw new NotImplementedException();
-    //    }
-    //}		
-}

Essentials/PepperDashEssentials/Configuration Original/ConfigTieLine.cs

@@ -1,82 +0,0 @@
-using System.Linq;
-using Newtonsoft.Json;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-	public class ConfigTieLine
-	{
-		[JsonProperty(Required=Required.Always)]
-		public string SourceDeviceKey { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		public string SourcePortKey { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		public string DestinationDeviceKey { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		public string DestinationPortKey { get; set; }
-
-		public override string ToString()
-		{
-			return string.Format("Tie line: [{0}]{1} --> [{2}]{3}", SourceDeviceKey, SourcePortKey, DestinationDeviceKey, DestinationPortKey);
-		}
-
-		/// <summary>
-		/// Returns a tie line if one can be constructed between the two devices and ports
-		/// </summary>
-		/// <returns>TieLine or null if devices or ports don't exist</returns>
-		public TieLine GetTieLine()
-		{
-			var sourceDevice = (IRoutingOutputs)DeviceManager.GetDeviceForKey(SourceDeviceKey);
-			var destinationDevice = (IRoutingInputs)DeviceManager.GetDeviceForKey(DestinationDeviceKey);
-
-			if (sourceDevice == null)
-			{
-				Debug.Console(0, "    Cannot create TieLine. Source device '{0}' not found or does not have outputs",
-					SourceDeviceKey);
-				return null;
-			}
-			else if (destinationDevice == null)
-			{
-				Debug.Console(0, "    Cannot create TieLine. Destination device '{0}' not found or does not have inputs",
-					DestinationDeviceKey);
-				return null;
-			}
-			else
-			{
-				// Get the ports by key name from the lists
-				RoutingOutputPort sourcePort = sourceDevice.OutputPorts.FirstOrDefault(
-				    p => p.Key.Equals(SourcePortKey, System.StringComparison.OrdinalIgnoreCase));
-				//RoutingOutputPort sourcePort = null;
-				//sourceDevice.OutputPorts.TryGetValue(SourcePortKey, out sourcePort);
-				if (sourcePort == null)
-				{
-					Debug.Console(0, "    Cannot create TieLine {0}-->{1}. Source device does not have output port '{2}'",
-						sourceDevice.Key, destinationDevice.Key, SourcePortKey);
-					return null;
-				}
-
-				RoutingInputPort destinationPort = destinationDevice.InputPorts.FirstOrDefault(
-					p => p.Key.Equals(DestinationPortKey, System.StringComparison.OrdinalIgnoreCase));
-				//RoutingInputPort destinationPort = null;
-				//destinationDevice.InputPorts.TryGetValue(DestinationPortKey, out destinationPort);
-				if (destinationPort == null)
-				{
-					Debug.Console(0, "    Cannot create TieLine {0}-->{1}. Destination device does not have input port '{2}'",
-						sourceDevice.Key, destinationDevice.Key, DestinationPortKey);
-					return null;
-				}
-
-				var tl = new TieLine(sourcePort, destinationPort);
-				Debug.Console(1, "    Created {0}", this);
-				return tl;
-			}
-		}
-
-	}
-
-}

Essentials/PepperDashEssentials/Configuration Original/Configuration.cs

@@ -1,287 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.CrestronThread;
-using Crestron.SimplSharpPro.Diagnostics;
-using Crestron.SimplSharpPro.EthernetCommunication;
-using Crestron.SimplSharpPro.UI;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices;
-//using PepperDash.Essentials.Core.Devices.Dm;
-//using PepperDash.Essentials.Fusion;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-	public static class Configuration
-	{
-
-		public static string LastPath { get; private set; }
-		public static CrestronControlSystem ControlSystem { get; private set; }
-		
-		public static void Initialize(CrestronControlSystem cs)
-		{
-			CrestronConsole.AddNewConsoleCommand(ReloadFromConsole, "configreload", "Reloads configuration file", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			ControlSystem = cs;
-		}
-
-		public static bool ReadConfiguration(string filePath)
-		{
-			try
-			{
-				// Read file
-				if (File.Exists(filePath))
-				{
-					LastPath = filePath;
-					string json = File.ReadToEnd(filePath, System.Text.Encoding.ASCII);
-					JObject jo = JObject.Parse(json);
-
-					var info = JsonConvert.DeserializeObject<ConfigInfo>(jo["info"].ToString());
-					Debug.Console(0, "\r[Config] file read:");
-					Debug.Console(0, "    File: {0}", filePath);
-					Debug.Console(0, "    Name: {0}", info.Name);
-					Debug.Console(0, "    Type: {0}", info.SystemTemplateType);
-					Debug.Console(0, "    Date: {0}", info.EditDate);
-					Debug.Console(0, "    ConfigVersion: {0}", info.Version);
-					Debug.Console(0, "    EditedBy: {0}", info.EditedBy);
-					Debug.Console(0, "    Comment: {0}\r", info.Comment);
-
-					// Get the main config object
-					var jConfig = jo["configuration"];
-
-					// Devices
-					var jDevices = (JArray)jConfig["devices"];
-					CreateDevices(jDevices);
-
-					// TieLines
-					var jRouting = jConfig["routing"];
-					CreateRouting(jRouting);	
-				
-					/// Parse the available source list(s)
-					var jSourceLists = (JArray)jConfig["sourceLists"];
-					var jSourceListJson = jSourceLists.ToString();
-					List<ConfigSourceList> sourceLists = JsonConvert.DeserializeObject<List<ConfigSourceList>>(jSourceListJson);
-
-					// System
-					var jSystems = (JArray)jConfig["systems"];
-					CreateSystems(jSystems, sourceLists);
-
-					// Activate everything
-					DeviceManager.ActivateAll();
-				}
-				else
-				{
-					Debug.Console(0, "[Config] file not found '{0}'", filePath);
-					return false;
-				}
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, "Configuration read error: \r {0}", e);
-				return false;
-			}
-
-			return true;
-		}
-
-		static void CreateDevices(JArray jDevices)
-		{
-			//Debug.Console(0, "  Creating {0} devices", jDevices.Count);
-			//for (int i = 0; i < jDevices.Count; i++)
-			//{
-			//    var jDev = jDevices[i];
-
-			//    //var devConfig = JsonConvert.DeserializeObject<DeviceConfig>(jDev.ToString());
-			//    //Debug.Console(0, "++++++++++++{0}", devConfig);
-
-
-			//    var group = jDev["group"].Value<string>();
-			//    Debug.Console(0, "  [{0}], creating {1}:{2}", jDev["key"].Value<string>(),
-			//        group, jDev["type"].Value<string>());
-
-			//    Device dev = null;
-			//    if (group.Equals("Display", StringComparison.OrdinalIgnoreCase))
-			//        dev = DisplayFactory.CreateDisplay(jDev);
-			//    else if (group.Equals("DeviceMonitor", StringComparison.OrdinalIgnoreCase))
-			//        dev = DeviceManagerFactory.Create(jDev);
-			//    //else if (group.Equals("Pc", StringComparison.OrdinalIgnoreCase))
-			//    //    dev = PcFactory.Create(jDev);
-			//    //else if (group.Equals("SetTopBox", StringComparison.OrdinalIgnoreCase))
-			//    //    dev = SetTopBoxFactory.Create(jDev);
-			//    //else if (group.Equals("DiscPlayer", StringComparison.OrdinalIgnoreCase))
-			//    //    dev = DiscPlayerFactory.Create(jDev);
-			//    //else if (group.Equals("Touchpanel", StringComparison.OrdinalIgnoreCase))
-			//    //    dev = TouchpanelFactory.Create(jDev);
-			//    else if (group.Equals("dmEndpoint", StringComparison.OrdinalIgnoreCase)) // Add Transmitter and Receiver
-			//        dev = DmFactory.Create(jDev);
-			//    else if (group.Equals("dmChassic", StringComparison.OrdinalIgnoreCase))
-			//        dev = DmFactory.CreateChassis(jDev);
-			//    else if (group.Equals("processor", StringComparison.OrdinalIgnoreCase))
-			//        continue; // ignore it.  Has no value right now.
-			//    //else if (group.Equals("remote", StringComparison.OrdinalIgnoreCase))
-			//    //    dev = RemoteFactory.Create(jDev);
-			//    else
-			//    {
-			//        Debug.Console(0, "      ERROR: Device [{0}] has unknown Group '{1}'. Skipping",
-			//            jDev["key"].Value<string>(), group);
-			//        continue;
-			//    }
-
-			//    if (dev != null)
-			//        DeviceManager.AddDevice(dev);
-			//    else
-			//        Debug.Console(0, "      ERROR: failed to create device {0}",
-			//            jDev["key"].Value<string>());
-			//}
-		}
-
-		static void CreateSystems(JArray jSystems, List<ConfigSourceList> sourceLists)
-		{
-//            // assuming one system
-//            var jSystem = jSystems[0];
-//            var name = jSystem.Value<string>("name");
-//            var key = FactoryHelper.KeyOrConvertName(jSystem.Value<string>("key"), name);
-
-//            if (jSystem.Value<string>("type").Equals("EssentialsHuddleSpace", StringComparison.OrdinalIgnoreCase))
-//            {
-//                var sys = new HuddleSpaceRoom(key, name);
-//                var props = jSystem["properties"];
-//                var displayKey = props["displayKey"].Value<string>();
-//                if (displayKey != null)
-//                    sys.DefaultDisplay = (DisplayBase)DeviceManager.GetDeviceForKey(displayKey);
-
-//                // Add sources from passed in config list
-//                var myList = sourceLists.FirstOrDefault(
-//                    l => l.Key.Equals(props.Value<string>("sourceListKey"), StringComparison.OrdinalIgnoreCase));
-//                if (myList != null)
-//                    AddSourcesToSystem(sys, myList);
-
-//                DeviceManager.AddDevice(sys);
-
-//                //spin up a fusion thing too
-//#warning add this fusion connector back in later
-//                //DeviceManager.AddDevice(new EssentialsHuddleSpaceFusionSystemController(sys, 0xf1));
-			//}
-		}
-
-		//static void AddSourcesToSystem(Room system, ConfigSourceList configList)
-		//{
-			//foreach (var configItem in configList.PresentationSources)
-			//{
-			//    var src = (IPresentationSource)DeviceManager.GetDeviceForKey(configItem.SourceKey);
-			//    if (src != null)
-			//        system.Sources.Add(configItem.Number, src);
-			//    else
-			//        Debug.Console(0, system, "cannot find source '{0}' from list {1}", 
-			//            configItem.SourceKey, configList.Name);
-			//}
-		//}
-
-		/// <summary>
-		/// Links up routing, creates tie lines
-		/// </summary>
-		/// <param name="jRouting">The "Routing" JArray from configuration</param>
-		static void CreateRouting(JToken jRouting)
-		{
-			var jsonTieLines = jRouting["tieLines"].ToString();
-			var tieLineConfigs = JsonConvert.DeserializeObject<List<ConfigTieLine>>(jsonTieLines);
-			foreach (var c in tieLineConfigs)
-			{
-				var tl = c.GetTieLine();
-				if (tl != null)
-					TieLineCollection.Default.Add(tl);
-			}
-		}
-
-
-		/// <summary>
-		/// Returns the IIROutputPorts device (control system, etc) that contains a given IR port
-		/// </summary>
-		/// <param name="propsToken"></param>
-		static IROutputPort GetIrPort(JToken propsToken)
-		{
-			var portDevName = propsToken.Value<string>("IrPortDevice");
-			var portNum = propsToken.Value<uint>("IrPortNumber");
-			if (portDevName.Equals("controlSystem", StringComparison.OrdinalIgnoreCase))
-			{
-				IIROutputPorts irDev = ControlSystem;
-				if (portNum <= irDev.NumberOfIROutputPorts)
-					return ControlSystem.IROutputPorts[portNum];
-				else
-					Debug.Console(0, "[Config] ERROR: IR Port {0} out of range. Range 0-{1} on {2}", portNum,
-						ControlSystem.IROutputPorts.Count, irDev.ToString());
-			}
-			return null;
-		}
-
-		static void HandleUnknownType(JToken devToken, string type)
-		{
-			Debug.Console(0, "[Config] ERROR: Type '{0}' not found in group '{1}'", type, 
-				devToken.Value<string>("Group"));
-		}
-
-		static void HandleDeviceCreationError(JToken devToken, Exception e)
-		{
-			Debug.Console(0, "[Config] ERROR creating device [{0}]: \r{1}", 
-				devToken["Key"].Value<string>(), e);
-		}
-
-		/// <summary>
-		/// Console helper to reload
-		/// </summary>
-		static void ReloadFromConsole(string s)
-		{
-			// Gotta tear down everything first!
-
-			if (!string.IsNullOrEmpty(LastPath))
-			{
-				ReadConfiguration(LastPath);
-			}
-		}
-	}
-
-	public class ConfigSourceList
-	{
-		[JsonProperty(Required = Required.Always)]
-		public string Key { get; set; }
-		
-		[JsonProperty(Required = Required.Always)]
-		public string Name { get; set; }
-		
-		[JsonProperty(Required = Required.Always)]
-		public List<ConfigSourceItem> PresentationSources { get; set; }
-		
-	}
-
-	public class ConfigSourceItem
-	{
-		[JsonProperty(Required = Required.Always)]
-		public uint Number { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		public string SourceKey { get; set; }
-		
-		public string AlternateName { get; set; }
-	}
-
-	public class ConfigInfo
-	{
-		public string SystemTemplateType { get; set; }
-		public string ProcessorType { get; set; }
-		public string Name { get; set; }
-		public uint ProgramSlotNumber { get; set; }
-		public string Version { get; set; }
-		public string EditedBy { get; set; }
-		public string EditDate { get; set; }
-		public string Comment { get; set; }
-	}
-}

Essentials/PepperDashEssentials/Configuration Original/ConfigurationHelpers.cs

@@ -1,20 +0,0 @@
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials
-{
-	public class SourceListConfigProperties
-	{
-		[JsonProperty(Required= Required.Always)]
-		public uint Number { get; set; }
-		[JsonProperty(Required= Required.Always)]
-		public string SourceKey { get; set; }
-		public string AltName { get; set; }
-		public string AltIcon { get; set; }
-
-		public SourceListConfigProperties()
-		{
-			AltName = "";
-			AltIcon = "";
-		}
-	}
-}

Essentials/PepperDashEssentials/Configuration Original/Factories/CommFactory.cs

@@ -1,54 +0,0 @@
-//using System;
-//using Crestron.SimplSharpPro;
-
-//using Newtonsoft.Json;
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class CommFactory
-//    {
-//        public static IBasicCommunication CreateCommForDevice(JToken devToken)
-//        {
-//            var devKey = devToken.Value<string>("key");
-//            IBasicCommunication comm = null;
-//            try
-//            {
-//                var control = devToken["properties"]["control"];
-//                var commMethod = control["method"].Value<string>();
-//                if (commMethod == "com")
-//                {
-//                    var comConfig = JsonConvert.DeserializeObject<ComPortConfig>(
-//                        control["comParams"].ToString(),
-//                        new JsonSerializerSettings
-//                        {
-//                            // Needs ObjectCreationHandling to make the ComSpec struct populate
-//                            ObjectCreationHandling = ObjectCreationHandling.Replace,
-//                            Converters = new JsonConverter[] { new ComSpecJsonConverter() }
-//                        });
-//                    comm = new ComPortController(devKey + "-com", comConfig.GetComPort(), comConfig.ComSpec);
-//                }
-//                else if (commMethod == "tcpIp")
-//                {
-//                    var tcpConfig = JsonConvert.DeserializeObject<TcpIpConfig>(control["tcpParams"].ToString());
-//                    comm = new GenericTcpIpClient(devKey + "-tcp", tcpConfig.Address, tcpConfig.Port, tcpConfig.BufferSize);
-//                }
-//            }
-//            catch (Exception e)
-//            {
-//                Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}", devToken.ToString(), e);
-//            }
-
-//            // put it in the device manager if it's the right flavor
-//            var comDev = comm as Device;
-//            if (comDev != null)
-//                DeviceManager.AddDevice(comDev);
-
-//            return comm;
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/DeviceMonitorFactory.cs

@@ -1,38 +0,0 @@
-//using System;
-//using Crestron.SimplSharpPro;
-
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Core.Devices;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class DeviceManagerFactory
-//    {
-//        public static Device Create(JToken devToken)
-//        {
-//            Device dev = null;
-//            try
-//            {
-//                var devType = devToken.Value<string>("type");
-//                var devKey = devToken.Value<string>("key");
-//                var devName = devToken.Value<string>("name");
-//                if (devType.Equals("DeviceMonitor", StringComparison.OrdinalIgnoreCase))
-//                {
-//                    var comm = CommFactory.CreateCommForDevice(devToken);
-//                    if (comm == null) return null;
-//                    dev = new GenericCommunicationMonitoredDevice(devKey, devName, comm, devToken["properties"]["pollString"].Value<string>());
-//                }
-//                else
-//                    FactoryHelper.HandleUnknownType(devToken, devType);
-//            }
-//            catch (Exception e)
-//            {
-//                FactoryHelper.HandleDeviceCreationError(devToken, e);
-//            }
-//            return dev;
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/DisplayFactory.cs

@@ -1,122 +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.Devices;
-//using PepperDash.Essentials.Displays;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class DisplayFactory
-//    {
-//        public static DisplayBase CreateDisplay(JToken devToken)
-//        {
-//            DisplayBase dev = null;
-//            try
-//            {
-//                var devType = devToken.Value<string>("type");
-//                var devKey = devToken.Value<string>("key");
-//                var devName = devToken.Value<string>("name");
-//                var properties = devToken["properties"];
-
-//                if (devType.Equals("MockDisplay", StringComparison.OrdinalIgnoreCase))
-//                    dev = new MockDisplay(devKey, devName);
-
-//                else if (devType.Equals("NecMPSX", StringComparison.OrdinalIgnoreCase))
-//                {
-//                    var comm = CommFactory.CreateCommForDevice(devToken);
-//                    if (comm == null) return null;
-//                    dev = new NecPSXMDisplayCom(devKey, devName, comm);
-					
-
-
-//                    //var commMethod = properties["control"]["method"].Value<string>();
-
-//                    //// Helper-ize this?
-//                    //if(commMethod == "com")
-//                    //{
-//                    //    // Move some of this up above???
-//                    //    var comConfig = JsonConvert.DeserializeObject<ComPortConfig>(
-//                    //        properties["control"]["comParams"].ToString(),
-//                    //        new JsonSerializerSettings { 
-//                    //            // Needs ObjectCreationHandling to make the ComSpec struct populate
-//                    //            ObjectCreationHandling = ObjectCreationHandling.Replace,
-//                    //            Converters = new JsonConverter[] { new ComSpecJsonConverter() }
-//                    //        });
-//                    //    dev = new NecPSXMDisplayCom(devKey, devName, comConfig.GetComPort(), comConfig.ComSpec);
-//                    //}
-//                    //else if (commMethod == "tcpIp")
-//                    //{
-//                    //    var spec = properties["control"]["tcpSpec"];
-//                    //    var host = spec["address"].Value<string>();
-//                    //    var port = spec["port"].Value<int>();
-//                    //    dev = new NecPSXMDisplayCom(devKey, devName, host, port);
-//                    //}
-
-
-
-//                }
-
-//                else if (devType.Equals("NecNpPa550", StringComparison.OrdinalIgnoreCase))
-//                {
-//                    var proj = new NecPaSeriesProjector(devKey, devName);
-//                    var comm = CreateCommunicationFromPropertiesToken(
-//                        devKey + "-comm", properties, 3000);
-//                    proj.CommunicationMethod = comm;
-//                    dev = proj;
-//                }
-//                else
-//                    FactoryHelper.HandleUnknownType(devToken, devType);
-//            }
-//            catch (Exception e)
-//            {
-//                FactoryHelper.HandleDeviceCreationError(devToken, e);
-//            }
-//            return dev;
-//        }
-
-//        public static IBasicCommunication CreateCommunicationFromPropertiesToken(
-//            string commKey, JToken properties, int bufferSize)
-//        {
-//            Debug.Console(2, "Building port from: {0}", properties.ToString());
-
-//            var tcpToken = properties["TcpIp"];
-//            if (tcpToken != null)
-//            {
-//                // Convert the Tcp property
-//                var spec = JsonConvert.DeserializeObject<TcpIpConfig>(tcpToken.ToString());
-
-//                var tcp = new GenericTcpIpClient(commKey, spec.Address, spec.Port, bufferSize);
-//                DeviceManager.AddDevice(tcp);
-//                return tcp;
-//            }
-
-//            var com = properties["Com"];
-//            if (com != null)
-//            {
-//                // Make the interim config object
-//                var comConfig = JsonConvert.DeserializeObject<ComPortConfig>(com.ToString(),
-//                    new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace });
-
-//                // Get the IComPorts hardware device from the Device or Control System
-//                var comDev = comConfig.GetIComPortsDeviceFromManagedDevice();
-//                if (comDev != null)
-//                {
-//                    var controller = new ComPortController(commKey, comDev.ComPorts[comConfig.ComPortNumber], comConfig.ComSpec);
-//                    DeviceManager.AddDevice(controller);
-//                    return controller;
-//                }
-//            }
-//            Debug.Console(0, "No Tcp or Com port information for port {0}", commKey);
-//            return null;
-//        }
-
-//    }
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/FactoryHelper.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-	public static class FactoryHelper
-	{
-		public static string IrDriverPathPrefix = Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
-
-		public static void HandleUnknownType(JToken devToken, string type)
-		{
-			Debug.Console(0, "[Config] ERROR: Type '{0}' not found in group '{1}'", type,
-				devToken.Value<string>("group"));
-		}
-
-		public static void HandleDeviceCreationError(JToken devToken, Exception e)
-		{
-			Debug.Console(0, "[Config] ERROR creating device [{0}]: \r{1}",
-				devToken["key"].Value<string>(), e);
-			Debug.Console(0, "Relevant config:\r{0}", devToken.ToString(Newtonsoft.Json.Formatting.Indented));
-		}
-
-		/// <summary>
-		/// Finds either the ControlSystem or a device controller that contains IR ports and
-		/// returns a port from the hardware device
-		/// </summary>
-		/// <param name="propsToken"></param>
-		/// <returns>Crestron IrPort or null if device doesn't have IR or is not found</returns>
-		public static IrOutPortConfig GetIrPort(JToken propsToken)
-		{
-			var irSpec = propsToken["control"]["irSpec"];
-			var portDevKey = irSpec.Value<string>("portDeviceKey");
-			var portNum = irSpec.Value<uint>("portNumber");
-			IIROutputPorts irDev = null;
-			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-				|| portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
-				irDev = Global.ControlSystem;
-			else
-				irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
-
-			if (irDev == null)
-			{
-				Debug.Console(0, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
-				return null;
-			}
-
-			if (portNum <= irDev.NumberOfIROutputPorts) // success!
-			{
-				var file = IrDriverPathPrefix + irSpec["file"].Value<string>();
-				return new IrOutPortConfig { Port = irDev.IROutputPorts[portNum], FileName = file };
-			}
-			else
-			{
-				Debug.Console(0, "[Config] Error, device '{0}' IR port {1} out of range",
-					portDevKey, portNum);
-				return null;
-			}
-		}
-
-
-		/// <summary>
-		/// Finds either the ControlSystem or a device controller that contains com ports and
-		/// returns a port from the hardware device
-		/// </summary>
-		/// <param name="propsToken">The Properties token from the device's config</param>
-		/// <returns>Crestron ComPort or null if device doesn't have IR or is not found</returns>
-		public static ComPort GetComPort(JToken propsToken)
-		{
-			var portDevKey = propsToken.Value<string>("comPortDevice");
-			var portNum = propsToken.Value<uint>("comPortNumber");
-			IComPorts comDev = null;
-			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase))
-				comDev = Global.ControlSystem;
-			else
-				comDev = DeviceManager.GetDeviceForKey(portDevKey) as IComPorts;
-
-			if (comDev == null)
-			{
-				Debug.Console(0, "[Config] Error, device with com ports '{0}' not found", portDevKey);
-				return null;
-			}
-
-			if (portNum <= comDev.NumberOfComPorts) // success!
-				return comDev.ComPorts[portNum];
-			else
-			{
-				Debug.Console(0, "[Config] Error, device '{0}' com port {1} out of range",
-					portDevKey, portNum);
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// Returns the key if it exists or converts the name into a key
-		/// </summary>
-		public static string KeyOrConvertName(string key, string name)
-		{
-			if (string.IsNullOrEmpty(key))
-				return name.Replace(' ', '-');
-			return key;
-		}
-	}
-
-	/// <summary>
-	/// Wrapper to help in IR port creation
-	/// </summary>
-	public class IrOutPortConfig
-	{
-		public IROutputPort Port { get; set; }
-		public string FileName { get; set; }
-	}
-}

Essentials/PepperDashEssentials/Configuration Original/Factories/MAYBE SetTopBoxFactory.cs

@@ -1,52 +0,0 @@
-//using System;
-//using Crestron.SimplSharpPro;
-
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices;
-
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class SetTopBoxFactory
-//    {
-//        public static Device Create(JToken devToken)
-//        {
-//            Device dev = null;
-//            try
-//            {
-//                var devType = devToken.Value<string>("type");
-//                var devKey = devToken.Value<string>("key");
-//                var devName = devToken.Value<string>("name");
-//                var props = devToken["properties"];
-//                var portConfig = FactoryHelper.GetIrPort(props);
-//                if (portConfig != null)
-//                {
-//                    if (devType.EndsWith("-generic"))
-//                    {
-//                        var stb = new IrSetTopBoxBase(devKey, devName, portConfig.Port, portConfig.FileName);
-//                        // Do this a better way?
-//                        stb.HasDpad = props["hasDpad"].Value<bool>();
-//                        stb.HasDvr = props["hasDvr"].Value<bool>();
-//                        stb.HasNumbers = props["hasNumbers"].Value<bool>();
-//                        stb.HasPreset = props["hasPresets"].Value<bool>();
-//                        dev = stb;
-//                    }
-//                    else
-//                        FactoryHelper.HandleUnknownType(devToken, devType);
-
-//                    var preDev = dev as IHasSetTopBoxProperties;
-//                    if(preDev.HasPreset)
-//                        preDev.LoadPresets(props["presetListName"].Value<string>());					
-//                }			
-//            }
-//            catch (Exception e)
-//            {
-//                FactoryHelper.HandleDeviceCreationError(devToken, e);
-//            }
-//            return dev;
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/PcFactory.cs

@@ -1,34 +0,0 @@
-//using System;
-//using Crestron.SimplSharpPro;
-
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class PcFactory
-//    {
-//        public static Device Create(JToken devToken)
-//        {
-//            Device dev = null;
-//            //try
-//            //{
-//            //    var devType = devToken.Value<string>("type");
-//            //    var devKey = devToken.Value<string>("key");
-//            //    var devName = devToken.Value<string>("name");
-//            //    if (devType.Equals("laptop", StringComparison.OrdinalIgnoreCase))
-//            //        dev = new Laptop(devKey, devName);
-//            //    else
-//            //        FactoryHelper.HandleUnknownType(devToken, devType);
-//            //}
-//            //catch (Exception e)
-//            //{
-//            //    FactoryHelper.HandleDeviceCreationError(devToken, e);
-//            //}
-//            return dev;
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/REMOVE DiscPlayerFactory.cs

@@ -1,46 +0,0 @@
-//using System;
-//using Crestron.SimplSharpPro;
-
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class DiscPlayerFactory
-//    {
-//        public static Device Create(JToken devToken)
-//        {
-//            Device dev = null;
-//            try
-//            {
-//                var devType = devToken.Value<string>("type");
-//                var devKey = devToken.Value<string>("key");
-//                var devName = devToken.Value<string>("name");
-
-//                // Filter out special (Pioneer
-//                //(devType.Equals("genericIr", StringComparison.OrdinalIgnoreCase))
-
-//                var props = devToken["properties"];
-//                var portConfig = FactoryHelper.GetIrPort(props);
-//                if (portConfig != null)
-//                {
-//                    if (devType.EndsWith("-generic"))
-//                        dev = new IrDvdBase(devKey, devName, portConfig.Port, portConfig.FileName);
-//                    else
-//                        FactoryHelper.HandleUnknownType(devToken, devType);
-//                }	
-
-//                // NO PORT ERROR HERE??
-
-//            }
-//            catch (Exception e)
-//            {
-//                FactoryHelper.HandleDeviceCreationError(devToken, e);
-//            }
-//            return dev;
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/RemoteFactory.cs

@@ -1,127 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.Remotes;
-//using Crestron.SimplSharpPro.UI;
-//using Newtonsoft.Json;
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices;
-////using PepperDash.Essentials.Remotes;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    //public class RemoteFactory
-//    //{
-//    //    public static Device Create(JToken devToken)
-//    //    {
-//    //        Hr150Controller dev = null;
-//    //        try
-//    //        {
-//    //            var devType = devToken.Value<string>("type");
-//    //            var devKey = devToken.Value<string>("key");
-//    //            var devName = devToken.Value<string>("name");
-//    //            var props = devToken["properties"];
-
-//    //            if (devType.Equals("hr150", StringComparison.OrdinalIgnoreCase))
-//    //            {
-//    //                uint id = Convert.ToUInt32(props.Value<string>("rfId"), 16);
-//    //                var parent = props.Value<string>("rfGateway");
-//    //                RFExGateway rf = GetGateway(parent);
-
-//    //                var hw = new Hr150(id, rf);
-//    //                dev = new Hr150Controller(devKey, devName, hw);
-
-//    //                // Have to add the buttons and default source after all devices are spun up
-//    //                dev.AddPostActivationAction(() =>
-//    //                    {
-//    //                        var defaultSystemKey = props.Value<string>("defaultSystemKey");
-//    //                        dev.SetCurrentRoom((EssentialsRoom)DeviceManager.GetDeviceForKey(defaultSystemKey));
-							
-//    //                        // Link custom buttons
-//    //                        var buttonProps = JsonConvert.DeserializeObject<Dictionary<uint, string>>(props["buttons"].ToString());
-//    //                        foreach (var kvp in buttonProps)
-//    //                        {
-//    //                            var split = kvp.Value.Split(':');
-//    //                            if (split[0].Equals("source"))
-//    //                            {
-//    //                                var src = DeviceManager.GetDeviceForKey(split[1]) as IPresentationSource;
-//    //                                if (src == null)
-//    //                                {
-//    //                                    Debug.Console(0, dev, "Error: Cannot add source key '{0}'", split[1]);
-//    //                                    continue;
-//    //                                }
-//    //                                dev.SetCustomButtonAsSource(kvp.Key, src);
-//    //                            }
-//    //                            else if (split[0] == "room")
-//    //                            {
-//    //                                if (split[1] == "off")
-//    //                                    dev.SetCustomButtonAsRoomOff(kvp.Key);
-//    //                            }
-//    //                        }
-//    //                    });
-//    //            }
-//    //            else if (devType.Equals("tsr302", StringComparison.OrdinalIgnoreCase))
-//    //            {
-//    //                uint id = Convert.ToUInt32(props.Value<string>("rfId"), 16);
-//    //                var parent = props.Value<string>("rfGateway");
-//    //                RFExGateway rf = GetGateway(parent);
-//    //                var sgd = props.Value<string>("sgdPath");
-
-//    //                var hw = new Tsr302(id, rf);
-
-//    //                //dev = new Hr150Controller(devKey, devName, hw);
-
-//    //                //// Have to add the buttons and default source after all devices are spun up
-//    //                //dev.AddPostActivationAction(() =>
-//    //                //{
-//    //                //    var defaultSystemKey = props.Value<string>("defaultSystemKey");
-//    //                //    dev.SetCurrentRoom((EssentialsRoom)DeviceManager.GetDeviceForKey(defaultSystemKey));
-
-//    //                //    // Link custom buttons
-//    //                //    var buttonProps = JsonConvert.DeserializeObject<Dictionary<uint, string>>(props["buttons"].ToString());
-//    //                //    foreach (var kvp in buttonProps)
-//    //                //    {
-//    //                //        var split = kvp.Value.Split(':');
-//    //                //        if (split[0].Equals("source"))
-//    //                //        {
-//    //                //            var src = DeviceManager.GetDeviceForKey(split[1]) as IPresentationSource;
-//    //                //            if (src == null)
-//    //                //            {
-//    //                //                Debug.Console(0, dev, "Error: Cannot add source key '{0}'", split[1]);
-//    //                //                continue;
-//    //                //            }
-//    //                //            dev.SetCustomButtonAsSource(kvp.Key, src);
-//    //                //        }
-//    //                //        else if (split[0] == "room")
-//    //                //        {
-//    //                //            if (split[1] == "off")
-//    //                //                dev.SetCustomButtonAsRoomOff(kvp.Key);
-//    //                //        }
-//    //                //    }
-//    //                //});
-//    //            }
-//    //        }
-//    //        catch (Exception e)
-//    //        {
-//    //            FactoryHelper.HandleDeviceCreationError(devToken, e);
-//    //        }
-//    //        return dev;
-//    //    }
-
-//    //    public static RFExGateway GetGateway(string parent)
-//    //    {
-//    //        if (parent == null)
-//    //            parent = "controlSystem";
-//    //        RFExGateway rf = null;
-//    //        if (parent.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-//    //            || parent.Equals("processor", StringComparison.OrdinalIgnoreCase))
-//    //        {
-//    //            rf = Global.ControlSystem.ControllerRFGatewayDevice;
-//    //        }
-//    //        return rf;
-//    //    }
-//    //}
-//}

Essentials/PepperDashEssentials/Configuration Original/Factories/TouchpanelFactory.cs

@@ -1,48 +0,0 @@
-//using System;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.UI;
-
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class TouchpanelFactory
-//    {
-//        public static Device Create(JToken devToken)
-//        {
-//            SmartGraphicsTouchpanelControllerBase dev = null;
-//            try
-//            {
-//                var devType = devToken.Value<string>("type");
-//                var devKey = devToken.Value<string>("key");
-//                var devName = devToken.Value<string>("name");
-//                var props = devToken["properties"];
-//                if (devType.Equals("Tsw1052", StringComparison.OrdinalIgnoreCase))
-//                {
-//                    uint ipId = Convert.ToUInt32(props.Value<string>("ipId"), 16);
-//                    var hw = new Tsw1052(ipId, Global.ControlSystem);
-//                    dev = TouchpanelControllerFactory.Create(devKey, devName, hw, props.Value<string>("sgdPath"));
-//                    dev.UsesSplashPage = props.Value<bool>("usesSplashPage");
-//                    dev.ShowDate = props.Value<bool>("showDate");
-//                    dev.ShowTime = props.Value<bool>("showTime");
-
-//                    // This plugs the system key into the tp, but it won't be linked up until later
-//                    dev.AddPostActivationAction(() =>
-//                        {
-//                            var defaultSystemKey = props.Value<string>("defaultSystemKey");
-//                            dev.SetCurrentRoom((EssentialsRoom)DeviceManager.GetDeviceForKey(defaultSystemKey));
-//                        });
-//                }
-//            }
-//            catch (Exception e)
-//            {
-//                FactoryHelper.HandleDeviceCreationError(devToken, e);
-//            }
-//            return dev;
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/ControlSystem.cs

@@ -1,362 +0,0 @@
-using System;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.CrestronThread;
-using PepperDash.Core;
-using PepperDash.Core.PortalSync;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.DM;
-using PepperDash.Essentials.Fusion;
-using PepperDash.Essentials.Room.Cotija;
-
-namespace PepperDash.Essentials
-{
-	public class ControlSystem : CrestronControlSystem
-	{
-		PepperDashPortalSyncClient PortalSync;
-        HttpLogoServer LogoServer;
-
-		public ControlSystem()
-			: base()
-		{
-			Thread.MaxNumberOfUserThreads = 400;
-			Global.ControlSystem = this;
-			DeviceManager.Initialize(this);        
-		}
-
-		/// <summary>
-		/// Git 'er goin'
-		/// </summary>
-		public override void InitializeSystem()
-		{
-            DeterminePlatform();
-
-            //CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
-            //    ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(s =>
-            {
-                foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}\r", tl);
-            },
-            "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
-
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				CrestronConsole.ConsoleCommandResponse
-					("Current running configuration. This is the merged system and template configuration");
-				CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
-					(ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
-			}, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
-
-			CrestronConsole.AddNewConsoleCommand(s =>
-				{
-					CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
-						"System URL:   {0}\r" +
-						"Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
-				}, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
-
-            GoWithLoad();
-		}
-
-        /// <summary>
-        /// Determines if the program is running on a processor (appliance) or server (XiO Edge).
-        /// 
-        /// Sets Global.FilePathPrefix based on platform
-        /// </summary>
-        public void DeterminePlatform()
-        {
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
-
-            string filePathPrefix;
-
-            var dirSeparator = Global.DirectorySeparator;
-
-            var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-
-            var versionString = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
-
-            string directoryPrefix;
-
-            //directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
-#warning ^ For use with beta Include4.dat for XiO Edge
-            directoryPrefix = "";
-
-            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
-            {
-                filePathPrefix = directoryPrefix + dirSeparator + "NVRAM" 
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", versionString);
-            }
-            else
-            {
-                filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on XiO Edge Server", versionString);
-            }
-
-            Global.SetFilePathPrefix(filePathPrefix);
-        }
-
-		/// <summary>
-		/// Do it, yo
-		/// </summary>
-		public void GoWithLoad()
-		{
-			try
-			{
-                CrestronConsole.AddNewConsoleCommand(EnablePortalSync, "portalsync", "Loads Portal Sync",
-                    ConsoleAccessLevelEnum.AccessOperator);
-
-                //PortalSync = new PepperDashPortalSyncClient();
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
-
-				var filesReady = SetupFilesystem();
-				if (filesReady)
-				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
-					if (!ConfigReader.LoadConfig2())
-						return;
-
-					Load();
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r" +
-						"-------------------------------------------------------------");
-				}
-				else
-				{
-					Debug.Console(0,
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"Essentials file structure setup completed.\r" +
-						"Please load config, sgd and ir files and\r" +
-						"restart program.\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------");
-				}
-            }
-			catch (Exception e)
-			{
-				Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
-			}
-
-		}
-
-		/// <summary>
-		/// Verifies filesystem is set up. IR, SGD, and program1 folders
-		/// </summary>
-		bool SetupFilesystem()
-		{
-			Debug.Console(0, "Verifying and/or creating folder structure");
-			var configDir = Global.FilePathPrefix;
-			var configExists = Directory.Exists(configDir);
-			if (!configExists)
-				Directory.Create(configDir);
-
-			var irDir = Global.FilePathPrefix + "ir";
-			if (!Directory.Exists(irDir))
-				Directory.Create(irDir);
-
-            var sgdDir = Global.FilePathPrefix + "sgd";
-			if (!Directory.Exists(sgdDir))
-				Directory.Create(sgdDir);
-
-			return configExists;
-		}
-
-        public void EnablePortalSync(string s)
-        {
-            if (s.ToLower() == "enable")
-            {
-                CrestronConsole.ConsoleCommandResponse("Portal Sync features enabled");
-                PortalSync = new PepperDashPortalSyncClient();
-            }
-        }
-
-		public void TearDown()
-		{
-			Debug.Console(0, "Tearing down existing system");
-			DeviceManager.DeactivateAll();
-
-			TieLineCollection.Default.Clear();
-
-			foreach (var key in DeviceManager.GetDevices())
-				DeviceManager.RemoveDevice(key);
-
-			Debug.Console(0, "Tear down COMPLETE");
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void Load()
-		{
-			LoadDevices();
-			LoadTieLines();
-			LoadRooms();
-			LoadLogoServer();
-
-			DeviceManager.ActivateAll();
-		}
-
-
-		/// <summary>
-		/// Reads all devices from config and adds them to DeviceManager
-		/// </summary>
-		public void LoadDevices()
-		{
-			foreach (var devConf in ConfigReader.ConfigObject.Devices)
-			{
-
-				try
-				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}'", devConf.Key);
-					// Skip this to prevent unnecessary warnings
-					if (devConf.Key == "processor")
-						continue;
-
-					// Try local factory first
-					var newDev = DeviceFactory.GetDevice(devConf);
-
-					// Then associated library factories
-					if (newDev == null)
-						newDev = PepperDash.Essentials.Devices.Common.DeviceFactory.GetDevice(devConf);
-					if (newDev == null)
-						newDev = PepperDash.Essentials.DM.DeviceFactory.GetDevice(devConf);
-					if (newDev == null)
-						newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
-
-					if (newDev != null)
-						DeviceManager.AddDevice(newDev);
-					else
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
-				}
-				catch (Exception e)
-				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
-				} 
-			}
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
-
-		}
-
-		/// <summary>
-		/// Helper method to load tie lines.  This should run after devices have loaded
-		/// </summary>
-		public void LoadTieLines()
-		{
-			// In the future, we can't necessarily just clear here because devices
-			// might be making their own internal sources/tie lines
-
-			var tlc = TieLineCollection.Default;
-			//tlc.Clear();
-			if (ConfigReader.ConfigObject.TieLines == null)
-			{
-				return;
-			}
-
-			foreach (var tieLineConfig in ConfigReader.ConfigObject.TieLines)
-			{
-				var newTL = tieLineConfig.GetTieLine();
-				if (newTL != null)
-					tlc.Add(newTL);
-			}
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Tie Lines Loaded.");
-
-		}
-
-		/// <summary>
-		/// Reads all rooms from config and adds them to DeviceManager
-		/// </summary>
-		public void LoadRooms()
-		{
-			if (ConfigReader.ConfigObject.Rooms == null)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
-				return;
-			}
-
-			foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
-			{
-				var room = roomConfig.GetRoomObject();
-				if (room != null)
-				{
-                    if (room is EssentialsHuddleSpaceRoom)
-                    {
-                        DeviceManager.AddDevice(room);
-
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
-
-
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
-						// Cotija bridge
-						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
-						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-						DeviceManager.AddDevice(bridge);
-
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Cotija Bridge Added...");
-                    }
-                    else if (room is EssentialsHuddleVtc1Room)
-                    {
-                        DeviceManager.AddDevice(room);
-
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
-                    }					
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsHuddleSpaceRoom, attempting to add to DeviceManager w/o Fusion");
-                        DeviceManager.AddDevice(room);
-                    }
-
-				}
-				else
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
-			}
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
-
-		}
-
-		/// <summary>
-		/// Helps add the post activation steps that link bridges to main controller
-		/// </summary>
-		/// <param name="bridge"></param>
-		void AddBridgePostActivationHelper(CotijaBridgeBase bridge)
-		{
-			bridge.AddPostActivationAction(() =>
-			{
-				var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
-				if (parent == null)
-				{
-					Debug.Console(0, bridge, "ERROR: Cannot connect bridge. System controller not present");
-				}
-				Debug.Console(0, bridge, "Linking to parent controller");
-				bridge.AddParent(parent);
-				parent.AddBridge(bridge);
-			});
-		}
-
-		/// <summary>
-		/// Fires up a logo server if not already running
-		/// </summary>
-		void LoadLogoServer()
-		{
-			try
-			{
-                LogoServer = new HttpLogoServer(8080, Global.FilePathPrefix + "html" + Global.DirectorySeparator + "logo");
-            }
-			catch (Exception)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
-			}
-		}
-	}
-}

Essentials/PepperDashEssentials/Devices/Amplifier.cs

@@ -1,31 +0,0 @@
-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.Core.Routing;
-
-namespace PepperDash.Essentials
-{
-    public class Amplifier : Device, IRoutingSinkNoSwitching
-    {
-        public RoutingInputPort AudioIn { get; private set; }
-
-        public Amplifier(string key, string name)
-            : base(key, name)
-        {
-            AudioIn = new RoutingInputPort(RoutingPortNames.AnyAudioIn, eRoutingSignalType.Audio,
-                eRoutingPortConnectionType.None, null, this);
-            InputPorts = new RoutingPortCollection<RoutingInputPort> { AudioIn };
-        }
-
-        #region IRoutingInputs Members
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-        #endregion
-    }
-}

Essentials/PepperDashEssentials/Devices/DiscPlayer/OppoExtendedBdp.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices
-{
-	///// <summary>
-	///// This DVD class should cover most IR, one-way DVD and Bluray fuctions
-	///// </summary>
-	//public class OppoBluray : IrDvdBase, IDvdControls, IExtendedOutputs
-	//{
-	//    public OppoBluray(string key, string name, IROutputPort port, string irDriverFilepath) : base(key, name, port, irDriverFilepath) { }
-
-
-
-	//    public OutputsToTriListBridge GetExtendedOutputsToTriListBridge()
-	//    {
-	//        return new ExtendedDvdTriListBridge();
-	//    }
-
-
-	//}
-
-	//public class ExtendedDvdTriListBridge : OutputsToTriListBridge
-	//{
-
-	//    public override void Link()
-	//    {
-	//        throw new NotImplementedException();
-	//    }
-
-	//    public override void UnLink()
-	//    {
-	//        throw new NotImplementedException();
-	//    }
-	//}
-}

Essentials/PepperDashEssentials/Devices/NUMERIC AppleTV.cs

@@ -1,45 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-
-//using PepperDash.Essentials.Core;
-
-//namespace PepperDash.Essentials.Devices
-//{
-//    public class AppleTV : Device, IHasCueActionList
-//    {
-//        public IrOutputPortController IrPort { get; private set; }
-
-//        public AppleTV(string key, string name, IROutputPort port, string irDriverFilepath)
-//            : base(key, name) 
-//        {
-//            IrPort = new IrOutputPortController("ir" + key, port, irDriverFilepath);
-//        }
-
-//        #region IFunctionList Members
-//        public List<CueActionPair> CueActionList
-//        {
-//            get 
-//            {
-//                var numToIr = new Dictionary<Cue, string>
-//                {
-//                    { CommonBoolCue.Menu, IROutputStandardCommands.IROut_MENU },
-//                    { CommonBoolCue.Up, IROutputStandardCommands.IROut_UP_ARROW },
-//                    { CommonBoolCue.Down, IROutputStandardCommands.IROut_DN_ARROW },
-//                    { CommonBoolCue.Left, IROutputStandardCommands.IROut_LEFT_ARROW },
-//                    { CommonBoolCue.Right, IROutputStandardCommands.IROut_RIGHT_ARROW },
-//                    { CommonBoolCue.Select, IROutputStandardCommands.IROut_ENTER }
-//                };
-//                var funcs = new List<CueActionPair>(numToIr.Count);
-
-//                foreach (var kvp in numToIr)
-//                    funcs.Add(new BoolCueActionPair(kvp.Key, b => IrPort.PressRelease(kvp.Value, b)));
-//                return funcs;
-//            }
-//        }
-//        #endregion
-//    }
-//}

Essentials/PepperDashEssentials/FOR REFERENCE UI/PageControllers/DevicePageControllerBase.cs

@@ -1,47 +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 PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Core.Presets;
-
-//namespace PepperDash.Essentials
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public abstract class DevicePageControllerBase
-//    {
-
-//        protected BasicTriListWithSmartObject TriList;
-//        protected List<BoolInputSig> FixedObjectSigs;
-
-//        public DevicePageControllerBase(BasicTriListWithSmartObject triList)
-//        {
-//            TriList = triList;
-//        }
-
-//        public void SetVisible(bool state)
-//        {
-//            foreach (var sig in FixedObjectSigs)
-//            {
-//                Debug.Console(2, "set visible {0}={1}", sig.Number, state);
-//                sig.BoolValue = state;
-//            }
-//            CustomSetVisible(state);
-//        }
-
-//        /// <summary>
-//        /// Add any specialized show/hide logic here - beyond FixedObjectSigs. Overriding
-//        /// methods do not need to call this base method
-//        /// </summary>
-//        protected virtual void CustomSetVisible(bool state)
-//        {
-//        }
-//    }
-//}

Essentials/PepperDashEssentials/FOR REFERENCE UI/PageControllers/LargeTouchpanelControllerBase.cs

@@ -1,308 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using Crestron.SimplSharpPro.UI;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    public class LargeTouchpanelControllerBase : SmartGraphicsTouchpanelControllerBase
-//    {
-//        public string PresentationShareButtonInVideoText = "Share";
-//        public string PresentationShareButtonNotInVideoText = "Presentation";
-
-//        SourceListSubpageReferenceList SourceSelectSRL;
-//        DevicePageControllerBase CurrentPresentationSourcePageController;
-
-//        public LargeTouchpanelControllerBase(string key, string name,
-//            BasicTriListWithSmartObject triList, string sgdFilePath)
-//            : base(key, name, triList, sgdFilePath)
-//        {
-//        }
-
-//        /// <summary>
-//        /// Static factory method
-//        /// </summary>
-//        public static LargeTouchpanelControllerBase GetController(string key, string name,
-//            string type, CrestronTswPropertiesConfig props)
-//        {
-//            var id = Convert.ToUInt32(props.IpId, 16);
-//            type = type.ToLower();
-//            Tswx52ButtonVoiceControl tsw = null;
-//            if (type == "tsw752")
-//                tsw = new Tsw752(id, Global.ControlSystem);
-//            else if (type == "tsw1052")
-//                tsw = new Tsw1052(id, Global.ControlSystem);
-//            else
-//            {
-//                Debug.Console(0, "WARNING: Cannot create TSW controller with type '{0}'", type);
-//                return null;
-//            }
-
-//            var sgdPath = string.Format(@"\NVRAM\Program{0}\SGD\{1}", 
-//                InitialParametersClass.ApplicationNumber, props.SgdFile);
-//            var controller = new LargeTouchpanelControllerBase(key, name, tsw, sgdPath);
-//            controller.UsesSplashPage = props.UsesSplashPage;
-			
-//            // Get the room and add it after everthing is ready
-//            var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey) as EssentialsRoom;
-//            controller.AddPostActivationAction(() =>
-//                {
-//                    controller.SetCurrentRoom(room);
-
-//                });
-
-//            return controller;
-//        }
-
-//        public override bool CustomActivate()
-//        {
-//            var baseSuccess = base.CustomActivate();
-//            if (!baseSuccess) return false;
-
-//            SourceSelectSRL = new SourceListSubpageReferenceList(this.TriList, n =>
-//                { if (CurrentRoom != null) CurrentRoom.SelectSource(n); });
-
-//            var lm = Global.LicenseManager;
-//            if (lm != null)
-//            {
-//                lm.LicenseIsValid.LinkInputSig(TriList.BooleanInput[UiCue.ShowLicensed.Number]);
-//                //others
-//            }
-
-//            // Wire up buttons
-//            TriList.SetSigFalseAction(15003, () => SetMainMode(eMainModeType.Presentation));
-//            TriList.SetSigFalseAction(15008, PowerOffWithConfirmPressed);
-//            TriList.SetSigFalseAction(15101, () => SetMainMode(eMainModeType.Presentation));
-//            TriList.SetSigFalseAction(15013, ShowHelp);
-//            TriList.SetSigFalseAction(15014, () => SetMainMode(eMainModeType.Tech));
-
-//            // Temp things -----------------------------------------------------------------------
-//            TriList.StringInput[UiCue.SplashMessage.Number].StringValue = SplashMessage;
-//            //------------------------------------------------------------------------------------
-
-//            // Initialize initial view
-//            ShowSplashOrMain();
-//            return true;
-//        }
-
-//        /// <summary>
-//        /// In Essentials, this should NEVER be called, since it's a one-room solution
-//        /// </summary>
-//        protected override void HideRoomUI()
-//        {
-//            // UI Cleanup here????
-
-//            //SwapAudioDeviceControls(CurrentRoom.CurrentAudioDevice, null);
-//            //CurrentRoom.AudioDeviceWillChange -= CurrentRoom_AudioDeviceWillChange;
-
-//            CurrentRoom.IsCoolingDownFeedback.OutputChange -= CurrentRoom_IsCoolingDown_OutputChange;
-//            CurrentRoom.IsWarmingUpFeedback.OutputChange -= CurrentRoom_IsWarmingUp_OutputChange;
-
-//            SourceSelectSRL.DetachFromCurrentRoom();
-//        }
-
-//        /// <summary>
-//        /// Ties this panel controller to the Room and gets updates.
-//        /// </summary>
-//        protected override void ShowRoomUI()
-//        {
-//            Debug.Console(1, this, "connecting to system '{0}'", CurrentRoom.Key);
-
-//            TriList.StringInput[RoomCue.Name.Number].StringValue = CurrentRoom.Name;
-//            TriList.StringInput[RoomCue.Description.Number].StringValue = CurrentRoom.Description;
-
-//            CurrentRoom.IsCoolingDownFeedback.OutputChange -= CurrentRoom_IsCoolingDown_OutputChange;
-//            CurrentRoom.IsWarmingUpFeedback.OutputChange -= CurrentRoom_IsWarmingUp_OutputChange;
-//            CurrentRoom.IsCoolingDownFeedback.OutputChange += CurrentRoom_IsCoolingDown_OutputChange;
-//            CurrentRoom.IsWarmingUpFeedback.OutputChange += CurrentRoom_IsWarmingUp_OutputChange;
-
-//            SourceSelectSRL.AttachToRoom(CurrentRoom);
-//        }
-
-//        void CurrentRoom_IsCoolingDown_OutputChange(object sender, EventArgs e)
-//        {
-//            Debug.Console(2, this, "Received room in cooldown={0}", CurrentRoom.IsCoolingDownFeedback.BoolValue);
-//            if (CurrentRoom.IsCoolingDownFeedback.BoolValue) // When entering cooldown
-//            {
-//                // Do we need to check for an already-running cooldown - like in the case of room switches?
-//                new ModalDialog(TriList).PresentModalTimerDialog(0, "Power Off", "Power", "Please wait, shutting down",
-//                    "", "", CurrentRoom.CooldownTime, true, b =>
-//                    {
-//                        ShowSplashOrMain();
-//                    });
-//            }
-//        }
-
-//        void CurrentRoom_IsWarmingUp_OutputChange(object sender, EventArgs e)
-//        {
-//            Debug.Console(2, this, "Received room in warmup={0}", CurrentRoom.IsWarmingUpFeedback.BoolValue);
-//            if (CurrentRoom.IsWarmingUpFeedback.BoolValue) // When entering warmup
-//            {
-//                // Do we need to check for an already-running cooldown - like in the case of room switches?
-//                new ModalDialog(TriList).PresentModalTimerDialog(0, "Power On", "Power", "Please wait, powering on",
-//                    "", "", CurrentRoom.WarmupTime, false, b =>
-//                    {
-//                        // Reveal sources - or has already been done behind modal
-//                    });
-//            }
-//        }
-
-//        // Handler for source change events.
-//        void CurrentRoom_PresentationSourceChange(object sender, EssentialsRoomSourceChangeEventArgs args)
-//        {
-//            // Put away the old source and set up the new source.
-//            Debug.Console(2, this, "Received source change={0}", args.NewSource != null ? args.NewSource.SourceKey : "none");
-
-//            // If we're in tech, don't switch screen modes.  Add any other modes we may want to switch away from
-//            // inside the if below.
-//            if (MainMode == eMainModeType.Splash)
-//                SetMainMode(eMainModeType.Presentation);
-//            SetControlSource(args.NewSource);
-//        }
-
-//        //***********************************************************************
-//        //** UI Manipulation
-//        //***********************************************************************
-
-//        /// <summary>
-//        /// Shows the splash page or the main presentation page, depending on config setting
-//        /// </summary>
-//        void ShowSplashOrMain()
-//        {
-//            if (UsesSplashPage)
-//                SetMainMode(eMainModeType.Splash);
-//            else
-//                SetMainMode(eMainModeType.Presentation);
-//        }
-
-//        /// <summary>
-//        /// Switches between main modes
-//        /// </summary>
-//        void SetMainMode(eMainModeType mode)
-//        {
-//            MainMode = mode;
-//            switch (mode)
-//            {
-//                case eMainModeType.Presentation:
-//                    TriList.BooleanInput[UiCue.VisibleCommonFooter.Number].BoolValue = true;
-//                    TriList.BooleanInput[UiCue.VisibleCommonHeader.Number].BoolValue = true;
-//                    TriList.BooleanInput[UiCue.VisibleSplash.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisiblePresentationSourceList.Number].BoolValue = true;
-//                    ShowCurrentPresentationSourceUi();
-//                    break;
-//                case eMainModeType.Splash:
-//                    TriList.BooleanInput[UiCue.VisibleCommonFooter.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisibleCommonHeader.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisiblePresentationSourceList.Number].BoolValue = false;
-//                    TriList.BooleanInput[UiCue.VisibleSplash.Number].BoolValue = true;
-//                    HideCurrentPresentationSourceUi();
-//                    break;
-//                case eMainModeType.Tech:
-//                    new ModalDialog(TriList).PresentModalTimerDialog(1, "Tech page", "Info",
-//                        "Tech page will be here soon!<br>I promise",
-//                        "Bueno!", "", 0, false, null);
-//                    MainMode = eMainModeType.Presentation;
-//                    break;
-//                default:
-//                    break;
-//            }
-//        }
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        void PowerOffWithConfirmPressed()
-//        {
-//            if (CurrentRoom == null)
-//                return;
-//            if (!CurrentRoom.RoomIsOnFeedback.BoolValue) 
-//                return;
-//            // Timeout or button 1 press will shut down
-//            var modal = new ModalDialog(TriList);
-//            uint seconds = CurrentRoom.UnattendedShutdownTimeMs / 1000;
-//            var message = string.Format("Meeting will end in {0} seconds", seconds);
-//            modal.PresentModalTimerDialog(2, "End Meeting", "Info", message,
-//                "End Meeting Now", "Cancel", CurrentRoom.UnattendedShutdownTimeMs, true,
-//                but => { if (but != 2) CurrentRoom.RoomOff(); });
-//        }
-
-//        /// <summary>
-//        /// Reveals the basic UI for the current device
-//        /// </summary>
-//        protected override void ShowCurrentPresentationSourceUi()
-//        {
-//            if (MainMode == eMainModeType.Splash && CurrentRoom.RoomIsOnFeedback.BoolValue)
-//                SetMainMode(eMainModeType.Presentation);
-
-//            if (CurrentPresentationControlDevice == null)
-//            {
-//                // If system is off, do one thing
-
-//                // Otherwise, do something else - shouldn't be in this condition
-
-//                return;
-//            }
-
-//            // If a controller is already loaded, use it
-//            if (LoadedPageControllers.ContainsKey(CurrentPresentationControlDevice))
-//                CurrentPresentationSourcePageController = LoadedPageControllers[CurrentPresentationControlDevice];
-//            else
-//            {
-//                // This is by no means optimal, but for now....
-//                if (CurrentPresentationControlDevice.Type == PresentationSourceType.SetTopBox
-//                    && CurrentPresentationControlDevice is ISetTopBoxControls)
-//                    CurrentPresentationSourcePageController = new PageControllerLargeSetTopBoxGeneric(TriList,
-//                        CurrentPresentationControlDevice as ISetTopBoxControls);
-
-//                else if (CurrentPresentationControlDevice.Type == PresentationSourceType.Laptop)
-//                    CurrentPresentationSourcePageController = new PageControllerLaptop(TriList);
-
-//                // separate these...
-//                else if (CurrentPresentationControlDevice.Type == PresentationSourceType.Dvd)
-//                    CurrentPresentationSourcePageController =
-//                        new PageControllerLargeDvd(TriList, CurrentPresentationControlDevice as IDiscPlayerControls);
-
-//                else
-//                    CurrentPresentationSourcePageController = null;
-
-//                // Save it.
-//                if (CurrentPresentationSourcePageController != null)
-//                    LoadedPageControllers[CurrentPresentationControlDevice] = CurrentPresentationSourcePageController;
-//            }
-
-//            if (CurrentPresentationSourcePageController != null)
-//                CurrentPresentationSourcePageController.SetVisible(true);
-//        }
-
-//        protected override void HideCurrentPresentationSourceUi()
-//        {
-//            if (CurrentPresentationControlDevice != null && CurrentPresentationSourcePageController != null)
-//                CurrentPresentationSourcePageController.SetVisible(false);
-//        }
-
-
-
-//        void ShowHelp()
-//        {
-//            new ModalDialog(TriList).PresentModalTimerDialog(1, "Help", "Help", CurrentRoom.HelpMessage,
-//                    "OK", "", 0, false, null);
-//        }
-
-//        protected void ListSmartObjects()
-//        {
-//            Debug.Console(0, this, "Smart objects IDs:");
-//            var list = TriList.SmartObjects.OrderBy(s => s.Key);
-//            foreach (var kvp in list)
-//                Debug.Console(0, "  {0}", kvp.Key);
-//        }
-//    }
-//}