fix (essentials): fixed essentials csproj

# Conflicts:
#	PepperDashEssentials.sln
#	src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
#	src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
#	src/PepperDash.Essentials.Devices.DM/PepperDash.Essentials.Devices.Dm.csproj
#	src/PepperDash.Essentials/PepperDash.Essentials.csproj

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,9 @@ assignees: ''
 
 ---
 
+**Was this bug identified in a specific build version?**
+Please note the build version where this bug was identified
+
 **Describe the bug**
 A clear and concise description of what the bug is.  
 

.github/ISSUE_TEMPLATE/rfi_request.md

@@ -0,0 +1,27 @@
+---
+name: Request for Information
+about: Request specific information about capabilities of the framework
+title: "[RFI]-"
+labels: RFI
+assignees: ''
+
+---
+
+**What is your request?**
+Please provide as much detail as possible.
+
+
+**What is the intended use case**
+- [ ] Essentials Standalone Application
+- [ ] Essentials + SIMPL Windows Hybrid
+
+**User Interface Requirements**
+- [ ] Not Applicable (logic only)
+- [ ] Crestron Smart Graphics Touchpanel
+- [ ] Cisco Touch10
+- [ ] Mobile Control
+- [ ] Crestron CH5 Touchpanel interface
+
+
+**Additional context**
+Add any other context or screenshots about the request here.

.github/scripts/GenerateVersionNumber-2.0.0.ps1

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

.github/scripts/GenerateVersionNumber.ps1

@@ -1,5 +1,8 @@
-$latestVersions = $(git tag --merged origin/master)
+$latestVersions = $(git tag --merged origin/main)
 $latestVersion = [version]"0.0.0"
+Write-Host "GITHUB_REF: $($Env:GITHUB_REF)"
+Write-Host "GITHUB_HEAD_REF: $($Env:GITHUB_HEAD_REF)"
+Write-Host "GITHUB_BASE_REF: $($Env:GITHUB_BASE_REF)"
 Foreach ($version in $latestVersions) {
   Write-Host $version
   try {
@@ -17,8 +20,14 @@ Foreach ($version in $latestVersions) {
 $newVersion = [version]$latestVersion
 $phase = ""
 $newVersionString = ""
+
 switch -regex ($Env:GITHUB_REF) {
-  '^refs\/heads\/master*.' {
+  '^refs\/pull\/*.' {
+    $splitRef = $Env:GITHUB_REF -split "/"
+    $phase = "pr$($splitRef[2])"
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/main*.' {
     $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, $newVersion.Build
   }
   '^refs\/heads\/feature\/*.' {
@@ -39,6 +48,11 @@ switch -regex ($Env:GITHUB_REF) {
     $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
+  }
+  
 }
 
 

.github/scripts/ZipBuildOutput.ps1

@@ -8,9 +8,10 @@ $destination = "$($Env:GITHUB_HOME)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
+$exclusions += "Newtonsoft.Compact.Json.dll"
 # 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" | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {
   $allowed = $true;
   # Exclude any files in submodules
   foreach ($exclude in $exclusions) {
@@ -28,7 +29,8 @@ 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 
-  $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
+  # 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) {

.github/workflows/docker.yml

@@ -1,252 +0,0 @@
-name: Branch Build Using Docker
-
-on:
-  push:
-    branches:
-      - feature/*
-      - hotfix/*
-      - 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 }}
-      # 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 Release
-        id: create_release
-        # using contributor's version to allow for pointing at the right commit
-        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
-        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:
-      # 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: 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/essentialsplugins-betabuilds.yml

@@ -0,0 +1,271 @@
+name: 2.0.0 Branch Build Using Docker
+
+on:
+  push:
+    branches:
+      - feature/*
+      - hotfix/*
+      - release/*
+      - dev*
+
+env:
+  # 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: main
+jobs:
+  Build_Project:
+    runs-on: windows-2019
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      # Fetch all tags
+      - name: Fetch tags
+        run: git fetch --tags
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          $latestVersions = $(git tag --merged origin/main)
+          $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\/main*.' {
+              $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\/dev*.' {
+              $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
+            }
+          }      
+          echo "VERSION=$newVersionString" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          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($Env:VERSION, "\d+\.\d+\.\d+.*");
+          if ($r.Success) {
+              Write-Output "Updating Assembly Version to $Env:VERSION ...";
+              Update-AllAssemblyInfoFiles $Env:VERSION;
+          }
+          else {
+              Write-Output " ";
+              Write-Output "Error: Input version $Env:VERSION does not match x.y.z format!"
+              Write-Output " ";
+              Write-Output "Unable to apply version to AssemblyInfo.cs files";
+          }
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
+      # Set the SOLUTION_PATH
+      - name: Get SLN Path
+        shell: powershell
+        run: |
+          $solution_path = Get-ChildItem *.sln -recurse 
+          $solution_path = $solution_path.FullName
+          $solution_path = $solution_path -replace "(?:[^\\]*\\){4}", ""
+          Write-Output $solution_path
+          echo "SOLUTION_PATH=$($solution_path)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        # Set the SOLUTION_FILE
+      - name: Get SLN File
+        shell: powershell
+        run: |
+          $solution_file = Get-ChildItem .\*.sln -recurse -Path "$($Env:GITHUB_WORKSPACE)" 
+          echo "SOLUTION_FILE=$($solution_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      # 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_PATH)"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+      # Zip up the output files as needed
+      - name: Zip Build Output
+        shell: powershell
+        run: |
+          $destination = "$($Env:GITHUB_HOME)\output"
+          New-Item -ItemType Directory -Force -Path ($destination)
+          Get-ChildItem ($destination)
+          $exclusions = "packages"
+          # 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", "*.nuspec" | 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 
+            $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -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\*.cplz | 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
+      # 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 output files
+      - 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 Release
+        id: create_release
+        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
+        id: upload_release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Get nuget File
+        shell: powershell
+        run: |
+          $nuspec_file = Get-ChildItem *.nuspec -recurse 
+          echo "NUSPEC_FILE=$($nuspec_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      # Pushes to nuget, not needed unless publishing publicly
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      # Pushes to nuget, not needed unless publishing publicly >> this pushes package to nuget.org
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json

.github/workflows/essentialsplugins-releasebuilds.yml

@@ -0,0 +1,219 @@
+name: 2.0.0 Main Build using Docker
+
+on:
+  release:
+    types:
+      - released
+    branches:
+      - main
+
+env:
+  # 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: main
+jobs:
+  Build_Project:
+    runs-on: windows-2019
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      # Fetch all tags
+      - name: Fetch tags
+        run: git fetch --tags
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        env:
+          TAG_NAME: ${{ github.event.release.tag_name }}
+        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          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($Env:VERSION, "\d+\.\d+\.\d+.*");
+          if ($r.Success) {
+              Write-Output "Updating Assembly Version to $Env:VERSION ...";
+              Update-AllAssemblyInfoFiles $Env:VERSION;
+          }
+          else {
+              Write-Output " ";
+              Write-Output "Error: Input version $Env:VERSION does not match x.y.z format!"
+              Write-Output " ";
+              Write-Output "Unable to apply version to AssemblyInfo.cs files";
+          }
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
+      # Set the SOLUTION_PATH
+      - name: Get SLN Path
+        shell: powershell
+        run: |
+          $solution_path = Get-ChildItem *.sln -recurse 
+          $solution_path = $solution_path.FullName
+          $solution_path = $solution_path -replace "(?:[^\\]*\\){4}", ""
+          Write-Output $solution_path
+          echo "SOLUTION_PATH=$($solution_path)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        # Set the SOLUTION_FILE
+      - name: Get SLN File
+        shell: powershell
+        run: |
+          $solution_file = Get-ChildItem .\*.sln -recurse -Path "$($Env:GITHUB_WORKSPACE)" 
+          echo "SOLUTION_FILE=$($solution_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      # 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_PATH)"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+      # Zip up the output files as needed
+      - name: Zip Build Output
+        shell: powershell
+        run: |
+          $destination = "$($Env:GITHUB_HOME)\output"
+          New-Item -ItemType Directory -Force -Path ($destination)
+          Get-ChildItem ($destination)
+          $exclusions = "packages"
+          # 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", "*.nuspec" | 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 
+            $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -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\*.cplz | 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
+      # 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 output files
+      - 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 }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Get nuget File
+        shell: powershell
+        run: |
+          $nuspec_file = Get-ChildItem *.nuspec -recurse 
+          echo "NUSPEC_FILE=$($nuspec_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      # Pushes to nuget, not needed unless publishing publicly
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      # Pushes to nuget, not needed unless publishing publicly >> this pushes package to nuget.org
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json

.github/workflows/master.yml

@@ -1,74 +0,0 @@
-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
-      # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # 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 }}
-      # 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
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: Build
-          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-      # 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 }}

.gitignore

@@ -23,5 +23,369 @@ SIMPLSharpLogs/
 *.projectinfo
 essentials-framework/EssentialDMTestConfig/
 output/
+packages/
 
 PepperDashEssentials-0.0.0-buildType-test.zip
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj

.gitmodules

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

PepperDashEssentials.sln

@@ -1,21 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", ".\PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials", "Src/PepperDash.Essentials/PepperDash.Essentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{892B761C-E479-44CE-BD74-243E9214AF13} = {892B761C-E479-44CE-BD74-243E9214AF13}
 		{9199CE8A-0C9F-4952-8672-3EED798B284F} = {9199CE8A-0C9F-4952-8672-3EED798B284F}
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", ".\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.Core", "Src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", ".\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.Devices.Common", "Src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials_DM", ".\essentials-framework\Essentials DM\Essentials_DM\Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.Devices.Dm", "SRc/PepperDash.Essentials.Devices.DM/PepperDash.Essentials.Devices.Dm.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IChannelExtensions.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class IChannelExtensions
-    {
-        public static void LinkActions(this IChannel dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "chanUp", new PressAndHoldAction(dev.ChannelUp));
-            controller.AddAction(prefix + "chanDown", new PressAndHoldAction(dev.ChannelDown));
-            controller.AddAction(prefix + "lastChan", new PressAndHoldAction(dev.LastChannel));
-            controller.AddAction(prefix + "guide", new PressAndHoldAction(dev.Guide));
-            controller.AddAction(prefix + "info", new PressAndHoldAction(dev.Info));
-            controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
-        }
-
-        public static void UnlinkActions(this IChannel dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "chanUp");
-            controller.RemoveAction(prefix + "chanDown");
-            controller.RemoveAction(prefix + "lastChan");
-            controller.RemoveAction(prefix + "guide");
-            controller.RemoveAction(prefix + "info");
-            controller.RemoveAction(prefix + "exit");
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IColorExtensions.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class IColorExtensions
-    {
-        public static void LinkActions(this IColor dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "red", new PressAndHoldAction(dev.Red));
-            controller.AddAction(prefix + "green", new PressAndHoldAction(dev.Green));
-            controller.AddAction(prefix + "yellow", new PressAndHoldAction(dev.Yellow));
-            controller.AddAction(prefix + "blue", new PressAndHoldAction(dev.Blue));
-        }
-
-        public static void UnlinkActions(this IColor dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "red");
-            controller.RemoveAction(prefix + "green");
-            controller.RemoveAction(prefix + "yellow");
-            controller.RemoveAction(prefix + "blue");
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDPadExtensions.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class IDPadExtensions
-    {
-        public static void LinkActions(this IDPad dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "up", new PressAndHoldAction(dev.Up));
-            controller.AddAction(prefix + "down", new PressAndHoldAction(dev.Down));
-            controller.AddAction(prefix + "left", new PressAndHoldAction(dev.Left));
-            controller.AddAction(prefix + "right", new PressAndHoldAction(dev.Right));
-            controller.AddAction(prefix + "select", new PressAndHoldAction(dev.Select));
-            controller.AddAction(prefix + "menu", new PressAndHoldAction(dev.Menu));
-            controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
-        }
-
-        public static void UnlinkActions(this IDPad dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "up");
-            controller.RemoveAction(prefix + "down");
-            controller.RemoveAction(prefix + "left");
-            controller.RemoveAction(prefix + "right");
-            controller.RemoveAction(prefix + "select");
-            controller.RemoveAction(prefix + "menu");
-            controller.RemoveAction(prefix + "exit"); 
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDvrExtensions.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class IDvrExtensions
-    {
-        public static void LinkActions(this IDvr dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "dvrlist", new PressAndHoldAction(dev.DvrList));
-            controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
-        }
-
-        public static void UnlinkActions(this IDvr dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "dvrlist");
-            controller.RemoveAction(prefix + "record");
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/INumericExtensions.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class INumericExtensions
-    {
-        public static void LinkActions(this INumericKeypad dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "num0", new PressAndHoldAction(dev.Digit0));
-            controller.AddAction(prefix + "num1", new PressAndHoldAction(dev.Digit1));
-            controller.AddAction(prefix + "num2", new PressAndHoldAction(dev.Digit2));
-            controller.AddAction(prefix + "num3", new PressAndHoldAction(dev.Digit3));
-            controller.AddAction(prefix + "num4", new PressAndHoldAction(dev.Digit4));
-            controller.AddAction(prefix + "num5", new PressAndHoldAction(dev.Digit5));
-            controller.AddAction(prefix + "num6", new PressAndHoldAction(dev.Digit6));
-            controller.AddAction(prefix + "num7", new PressAndHoldAction(dev.Digit0));
-            controller.AddAction(prefix + "num8", new PressAndHoldAction(dev.Digit0));
-            controller.AddAction(prefix + "num9", new PressAndHoldAction(dev.Digit0));
-            controller.AddAction(prefix + "numDash", new PressAndHoldAction(dev.KeypadAccessoryButton1));
-            controller.AddAction(prefix + "numEnter", new PressAndHoldAction(dev.KeypadAccessoryButton2));
-            // Deal with the Accessory functions on the numpad later
-        }
-
-        public static void UnlinkActions(this INumericKeypad dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "num0");
-            controller.RemoveAction(prefix + "num1");
-            controller.RemoveAction(prefix + "num2");
-            controller.RemoveAction(prefix + "num3");
-            controller.RemoveAction(prefix + "num4");
-            controller.RemoveAction(prefix + "num5");
-            controller.RemoveAction(prefix + "num6");
-            controller.RemoveAction(prefix + "num7");
-            controller.RemoveAction(prefix + "num8");
-            controller.RemoveAction(prefix + "num9");
-            controller.RemoveAction(prefix + "numDash");
-            controller.RemoveAction(prefix + "numEnter");
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IPowerExtensions.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class IPowerExtensions
-    {
-        public static void LinkActions(this IPower dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "powerOn", new Action(dev.PowerOn));
-            controller.AddAction(prefix + "powerOff", new Action(dev.PowerOff));
-            controller.AddAction(prefix + "powerToggle", new Action(dev.PowerToggle));
-        }
-
-        public static void UnlinkActions(this IPower dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "powerOn");
-            controller.RemoveAction(prefix + "powerOff");
-            controller.RemoveAction(prefix + "powerToggle");
-  
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ISetTopBoxControlsExtensions.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class ISetTopBoxControlsExtensions
-    {
-        public static void LinkActions(this ISetTopBoxControls dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "dvrList", new PressAndHoldAction(dev.DvrList));
-            controller.AddAction(prefix + "replay", new PressAndHoldAction(dev.Replay));
-        }
-
-        public static void UnlinkActions(this ISetTopBoxControls dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "dvrList");
-            controller.RemoveAction(prefix + "replay");
-        }
-    }
-}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ITransportExtensions.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-    public static class ITransportExtensions
-    {
-        public static void LinkActions(this ITransport dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.AddAction(prefix + "play", new PressAndHoldAction(dev.Play));
-            controller.AddAction(prefix + "pause", new PressAndHoldAction(dev.Pause));
-            controller.AddAction(prefix + "stop", new PressAndHoldAction(dev.Stop));
-            controller.AddAction(prefix + "prevTrack", new PressAndHoldAction(dev.ChapPlus));
-            controller.AddAction(prefix + "nextTrack", new PressAndHoldAction(dev.ChapMinus));
-            controller.AddAction(prefix + "rewind", new PressAndHoldAction(dev.Rewind));
-            controller.AddAction(prefix + "ffwd", new PressAndHoldAction(dev.FFwd));
-            controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
-        }
-
-        public static void UnlinkActions(this ITransport dev, MobileControlSystemController controller)
-        {
-            var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
-
-            controller.RemoveAction(prefix + "play");
-            controller.RemoveAction(prefix + "pause");
-            controller.RemoveAction(prefix + "stop");
-            controller.RemoveAction(prefix + "prevTrack");
-            controller.RemoveAction(prefix + "nextTrack");
-            controller.RemoveAction(prefix + "rewind");
-            controller.RemoveAction(prefix + "ffwd");
-            controller.RemoveAction(prefix + "record");
-        }
-    }
-}

PepperDashEssentials/AppServer/Interfaces.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-	/// <summary>
-	/// Represents a room whose configuration is derived from runtime data,
-	/// perhaps from another program, and that the data may not be fully
-	/// available at startup.
-	/// </summary>
-	public interface IDelayedConfiguration
-	{
-		event EventHandler<EventArgs> ConfigurationIsReady;
-	}
-}
-

PepperDashEssentials/AppServer/Messengers/AudioCodecBaseMessenger.cs

@@ -1,102 +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.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    /// <summary>
-    /// Provides a messaging bridge for an AudioCodecBase device
-    /// </summary>
-    public class AudioCodecBaseMessenger : MessengerBase
-    {
-        /// <summary>
-        /// Device being bridged
-        /// </summary>
-        public AudioCodecBase Codec { get; set; }
-
-        /// <summary>
-        /// Constuctor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="codec"></param>
-        /// <param name="messagePath"></param>
-        public AudioCodecBaseMessenger(string key, AudioCodecBase codec, string messagePath)
-            : base(key, messagePath)
-        {
-            if (codec == null)
-                throw new ArgumentNullException("codec");
-
-            Codec = codec;
-            codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
-
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendAtcFullMessageObject));
-            appServerController.AddAction(MessagePath + "/dial", new Action<string>(s => Codec.Dial(s)));
-            appServerController.AddAction(MessagePath + "/endCallById", new Action<string>(s =>
-            {
-                var call = GetCallWithId(s);
-                if (call != null)
-                    Codec.EndCall(call);
-            }));
-            appServerController.AddAction(MessagePath + "/endAllCalls", new Action(Codec.EndAllCalls));
-            appServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s => Codec.SendDtmf(s)));
-            appServerController.AddAction(MessagePath + "/rejectById", new Action<string>(s =>
-            {
-                var call = GetCallWithId(s);
-                if (call != null)
-                    Codec.RejectCall(call);
-            }));
-            appServerController.AddAction(MessagePath + "/acceptById", new Action<string>(s =>
-            {
-                var call = GetCallWithId(s);
-                if (call != null)
-                    Codec.AcceptCall(call);
-            }));
-        }
-
-        /// <summary>
-        /// Helper to grab a call with string ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        CodecActiveCallItem GetCallWithId(string id)
-        {
-            return Codec.ActiveCalls.FirstOrDefault(c => c.Id == id);
-        }
-
-        void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
-        {
-            SendAtcFullMessageObject();
-        }
-
-        /// <summary>
-        /// Helper method to build call status for vtc
-        /// </summary>
-        /// <returns></returns>
-        void SendAtcFullMessageObject()
-        {
-
-            var info = Codec.CodecInfo;
-            PostStatusMessage(new
-            {
-                isInCall = Codec.IsInCall,
-                calls = Codec.ActiveCalls,
-                info = new
-                {
-                    phoneNumber = info.PhoneNumber
-                }
-            });
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-
-    /// <summary>
-    /// Handles interactions with the app server to update the config
-    /// </summary>
-    public class ConfigMessenger : MessengerBase
-    {
-        public ConfigMessenger(string key, string messagePath)
-            : base(key, messagePath)
-        {
-            ConfigUpdater.ConfigStatusChanged -= ConfigUpdater_ConfigStatusChanged;
-            ConfigUpdater.ConfigStatusChanged += new EventHandler<ConfigStatusEventArgs>(ConfigUpdater_ConfigStatusChanged);
-        }
-
-        void ConfigUpdater_ConfigStatusChanged(object sender, ConfigStatusEventArgs e)
-        {
-            PostUpdateStatus(e.UpdateStatus.ToString());
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/updateConfig", new Action<string>(s => GetConfigFile(s)));
-        }
-
-        /// <summary>
-        /// Generates or passes the URL to make the request to GET the config from a server
-        /// </summary>
-        /// <param name="url"></param>
-        void GetConfigFile(string url)
-        {
-            try
-            {
-                // Attempt to parse the URL
-                var parser = new Crestron.SimplSharp.Net.Http.UrlParser(url);
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully parsed URL from AppServer message: {0}", parser.Url);
-            }
-            catch (Exception e)
-            {
-                // If unable to parse the URL, generate it from config data
-                Debug.Console(2, "Error parsing URL: {0}", e);
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to parse URL from AppServer message.  Generating URL from config data");
-                url = string.Format("http://{0}/api/system/{1}/config", AppServerController.Config.ServerUrl, AppServerController.SystemUuid);
-            }
-
-            ConfigUpdater.GetConfigFromServer(url);
-        }
-
-        /// <summary>
-        /// Posts a message with the current status of the config update
-        /// </summary>
-        /// <param name="status"></param>
-        void PostUpdateStatus(string status)
-        {
-            PostStatusMessage(new
-            {
-                updateStatus = status
-            });
-        }
-
-    }
-
-
-}

PepperDashEssentials/AppServer/Messengers/Ddvc01AtcMessenger.cs

@@ -1,216 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Codec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	public class Ddvc01AtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-		/// <summary>
-		/// 221
-		/// </summary>
-		const uint BDialHangupOnHook = 221;
-
-		/// <summary>
-		/// 251
-		/// </summary>
-		const uint BIncomingAnswer = 251;
-		/// <summary>
-		/// 252
-		/// </summary>
-		const uint BIncomingReject = 252;
-		/// <summary>
-		/// 241
-		/// </summary>
-		const uint BSpeedDial1 = 241;
-		/// <summary>
-		/// 242
-		/// </summary>
-		const uint BSpeedDial2 = 242;
-		/// <summary>
-		/// 243
-		/// </summary>
-		const uint BSpeedDial3 = 243;
-		/// <summary>
-		/// 244
-		/// </summary>
-		const uint BSpeedDial4 = 244;
-
-		/// <summary>
-		/// 201
-		/// </summary>
-		const uint SCurrentDialString = 201;
-		/// <summary>
-		/// 211
-		/// </summary>
-		const uint SCurrentCallNumber = 211;
-        /// <summary>
-        /// 212
-        /// </summary>
-        const uint SCurrentCallName = 212;
-		/// <summary>
-		/// 221
-		/// </summary>
-		const uint SHookState = 221;
-        /// <summary>
-        /// 222
-        /// </summary>
-        const uint SCallDirection = 222;
-
-		/// <summary>
-		/// 201-212 0-9*#
-		/// </summary>
-		Dictionary<string, uint> DTMFMap = new Dictionary<string, uint>
-		{
-			{ "1", 201 },
-			{ "2", 202 },
-			{ "3", 203 },
-			{ "4", 204 },
-			{ "5", 205 },
-			{ "6", 206 },
-			{ "7", 207 },
-			{ "8", 208 },
-			{ "9", 209 },
-			{ "0", 210 },
-			{ "*", 211 },
-			{ "#", 212 },
-		};
-
-		/// <summary>
-		/// 
-		/// </summary>
-		CodecActiveCallItem CurrentCallItem;
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="eisc"></param>
-		/// <param name="messagePath"></param>
-		public Ddvc01AtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-			EISC = eisc;
-
-			CurrentCallItem = new CodecActiveCallItem();
-			CurrentCallItem.Type = eCodecCallType.Audio;
-			CurrentCallItem.Id = "-audio-";
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-            
-
-			this.PostStatusMessage(new
-			{				
-				calls = GetCurrentCallList(),
-				currentCallString = EISC.GetString(SCurrentCallNumber),
-				currentDialString = EISC.GetString(SCurrentDialString),
-                isInCall = EISC.GetString(SHookState) == "Connected"
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
-
-			EISC.SetStringSigAction(SHookState, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-                //GetCurrentCallList();
-				SendFullStatus();
-			});
-
-			EISC.SetStringSigAction(SCurrentCallNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                SendCallsList();
-			});
-
-            EISC.SetStringSigAction(SCurrentCallName, s =>
-            {
-                CurrentCallItem.Name = s;
-                SendCallsList();
-            });
-
-            EISC.SetStringSigAction(SCallDirection, s =>
-            {
-                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
-                SendCallsList();
-            });
-
-			// Add press and holds using helper
-			Action<string, uint> addPHAction = (s, u) => 
-				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-
-			// Add straight pulse calls
-			Action<string, uint> addAction = (s, u) =>
-				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-            addAction("/endCallById", BDialHangupOnHook);
-			addAction("/endAllCalls", BDialHangupOnHook);
-            addAction("/acceptById", BIncomingAnswer);
-            addAction("/rejectById", BIncomingReject);
-			addAction("/speedDial1", BSpeedDial1);
-			addAction("/speedDial2", BSpeedDial2);
-			addAction("/speedDial3", BSpeedDial3);
-			addAction("/speedDial4", BSpeedDial4);
-
-			// Get status
-			AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatus));
-			// Dial on string
-			AppServerController.AddAction(MessagePath + "/dial", new Action<string>(s => EISC.SetString(SCurrentDialString, s)));
-			// Pulse DTMF
-			AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-			{
-				if (DTMFMap.ContainsKey(s))
-				{
-					EISC.PulseBool(DTMFMap[s], 100);
-				}
-			}));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-        void SendCallsList()
-        {
-            PostStatusMessage(new
-            {
-                calls = GetCurrentCallList(),
-            });
-        }
-
-		/// <summary>
-		/// Turns the 
-		/// </summary>
-		/// <returns></returns>
-		List<CodecActiveCallItem> GetCurrentCallList()
-		{
-			if (CurrentCallItem.Status == eCodecCallStatus.Disconnected)
-			{
-				return new List<CodecActiveCallItem>();
-			}
-			else
-			{
-				return new List<CodecActiveCallItem>() { CurrentCallItem };
-			}
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/Ddvc01VtcMessenger.cs

@@ -1,648 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Codec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	public class Ddvc01VtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-		/********* Bools *********/
-		/// <summary>
-		/// 724
-		/// </summary>
-		const uint BDialHangup = 724;
-		/// <summary>
-		/// 750
-		/// </summary>
-		const uint BCallIncoming = 750;
-		/// <summary>
-		/// 751
-		/// </summary>
-		const uint BIncomingAnswer = 751;
-		/// <summary>
-		/// 752
-		/// </summary>
-		const uint BIncomingReject = 752;
-		/// <summary>
-		/// 741
-		/// </summary>
-		const uint BSpeedDial1 = 741;
-		/// <summary>
-		/// 742
-		/// </summary>
-		const uint BSpeedDial2 = 742;
-		/// <summary>
-		/// 743
-		/// </summary>
-		const uint BSpeedDial3 = 743;
-		/// <summary>
-		/// 744
-		/// </summary>
-		const uint BSpeedDial4 = 744;
-		/// <summary>
-		/// 800
-		/// </summary>
-		const uint BDirectorySearchBusy = 800;
-		/// <summary>
-		/// 801 
-		/// </summary>
-		const uint BDirectoryLineSelected = 801;
-		/// <summary>
-		/// 801 when selected entry is a contact
-		/// </summary>
-		const uint BDirectoryEntryIsContact = 801;
-		/// <summary>
-		/// 802 To show/hide back button
-		/// </summary>
-		const uint BDirectoryIsRoot = 802;
-		/// <summary>
-		/// 803 Pulse from system to inform us when directory is ready
-		/// </summary>
-		const uint DDirectoryHasChanged = 803;
-		/// <summary>
-		/// 804
-		/// </summary>
-		const uint BDirectoryRoot = 804;
-		/// <summary>
-		/// 805
-		/// </summary>
-		const uint BDirectoryFolderBack = 805;
-		/// <summary>
-		/// 806
-		/// </summary>
-		const uint BDirectoryDialSelectedLine = 806;
-		/// <summary>
-		/// 811
-		/// </summary>
-		const uint BCameraControlUp = 811;
-		/// <summary>
-		/// 812
-		/// </summary>
-		const uint BCameraControlDown = 812;
-		/// <summary>
-		/// 813
-		/// </summary>
-		const uint BCameraControlLeft = 813;
-		/// <summary>
-		/// 814
-		/// </summary>
-		const uint BCameraControlRight = 814;
-		/// <summary>
-		/// 815
-		/// </summary>
-		const uint BCameraControlZoomIn = 815;
-		/// <summary>
-		/// 816
-		/// </summary>
-		const uint BCameraControlZoomOut = 816;
-		/// <summary>
-		/// 821 - 826
-		/// </summary>
-		const uint BCameraPresetStart = 821;
-
-		/// <summary>
-		/// 831
-		/// </summary>
-		const uint BCameraModeAuto = 831;
-		/// <summary>
-		/// 832
-		/// </summary>
-		const uint BCameraModeManual = 832;
-		/// <summary>
-		/// 833
-		/// </summary>
-		const uint BCameraModeOff = 833;
-
-		/// <summary>
-		/// 841
-		/// </summary>
-		const uint BCameraSelfView = 841;
-
-		/// <summary>
-		/// 842
-		/// </summary>
-		const uint BCameraLayout = 842;
-		/// <summary>
-		/// 843
-		/// </summary>
-		const uint BCameraSupportsAutoMode = 843;
-		/// <summary>
-		/// 844
-		/// </summary>
-		const uint BCameraSupportsOffMode = 844;
-
-
-		/********* Ushorts *********/
-		/// <summary>
-		/// 760
-		/// </summary>
-		const uint UCameraNumberSelect = 760;
-		/// <summary>
-		/// 801
-		/// </summary>
-		const uint UDirectorySelectRow = 801;
-		/// <summary>
-		/// 801
-		/// </summary>
-		const uint UDirectoryRowCount = 801;
-
-
-
-		/********* Strings *********/
-		/// <summary>
-		/// 701
-		/// </summary>
-		const uint SCurrentDialString = 701;
-		/// <summary>
-		/// 702
-		/// </summary>
-		const uint SCurrentCallName = 702;
-        /// <summary>
-		/// 703
-        /// </summary>
-		const uint SCurrentCallNumber = 703;
-		/// <summary>
-		/// 731
-		/// </summary>
-		const uint SHookState = 731;
-        /// <summary>
-		/// 722
-        /// </summary>
-        const uint SCallDirection = 722;
-		/// <summary>
-		/// 751
-		/// </summary>
-		const uint SIncomingCallName = 751;
-		/// <summary>
-		/// 752
-		/// </summary>
-		const uint SIncomingCallNumber = 752;
-
-		/// <summary>
-		/// 800
-		/// </summary>
-		const uint SDirectorySearchString = 800;
-		/// <summary>
-		/// 801-1055
-		/// </summary>
-		const uint SDirectoryEntriesStart = 801;
-		/// <summary>
-		/// 1056
-		/// </summary>
-		const uint SDirectoryEntrySelectedName = 1056;
-		/// <summary>
-		/// 1057
-		/// </summary>
-		const uint SDirectoryEntrySelectedNumber = 1057;
-		/// <summary>
-		/// 1058
-		/// </summary>
-		const uint SDirectorySelectedFolderName = 1058;
-
-
-		/// <summary>
-		/// 701-712 0-9*#
-		/// </summary>
-		Dictionary<string, uint> DTMFMap = new Dictionary<string, uint>
-		{
-			{ "1", 701 },
-			{ "2", 702 },
-			{ "3", 703 },
-			{ "4", 704 },
-			{ "5", 705 },
-			{ "6", 706 },
-			{ "7", 707 },
-			{ "8", 708 },
-			{ "9", 709 },
-			{ "0", 710 },
-			{ "*", 711 },
-			{ "#", 712 },
-		};
-
-		CodecActiveCallItem CurrentCallItem;
-		CodecActiveCallItem IncomingCallItem;
-
-		ushort PreviousDirectoryLength = 0;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="eisc"></param>
-		/// <param name="messagePath"></param>
-		public Ddvc01VtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-			EISC = eisc;
-
-			CurrentCallItem = new CodecActiveCallItem();
-			CurrentCallItem.Type = eCodecCallType.Video;
-			CurrentCallItem.Id = "-video-";
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-			var asc = appServerController;
-			EISC.SetStringSigAction(SHookState, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-				PostFullStatus(); // SendCallsList();
-			});
-
-			EISC.SetStringSigAction(SCurrentCallNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                PostCallsList();
-			});
-
-            EISC.SetStringSigAction(SCurrentCallName, s =>
-            {
-                CurrentCallItem.Name = s;
-                PostCallsList();
-            });
-
-            EISC.SetStringSigAction(SCallDirection, s =>
-            {
-                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
-                PostCallsList();
-            });
-
-			EISC.SetBoolSigAction(BCallIncoming, b =>
-			{
-				if (b)
-				{
-					var ica = new CodecActiveCallItem()
-					{
-						Direction = eCodecCallDirection.Incoming,
-						Id = "-video-incoming",
-						Name = EISC.GetString(SIncomingCallName),
-						Number = EISC.GetString(SIncomingCallNumber),
-						Status = eCodecCallStatus.Ringing,
-						Type = eCodecCallType.Video
-					};
-					IncomingCallItem = ica;
-				}
-				else
-				{
-					IncomingCallItem = null;
-				}
-				PostCallsList();
-			});
-
-			EISC.SetBoolSigAction(BCameraSupportsAutoMode, b =>
-			{
-				PostStatusMessage(new
-				{	
-					cameraSupportsAutoMode = b
-				});
-			});
-			EISC.SetBoolSigAction(BCameraSupportsOffMode, b =>
-			{
-				PostStatusMessage(new
-				{
-					cameraSupportsOffMode = b
-				});
-			});
-
-			// Directory insanity
-			EISC.SetUShortSigAction(UDirectoryRowCount, u =>
-			{
-				// The length of the list comes in before the list does.
-				// Splice the sig change operation onto the last string sig that will be changing
-				// when the directory entries make it through.
-				if (PreviousDirectoryLength > 0)
-				{
-					EISC.ClearStringSigAction(SDirectoryEntriesStart + PreviousDirectoryLength - 1);
-				}
-				EISC.SetStringSigAction(SDirectoryEntriesStart + u - 1, s => PostDirectory());
-				PreviousDirectoryLength = u;
-			});
-
-			EISC.SetStringSigAction(SDirectoryEntrySelectedName, s =>
-			{
-				PostStatusMessage(new
-				{
-					directoryContactSelected = new
-					{
-						name = EISC.GetString(SDirectoryEntrySelectedName),
-					}
-				});
-			});
-
-			EISC.SetStringSigAction(SDirectoryEntrySelectedNumber, s =>
-			{
-				PostStatusMessage(new
-				{
-					directoryContactSelected = new
-					{
-						number = EISC.GetString(SDirectoryEntrySelectedNumber),
-					}
-				});
-			});
-
-			EISC.SetStringSigAction(SDirectorySelectedFolderName, s => PostStatusMessage(new
-			{
-				directorySelectedFolderName = EISC.GetString(SDirectorySelectedFolderName)
-			}));
-
-			EISC.SetSigTrueAction(BCameraModeAuto, () => PostCameraMode());
-			EISC.SetSigTrueAction(BCameraModeManual, () => PostCameraMode());
-			EISC.SetSigTrueAction(BCameraModeOff, () => PostCameraMode());
-
-			EISC.SetBoolSigAction(BCameraSelfView, b => PostStatusMessage(new 
-				{
-					cameraSelfView = b
-				}));
-
-			EISC.SetUShortSigAction(UCameraNumberSelect, (u) => PostSelectedCamera());
-
-
-			// Add press and holds using helper action
-			Action<string, uint> addPHAction = (s, u) => 
-				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-			addPHAction("/cameraUp", BCameraControlUp);
-			addPHAction("/cameraDown", BCameraControlDown);
-			addPHAction("/cameraLeft", BCameraControlLeft);
-			addPHAction("/cameraRight", BCameraControlRight);
-			addPHAction("/cameraZoomIn", BCameraControlZoomIn);
-			addPHAction("/cameraZoomOut", BCameraControlZoomOut);
-
-			// Add straight pulse calls using helper action
-			Action<string, uint> addAction = (s, u) =>
-				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-			addAction("/endCallById", BDialHangup);
-			addAction("/endAllCalls", BDialHangup);
-            addAction("/acceptById", BIncomingAnswer);
-            addAction("/rejectById", BIncomingReject);
-			addAction("/speedDial1", BSpeedDial1);
-			addAction("/speedDial2", BSpeedDial2);
-			addAction("/speedDial3", BSpeedDial3);
-			addAction("/speedDial4", BSpeedDial4);
-			addAction("/cameraModeAuto", BCameraModeAuto);
-			addAction("/cameraModeManual", BCameraModeManual);
-			addAction("/cameraModeOff", BCameraModeOff);
-			addAction("/cameraSelfView", BCameraSelfView);
-			addAction("/cameraLayout", BCameraLayout);
-
-			asc.AddAction("/cameraSelect", new Action<string>(SelectCamera));
-
-			// camera presets
-			for(uint i = 0; i < 6; i++) 
-			{
-				addAction("/cameraPreset" + (i + 1), BCameraPresetStart + i);
-			}
-
-			asc.AddAction(MessagePath + "/isReady", new Action(PostIsReady));
-			// Get status
-			asc.AddAction(MessagePath + "/fullStatus", new Action(PostFullStatus));
-			// Dial on string
-			asc.AddAction(MessagePath + "/dial", new Action<string>(s => 
-				EISC.SetString(SCurrentDialString, s)));
-			// Pulse DTMF
-			asc.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-			{
-				if (DTMFMap.ContainsKey(s))
-				{
-					EISC.PulseBool(DTMFMap[s], 100);
-				}
-			}));
-
-			// Directory madness
-			asc.AddAction(MessagePath + "/directoryRoot", new Action(() => EISC.PulseBool(BDirectoryRoot)));
-			asc.AddAction(MessagePath + "/directoryBack", new Action(() => EISC.PulseBool(BDirectoryFolderBack)));
-			asc.AddAction(MessagePath + "/directoryById", new Action<string>(s =>
-			{
-				// the id should contain the line number to forward to simpl
-				try
-				{
-					var u = ushort.Parse(s);
-					EISC.SetUshort(UDirectorySelectRow, u);
-					EISC.PulseBool(BDirectoryLineSelected);
-				}
-				catch (Exception)
-				{
-					Debug.Console(1, this, Debug.ErrorLogLevel.Warning, 
-						"/directoryById request contains non-numeric ID incompatible with DDVC bridge");
-				}
-
-			}));
-			asc.AddAction(MessagePath + "/directorySelectContact", new Action<string>(s =>
-			{
-				try
-				{
-					var u = ushort.Parse(s);
-					EISC.SetUshort(UDirectorySelectRow, u);
-					EISC.PulseBool(BDirectoryLineSelected);
-				}
-				catch
-				{
-					
-				}
-			}));
-			asc.AddAction(MessagePath + "/directoryDialContact", new Action(() => {
-				EISC.PulseBool(BDirectoryDialSelectedLine);
-			}));
-			asc.AddAction(MessagePath + "/getDirectory", new Action(() =>
-			{
-				if (EISC.GetUshort(UDirectoryRowCount) > 0)
-				{
-					PostDirectory();
-				}
-				else
-				{
-					EISC.PulseBool(BDirectoryRoot);
-				}
-			}));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostFullStatus()
-		{
-			this.PostStatusMessage(new
-			{
-				calls = GetCurrentCallList(),
-				cameraMode = GetCameraMode(),
-				cameraSelfView = EISC.GetBool(BCameraSelfView),
-				cameraSupportsAutoMode = EISC.GetBool(BCameraSupportsAutoMode),
-				cameraSupportsOffMode = EISC.GetBool(BCameraSupportsOffMode),
-				currentCallString = EISC.GetString(SCurrentCallNumber),
-				currentDialString = EISC.GetString(SCurrentDialString),
-				directoryContactSelected = new
-				{
-					name = EISC.GetString(SDirectoryEntrySelectedName),
-					number = EISC.GetString(SDirectoryEntrySelectedNumber)
-				},
-				directorySelectedFolderName = EISC.GetString(SDirectorySelectedFolderName),
-				isInCall = EISC.GetString(SHookState) == "Connected",
-				hasDirectory = true,
-				hasDirectorySearch = false,
-				hasRecents = !EISC.BooleanOutput[502].BoolValue,
-				hasCameras = true,
-				showCamerasWhenNotInCall = EISC.BooleanOutput[503].BoolValue,
-				selectedCamera = GetSelectedCamera(),
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostDirectory()
-		{
-			var u = EISC.GetUshort(UDirectoryRowCount);
-			var items = new List<object>();
-			for (uint i = 0; i < u; i++)
-			{
-				var name = EISC.GetString(SDirectoryEntriesStart + i);
-				var id = (i + 1).ToString();
-				// is folder or contact?
-				if (name.StartsWith("[+]"))
-				{
-					items.Add(new
-					{
-						folderId = id,
-						name = name
-					});
-				}
-				else
-				{
-					items.Add(new
-					{
-						contactId = id,
-						name = name
-					});
-				}
-			}
-
-			var directoryMessage = new
-			{
-				currentDirectory = new
-				{
-					isRootDirectory = EISC.GetBool(BDirectoryIsRoot),
-					directoryResults = items
-				}
-			};
-			PostStatusMessage(directoryMessage);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostCameraMode()
-		{
-			PostStatusMessage(new
-			{
-				cameraMode = GetCameraMode()
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="mode"></param>
-		string GetCameraMode()
-		{
-			string m;
-			if (EISC.GetBool(BCameraModeAuto)) m = "auto";
-			else if (EISC.GetBool(BCameraModeManual)) m = "manual";
-			else m = "off";
-			return m;
-		}
-
-		void PostSelectedCamera()
-		{
-			PostStatusMessage(new
-			{
-				selectedCamera = GetSelectedCamera()
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		string GetSelectedCamera()
-		{
-			var num = EISC.GetUshort(UCameraNumberSelect);
-			string m;
-			if (num == 100)
-			{
-				m = "cameraFar";
-			}
-			else
-			{
-				m = "camera" + num;
-			}
-			return m;
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostIsReady()
-		{
-			PostStatusMessage(new
-			{
-				isReady = true
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-        void PostCallsList()
-        {
-            PostStatusMessage(new
-            {
-                calls = GetCurrentCallList(),
-            });
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="s"></param>
-		void SelectCamera(string s)
-		{
-			var cam = s.Substring(6);
-			if (cam.ToLower() == "far")
-			{
-				EISC.SetUshort(UCameraNumberSelect, 100);
-			}
-			else
-			{
-				EISC.SetUshort(UCameraNumberSelect, UInt16.Parse(cam));
-			}
-		}
-
-		/// <summary>
-		/// Turns the 
-		/// </summary>
-		/// <returns></returns>
-		List<CodecActiveCallItem> GetCurrentCallList()
-		{
-			var list = new List<CodecActiveCallItem>();
-			if (CurrentCallItem.Status != eCodecCallStatus.Disconnected)
-			{
-				list.Add(CurrentCallItem);
-			}
-			if (EISC.GetBool(BCallIncoming)) {
-
-			}
-			return list;
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/MessengerBase.cs

@@ -1,81 +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.Core;
-
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	/// <summary>
-	/// Provides a messaging bridge for a VideoCodecBase
-	/// </summary>
-	public abstract class MessengerBase : IKeyed
-	{
-        public string Key { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public MobileControlSystemController AppServerController { get; private set; }
-
-		public string MessagePath { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="codec"></param>
-		public MessengerBase(string key, string messagePath)
-		{
-            Key = key;
-
-			if (string.IsNullOrEmpty(messagePath))
-				throw new ArgumentException("messagePath must not be empty or null");
-
-			MessagePath = messagePath;
-		}
-		
-
-		/// <summary>
-		/// Registers this messenger with appserver controller
-		/// </summary>
-		/// <param name="appServerController"></param>
-		public void RegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-			if (appServerController == null)
-				throw new ArgumentNullException("appServerController");
-			
-			AppServerController = appServerController;
-			CustomRegisterWithAppServer(AppServerController);
-		}
-
-		/// <summary>
-		/// Implemented in extending classes. Wire up API calls and feedback here
-		/// </summary>
-		/// <param name="appServerController"></param>
-		abstract protected void CustomRegisterWithAppServer(MobileControlSystemController appServerController);
-
-		/// <summary>
-		/// Helper for posting status message
-		/// </summary>
-		/// <param name="contentObject">The contents of the content object</param>
-		protected void PostStatusMessage(object contentObject)
-		{
-            if (AppServerController != null)
-            {
-                AppServerController.SendMessageToServer(JObject.FromObject(new
-                {
-                    type = MessagePath,
-                    content = contentObject
-                }));
-            }
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs

@@ -1,86 +0,0 @@
-using System;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Monitoring;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class SystemMonitorMessenger : MessengerBase
-    {
-        public SystemMonitorController SysMon { get; private set; }
-
-        public SystemMonitorMessenger(string key, SystemMonitorController sysMon, string messagePath)
-            : base(key, messagePath)
-        {
-            if (sysMon == null)
-                throw new ArgumentNullException("sysMon");
-
-            SysMon = sysMon;
-
-            SysMon.SystemMonitorPropertiesChanged += SysMon_SystemMonitorPropertiesChanged;
-
-            foreach (var p in SysMon.ProgramStatusFeedbackCollection)
-            {
-                p.Value.ProgramInfoChanged += ProgramInfoChanged;
-            }
-
-            CrestronConsole.AddNewConsoleCommand(s => SendFullStatusMessage(), "SendFullSysMonStatus", "Sends the full System Monitor Status", ConsoleAccessLevelEnum.AccessOperator);
-        }
-
-        /// <summary>
-        /// Posts the program information message
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void ProgramInfoChanged(object sender, ProgramInfoEventArgs e)
-        {
-            if (e.ProgramInfo != null)
-            {
-                //Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
-                PostStatusMessage(e.ProgramInfo);
-            }
-        }
-
-        /// <summary>
-        /// Posts the system monitor properties
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void SysMon_SystemMonitorPropertiesChanged(object sender, EventArgs e)
-        {
-            SendSystemMonitorStatusMessage();
-        }
-
-        void SendFullStatusMessage()
-        {
-            SendSystemMonitorStatusMessage();
-
-            foreach (var p in SysMon.ProgramStatusFeedbackCollection)
-            {
-                PostStatusMessage(p.Value.ProgramInfo);               
-            }
-        }
-
-        void SendSystemMonitorStatusMessage()
-        {
-            Debug.Console(1, "Posting System Monitor Status Message.");
-
-            // This takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke(o => PostStatusMessage(new
-            {
-                timeZone = SysMon.TimeZoneFeedback.IntValue,
-                timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
-                ioControllerVersion = SysMon.IoControllerVersionFeedback.StringValue,
-                snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
-                bacnetVersion = SysMon.BaCnetAppVersionFeedback.StringValue,
-                controllerVersion = SysMon.ControllerVersionFeedback.StringValue
-            }));
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatusMessage));
-        }
-
-    }
-}

PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs

@@ -1,373 +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.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.Cameras;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	/// <summary>
-	/// Provides a messaging bridge for a VideoCodecBase device
-	/// </summary>
-	public class VideoCodecBaseMessenger : MessengerBase
-	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public VideoCodecBase Codec { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="codec"></param>
-		public VideoCodecBaseMessenger(string key, VideoCodecBase codec, string messagePath)
-            : base(key, messagePath)
-		{
-			if (codec == null)
-				throw new ArgumentNullException("codec");
-
-			Codec = codec;
-			codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
-			codec.IsReadyChange += new EventHandler<EventArgs>(codec_IsReadyChange);
-
-			var dirCodec = codec as IHasDirectory;
-			if (dirCodec != null)
-			{
-				dirCodec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dirCodec_DirectoryResultReturned);
-
-			}
-
-            var recCodec = codec as IHasCallHistory;
-            if (recCodec != null)
-            {
-                recCodec.CallHistory.RecentCallsListHasChanged += new EventHandler<EventArgs>(CallHistory_RecentCallsListHasChanged);
-            }
-		}
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void CallHistory_RecentCallsListHasChanged(object sender, EventArgs e)
-        {
-            var recents = (sender as CodecCallHistory).RecentCalls;
-
-            if (recents != null)
-            {
-                PostStatusMessage(new
-                {
-                    recentCalls = recents
-                });
-            }
-        }
-		
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void dirCodec_DirectoryResultReturned(object sender, DirectoryEventArgs e)
-		{
-            SendDirectory((Codec as IHasDirectory).CurrentDirectoryResult, e.DirectoryIsOnRoot);
-		}
-
-        /// <summary>
-        /// Posts the current directory
-        /// </summary>
-        void SendDirectory(CodecDirectory directory, bool isRoot)
-        {
-            var dirCodec = Codec as IHasDirectory;
-
-            if (dirCodec != null)
-            {
-                var prefixedDirectoryResults = PrefixDirectoryFolderItems(directory);
-
-                var directoryMessage = new
-                {
-                    currentDirectory = new
-                    {
-                        directoryResults = prefixedDirectoryResults,
-                        isRootDirectory = isRoot
-                    }
-                };
-                PostStatusMessage(directoryMessage);
-            }
-        }
-
-        /// <summary>
-        /// Iterates a directory object and prefixes any folder items with "[+] "
-        /// </summary>
-        /// <param name="directory"></param>
-        /// <returns></returns>
-         List<DirectoryItem> PrefixDirectoryFolderItems (CodecDirectory directory)
-        {
-            var tempDirectoryList = new List<DirectoryItem>();
-
-            if (directory.CurrentDirectoryResults.Count > 0)
-            {
-                foreach (var item in directory.CurrentDirectoryResults)
-                {
-                    if (item is DirectoryFolder)
-                    {
-                        var newFolder = new DirectoryFolder();
-
-                        newFolder = (DirectoryFolder)item.Clone();
-
-                        string prefixName = "[+] " + newFolder.Name;
-
-                        newFolder.Name = prefixName;
-
-                        tempDirectoryList.Add(newFolder);
-                    }
-                    else
-                    {
-                        tempDirectoryList.Add(item);
-                    }
-                }
-            }
-            //else
-            //{
-            //    DirectoryItem noResults = new DirectoryItem() { Name = "No Results Found" };
-
-            //    tempDirectoryList.Add(noResults);
-            //}
-
-            return tempDirectoryList;
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void codec_IsReadyChange(object sender, EventArgs e)
-		{
-			PostStatusMessage(new
-			{
-				isReady = true
-			});
-		}
-
-		/// <summary>
-		/// Called from base's RegisterWithAppServer method
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-			appServerController.AddAction("/device/videoCodec/isReady", new Action(SendIsReady));
-			appServerController.AddAction("/device/videoCodec/fullStatus", new Action(SendVtcFullMessageObject));
-			appServerController.AddAction("/device/videoCodec/dial", new Action<string>(s => Codec.Dial(s)));
-			appServerController.AddAction("/device/videoCodec/endCallById", new Action<string>(s =>
-			{
-				var call = GetCallWithId(s);
-				if (call != null)
-					Codec.EndCall(call);
-			}));
-			appServerController.AddAction(MessagePath + "/endAllCalls", new Action(Codec.EndAllCalls));
-			appServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s => Codec.SendDtmf(s)));
-			appServerController.AddAction(MessagePath + "/rejectById", new Action<string>(s =>
-			{
-				var call = GetCallWithId(s);
-				if (call != null)
-					Codec.RejectCall(call);
-			}));
-			appServerController.AddAction(MessagePath + "/acceptById", new Action<string>(s =>
-			{
-				var call = GetCallWithId(s);
-				if (call != null)
-					Codec.AcceptCall(call);
-			}));
-
-            // Directory actions
-            var dirCodec = Codec as IHasDirectory;
-            if (dirCodec != null)
-            {
-                appServerController.AddAction(MessagePath + "/getDirectory", new Action(GetDirectoryRoot));
-                appServerController.AddAction(MessagePath + "/directoryById", new Action<string>(s => GetDirectory(s)));
-                appServerController.AddAction(MessagePath + "/directorySearch", new Action<string>(s => DirectorySearch(s)));
-                appServerController.AddAction(MessagePath + "/directoryBack", new Action(GetPreviousDirectory));
-            }
-
-            // History actions
-            var recCodec = Codec as IHasCallHistory;
-            if (recCodec != null)
-            {
-                appServerController.AddAction(MessagePath + "/getCallHistory", new Action(GetCallHistory));
-            }
-
-			appServerController.AddAction(MessagePath + "/privacyModeOn", new Action(Codec.PrivacyModeOn));
-			appServerController.AddAction(MessagePath + "/privacyModeOff", new Action(Codec.PrivacyModeOff));
-			appServerController.AddAction(MessagePath + "/privacyModeToggle", new Action(Codec.PrivacyModeToggle));
-			appServerController.AddAction(MessagePath + "/sharingStart", new Action(Codec.StartSharing));
-			appServerController.AddAction(MessagePath + "/sharingStop", new Action(Codec.StopSharing));
-			appServerController.AddAction(MessagePath + "/standbyOn", new Action(Codec.StandbyActivate));
-			appServerController.AddAction(MessagePath + "/standbyOff", new Action(Codec.StandbyDeactivate));
-		}
-
-        void GetCallHistory()
-        {
-            var codec = (Codec as IHasCallHistory);
-
-            if (codec != null)
-            {
-                var recents = codec.CallHistory.RecentCalls;
-
-                if (recents != null)
-                {
-                    PostStatusMessage(new
-                    {
-                        recentCalls = recents
-                    });
-                }
-            }
-        }
-
-		public void GetFullStatusMessage()
-		{
-
-		}
-
-		/// <summary>
-		/// Helper to grab a call with string ID
-		/// </summary>
-		/// <param name="id"></param>
-		/// <returns></returns>
-		CodecActiveCallItem GetCallWithId(string id)
-		{
-			return Codec.ActiveCalls.FirstOrDefault(c => c.Id == id);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="s"></param>
-		void DirectorySearch(string s)
-		{
-			var dirCodec = Codec as IHasDirectory;
-			if (dirCodec != null)
-			{
-				dirCodec.SearchDirectory(s);
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="id"></param>
-		void GetDirectory(string id)
-		{
-			var dirCodec = Codec as IHasDirectory;
-			if(dirCodec == null)
-			{
-				return;
-			}
-			dirCodec.GetDirectoryFolderContents(id);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void GetDirectoryRoot()
-		{
-			var dirCodec = Codec as IHasDirectory;
-			if (dirCodec == null)
-			{
-				// do something else?
-				return;
-			}
-			if (!dirCodec.PhonebookSyncState.InitialSyncComplete)
-			{
-				PostStatusMessage(new
-				{
-					initialSyncComplete = false
-				});
-				return;
-			}
-
-            dirCodec.SetCurrentDirectoryToRoot();
-
-            //PostStatusMessage(new
-            //{
-            //    currentDirectory = dirCodec.DirectoryRoot
-            //});
-		}
-
-        /// <summary>
-        /// Requests the parent folder contents
-        /// </summary>
-        void GetPreviousDirectory()
-        {
-            var dirCodec = Codec as IHasDirectory;
-            if (dirCodec == null)
-            {
-                return;
-            }
-
-            dirCodec.GetDirectoryParentFolderContents();
-        }
-
-		/// <summary>
-		/// Handler for codec changes
-		/// </summary>
-		void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
-		{
-			SendVtcFullMessageObject();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendIsReady()
-		{
-			PostStatusMessage(new
-			{
-				isReady = Codec.IsReady
-			});
-		}
-
-		/// <summary>
-		/// Helper method to build call status for vtc
-		/// </summary>
-		/// <returns></returns>
-		void SendVtcFullMessageObject()
-		{
-			if (!Codec.IsReady)
-			{
-				return;
-			}
-
-			var info = Codec.CodecInfo;
-			PostStatusMessage(new
-			{
-				isInCall = Codec.IsInCall,
-				privacyModeIsOn = Codec.PrivacyModeIsOnFeedback.BoolValue,
-				sharingContentIsOn = Codec.SharingContentIsOnFeedback.BoolValue,
-				sharingSource = Codec.SharingSourceFeedback.StringValue,
-				standbyIsOn = Codec.StandbyIsOnFeedback.StringValue,
-				calls = Codec.ActiveCalls,
-				info = new
-				{
-					autoAnswerEnabled = info.AutoAnswerEnabled,
-					e164Alias = info.E164Alias,
-					h323Id = info.H323Id,
-					ipAddress = info.IpAddress,
-					sipPhoneNumber = info.SipPhoneNumber,
-					sipURI = info.SipUri
-				},
-				showSelfViewByDefault = Codec.ShowSelfViewByDefault,
-				hasDirectory = Codec is IHasDirectory,
-                hasDirectorySearch = true,
-                hasRecents = Codec is IHasCallHistory,
-                hasCameras = Codec is IHasCodecCameras
-			});
-		}
-	}
-}

PepperDashEssentials/AppServer/MobileControlConfig.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core.Config;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials
-{
-
-	/// <summary>
-	/// 
-	/// </summary>
-    public class MobileControlConfig
-    {       
-		[JsonProperty("serverUrl")]
-        public string ServerUrl { get; set; }
-
-		[JsonProperty("clientAppUrl")]
-		public string ClientAppUrl { get; set; }
-    }
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public class MobileControlDdvc01RoomBridgePropertiesConfig
-	{
-		[JsonProperty("eiscId")]
-		public string EiscId { get; set; }
-	}
-}

PepperDashEssentials/AppServer/MobileControlDdvc01DeviceBridge.cs

@@ -1,148 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-	/// <summary>
-	/// Represents a generic device connection through to and EISC for DDVC01
-	/// </summary>
-	public class MobileControlDdvc01DeviceBridge : Device, IChannel, INumericKeypad 
-	{
-		/// <summary>
-		/// EISC used to talk to Simpl
-		/// </summary>
-		ThreeSeriesTcpIpEthernetIntersystemCommunications EISC;
-
-		public MobileControlDdvc01DeviceBridge(string key, string name, ThreeSeriesTcpIpEthernetIntersystemCommunications eisc)
-			: base(key, name)
-		{
-			EISC = eisc;
-		}
-
-
-		#region IChannel Members
-
-		public void ChannelUp(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void ChannelDown(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void LastChannel(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Guide(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Info(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Exit(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		#endregion
-
-		#region INumericKeypad Members
-
-		public void Digit0(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit1(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit2(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit3(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit4(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit5(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit6(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit7(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit8(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public void Digit9(bool pressRelease)
-		{
-			EISC.SetBool(1111, pressRelease);
-		}
-
-		public bool HasKeypadAccessoryButton1
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public string KeypadAccessoryButton1Label
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public void KeypadAccessoryButton1(bool pressRelease)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool HasKeypadAccessoryButton2
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public string KeypadAccessoryButton2Label
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public void KeypadAccessoryButton2(bool pressRelease)
-		{
-			throw new NotImplementedException();
-		}
-
-		#endregion
-	}
-}

PepperDashEssentials/AppServer/MobileControlSystemController.cs

@@ -1,864 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.Reflection;
-using Crestron.SimplSharpPro.CrestronThread;
-using Crestron.SimplSharp.CrestronWebSocketClient;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharp.Net.Http;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Room.MobileControl;
-using PepperDash.Essentials.AppServer.Messengers;
-
-namespace PepperDash.Essentials
-{
-    public class MobileControlSystemController : Device
-    {
-		WebSocketClient WSClient;
-
-		//bool LinkUp;
-
-		/// <summary>
-		/// Prevents post operations from stomping on each other and getting lost
-		/// </summary>
-		CEvent PostLockEvent = new CEvent(true, true);
-
-		CEvent RegisterLockEvent = new CEvent(true, true);
-
-		public MobileControlConfig Config { get; private set; }
-
-        Dictionary<string, Object> ActionDictionary = new Dictionary<string, Object>(StringComparer.InvariantCultureIgnoreCase);
-
-        Dictionary<string, CTimer> PushedActions = new Dictionary<string, CTimer>();
-
-        public ConfigMessenger ConfigMessenger { get; private set; }
-
-        CTimer ServerHeartbeatCheckTimer;
-
-        long ServerHeartbeatInterval = 20000;
-
-        CTimer ServerReconnectTimer;
-
-        long ServerReconnectInterval = 5000;
-
-        DateTime LastAckMessage;
-
-        public string SystemUuid;
-
-		List<MobileControlBridgeBase> RoomBridges = new List<MobileControlBridgeBase>();
-
-        long ButtonHeartbeatInterval = 1000;
-
-		/// <summary>
-		/// Used for tracking HTTP debugging
-		/// </summary>
-		bool HttpDebugEnabled;
-		
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="config"></param>
-        public MobileControlSystemController(string key, string name, MobileControlConfig config) : base(key, name)
-        {
-            Config = config;
-
-            SystemUuid = ConfigReader.ConfigObject.SystemUuid;
-
-			Debug.Console(0, this, "Mobile UI controller initializing for server:{0}", config.ServerUrl);
-
-			CrestronConsole.AddNewConsoleCommand(AuthorizeSystem,
-				"mobileauth", "Authorizes system to talk to Mobile Control server", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => ShowInfo(),
-				"mobileinfo", "Shows information for current mobile control session", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => { 
-					s = s.Trim();
-					if(!string.IsNullOrEmpty(s))
-					{
-						HttpDebugEnabled = (s.Trim() != "0"); 
-					}
-					CrestronConsole.ConsoleCommandResponse("HTTP Debug {0}", HttpDebugEnabled ? "Enabled" : "Disabled");
-				},
-				"mobilehttpdebug", "1 enables more verbose HTTP response debugging", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(TestHttpRequest,
-			"mobilehttprequest", "Tests an HTTP get to URL given", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(PrintActionDictionaryPaths, "mobileshowactionpaths", 
-				"Prints the paths in the Action Dictionary", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => ConnectWebsocketClient(), "mobileconnect", 
-				"Forces connect of websocket", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CleanUpWebsocketClient(), "mobiledisco",
-				"Disconnects websocket", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(s => ParseStreamRx(s), "mobilesimulateaction", "Simulates a message from the server", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-			CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
-
-            // Config Messenger
-            var cmKey = Key + "-config";
-            ConfigMessenger = new ConfigMessenger(cmKey, "/config");
-            ConfigMessenger.RegisterWithAppServer(this);			
-        }
-
-        /// <summary>
-        /// If config rooms is empty or null then go
-        /// </summary>
-        /// <returns></returns>
-        public override bool CustomActivate()
-        {
-            if (ConfigReader.ConfigObject.Rooms == null || ConfigReader.ConfigObject.Rooms.Count == 0)
-            {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Config contains no rooms.  Registering with Server.");
-                RegisterSystemToServer();
-            }
-
-            return base.CustomActivate();
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="ethernetEventArgs"></param>
-		void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs args)
-		{
-			Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Ethernet status change, port {0}: {1}",
-				args.EthernetAdapter, args.EthernetEventType);
-
-			if (args.EthernetEventType == eEthernetEventType.LinkDown && WSClient != null && args.EthernetAdapter == WSClient.EthernetAdapter)
-			{
-				CleanUpWebsocketClient();
-			}
-		}
-
-        /// <summary>
-        /// Sends message to server to indicate the system is shutting down
-        /// </summary>
-        /// <param name="programEventType"></param>
-        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
-        {
-            if (programEventType == eProgramStatusEventType.Stopping 
-				&& WSClient != null
-				&& WSClient.Connected)
-            {
-				CleanUpWebsocketClient();
-            }
-        }
-
-        public void PrintActionDictionaryPaths(object o)
-        {
-            Debug.Console(0, this, "ActionDictionary Contents:");
-
-            foreach (var item in ActionDictionary)
-            {
-                Debug.Console(0, this, "{0}", item.Key);
-            }
-        }
-
-        /// <summary>
-        /// Adds an action to the dictionary
-        /// </summary>
-        /// <param name="key">The path of the API command</param>
-        /// <param name="action">The action to be triggered by the commmand</param>
-        public void AddAction(string key, object action)
-        {
-            if (!ActionDictionary.ContainsKey(key))
-            {
-                ActionDictionary.Add(key, action);
-            }
-            else
-            {
-                Debug.Console(1, this, "Cannot add action with key '{0}' because key already exists in ActionDictionary.", key);
-            }
-        }
-
-        /// <summary>
-        /// Removes an action from the dictionary
-        /// </summary>
-        /// <param name="key"></param>
-        public void RemoveAction(string key)
-        {
-            if (ActionDictionary.ContainsKey(key))
-                ActionDictionary.Remove(key);
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="bridge"></param>
-		public void AddBridge(MobileControlBridgeBase bridge)
-		{
-			RoomBridges.Add(bridge);
-			var b = bridge as IDelayedConfiguration;
-			if (b != null)
-			{
-				Debug.Console(0, this, "Adding room bridge with delayed configuration");
-				b.ConfigurationIsReady += new EventHandler<EventArgs>(bridge_ConfigurationIsReady);
-			}
-			else
-			{
-				Debug.Console(0, this, "Adding room bridge and sending configuration");
-                //SystemUuid = ConfigReader.ConfigObject.SystemUuid;
-				RegisterSystemToServer();
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void bridge_ConfigurationIsReady(object sender, EventArgs e)
-		{
-			Debug.Console(1, this, "Bridge ready.  Registering");
-            //SystemUuid = ConfigReader.ConfigObject.SystemUuid;
-			// send the configuration object to the server
-			RegisterSystemToServer();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="o"></param>
-        void ReconnectToServerTimerCallback(object o)
-        {
-            RegisterSystemToServer();
-        }
-
-		/// <summary>
-		/// Verifies system connection with servers
-		/// </summary>
-		/// <param name="command"></param>
-		void AuthorizeSystem(string code)
-		{
-            //SystemUuid = ConfigReader.ConfigObject.SystemUuid;
-
-			if (string.IsNullOrEmpty(SystemUuid))
-			{
-				CrestronConsole.ConsoleCommandResponse("System does not have a UUID. Please ensure proper portal-format configuration is loaded and restart.");
-				return;
-			}
-
-			if (string.IsNullOrEmpty(code))
-			{
-				CrestronConsole.ConsoleCommandResponse("Please enter a user code to authorize a system");
-				return;
-			}
-
-			var req = new HttpClientRequest();
-			string url = string.Format("http://{0}/api/system/grantcode/{1}/{2}", Config.ServerUrl, code, SystemUuid);
-			Debug.Console(0, this, "Authorizing to: {0}", url);
-
-			if (string.IsNullOrEmpty(Config.ServerUrl))
-			{
-				CrestronConsole.ConsoleCommandResponse("Config URL address is not set.  Check portal configuration");
-				return;
-			}
-			try
-			{
-				req.Url.Parse(url);
-				new HttpClient().DispatchAsync(req, (r, e) =>
-				{
-					CheckHttpDebug(r, e);
-					if (e == HTTP_CALLBACK_ERROR.COMPLETED)
-					{
-						if (r.Code == 200)
-						{
-							Debug.Console(0, "System authorized, sending config.");
-#warning This registration may need to wait for config ready. Maybe.
-							RegisterSystemToServer();
-						}
-						else if (r.Code == 404)
-						{
-							if (r.ContentString.Contains("codeNotFound"))
-							{
-								Debug.Console(0, "Authorization failed, code not found for system UUID {0}", SystemUuid);
-							}
-							else if (r.ContentString.Contains("uuidNotFound"))
-							{
-								Debug.Console(0, "Authorization failed, uuid {0} not found. Check Essentials configuration is correct",
-									SystemUuid);
-							}
-						}
-					}
-					else
-						Debug.Console(0, this, "Error {0} in authorizing system", e);
-				});
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, this, "Error in authorizing: {0}", e);
-			}
-		}
-
-		/// <summary>
-		/// Dumps info in response to console command.
-		/// </summary>
-		void ShowInfo()
-		{
-			var url = Config != null ? Config.ServerUrl : "No config";
-			string name;
-			string code;
-			if (RoomBridges != null && RoomBridges.Count > 0)
-			{
-				name = RoomBridges[0].RoomName;
-				code = RoomBridges[0].UserCode;
-			}
-			else
-			{
-				name = "No config";
-				code = "Not available";
-			}
-			var conn = WSClient == null ? "No client" : (WSClient.Connected ? "Yes" : "No");
-            var secSinceLastAck = DateTime.Now - LastAckMessage;
-
-
-			CrestronConsole.ConsoleCommandResponse(@"Mobile Control Information:
-	Server address: {0}
-	System Name: {1}
-    System URL: {2}
-	System UUID: {3}
-	System User code: {4}
-	Connected?: {5}
-    Seconds Since Last Ack: {6}"
-                , url, name, ConfigReader.ConfigObject.SystemUrl, SystemUuid,
-                    code, conn, secSinceLastAck.Seconds);
-		}
-
-        /// <summary>
-        /// Registers the room with the server
-        /// </summary>
-        /// <param name="url">URL of the server, including the port number, if not 80.  Format: "serverUrlOrIp:port"</param>
-        void RegisterSystemToServer()
-        {
-			ConnectWebsocketClient();
-        }
-
-		/// <summary>
-		/// Connects the Websocket Client
-		/// </summary>
-		/// <param name="o"></param>
-		void ConnectWebsocketClient()
-		{
-
-			Debug.Console(1, this, "Initializing Stream client to server.");
-
-			if (WSClient != null)
-			{
-				Debug.Console(1, this, "Cleaning up previous socket");
-				CleanUpWebsocketClient();
-			}
-
-			WSClient = new WebSocketClient();
-			WSClient.URL = string.Format("wss://{0}/system/join/{1}", Config.ServerUrl, this.SystemUuid);
-			WSClient.ConnectionCallBack = Websocket_ConnectCallback;
-			WSClient.ConnectAsync();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="code"></param>
-		/// <returns></returns>
-		int Websocket_ConnectCallback(WebSocketClient.WEBSOCKET_RESULT_CODES code)
-		{
-			if (code == WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_SUCCESS)
-			{
-				StopServerReconnectTimer();
-				Debug.Console(1, this, "Websocket connected");
-				WSClient.DisconnectCallBack = Websocket_DisconnectCallback;
-				WSClient.SendCallBack = Websocket_SendCallback;
-				WSClient.ReceiveCallBack = Websocket_ReceiveCallback;
-				WSClient.ReceiveAsync();
-				SendMessageObjectToServer(new
-				{
-					type = "hello"
-				});
-			}
-			else
-			{
-				if (code == WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_HTTP_HANDSHAKE_TOKEN_ERROR)
-				{
-					// This is the case when app server is running behind a websever and app server is down
-					Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Web socket connection failed. Check that app server is running behind web server");
-				}
-				else if (code == WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_SOCKET_CONNECTION_FAILED)
-				{
-					// this will be the case when webserver is unreachable
-					Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Web socket connection failed");
-				}
-				else
-				{
-					Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Web socket connection failure: {0}", code);
-				} 
-				StartServerReconnectTimer();
-			}
-
-			return 0;
-		}
-
-		/// <summary>
-		/// After a "hello" from the server, sends config and stuff
-		/// </summary>
-		void SendInitialMessage()
-		{
-			Debug.Console(1, this, "Sending initial join message");
-			var confObject = ConfigReader.ConfigObject;
-			confObject.Info.RuntimeInfo.AppName = Assembly.GetExecutingAssembly().GetName().Name;
-			var version = Assembly.GetExecutingAssembly().GetName().Version;
-			confObject.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
-
-			var msg = new
-			{
-				type = "join",
-				content = new
-				{
-					config = confObject
-				}
-			};
-			SendMessageObjectToServer(msg);
-		}
-
-		/// <summary>
-		/// Sends any object type to server
-		/// </summary>
-		/// <param name="o"></param>
-		public void SendMessageObjectToServer(object o)
-		{
-			SendMessageToServer(JObject.FromObject(o));
-		}
-
-        /// <summary>
-        /// Sends a message to the server from a room
-        /// </summary>
-        /// <param name="room">room from which the message originates</param>
-        /// <param name="o">object to be serialized and sent in post body</param>
-        public void SendMessageToServer(JObject o)
-        {
-            if (WSClient != null && WSClient.Connected)
-            {
-                string message = JsonConvert.SerializeObject(o, Formatting.None, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-
-                if (!message.Contains("/system/heartbeat"))
-                    Debug.Console(1, this, "Message TX: {0}", message);
-                //else
-                //    Debug.Console(1, this, "TX messages contains /system/heartbeat");
-
-                var messageBytes = System.Text.Encoding.UTF8.GetBytes(message);
-				var result = WSClient.Send(messageBytes, (uint)messageBytes.Length, WebSocketClient.WEBSOCKET_PACKET_TYPES.LWS_WS_OPCODE_07__TEXT_FRAME);
-				if (result != WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_SUCCESS)
-				{
-					Debug.Console(1, this, "Socket send result error: {0}", result);
-				}
-            }
-			else if (WSClient == null)
-			{
-				Debug.Console(1, this, "Cannot send. Not connected.");
-			}
-        }
-
-        /// <summary>
-        /// Disconnects the SSE Client and stops the heartbeat timer
-        /// </summary>
-        /// <param name="command"></param>
-        void CleanUpWebsocketClient()
-        {
-			Debug.Console(1, this, "Disconnecting websocket");
-			if (WSClient != null)
-			{
-				WSClient.SendCallBack = null;
-				WSClient.ReceiveCallBack = null;
-				WSClient.ConnectionCallBack = null;
-				WSClient.DisconnectCallBack = null;
-				if (WSClient.Connected)
-				{
-					WSClient.Disconnect();
-				}
-				WSClient = null;
-			}
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="dueTime"></param>
-		/// <param name="repeatTime"></param>
-		void StartServerReconnectTimer()
-		{
-			StopServerReconnectTimer();
-			ServerReconnectTimer = new CTimer(ReconnectToServerTimerCallback, ServerReconnectInterval);
-			Debug.Console(1, this, "Reconnect Timer Started.");
-		}
-
-		/// <summary>
-		/// Does what it says
-		/// </summary>
-		void StopServerReconnectTimer()
-		{
-			if (ServerReconnectTimer != null)
-			{
-				ServerReconnectTimer.Stop();
-				ServerReconnectTimer = null;
-			}
-		}
-
-        /// <summary>
-        /// Executes when we don't get a heartbeat message in time.  Triggers reconnect.
-        /// </summary>
-        /// <param name="o">For CTimer callback. Not used</param>
-        void HeartbeatExpiredTimerCallback(object o)
-        {
-			Debug.Console(1, this, "Heartbeat Timer Expired.");
-			if (ServerHeartbeatCheckTimer != null)
-            {
-                ServerHeartbeatCheckTimer.Stop();
-                ServerHeartbeatCheckTimer = null;
-            }
-			CleanUpWebsocketClient();
-            StartServerReconnectTimer();
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="dueTime"></param>
-		/// <param name="repeatTime"></param>
-        void ResetOrStartHearbeatTimer()
-        {
-			if (ServerHeartbeatCheckTimer == null)
-			{
-				ServerHeartbeatCheckTimer = new CTimer(HeartbeatExpiredTimerCallback, null, ServerHeartbeatInterval, ServerHeartbeatInterval);
-				Debug.Console(1, this, "Heartbeat Timer Started.");
-			}
-			else
-			{
-				ServerHeartbeatCheckTimer.Reset(ServerHeartbeatInterval, ServerHeartbeatInterval);
-			}
-        }
-
-		/// <summary>
-		/// Waits two and goes again
-		/// </summary>
-		void ReconnectStreamClient()
-		{
-			new CTimer(o => ConnectWebsocketClient(), 2000);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="code"></param>
-		/// <returns></returns>
-		int Websocket_DisconnectCallback(WebSocketClient.WEBSOCKET_RESULT_CODES code, object o)
-		{
-			Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Websocket disconnected with code: {0}", code);
-
-			if (ServerHeartbeatCheckTimer != null)
-				ServerHeartbeatCheckTimer.Stop();
-			// Start the reconnect timer
-			StartServerReconnectTimer();
-			return 0;
-		}
-
-
-		/// <summary>
-		/// Resets reconnect timer and updates usercode
-		/// </summary>
-		/// <param name="content"></param>
-		void HandleHeartBeat(JToken content)
-		{
-            SendMessageToServer(JObject.FromObject(new
-            {
-                type = "/system/heartbeatAck"
-            }));
-
-			var code = content["userCode"];
-			if(code != null) 
-			{
-				foreach (var b in RoomBridges)
-				{
-					b.SetUserCode(code.Value<string>());
-				}
-			}
-			ResetOrStartHearbeatTimer();
-		}
-
-		/// <summary>
-		/// Outputs debug info when enabled
-		/// </summary>
-		/// <param name="req"></param>
-		/// <param name="r"></param>
-		/// <param name="e"></param>
-		void CheckHttpDebug(HttpClientResponse r, HTTP_CALLBACK_ERROR e)
-		{
-			if (HttpDebugEnabled)
-			{
-				try
-				{
-					Debug.Console(0, this, "------ Begin HTTP Debug ---------------------------------------");
-					if (r != null)
-					{
-						Debug.Console(0, this, "HTTP Response URL: {0}", r.ResponseUrl != null ? r.ResponseUrl.ToString() : "NONE");
-						Debug.Console(0, this, "HTTP Response code: {0}", r.Code);
-						Debug.Console(0, this, "HTTP Response content: \r{0}", r.ContentString);
-					}
-					else
-					{
-						Debug.Console(0, this, "No HTTP response");
-					}
-					Debug.Console(0, this, "HTTP Response 'error' {0}", e);
-					Debug.Console(0, this, "------ End HTTP Debug -----------------------------------------");
-				}
-				catch (Exception ex)
-				{
-					Debug.Console(0, this, "HttpDebugError: {0}", ex);
-				}
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="data"></param>
-		/// <param name="length"></param>
-		/// <param name="opcode"></param>
-		/// <param name="err"></param>
-		int Websocket_ReceiveCallback(byte[] data, uint length, WebSocketClient.WEBSOCKET_PACKET_TYPES opcode,
-			WebSocketClient.WEBSOCKET_RESULT_CODES err)
-		{
-			if (opcode == WebSocketClient.WEBSOCKET_PACKET_TYPES.LWS_WS_OPCODE_07__TEXT_FRAME)
-			{
-				var rx = System.Text.Encoding.UTF8.GetString(data, 0, (int)length);
-				if (rx.Length > 0)
-					ParseStreamRx(rx);
-				WSClient.ReceiveAsync();
-			}
-
-			else if (opcode == WebSocketClient.WEBSOCKET_PACKET_TYPES.LWS_WS_OPCODE_07__CLOSE)
-			{
-				Debug.Console(1, this, "Websocket disconnect received from remote");
-				CleanUpWebsocketClient();
-			}
-			else
-			{
-				Debug.Console(1, this, "websocket rx opcode/err {0}/{1}", opcode, err);
-				WSClient.ReceiveAsync();
-			}
-			return 0;
-		}
-
-        /// <summary>
-        /// Callback to catch possible errors in sending via the websocket
-        /// </summary>
-        /// <param name="result"></param>
-        /// <returns></returns>
-        int Websocket_SendCallback(Crestron.SimplSharp.CrestronWebSocketClient.WebSocketClient.WEBSOCKET_RESULT_CODES result)
-        {
-			if(result != WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_SUCCESS)
-	            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "SendCallback questionable result: {0}", result);
-			return 1;
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-        void ParseStreamRx(string message)
-		{
-            if(string.IsNullOrEmpty(message))
-                return;
-
-			if (!message.Contains("/system/heartbeat"))
-			{
-				Debug.Console(1, this, "Message RX: {0}", message);
-			}
-			else
-			{
-				LastAckMessage = DateTime.Now;
-			}
-
-            try
-            {
-                var messageObj = JObject.Parse(message);
-
-                var type = messageObj["type"].Value<string>();
-
-                if (type == "hello")
-                {
-					SendInitialMessage();
-                    ResetOrStartHearbeatTimer();
-                }
-				else if (type == "/system/heartbeat")
-				{
-					HandleHeartBeat(messageObj["content"]);
-				}
-				else if (type == "raw")
-				{
-					var wrapper = messageObj["content"].ToObject<DeviceActionWrapper>();
-					DeviceJsonApi.DoDeviceAction(wrapper);
-				}
-				else if (type == "close")
-				{
-					Debug.Console(1, this, "Received close message from server.");
-					// DisconnectWebsocketClient();
-
-					if (ServerHeartbeatCheckTimer != null)
-						ServerHeartbeatCheckTimer.Stop();
-				}
-				else
-				{
-					// Check path against Action dictionary
-					if (ActionDictionary.ContainsKey(type))
-					{
-						var action = ActionDictionary[type];
-
-						if (action is Action)
-						{
-							(action as Action)();
-						}
-						else if (action is PressAndHoldAction)
-						{
-							var stateString = messageObj["content"]["state"].Value<string>();
-
-							// Look for a button press event
-							if (!string.IsNullOrEmpty(stateString))
-							{
-								switch (stateString)
-								{
-									case "true":
-										{
-											if (!PushedActions.ContainsKey(type))
-											{
-												PushedActions.Add(type, new CTimer(o =>
-												{
-													(action as PressAndHoldAction)(false);
-													PushedActions.Remove(type);
-												}, null, ButtonHeartbeatInterval, ButtonHeartbeatInterval));
-											}
-											// Maybe add an else to reset the timer
-											break;
-										}
-									case "held":
-										{
-											if (PushedActions.ContainsKey(type))
-											{
-												PushedActions[type].Reset(ButtonHeartbeatInterval, ButtonHeartbeatInterval);
-											}
-											return;
-										}
-									case "false":
-										{
-											if (PushedActions.ContainsKey(type))
-											{
-												PushedActions[type].Stop();
-												PushedActions.Remove(type);
-											}
-											break;
-										}
-								}
-
-								(action as PressAndHoldAction)(stateString == "true");
-							}
-						}
-						else if (action is Action<bool>)
-						{
-							var stateString = messageObj["content"]["state"].Value<string>();
-
-							if (!string.IsNullOrEmpty(stateString))
-							{
-								(action as Action<bool>)(stateString == "true");
-							}
-						}
-						else if (action is Action<ushort>)
-						{
-							(action as Action<ushort>)(messageObj["content"]["value"].Value<ushort>());
-						}
-						else if (action is Action<string>)
-						{
-							(action as Action<string>)(messageObj["content"]["value"].Value<string>());
-						}
-						else if (action is Action<SourceSelectMessageContent>)
-						{
-							(action as Action<SourceSelectMessageContent>)(messageObj["content"]
-								.ToObject<SourceSelectMessageContent>());
-						}
-					}
-					else
-					{
-						Debug.Console(1, this, "-- Warning: Incoming message has no registered handler");
-					}
-				}
-            }
-            catch (Exception err)
-            {
-                //Debug.Console(1, "SseMessageLengthBeforeFailureCount: {0}", SseMessageLengthBeforeFailureCount);
-                //SseMessageLengthBeforeFailureCount = 0;
-                Debug.Console(1, this, "Unable to parse message: {0}", err);	
-            }
-        }
-
-		void TestHttpRequest(string s)
-		{
-			{
-				s = s.Trim();
-				if (string.IsNullOrEmpty(s))
-				{
-					PrintTestHttpRequestUsage();
-					return;
-				}
-				var tokens = s.Split(' ');
-				if (tokens.Length < 2)
-				{
-					CrestronConsole.ConsoleCommandResponse("Too few paramaters\r");
-					PrintTestHttpRequestUsage();
-					return;
-				}
-
-				try
-				{
-					var url = tokens[1];
-					if (tokens[0].ToLower() == "get")
-					{
-						var resp = new HttpClient().Get(url);
-						CrestronConsole.ConsoleCommandResponse("RESPONSE:\r{0}\r\r", resp);
-					}
-					else if (tokens[0].ToLower() == "post")
-					{
-						var resp = new HttpClient().Post(url, new byte[] { });
-						CrestronConsole.ConsoleCommandResponse("RESPONSE:\r{0}\r\r", resp);
-					}
-
-					else
-					{
-						CrestronConsole.ConsoleCommandResponse("Only get or post supported\r");
-						PrintTestHttpRequestUsage();
-					}
-				}
-				catch (HttpException e)
-				{
-					CrestronConsole.ConsoleCommandResponse("Exception in request:\r");
-					CrestronConsole.ConsoleCommandResponse("Response URL: {0}\r", e.Response.ResponseUrl);
-					CrestronConsole.ConsoleCommandResponse("Response Error Code: {0}\r", e.Response.Code);
-					CrestronConsole.ConsoleCommandResponse("Response body: {0}\r", e.Response.ContentString);
-				}
-
-			}
-		}
-
-		void PrintTestHttpRequestUsage()
-		{
-			CrestronConsole.ConsoleCommandResponse("Usage: mobilehttprequest:N get/post url\r");
-		}
-    }
-}

PepperDashEssentials/AppServer/RoomBridges/MobileControlBridgeBase.cs

@@ -1,62 +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
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class MobileControlBridgeBase: Device
-	{
-		public MobileControlSystemController Parent { get; private set; }
-
-		public string UserCode { get; private set; }
-
-		public abstract string RoomName { get; }
-
-		public MobileControlBridgeBase(string key, string name)
-			: base(key, name)
-		{
-		}
-
-		/// <summary>
-		/// Set the parent.  Does nothing else.  Override to add functionality such
-		/// as adding actions to parent
-		/// </summary>
-		/// <param name="parent"></param>
-		public virtual void AddParent(MobileControlSystemController parent)
-		{
-			Parent = parent;
-		}
-
-		/// <summary>
-		/// Sets the UserCode on the bridge object. Called from controller. A changed code will
-		/// fire method UserCodeChange.  Override that to handle changes
-		/// </summary>
-		/// <param name="code"></param>
-		public void SetUserCode(string code)
-		{
-			var changed = UserCode != code;
-			UserCode = code;
-			if (changed)
-			{
-				UserCodeChange();
-			}
-		}
-
-		/// <summary>
-		/// Empty method in base class.  Override this to add functionality
-		/// when code changes
-		/// </summary>
-		protected virtual void UserCodeChange()
-		{
-
-		}
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/MobileControlDdvc01RoomBridge.cs

@@ -1,912 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-using PepperDash.Essentials.AppServer.Messengers;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Room.Config;
-
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-	public class MobileControlDdvc01RoomBridge : MobileControlBridgeBase, IDelayedConfiguration
-	{
-		public class BoolJoin
-		{
-			/// <summary>
-			/// 301
-			/// </summary>
-			public const uint RoomIsOn = 301;
-
-			/// <summary>
-			/// 12
-			/// </summary>
-			public const uint PrivacyMute = 12;
-
-			/// <summary>
-			/// 41
-			/// </summary>
-			public const uint PromptForCode = 41;
-			/// <summary>
-			/// 42
-			/// </summary>
-			public const uint ClientJoined = 42;
-			/// <summary>
-			/// 51
-			/// </summary>
-			public const uint ActivityShare = 51;
-			/// <summary>
-			/// 52
-			/// </summary>
-			public const uint ActivityPhoneCall = 52;
-			/// <summary>
-			/// 53
-			/// </summary>
-			public const uint ActivityVideoCall = 53;
-
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint MasterVolumeIsMuted = 1;
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint MasterVolumeMuteToggle = 1;
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint VolumeMutesJoinStart = 1;
-			/// <summary>
-			/// 61
-			/// </summary>
-			public const uint ShutdownCancel = 61;
-			/// <summary>
-			/// 62
-			/// </summary>
-			public const uint ShutdownEnd = 62;			
-			/// <summary>
-			/// 63
-			/// </summary>
-			public const uint ShutdownStart = 63;
-			/// <summary>
-			/// 72
-			/// </summary>
-			public const uint SourceHasChanged = 71;
-
-			/// <summary>
-			/// 261 - The start of the range of speed dial visibles
-			/// </summary>
-			public const uint SpeedDialVisibleStartJoin = 261;
-			/// <summary>
-			/// 501
-			/// </summary>
-			public const uint ConfigIsReady = 501;
-			/// <summary>
-			/// 502
-			/// </summary>
-			public const uint HideVideoConfRecents = 502;
-			/// <summary>
-			/// 503
-			/// </summary>
-			public const uint ShowCameraWhenNotInCall = 503;
-			/// <summary>
-			/// 504
-			/// </summary>
-			public const uint UseSourceEnabled = 504;
-			/// <summary>
-			/// 601
-			/// </summary>
-			public const uint SourceShareDisableJoinStart = 601;
-			/// <summary>
-			/// 621
-			/// </summary>
-			public const uint SourceIsEnabledJoinStart = 621;
-
-		}
-
-		public class UshortJoin
-		{
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint MasterVolumeLevel = 1;
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint VolumeSlidersJoinStart = 1;
-			/// <summary>
-			/// 61
-			/// </summary>
-			public const uint ShutdownPromptDuration = 61;
-			/// <summary>
-			/// 101
-			/// </summary>
-			public const uint NumberOfAuxFaders = 101;
-		}
-
-		public class StringJoin
-		{
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint VolumeSliderNamesJoinStart = 1;
-			/// <summary>
-			/// 71
-			/// </summary>
-			public const uint SelectedSourceKey = 71;
-
-			/// <summary>
-			/// 241
-			/// </summary>
-			public const uint SpeedDialNameStartJoin = 241;
-
-			/// <summary>
-			/// 251
-			/// </summary>
-			public const uint SpeedDialNumberStartJoin = 251;
-			
-			/// <summary>
-			/// 501
-			/// </summary>
-			public const uint ConfigRoomName = 501;
-			/// <summary>
-			/// 502
-			/// </summary>
-			public const uint ConfigHelpMessage = 502;
-			/// <summary>
-			/// 503
-			/// </summary>
-			public const uint ConfigHelpNumber = 503;
-			/// <summary>
-			/// 504
-			/// </summary>
-			public const uint ConfigRoomPhoneNumber = 504;
-			/// <summary>
-			/// 505
-			/// </summary>
-			public const uint ConfigRoomURI = 505;
-			/// <summary>
-			/// 401
-			/// </summary>
-			public const uint UserCodeToSystem = 401;
-			/// <summary>
-			/// 402
-			/// </summary>
-			public const uint ServerUrl = 402;
-			/// <summary>
-			/// 512
-			/// </summary>
-			public const uint RoomSpeedDialNamesJoinStart = 512;
-			/// <summary>
-			/// 516
-			/// </summary>
-			public const uint RoomSpeedDialNumberssJoinStart = 516;
-			/// <summary>
-			/// 601
-			/// </summary>
-			public const uint SourceNameJoinStart = 601;
-			/// <summary>
-			/// 621
-			/// </summary>
-			public const uint SourceIconJoinStart = 621;
-			/// <summary>
-			/// 641
-			/// </summary>
-			public const uint SourceKeyJoinStart = 641;
-			/// <summary>
-			/// 661
-			/// </summary>
-			public const uint SourceTypeJoinStart = 661;
-			/// <summary>
-			/// 761
-			/// </summary>
-			public const uint CameraNearNameStart = 761;
-			/// <summary>
-			/// 770 - presence of this name on the input will cause the camera to be added
-			/// </summary>
-			public const uint CameraFarName = 770;
-		}
-
-		/// <summary>
-		/// Fires when config is ready to go
-		/// </summary>
-		public event EventHandler<EventArgs> ConfigurationIsReady;
-
-		public ThreeSeriesTcpIpEthernetIntersystemCommunications EISC { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public bool ConfigIsLoaded { get; private set; }
-
-		public override string RoomName
-		{
-			get { 
-				var name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue;
-				return string.IsNullOrEmpty(name) ? "Not Loaded" : name;
-			}
-		}
-
-		MobileControlDdvc01DeviceBridge SourceBridge;
-
-		Ddvc01AtcMessenger AtcMessenger;
-		Ddvc01VtcMessenger VtcMessenger;
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="ipId"></param>
-		public MobileControlDdvc01RoomBridge(string key, string name, uint ipId)
-			: base(key, name)
-		{
-			try
-			{
-				EISC = new ThreeSeriesTcpIpEthernetIntersystemCommunications(ipId, "127.0.0.2", Global.ControlSystem);
-				var reg = EISC.Register();
-				if (reg != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
-					Debug.Console(0, this, "Cannot connect EISC at IPID {0}: \r{1}", ipId, reg);
-
-				SourceBridge = new MobileControlDdvc01DeviceBridge(key + "-sourceBridge", "DDVC01 source bridge", EISC);
-				DeviceManager.AddDevice(SourceBridge);
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Finish wiring up everything after all devices are created. The base class will hunt down the related
-		/// parent controller and link them up.
-		/// </summary>
-		/// <returns></returns>
-		public override bool CustomActivate()
-		{
-			Debug.Console(0, this, "Final activation. Setting up actions and feedbacks");
-			SetupFunctions();
-			SetupFeedbacks();
-
-            var atcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			AtcMessenger = new Ddvc01AtcMessenger(atcKey, EISC, "/device/audioCodec");
-			AtcMessenger.RegisterWithAppServer(Parent);
-
-            var vtcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			VtcMessenger = new Ddvc01VtcMessenger(vtcKey, EISC, "/device/videoCodec");
-			VtcMessenger.RegisterWithAppServer(Parent);
-
-			EISC.SigChange += EISC_SigChange;
-			EISC.OnlineStatusChange += (o, a) =>
-			{
-				Debug.Console(1, this, "DDVC EISC online={0}. Config is ready={1}", a.DeviceOnLine, EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue);
-				if (a.DeviceOnLine && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue)
-					LoadConfigValues();
-			};
-			// load config if it's already there
-			if (EISC.IsOnline && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue) // || EISC.BooleanInput[BoolJoin.ConfigIsReady].BoolValue)
-				LoadConfigValues();
-
-
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				for (uint i = 1; i < 1000; i++)
-				{
-					if (s.ToLower().Equals("b"))
-					{
-						CrestronConsole.ConsoleCommandResponse("D{0,6} {1} - ", i, EISC.BooleanOutput[i].BoolValue);
-					}
-					else if (s.ToLower().Equals("u"))
-					{
-						CrestronConsole.ConsoleCommandResponse("U{0,6} {1,8} - ", i, EISC.UShortOutput[i].UShortValue);
-					}
-					else if (s.ToLower().Equals("s"))
-					{
-						var val = EISC.StringOutput[i].StringValue;
-						if(!string.IsNullOrEmpty(val))
-							CrestronConsole.ConsoleCommandResponse("S{0,6} {1}\r", i, EISC.StringOutput[i].StringValue);
-					}
-
-				}
-			}, "mobilebridgedump", "Dumps DDVC01 bridge EISC data b,u,s", ConsoleAccessLevelEnum.AccessOperator);
-
-			return base.CustomActivate();
-		}
-
-
-		/// <summary>
-		/// Setup the actions to take place on various incoming API calls
-		/// </summary>
-		void SetupFunctions()
-		{
-			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(BoolJoin.PromptForCode)));
-			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(BoolJoin.ClientJoined)));
-
-			Parent.AddAction(@"/room/room1/status", new Action(SendFullStatus));
-
-			Parent.AddAction(@"/room/room1/source", new Action<SourceSelectMessageContent>(c =>
-			{
-				EISC.SetString(StringJoin.SelectedSourceKey, c.SourceListItem);
-				EISC.PulseBool(BoolJoin.SourceHasChanged);
-			}));
-
-			Parent.AddAction(@"/room/room1/defaultsource", new Action(() => 
-				EISC.PulseBool(BoolJoin.ActivityShare)));
-			Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityPhoneCall)));
-			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityVideoCall)));
-
-			Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u => 
-				EISC.SetUshort(UshortJoin.MasterVolumeLevel, u)));
-			Parent.AddAction(@"/room/room1/volumes/master/muteToggle", new Action(() => 
-				EISC.PulseBool(BoolJoin.MasterVolumeIsMuted)));
-			Parent.AddAction(@"/room/room1/volumes/master/privacyMuteToggle", new Action(() =>
-				EISC.PulseBool(BoolJoin.PrivacyMute)));
-
-
-			// /xyzxyz/volumes/master/muteToggle ---> BoolInput[1]
-
-			for (uint i = 2; i <= 7; i++)
-			{
-				var index = i;
-				Parent.AddAction(string.Format(@"/room/room1/volumes/level-{0}/level", index), new Action<ushort>(u =>
-					EISC.SetUshort(index, u)));
-				Parent.AddAction(string.Format(@"/room/room1/volumes/level-{0}/muteToggle", index), new Action(() =>
-					EISC.PulseBool(index)));
-			}
-
-			Parent.AddAction(@"/room/room1/shutdownStart", new Action(() =>
-				EISC.PulseBool(BoolJoin.ShutdownStart)));
-			Parent.AddAction(@"/room/room1/shutdownEnd", new Action(() =>
-				EISC.PulseBool(BoolJoin.ShutdownEnd)));
-			Parent.AddAction(@"/room/room1/shutdownCancel", new Action(() =>
-				EISC.PulseBool(BoolJoin.ShutdownCancel)));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="devKey"></param>
-		void SetupSourceFunctions(string devKey)
-		{
-			SourceDeviceMapDictionary sourceJoinMap = new SourceDeviceMapDictionary();
-
-			var prefix = string.Format("/device/{0}/", devKey);
-
-			foreach (var item in sourceJoinMap)
-			{
-				var join = item.Value;
-				Parent.AddAction(string.Format("{0}{1}", prefix, item.Key), new PressAndHoldAction(b => EISC.SetBool(join, b)));
-			}
-		}
-
-
-		/// <summary>
-		/// Links feedbacks to whatever is gonna happen!
-		/// </summary>
-		void SetupFeedbacks()
-		{
-			// Power 
-			EISC.SetBoolSigAction(BoolJoin.RoomIsOn, b =>
-				PostStatusMessage(new
-					{
-						isOn = b
-					}));
-
-			// Source change things
-			EISC.SetSigTrueAction(BoolJoin.SourceHasChanged, () =>
-				PostStatusMessage(new
-					{
-						selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue
-					}));
-
-			// Volume things
-			EISC.SetUShortSigAction(UshortJoin.MasterVolumeLevel, u =>
-                PostStatusMessage(new
-                {
-                    volumes = new
-                    {
-                        master = new
-                        {
-                            level = u
-                        }
-                    }
-                }));
-
-			// map MasterVolumeIsMuted join -> status/volumes/master/muted
-			// 
-
-			EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b =>
-                PostStatusMessage(new
-                {
-                    volumes = new
-                    {
-                        master = new
-                        {
-                            muted = b
-                        }
-                    }
-                }));
-			EISC.SetBoolSigAction(BoolJoin.PrivacyMute, b => 
-				PostStatusMessage(new
-				{
-					volumes = new 
-					{
-						master = new 
-						{
-							privacyMuted = b
-						}
-					}
-				}));
-
-			for (uint i = 2; i <= 7; i++)
-			{
-				var index = i; // local scope for lambdas
-				EISC.SetUShortSigAction(index, u => // start at join 2
-				{
-					// need a dict in order to create the level-n property on auxFaders
-					var dict = new Dictionary<string, object>();
-					dict.Add("level-" + index, new { level = u });
-					PostStatusMessage(new
-					{
-						volumes = new
-						{
-							auxFaders = dict,
-						}
-					});
-				});
-				EISC.SetBoolSigAction(index, b =>
-				{
-					// need a dict in order to create the level-n property on auxFaders
-					var dict = new Dictionary<string, object>();
-					dict.Add("level-" + index, new { muted = b });
-					PostStatusMessage(new
-					{
-						volumes = new
-						{
-							auxFaders = dict,
-						}
-					});
-				});
-			}
-
-			EISC.SetUShortSigAction(UshortJoin.NumberOfAuxFaders, u => 
-				PostStatusMessage(new {
-					volumes = new {
-						numberOfAuxFaders = u,
-					}
-				}));
-
-			// shutdown things
-			EISC.SetSigTrueAction(BoolJoin.ShutdownCancel, new Action(() =>
-				PostMessage("/room/shutdown/", new
-				{
-					state = "wasCancelled"
-				})));
-			EISC.SetSigTrueAction(BoolJoin.ShutdownEnd, new Action(() =>
-				PostMessage("/room/shutdown/", new
-				{
-					state = "hasFinished"
-				})));
-			EISC.SetSigTrueAction(BoolJoin.ShutdownStart, new Action(() =>
-				PostMessage("/room/shutdown/", new
-				{
-					state = "hasStarted",
-					duration = EISC.UShortOutput[UshortJoin.ShutdownPromptDuration].UShortValue
-				})));
-
-			// Config things
-			EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
-
-			// Activity modes
-			EISC.SetSigTrueAction(BoolJoin.ActivityShare, () => UpdateActivity(1));
-			EISC.SetSigTrueAction(BoolJoin.ActivityPhoneCall, () => UpdateActivity(2));
-			EISC.SetSigTrueAction(BoolJoin.ActivityVideoCall, () => UpdateActivity(3));
-		}
-
-
-		/// <summary>
-		/// Updates activity states
-		/// </summary>
-		void UpdateActivity(int mode)
-		{
-			PostStatusMessage(new
-			{
-				activityMode = mode,
-			});
-		}
-
-		/// <summary>
-		/// Reads in config values when the Simpl program is ready
-		/// </summary>
-		void LoadConfigValues()
-		{
-			Debug.Console(1, this, "Loading configuration from DDVC01 EISC bridge");
-			ConfigIsLoaded = false;
-
-			var co = ConfigReader.ConfigObject;
-
-            co.Info.RuntimeInfo.AppName = Assembly.GetExecutingAssembly().GetName().Name;
-            var version = Assembly.GetExecutingAssembly().GetName().Version;
-            co.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
-
-			//Room
-			//if (co.Rooms == null)
-			// always start fresh in case simpl changed
-			co.Rooms = new List<DeviceConfig>();
-			var rm = new DeviceConfig();
-            if (co.Rooms.Count == 0)
-            {
-                Debug.Console(0, this, "Adding room to config");
-                co.Rooms.Add(rm);
-            }
-            else
-            {
-                Debug.Console(0, this, "Replacing Room[0] in config");
-                co.Rooms[0] = rm;
-            }
-			rm.Name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue;
-			rm.Key = "room1";
-			rm.Type = "ddvc01";
-
-			DDVC01RoomPropertiesConfig rmProps;
-			if (rm.Properties == null)
-				rmProps = new DDVC01RoomPropertiesConfig();
-			else
-				rmProps = JsonConvert.DeserializeObject<DDVC01RoomPropertiesConfig>(rm.Properties.ToString());
-
-			rmProps.Help = new EssentialsHelpPropertiesConfig();
-			rmProps.Help.CallButtonText = EISC.StringOutput[StringJoin.ConfigHelpNumber].StringValue;
-			rmProps.Help.Message = EISC.StringOutput[StringJoin.ConfigHelpMessage].StringValue;
-
-			rmProps.Environment = new EssentialsEnvironmentPropertiesConfig(); // enabled defaults to false
-
-			rmProps.RoomPhoneNumber = EISC.StringOutput[StringJoin.ConfigRoomPhoneNumber].StringValue;
-			rmProps.RoomURI = EISC.StringOutput[StringJoin.ConfigRoomURI].StringValue;
-			rmProps.SpeedDials = new List<DDVC01SpeedDial>();
-
-			// This MAY need a check 
-			rmProps.AudioCodecKey = "audioCodec";
-			rmProps.VideoCodecKey = "videoCodec";
-
-			// volume control names
-			var volCount = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
-
-            //// use Volumes object or?
-            //rmProps.VolumeSliderNames = new List<string>();
-            //for(uint i = 701; i <= 700 + volCount; i++)
-            //{
-            //    rmProps.VolumeSliderNames.Add(EISC.StringInput[i].StringValue);
-            //}
-
-			// There should be Mobile Control devices in here, I think...
-			if(co.Devices == null)
-				co.Devices = new List<DeviceConfig>();
-
-			// clear out previous DDVC devices
-			co.Devices.RemoveAll(d => 
-				d.Key.StartsWith("source-", StringComparison.OrdinalIgnoreCase)
-				|| d.Key.Equals("audioCodec", StringComparison.OrdinalIgnoreCase) 
-				|| d.Key.Equals("videoCodec", StringComparison.OrdinalIgnoreCase));
-			
-			rmProps.SourceListKey = "default";
-			rm.Properties = JToken.FromObject(rmProps);
-
-			// Source list! This might be brutal!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-			var groupMap = GetSourceGroupDictionary();
-
-			co.SourceLists = new Dictionary<string,Dictionary<string,SourceListItem>>();
-			var newSl = new Dictionary<string, SourceListItem>();
-			// add "none" source if VTC present
-
-			if (!string.IsNullOrEmpty(rmProps.VideoCodecKey))
-			{
-				var codecOsd = new SourceListItem()
-				{
-					Name = "None",
-					IncludeInSourceList = true,
-					Order = 1,
-					Type = eSourceListItemType.Route,
-					SourceKey = ""
-				};
-				newSl.Add("Source-None", codecOsd);
-			}
-			// add sources...
-			for (uint i = 0; i <= 19; i++)
-			{
-				var name = EISC.StringOutput[StringJoin.SourceNameJoinStart + i].StringValue;
-				if (EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue
-					&& !EISC.BooleanOutput[BoolJoin.SourceIsEnabledJoinStart + i].BoolValue)
-				{
-					continue;
-				}		
-				else if(!EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue && string.IsNullOrEmpty(name))
-					break;
-				var icon = EISC.StringOutput[StringJoin.SourceIconJoinStart + i].StringValue;
-				var key = EISC.StringOutput[StringJoin.SourceKeyJoinStart + i].StringValue;
-				var type = EISC.StringOutput[StringJoin.SourceTypeJoinStart + i].StringValue;
-				var disableShare = EISC.BooleanOutput[BoolJoin.SourceShareDisableJoinStart + i].BoolValue;
-
-				Debug.Console(0, this, "Adding source {0} '{1}'", key, name);
-				var newSLI = new SourceListItem{
-					Icon = icon,
-					Name = name,
-					Order = (int)i + 10,
-					SourceKey = key,
-					Type = eSourceListItemType.Route,
-					DisableCodecSharing = disableShare,
-				};
-				newSl.Add(key, newSLI);
-                
-				string group = "genericsource";
-				if (groupMap.ContainsKey(type))
-				{
-					group = groupMap[type];
-				}
-				
-				// add dev to devices list
-				var devConf = new DeviceConfig {
-					Group = group,
-					Key = key,
-					Name = name,
-					Type = type
-				};
-				co.Devices.Add(devConf);
-
-				if (group.ToLower().StartsWith("settopbox")) // Add others here as needed
-				{
-					SetupSourceFunctions(key);
-				}
-			}
-
-			co.SourceLists.Add("default", newSl);
-
-			// Build "audioCodec" config if we need
-			if (!string.IsNullOrEmpty(rmProps.AudioCodecKey))
-			{
-				var acFavs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
-				for (uint i = 0; i < 4; i++)
-				{
-					if (!EISC.GetBool(BoolJoin.SpeedDialVisibleStartJoin + i))
-					{
-						break;
-					}
-					acFavs.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem()
-					{
-						Name = EISC.GetString(StringJoin.SpeedDialNameStartJoin + i),
-						Number = EISC.GetString(StringJoin.SpeedDialNumberStartJoin + i),
-						Type = PepperDash.Essentials.Devices.Common.Codec.eCodecCallType.Audio
-					});
-				}
-
-				var acProps = new
-				{
-					favorites = acFavs
-				};
-
-				var acStr = "audioCodec";
-				var acConf = new DeviceConfig()
-				{
-					Group = acStr,
-					Key = acStr,
-					Name = acStr,
-					Type = acStr,
-					Properties = JToken.FromObject(acProps)
-				};
-				co.Devices.Add(acConf);
-			}
-
-			// Build Video codec config
-			if (!string.IsNullOrEmpty(rmProps.VideoCodecKey))
-			{
-				// No favorites, for now?
-				var favs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
-
-				// cameras
-				var camsProps = new List<object>();
-				for (uint i = 0; i < 9; i++)
-				{
-					var name = EISC.GetString(i + StringJoin.CameraNearNameStart);
-					if (!string.IsNullOrEmpty(name))
-					{
-						camsProps.Add(new
-						{
-							name = name,
-							selector = "camera" + (i + 1),
-						});
-					}
-				}
-				var farName = EISC.GetString(StringJoin.CameraFarName);
-				if (!string.IsNullOrEmpty(farName))
-				{
-					camsProps.Add(new
-					{
-						name = farName,
-						selector = "cameraFar",
-					});
-				}
-
-				var props = new
-				{
-					favorites = favs,
-					cameras = camsProps,
-				};
-				var str = "videoCodec";
-				var conf = new DeviceConfig()
-				{
-					Group = str,
-					Key = str,
-					Name = str,
-					Type = str,
-					Properties = JToken.FromObject(props)
-				};
-				co.Devices.Add(conf);
-			}
-
-			Debug.Console(0, this, "******* CONFIG FROM DDVC: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
-
-			var handler = ConfigurationIsReady;
-			if (handler != null)
-			{
-				handler(this, new EventArgs());
-			}
-
-			ConfigIsLoaded = true;
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-			if (ConfigIsLoaded)
-			{
-                var count = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
-
-                Debug.Console(1, this, "The Fader Count is : {0}", count);
-
-                // build volumes object, serialize and put in content of method below
-
-                // Create auxFaders
-				var auxFaderDict = new Dictionary<string, Volume>();
-				for (uint i = 2; i <= count; i++)
-				{
-					auxFaderDict.Add("level-" + i,
-						new Volume("level-" + i,
-							EISC.UShortOutput[i].UShortValue,
-							EISC.BooleanOutput[i].BoolValue,
-							EISC.StringOutput[i].StringValue,
-							true,
-							"someting.png"));
-				}
-
-                var volumes = new Volumes();
-
-                volumes.Master = new Volume("master", 
-                                EISC.UShortOutput[UshortJoin.MasterVolumeLevel].UShortValue,
-                                EISC.BooleanOutput[BoolJoin.MasterVolumeIsMuted].BoolValue,
-                  				EISC.StringOutput[1].StringValue,
-				                true,
-				                "something.png");
-				volumes.Master.HasPrivacyMute = true;
-				volumes.Master.PrivacyMuted = EISC.BooleanOutput[BoolJoin.PrivacyMute].BoolValue;
-
-                volumes.AuxFaders = auxFaderDict;
-				volumes.NumberOfAuxFaders = EISC.UShortInput[UshortJoin.NumberOfAuxFaders].UShortValue;
-
-                PostStatusMessage(new
-                    {
-						activityMode = GetActivityMode(),
-                        isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue,
-                        selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue,
-                        volumes = volumes
-                    });			
-			}
-			else
-			{
-				PostStatusMessage(new
-				{
-					error = "systemNotReady"
-				});
-			}
-		}
-
-		/// <summary>
-		/// Returns the activity mode int
-		/// </summary>
-		/// <returns></returns>
-		int GetActivityMode()
-		{
-			if (EISC.BooleanOutput[BoolJoin.ActivityPhoneCall].BoolValue) return 2;
-			else if (EISC.BooleanOutput[BoolJoin.ActivityShare].BoolValue) return 1;
-			else if (EISC.BooleanOutput[BoolJoin.ActivityVideoCall].BoolValue) return 3;
-			return 0;
-		}
-
-		/// <summary>
-		/// Helper for posting status message
-		/// </summary>
-		/// <param name="contentObject">The contents of the content object</param>
-		void PostStatusMessage(object contentObject)
-		{
-			Parent.SendMessageToServer(JObject.FromObject(new
-				{
-					type = "/room/status/",
-					content = contentObject
-				}));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="messageType"></param>
-		/// <param name="contentObject"></param>
-		void PostMessage(string messageType, object contentObject)
-		{
-			Parent.SendMessageToServer(JObject.FromObject(new
-			{
-				type = messageType,
-				content = contentObject
-			}));
-		}
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="currentDevice"></param>
-		/// <param name="args"></param>
-		void EISC_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
-		{
-			if (Debug.Level >= 1)
-				Debug.Console(1, this, "DDVC EISC change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-			var uo = args.Sig.UserObject;
-			if (uo is Action<bool>)
-				(uo as Action<bool>)(args.Sig.BoolValue);
-			else if (uo is Action<ushort>)
-				(uo as Action<ushort>)(args.Sig.UShortValue);
-			else if (uo is Action<string>)
-				(uo as Action<string>)(args.Sig.StringValue);
-		}
-
-		/// <summary>
-		/// Returns the mapping of types to groups, for setting up devices.
-		/// </summary>
-		/// <returns></returns>
-		Dictionary<string, string> GetSourceGroupDictionary()
-		{
-			//type, group
-			var d = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-			{
-				{ "laptop", "pc" },
-				{ "pc", "pc" },
-				{ "wireless", "genericsource" },
-				{ "iptv", "settopbox" }
-
-			};
-			return d;
-		}
-
-		/// <summary>
-		/// updates the usercode from server
-		/// </summary>
-		protected override void UserCodeChange()
-		{
-			Debug.Console(1, this, "Server user code changed: {0}", UserCode);
-			EISC.StringInput[StringJoin.UserCodeToSystem].StringValue = UserCode;
-			EISC.StringInput[StringJoin.ServerUrl].StringValue = Parent.Config.ClientAppUrl;
-		}
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/MobileControlEssentialsHuddleSpaceRoomBridge.cs

@@ -1,441 +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.Core;
-using PepperDash.Essentials.AppServer.Messengers;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.MobileControl;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.AudioCodec;
-
-namespace PepperDash.Essentials
-{
-    public class MobileConrolEssentialsHuddleSpaceRoomBridge : MobileControlBridgeBase
-    {
-
-        public EssentialsRoomBase Room { get; private set; }
-
-		public VideoCodecBaseMessenger VCMessenger { get; private set; }
-
-        public AudioCodecBaseMessenger ACMessenger { get; private set; }
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public override string RoomName
-		{
-			get
-			{
-				return Room.Name;
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="parent"></param>
-		/// <param name="room"></param>
-        public MobileConrolEssentialsHuddleSpaceRoomBridge(EssentialsRoomBase room):
-			base("mobileControlBridge-essentialsHuddle", "Essentials Mobile Control Bridge-Huddle")
-        {
-            Room = room;   
-        }
-
-		/// <summary>
-		/// Override of base: calls base to add parent and then registers actions and events.
-		/// </summary>
-		/// <param name="parent"></param>
-		public override void AddParent(MobileControlSystemController parent)
-		{
-			base.AddParent(parent);
-
-			// we add actions to the messaging system with a path, and a related action. Custom action
-			// content objects can be handled in the controller's LineReceived method - and perhaps other
-			// sub-controller parsing could be attached to these classes, so that the systemController
-			// doesn't need to know about everything.
-
-			// Source Changes and room off
-			Parent.AddAction(string.Format(@"/room/{0}/status", Room.Key), new Action(() => SendFullStatus(Room)));
-
-			var routeRoom = Room as IRunRouteAction;
-			if(routeRoom != null)
-				Parent.AddAction(string.Format(@"/room/{0}/source", Room.Key), new Action<SourceSelectMessageContent>(c => 
-					routeRoom.RunRouteAction(c.SourceListItem)));
-
-			var defaultRoom = Room as IRunDefaultPresentRoute;
-			if(defaultRoom != null)
-				Parent.AddAction(string.Format(@"/room/{0}/defaultsource", Room.Key), new Action(() => defaultRoom.RunDefaultPresentRoute()));
-
-			var volumeRoom = Room as IHasCurrentVolumeControls;
-			if (volumeRoom != null)
-			{
-				Parent.AddAction(string.Format(@"/room/{0}/volumes/master/level", Room.Key), new Action<ushort>(u =>
-					(volumeRoom.CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(u)));
-				Parent.AddAction(string.Format(@"/room/{0}/volumes/master/muteToggle", Room.Key), new Action(() => 
-					volumeRoom.CurrentVolumeControls.MuteToggle()));
-				volumeRoom.CurrentVolumeDeviceChange += new EventHandler<VolumeDeviceChangeEventArgs>(Room_CurrentVolumeDeviceChange);
-
-				// Registers for initial volume events, if possible
-				var currentVolumeDevice = volumeRoom.CurrentVolumeControls as IBasicVolumeWithFeedback;
-				if (currentVolumeDevice != null)
-				{
-					currentVolumeDevice.MuteFeedback.OutputChange += MuteFeedback_OutputChange;
-					currentVolumeDevice.VolumeLevelFeedback.OutputChange += VolumeLevelFeedback_OutputChange;
-				}
-			}
-
-			var sscRoom = Room as IHasCurrentSourceInfoChange;
-			if(sscRoom != null)
-				sscRoom.CurrentSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
-
-			var vcRoom = Room as IHasVideoCodec;
-			if (vcRoom != null && vcRoom.VideoCodec != null)
-			{
-				var codec = vcRoom.VideoCodec;
-                var key = vcRoom.VideoCodec.Key + "-" + parent.Key;
-				VCMessenger = new VideoCodecBaseMessenger(key, vcRoom.VideoCodec, "/device/videoCodec");
-				VCMessenger.RegisterWithAppServer(Parent);
-
-				vcRoom.IsSharingFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(IsSharingFeedback_OutputChange);
-			}
-
-            var acRoom = Room as IHasAudioCodec;
-            if (acRoom != null && acRoom.AudioCodec != null)
-            {
-                var codec = acRoom.AudioCodec;
-                var key = acRoom.AudioCodec.Key + "-" + parent.Key;
-                ACMessenger = new AudioCodecBaseMessenger(key, acRoom.AudioCodec, "/device/audioCodec");
-                ACMessenger.RegisterWithAppServer(Parent);
-            }
-
-			var defCallRm = Room as IRunDefaultCallRoute;
-			if (defCallRm != null)
-			{
-				Parent.AddAction(string.Format(@"/room/{0}/activityVideo", Room.Key), new Action(()=>defCallRm.RunDefaultCallRoute()));
-			}
-
-			Parent.AddAction(string.Format(@"/room/{0}/shutdownStart", Room.Key), new Action(() => Room.StartShutdown(eShutdownType.Manual)));
-			Parent.AddAction(string.Format(@"/room/{0}/shutdownEnd", Room.Key), new Action(() => Room.ShutdownPromptTimer.Finish()));
-			Parent.AddAction(string.Format(@"/room/{0}/shutdownCancel", Room.Key), new Action(() => Room.ShutdownPromptTimer.Cancel()));
-
-			Room.OnFeedback.OutputChange += OnFeedback_OutputChange;
-			Room.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
-			Room.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-
-			Room.ShutdownPromptTimer.HasStarted += ShutdownPromptTimer_HasStarted;
-			Room.ShutdownPromptTimer.HasFinished += ShutdownPromptTimer_HasFinished;
-			Room.ShutdownPromptTimer.WasCancelled += ShutdownPromptTimer_WasCancelled;
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void IsSharingFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-			// sharing source 
-			string shareText;
-			bool isSharing;
-#warning This share update needs to happen on source change as well!
-			var vcRoom = Room as IHasVideoCodec;
-			var srcInfoRoom = Room as IHasCurrentSourceInfoChange;
-			if (vcRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && srcInfoRoom.CurrentSourceInfo != null)
-			{
-
-				shareText = srcInfoRoom.CurrentSourceInfo.PreferredName;
-				isSharing = true;
-			}
-			else
-			{
-				shareText = "None";
-				isSharing = false;
-			}
-
-			PostStatusMessage(new
-			{
-				share = new
-				{
-					currentShareText = shareText,
-					isSharing = isSharing
-				}
-			});
-		}
-
-		/// <summary>
-		/// Helper for posting status message
-		/// </summary>
-		/// <param name="contentObject">The contents of the content object</param>
-		void PostStatusMessage(object contentObject)
-		{
-			Parent.SendMessageToServer(JObject.FromObject(new
-			{
-				type = "/room/status/",
-				content = contentObject
-			}));
-		}
-
-		/// <summary>
-		/// Handler for cancelled shutdown
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void ShutdownPromptTimer_WasCancelled(object sender, EventArgs e)
-		{
-			JObject roomStatus = new JObject();
-			roomStatus.Add("state", "wasCancelled");
-			JObject message = new JObject();
-			message.Add("type", "/room/shutdown/");
-			message.Add("content", roomStatus);
-			Parent.SendMessageToServer(message);
-		}
-
-		/// <summary>
-		/// Handler for when shutdown finishes
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void ShutdownPromptTimer_HasFinished(object sender, EventArgs e)
-		{
-			JObject roomStatus = new JObject();
-			roomStatus.Add("state", "hasFinished");
-			JObject message = new JObject();
-			message.Add("type", "/room/shutdown/");
-			message.Add("content", roomStatus);
-			Parent.SendMessageToServer(message);
-		}
-
-		/// <summary>
-		/// Handler for when shutdown starts
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void ShutdownPromptTimer_HasStarted(object sender, EventArgs e)
-		{
-			JObject roomStatus = new JObject();
-			roomStatus.Add("state", "hasStarted");
-			roomStatus.Add("duration", Room.ShutdownPromptTimer.SecondsToCount);
-			JObject message = new JObject();
-			message.Add("type", "/room/shutdown/");
-			message.Add("content", roomStatus);
-			Parent.SendMessageToServer(message);
-			// equivalent JS message:
-			//	Post( { type: '/room/status/', content: { shutdown: 'hasStarted', duration: Room.ShutdownPromptTimer.SecondsToCount })
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-			PostStatusMessage(new
-			{
-				isWarmingUp = e.BoolValue
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-			PostStatusMessage(new
-			{
-				isCoolingDown = e.BoolValue
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-        void OnFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            PostStatusMessage(new
-				{
-					isOn = e.BoolValue
-				});
-        }
-
-        void Room_CurrentVolumeDeviceChange(object sender, VolumeDeviceChangeEventArgs e)
-        {
-            if (e.OldDev is IBasicVolumeWithFeedback)
-            {
-                var oldDev = e.OldDev as IBasicVolumeWithFeedback;
-                oldDev.MuteFeedback.OutputChange -= MuteFeedback_OutputChange;
-                oldDev.VolumeLevelFeedback.OutputChange -= VolumeLevelFeedback_OutputChange;
-            }
-
-            if (e.NewDev is IBasicVolumeWithFeedback)
-            {
-                var newDev = e.NewDev as IBasicVolumeWithFeedback;
-				newDev.MuteFeedback.OutputChange += MuteFeedback_OutputChange;
-                newDev.VolumeLevelFeedback.OutputChange += VolumeLevelFeedback_OutputChange;
-            }
-        }
-
-		/// <summary>
-		/// Event handler for mute changes
-		/// </summary>
-		void MuteFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-			PostStatusMessage(new
-			{
-				volumes = new
-				{
-					master = new
-					{
-						muted = e.BoolValue
-					}
-				}
-			});
-		}
-
-		/// <summary>
-		/// Handles Volume changes on room
-		/// </summary>
-        void VolumeLevelFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-			PostStatusMessage(new
-			{
-				volumes = new
-				{
-					master = new
-					{
-						level = e.IntValue
-					}
-				}
-			});
-        }
-
-
-        void Room_CurrentSingleSourceChange(PepperDash.Essentials.Core.SourceListItem info, ChangeType type)
-        {
-            /* Example message
-             * {
-                  "type":"/room/status",
-                  "content": {
-                    "selectedSourceKey": "off",
-                  }
-                }
-             */
-            if (type == ChangeType.WillChange)
-            {
-                // Disconnect from previous source
-
-                if (info != null)
-                {
-                    var previousDev = info.SourceDevice;
-
-                    // device type interfaces
-                    if (previousDev is ISetTopBoxControls)
-                        (previousDev as ISetTopBoxControls).UnlinkActions(Parent);
-                    // common interfaces
-                    if (previousDev is IChannel)
-                        (previousDev as IChannel).UnlinkActions(Parent);
-                    if (previousDev is IColor)
-                        (previousDev as IColor).UnlinkActions(Parent);
-                    if (previousDev is IDPad)
-                        (previousDev as IDPad).UnlinkActions(Parent);
-                    if (previousDev is IDvr)
-                        (previousDev as IDvr).UnlinkActions(Parent);
-                    if (previousDev is INumericKeypad)
-                        (previousDev as INumericKeypad).UnlinkActions(Parent);
-                    if (previousDev is IPower)
-                        (previousDev as IPower).UnlinkActions(Parent);
-                    if (previousDev is ITransport)
-                        (previousDev as ITransport).UnlinkActions(Parent);
-                }
-            }
-            else // did change
-            {
-                if (info != null)
-                {
-                    var dev = info.SourceDevice;
-
-                    if (dev is ISetTopBoxControls)
-                        (dev as ISetTopBoxControls).LinkActions(Parent);
-                    if (dev is IChannel)
-                        (dev as IChannel).LinkActions(Parent);
-                    if (dev is IColor)
-                        (dev as IColor).LinkActions(Parent);
-                    if (dev is IDPad)
-                        (dev as IDPad).LinkActions(Parent);
-                    if (dev is IDvr)
-                        (dev as IDvr).LinkActions(Parent);
-                    if (dev is INumericKeypad)
-                        (dev as INumericKeypad).LinkActions(Parent);
-                    if (dev is IPower)
-                        (dev as IPower).LinkActions(Parent);
-                    if (dev is ITransport)
-                        (dev as ITransport).LinkActions(Parent);
-
-					var srcRm = Room as IHasCurrentSourceInfoChange;
-                    if (srcRm != null)
-                    {
-                        PostStatusMessage(new
-                        {
-                            selectedSourceKey = srcRm.CurrentSourceInfoKey
-                        });
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Posts the full status of the room to the server
-        /// </summary>
-        /// <param name="room"></param>
-        void SendFullStatus(EssentialsRoomBase room)
-        {
-			var sourceKey = room is IHasCurrentSourceInfoChange ? (room as IHasCurrentSourceInfoChange).CurrentSourceInfoKey : null;
-			
-			var rmVc = room as IHasCurrentVolumeControls;
-			var volumes = new Volumes();
-			if (rmVc != null)
-			{
-				var vc = rmVc.CurrentVolumeControls as IBasicVolumeWithFeedback;
-				if (vc != null)
-				{
-					volumes.Master = new Volume("master", vc.VolumeLevelFeedback.UShortValue, vc.MuteFeedback.BoolValue, "Volume", true, "");
-				}
-			}
-
-			PostStatusMessage(new
-			{
-                //calls = GetCallsMessageObject(),
-				isOn = room.OnFeedback.BoolValue,
-				selectedSourceKey = sourceKey,
-                //vtc = GetVtcCallsMessageObject(),
-				volumes = volumes
-			});
-        }
-    }
-
-	/// <summary>
-	/// 
-	/// </summary>
-    public class SourceSelectMessageContent
-    {
-		public string SourceListItem { get; set; }
-    }
-
-	/// <summary>
-	/// 
-	/// </summary>
-	/// <param name="b"></param>
-    public delegate void PressAndHoldAction(bool b);
-
-}

PepperDashEssentials/AppServer/RoomBridges/SourceDeviceMapDictionary.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-
-    /// <summary>
-    /// Contains all of the default joins that map to API funtions
-    /// </summary>
-    public class SourceDeviceMapDictionary : Dictionary<string, uint>
-    {
-
-        public SourceDeviceMapDictionary(): base()
-        {
-            var dictionary = new Dictionary<string, uint>
-            {
-                {"preset01", 101},
-                {"preset02", 102},
-                {"preset03", 103},
-                {"preset04", 104},
-                {"preset05", 105},
-                {"preset06", 106},
-                {"preset07", 107},
-                {"preset08", 108},
-                {"preset09", 109},
-                {"preset10", 110},
-                {"preset11", 111},
-                {"preset12", 112},
-                {"preset13", 113},
-                {"preset14", 114},
-                {"preset15", 115},
-                {"preset16", 116},
-                {"preset17", 117},
-                {"preset18", 118},
-                {"preset19", 119},
-                {"preset20", 120},
-                {"preset21", 121},
-                {"preset22", 122},
-                {"preset23", 123},
-                {"preset24", 124},
-
-                {"num0", 130},
-                {"num1", 131},
-                {"num2", 132},
-                {"num3", 133},
-                {"num4", 134},
-                {"num5", 135},
-                {"num6", 136},
-                {"num7", 137},
-                {"num8", 138},
-                {"num9", 139},
-                {"numDash", 140},
-                {"numEnter", 141},
-                {"chanUp", 142},
-                {"chanDown", 143},
-                {"lastChan", 144},
-                {"exit", 145},
-                {"powerToggle", 146},
-                {"red", 147},
-                {"green", 148},
-                {"yellow", 149},
-                {"blue", 150},
-                {"video", 151},
-                {"previous", 152},
-                {"next", 153},
-                {"rewind", 154},
-                {"ffwd", 155},
-                {"closedCaption", 156},
-                {"stop", 157},
-                {"pause", 158},
-                {"up", 159},
-                {"down", 160},
-                {"left", 161},
-                {"right", 162},
-                {"settings", 163},
-                {"info", 164},
-                {"return", 165},
-                {"guide", 166},
-                {"reboot", 167},
-                {"dvrList", 168},
-                {"replay", 169},           
-                {"play", 170},
-                {"select", 171},
-                {"record", 172},
-                {"menu", 173},
-                {"topMenu", 174},
-                {"prevTrack", 175},
-                {"nextTrack", 176},
-                {"powerOn", 177},
-                {"powerOff", 178},
-                {"dot", 179}
-
-            };
-
-            foreach (var item in dictionary)
-            {
-                this.Add(item.Key, item.Value);
-            }
-        }
-    }
-}

PepperDashEssentials/AppServer/Volumes.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Room.MobileControl
-{
-	public class Volumes
-	{
-		[JsonProperty("master")]
-		public Volume Master { get; set; }
-
-		[JsonProperty("auxFaders")]
-		public Dictionary<string, Volume> AuxFaders { get; set; }
-
-		[JsonProperty("numberOfAuxFaders")]
-		public int NumberOfAuxFaders { get; set; }
-
-		public Volumes()
-		{
-			AuxFaders = new Dictionary<string, Volume>();	
-		}
-	}
-
-	public class Volume
-	{
-		[JsonProperty("key")]
-		public string Key { get; set; }
-
-		[JsonProperty("level")]
-		public ushort Level { get; set; }
-
-		[JsonProperty("muted")]
-		public bool Muted { get; set; }
-
-		[JsonProperty("label")]
-		public string Label { get; set; }
-
-		[JsonProperty("hasMute")]
-		public bool HasMute { get; set; }
-
-		[JsonProperty("hasPrivacyMute")]
-		public bool HasPrivacyMute { get; set; }
-
-		[JsonProperty("privacyMuted")]
-		public bool PrivacyMuted { get; set; }
-
-
-		[JsonProperty("muteIcon")]
-		public string MuteIcon { get; set; }
-
-		public Volume(string key, ushort level, bool muted, string label, bool hasMute, string muteIcon)
-		{
-			Key = key;
-			Level = level;
-			Muted = muted;
-			Label = label;
-			HasMute = hasMute;
-			MuteIcon = muteIcon;
-		}
-	}
-}

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -1,305 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Lighting;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Devices.Common.Cameras;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.DM;
-//using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.Bridges
-{
-    /// <summary>
-    /// Base class for all bridge class variants
-    /// </summary>
-    public class BridgeBase : Device
-    {
-        public BridgeApi Api { get; private set; }
-
-        public BridgeBase(string key) :
-            base(key)
-        {
-
-        }
-            
-    }
-
-    /// <summary>
-    /// Base class for bridge API variants
-    /// </summary>
-    public abstract class BridgeApi : Device
-    {
-        public BridgeApi(string key) :
-            base(key)
-        {
-
-        }
-
-    }
-
-    /// <summary>
-    /// Bridge API using EISC
-    /// </summary>
-    public class EiscApi : BridgeApi
-    {
-        public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
-
-        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
-
-        public EiscApi(DeviceConfig dc) :
-            base(dc.Key)
-        {
-            PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
-
-            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
-
-            Eisc.SigChange += new Crestron.SimplSharpPro.DeviceSupport.SigEventHandler(Eisc_SigChange);
-
-            Eisc.Register();
-
-            AddPostActivationAction( () =>
-            {
-                Debug.Console(1, this, "Linking Devices...");
-
-                foreach (var d in PropertiesConfig.Devices)
-                {
-                    var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                    if (device != null)
-                    {
-                        if (device is IBridge)      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
-                        {
-                            (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
-                        {
-                            (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is GenericComm)
-                        {
-                            (device as GenericComm).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is CameraBase)
-                        {
-                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-						else if (device is PepperDash.Essentials.Core.DisplayBase)
-						{
-							(device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-                        else if (device is DmChassisController) {
-                            (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DmBladeChassisController) {
-                            (device as DmBladeChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DmpsRoutingController)
-                        {
-                            (device as DmpsRoutingController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DmpsAudioOutputController)
-                        {
-                            (device as DmpsAudioOutputController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DmTxControllerBase)
-                        {
-                            (device as DmTxControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DmRmcControllerBase)
-                        {
-                            (device as DmRmcControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is GenericRelayDevice)
-                        {
-                            (device as GenericRelayDevice).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is IRSetTopBoxBase)
-                        {
-                            (device as IRSetTopBoxBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is IDigitalInput)
-                        {
-                            (device as IDigitalInput).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is AppleTV)
-                        {
-                            (device as AppleTV).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is HdMdxxxCEController)
-                        {
-                            (device as HdMdxxxCEController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is LightingBase)
-                        {
-                            (device as LightingBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DigitalLogger)
-                        {
-                            (device as DigitalLogger).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is PepperDash.Essentials.Devices.Common.Occupancy.GlsOccupancySensorBaseController)
-                        {
-                            (device as PepperDash.Essentials.Devices.Common.Occupancy.GlsOccupancySensorBaseController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is StatusSignController)
-                        {
-                            (device as StatusSignController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is C2nRthsController)
-                        {
-                            (device as C2nRthsController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                    }
-                }
-
-                Debug.Console(1, this, "Devices Linked.");
-            });
-        }
-
-        /// <summary>
-        /// Used for debugging to trigger an action based on a join number and type
-        /// </summary>
-        /// <param name="join"></param>
-        /// <param name="type"></param>
-        public void ExecuteJoinAction(uint join, string type, object state)
-        {
-            try
-            {
-                switch (type.ToLower())
-                {
-                    case "digital":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
-                            if (uo != null)
-                            {
-                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToBoolean(state));
-                            }
-                            else
-                                Debug.Console(1, this, "User Action is null.  Nothing to Execute");
-                            break;
-                        }
-                    case "analog":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
-                            if (uo != null)
-                            {
-                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToUInt16(state));
-                            }
-                            else
-                                Debug.Console(1, this, "User Action is null.  Nothing to Execute"); break;
-                        }
-                    case "serial":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
-                            if (uo != null)
-                            {
-                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToString(state));
-                            }
-                            else
-                                Debug.Console(1, this, "User Action is null.  Nothing to Execute");
-                            break;
-                        }
-                    default:
-                        {
-                            Debug.Console(1, "Unknown join type.  Use digital/serial/analog");
-                            break;
-                        }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error: {0}", e);
-            }
-
-        }
-
-        /// <summary>
-        /// Handles incoming sig changes
-        /// </summary>
-        /// <param name="currentDevice"></param>
-        /// <param name="args"></param>
-        void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
-        {
-            try
-            {
-                if (Debug.Level >= 1)
-                    Debug.Console(1, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-                var uo = args.Sig.UserObject;
-                if (uo != null)
-                {
-                    Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
-                    if (uo is Action<bool>)
-                        (uo as Action<bool>)(args.Sig.BoolValue);
-                    else if (uo is Action<ushort>)
-                        (uo as Action<ushort>)(args.Sig.UShortValue);
-                    else if (uo is Action<string>)
-                        (uo as Action<string>)(args.Sig.StringValue);
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
-            }
-        }
-    }
-
-    public class EiscApiPropertiesConfig
-    {
-        [JsonProperty("control")]
-        public EssentialsControlPropertiesConfig Control { get; set; }
-
-        [JsonProperty("devices")]
-        public List<ApiDevice> Devices { get; set; }
-
-
-        public class ApiDevice
-        {
-            [JsonProperty("deviceKey")]
-            public string DeviceKey { get; set; }
-
-            [JsonProperty("joinStart")]
-            public uint JoinStart { get; set; }
-
-            [JsonProperty("joinMapKey")]
-            public string JoinMapKey { get; set; }
-        }
-
-    }
-
-
-}

PepperDashEssentials/Bridges/CameraControllerBridge.cs

@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class CameraControllerApiExtensions
-    {
-
-        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            CameraControllerJoinMap joinMap = new CameraControllerJoinMap();
-
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<CameraControllerJoinMap>(joinMapSerialized);
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-            Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
-
-            var commMonitor = cameraDevice as ICommunicationMonitor;
-            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-
-            var ptzCamera = cameraDevice as IHasCameraPtzControl;
-
-            if (ptzCamera != null)
-            {
-                trilist.SetBoolSigAction(joinMap.Left, (b) =>
-                    {
-                        if (b)
-                        {
-                            ptzCamera.PanLeft();
-                        }
-                        else
-                        {
-                            ptzCamera.PanStop();
-                        }
-                    });
-                trilist.SetBoolSigAction(joinMap.Right, (b) =>
-                {
-                    if (b)
-                    {
-                        ptzCamera.PanRight();
-                    }
-                    else
-                    {
-                        ptzCamera.PanStop();
-                    }
-                });
-
-                trilist.SetBoolSigAction(joinMap.Up, (b) =>
-                {
-                    if (b)
-                    {
-                        ptzCamera.TiltUp();
-                    }
-                    else
-                    {
-                        ptzCamera.TiltStop();
-                    }
-                });
-                trilist.SetBoolSigAction(joinMap.Down, (b) =>
-                {
-                    if (b)
-                    {
-                        ptzCamera.TiltDown();
-                    }
-                    else
-                    {
-                        ptzCamera.TiltStop();
-                    }
-                });
-
-                trilist.SetBoolSigAction(joinMap.ZoomIn, (b) =>
-                {
-                    if (b)
-                    {
-                        ptzCamera.ZoomIn();
-                    }
-                    else
-                    {
-                        ptzCamera.ZoomStop();
-                    }
-                });
-
-                trilist.SetBoolSigAction(joinMap.ZoomOut, (b) =>
-                {
-                    if (b)
-                    {
-                        ptzCamera.ZoomOut();
-                    }
-                    else
-                    {
-                        ptzCamera.ZoomStop();
-                    }
-                });
-            }
-
-            if (cameraDevice.GetType().Name.ToString().ToLower() == "cameravisca")
-            {
-                var viscaCamera = cameraDevice as PepperDash.Essentials.Devices.Common.Cameras.CameraVisca;
-                trilist.SetSigTrueAction(joinMap.PowerOn, () => viscaCamera.PowerOn());
-                trilist.SetSigTrueAction(joinMap.PowerOff, () => viscaCamera.PowerOff());
-
-                viscaCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
-                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
-
-                viscaCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-                for (int i = 0; i < joinMap.NumberOfPresets; i++)
-                {
-                    int tempNum = i;
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallOffset + tempNum), () =>
-                        {
-                            viscaCamera.RecallPreset(tempNum);
-                        });
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveOffset + tempNum), () =>
-                    {
-                        viscaCamera.SavePreset(tempNum);
-                    });
-                }
-            }
-        }
-    }
-
-}

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class DigitalLoggerApiExtensions
-    {
-        public static void LinkToApi(this DigitalLogger DigitalLogger, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            DigitalLoggerJoinMap joinMap = new DigitalLoggerJoinMap();
-
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DigitalLoggerJoinMap>(joinMapSerialized);
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, DigitalLogger, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-            for (uint i = 1; i <= DigitalLogger.CircuitCount; i++)
-            {
-                var circuit = i;
-                DigitalLogger.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
-                DigitalLogger.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
-                DigitalLogger.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
-                trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => DigitalLogger.CycleCircuit(circuit - 1));
-                trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => DigitalLogger.TurnOnCircuit(circuit - 1));
-                trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => DigitalLogger.TurnOffCircuit(circuit - 1));
-
-            }
-        }
-    }
-}

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common;
-
-using Newtonsoft.Json;
-
-
-namespace PepperDash.Essentials.Bridges
-{
-	public static class DisplayControllerApiExtensions
-	{
-		public static void LinkToApi(this PepperDash.Essentials.Core.DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-		{
-            int inputNumber = 0;
-            IntFeedback inputNumberFeedback;
-            List<string> inputKeys = new List<string>();
-
-            DisplayControllerJoinMap joinMap = new DisplayControllerJoinMap();
-
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-            
-            if(!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);
-
-			joinMap.OffsetJoinNumbers(joinStart);
-
-			Debug.Console(1, "Linking to Trilist '{0}'",trilist.ID.ToString("X"));
-			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
-
-            trilist.StringInput[joinMap.Name].StringValue = displayDevice.Name;			
-
-			var commMonitor = displayDevice as ICommunicationMonitor;
-            if (commMonitor != null)
-            {
-                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-            }
-
-            inputNumberFeedback = new IntFeedback(() => { return inputNumber; });
-
-            // Two way feedbacks
-            var twoWayDisplay = displayDevice as PepperDash.Essentials.Core.TwoWayDisplayBase;
-            if (twoWayDisplay != null)
-            {
-                trilist.SetBool(joinMap.IsTwoWayDisplay, true);
-
-                twoWayDisplay.CurrentInputFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(CurrentInputFeedback_OutputChange);
-
-
-                inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect]);
-            }
-
-			// Power Off
-			trilist.SetSigTrueAction(joinMap.PowerOff, () =>
-				{
-					inputNumber = 102;
-					inputNumberFeedback.FireUpdate();
-					displayDevice.PowerOff();
-				});
-
-			displayDevice.PowerIsOnFeedback.OutputChange += new EventHandler<FeedbackEventArgs>( (o,a) => {
-                if (!a.BoolValue)
-                {
-                    inputNumber = 102;
-                    inputNumberFeedback.FireUpdate();
-
-                }
-                else
-                {
-                    inputNumber = 0;
-                    inputNumberFeedback.FireUpdate();
-                }
-            });
-
-			displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
-
-			// PowerOn
-			trilist.SetSigTrueAction(joinMap.PowerOn, () =>
-				{
-					inputNumber = 0;
-					inputNumberFeedback.FireUpdate();
-					displayDevice.PowerOn();
-				});
-
-			
-			displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
-
-			int count = 1;
-			foreach (var input in displayDevice.InputPorts)
-			{
-				inputKeys.Add(input.Key.ToString());
-				var tempKey = inputKeys.ElementAt(count - 1);
-				trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset + count), () => { displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector); });
-                Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}", joinMap.InputSelectOffset + count, displayDevice.InputPorts[tempKey].Key.ToString());
-				trilist.StringInput[(ushort)(joinMap.InputNamesOffset + count)].StringValue = input.Key.ToString();
-				count++;
-			}
-
-            Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
-			trilist.SetUShortSigAction(joinMap.InputSelect, (a) =>
-			{
-				if (a == 0)
-				{
-					displayDevice.PowerOff();
-					inputNumber = 0;
-				}
-				else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
-				{
-					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-					inputNumber = a;
-				}
-				else if (a == 102)
-				{
-					displayDevice.PowerToggle();
-
-				}
-                if (twoWayDisplay != null)
-				    inputNumberFeedback.FireUpdate();
-			});
-
-
-            var volumeDisplay = displayDevice as IBasicVolumeControls;
-            if (volumeDisplay != null)
-            {
-                trilist.SetBoolSigAction(joinMap.VolumeUp, (b) => volumeDisplay.VolumeUp(b));
-                trilist.SetBoolSigAction(joinMap.VolumeDown, (b) => volumeDisplay.VolumeDown(b));
-                trilist.SetSigTrueAction(joinMap.VolumeMute, () => volumeDisplay.MuteToggle());
-
-                var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
-                if(volumeDisplayWithFeedback != null)
-                {
-                    trilist.SetUShortSigAction(joinMap.VolumeLevel, new Action<ushort>((u) => volumeDisplayWithFeedback.SetVolume(u)));
-                    volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel]);
-                    volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute]);
-                }
-            }
-		}
-
-		static void CurrentInputFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-
-			Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", e.StringValue);
-
-		}
-
-	}
-   
-}

PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs

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

PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public class CameraControllerJoinMap : JoinMapBase
-    {
-        public uint IsOnline { get; set; }
-        public uint PowerOff { get; set; }
-        public uint PowerOn { get; set; }
-        public uint Up { get; set; }
-        public uint Down { get; set; }
-        public uint Left { get; set; }
-        public uint Right { get; set; }
-        public uint ZoomIn { get; set; }
-        public uint ZoomOut { get; set; }
-        public uint PresetRecallOffset { get; set; }
-        public uint PresetSaveOffset { get; set; }
-        public uint NumberOfPresets { get; set; }
-
-        public CameraControllerJoinMap()
-        {
-            // Digital
-            IsOnline = 9;
-            PowerOff = 8;
-            PowerOn = 7;
-            Up = 1;
-            Down = 2;
-            Left = 3;
-            Right = 4;
-            ZoomIn = 5;
-            ZoomOut = 6;
-            PresetRecallOffset = 10;
-            PresetSaveOffset = 30;
-            NumberOfPresets = 5;
-            // Analog
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            PowerOff = PowerOff + joinOffset;
-            PowerOn = PowerOn + joinOffset;
-            Up = Up + joinOffset;
-            Down = Down + joinOffset;
-            Left = Left + joinOffset;
-            Right = Right + joinOffset;
-            ZoomIn = ZoomIn + joinOffset;
-            ZoomOut = ZoomOut + joinOffset;
-            PresetRecallOffset = PresetRecallOffset + joinOffset;
-            PresetSaveOffset = PresetSaveOffset + joinOffset;
-        }
-    }
-}

PepperDashEssentials/Factory/DeviceFactory.cs

@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-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
-{
-	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 == "amplifier")
-            {
-                return new Amplifier(dc.Key, dc.Name);
-            } 
-            else if (dc.Group.ToLower() == "touchpanel") //  typeName.StartsWith("tsw"))
-            {
-                return UiDeviceFactory.GetUiDevice(dc);
-            }
-
-            else if (typeName == "mockdisplay")
-            {
-                return new MockDisplay(key, name);
-            }
-
-            else if (typeName == "generic")
-            {
-                return new Device(key, name);
-            }
-
-            //// MOVE into something else???
-            //else if (typeName == "basicirdisplay")
-            //{
-            //    var ir = IRPortHelper.GetIrPort(properties);
-            //    if (ir != null)
-            //        return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
-            //}
-
-            else if (typeName == "commmock")
-            {
-                var comm = CommFactory.CreateCommForDevice(dc);
-                var props = JsonConvert.DeserializeObject<ConsoleCommMockDevicePropertiesConfig>(
-                    properties.ToString());
-                return new ConsoleCommMockDevice(key, name, props, comm);
-            }
-
-            else if (typeName == "appserver")
-            {
-                var props = JsonConvert.DeserializeObject<MobileControlConfig>(properties.ToString());
-                return new MobileControlSystemController(key, name, props);
-            }
-
-			else if (typeName == "mobilecontrolbridge-ddvc01")
-			{
-				var comm = CommFactory.GetControlPropertiesConfig(dc);
-
-				var bridge = new PepperDash.Essentials.Room.MobileControl.MobileControlDdvc01RoomBridge(key, name, comm.IpIdInt);
-				bridge.AddPreActivationAction(() =>
-				{
-					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;
-					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);
-				});
-
-				return bridge;
-			}
-
-            else if (typeName == "roomonwhenoccupancydetectedfeature")
-            {
-                return new RoomOnToDefaultSourceWhenOccupied(dc);
-            }
-
-			return null;
-		}
-	}
-
-}

PepperDashEssentials/Factory/UiDeviceFactory.cs

@@ -1,191 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.PageManagers;
-using PepperDash.Essentials.DM.Endpoints.DGEs;
-
-
-namespace PepperDash.Essentials
-{
-    public class UiDeviceFactory
-    {
-        public static IKeyed GetUiDevice(DeviceConfig config)
-        {
-            var comm = CommFactory.GetControlPropertiesConfig(config);
-
-            var typeName = config.Type.ToLower();
-
-            EssentialsTouchpanelController panelController = null;
-
-            var props = JsonConvert.DeserializeObject<CrestronTouchpanelPropertiesConfig>(config.Properties.ToString());
-
-            if (typeName.Contains("dge"))
-            {
-                Dge100 dgeDevice = null;
-                if (typeName == "dge100")
-                    dgeDevice = new Dge100(comm.IpIdInt, Global.ControlSystem);
-                else if (typeName == "dmdge200c")
-                    dgeDevice = new DmDge200C(comm.IpIdInt, Global.ControlSystem);
-
-                if (dgeDevice == null)
-                {
-                    Debug.Console(1, "Unable to create DGE device");
-                    return null;
-                }
-
-                var dgeController = new DgeController(config.Key + "-comPorts", config.Name, dgeDevice, config, props);
-
-                DeviceManager.AddDevice(dgeController);
-
-                panelController = new EssentialsTouchpanelController(config.Key, config.Name, dgeController.DigitalGraphicsEngine,
-                    props.ProjectName, props.SgdFile);
-            }
-            else
-            {
-                panelController = new EssentialsTouchpanelController(config.Key, config.Name, config.Type, props, comm.IpIdInt);
-            }
-
-            panelController.AddPostActivationAction(() =>
-                {
-                     var mainDriver = new EssentialsPanelMainInterfaceDriver(panelController.Panel, props);
-                    // Then the sub drivers
-
-                    // spin up different room drivers depending on room type
-                    var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
-                    if (room is EssentialsHuddleSpaceRoom)
-                    {
-
-                        // Header Driver
-                        Debug.Console(0, panelController, "Adding header driver");
-                        mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
-                        
-                        // AV Driver
-                        Debug.Console(0, panelController, "Adding huddle space AV driver");
-                        var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
-                        avDriver.DefaultRoomKey = props.DefaultRoomKey;
-                        mainDriver.AvDriver = avDriver;
-                        avDriver.CurrentRoom = room as EssentialsHuddleSpaceRoom;
-                        
-                        // Environment Driver
-                        if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
-                        {
-                            Debug.Console(0, panelController, "Adding environment driver");
-                            mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
-
-                            mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
-                        }
-
-                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
-
-                        panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
-
-                        if (panelController.Panel is TswFt5ButtonSystem)
-                        {
-                            var tsw = panelController.Panel as TswFt5ButtonSystem;
-                            // Wire up hard keys
-                            tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                            //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                            if(mainDriver.EnvironmentDriver != null)
-                                tsw.Lights.UserObject = new Action<bool>(b => 
-                                {
-                                    if (!b)
-                                    {
-                                        //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
-                                        mainDriver.EnvironmentDriver.Toggle();
-                                    }
-                                });
-                            tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                            tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                        }
-                    }
-                    //else if (room is EssentialsPresentationRoom)
-                    //{
-                    //    Debug.Console(0, panelController, "Adding presentation room driver");
-                    //    var avDriver = new EssentialsPresentationPanelAvFunctionsDriver(mainDriver, props);
-                    //    avDriver.CurrentRoom = room as EssentialsPresentationRoom;
-                    //    avDriver.DefaultRoomKey = props.DefaultRoomKey;
-                    //    mainDriver.AvDriver = avDriver ;
-                    //    mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
-                    //    panelController.LoadAndShowDriver(mainDriver);
-
-                    //    if (panelController.Panel is TswFt5ButtonSystem)
-                    //    {
-                    //        var tsw = panelController.Panel as TswFt5ButtonSystem;
-                    //        // Wire up hard keys
-                    //        tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                    //        //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                    //        tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                    //        tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                    //    }
-                    //}
-                    else if (room is EssentialsHuddleVtc1Room)
-                    {
-                        Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
-
-                        // Header Driver
-                        mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
-
-                        // AV Driver
-                        var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, props);
-
-                        var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(panelController.Panel, avDriver,
-                            (room as EssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
-                        avDriver.SetVideoCodecDriver(codecDriver);
-                        avDriver.DefaultRoomKey = props.DefaultRoomKey;
-                        mainDriver.AvDriver = avDriver;
-                        avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room;
-
-                        // Environment Driver
-                        if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
-                        {
-                            Debug.Console(0, panelController, "Adding environment driver");
-                            mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
-
-                            mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
-                        }
-
-                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
-
-                        panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
-
-                        if (panelController.Panel is TswFt5ButtonSystem)
-                        {
-                            var tsw = panelController.Panel as TswFt5ButtonSystem;
-                            // Wire up hard keys
-                            tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.EndMeetingPress(); });
-                            //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                            if (mainDriver.EnvironmentDriver != null)
-                                tsw.Lights.UserObject = new Action<bool>(b =>
-                                {
-                                    if (!b)
-                                    {
-                                        //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
-                                        mainDriver.EnvironmentDriver.Toggle();
-                                    }
-                                });
-                            tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                            tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(0, panelController, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", props.DefaultRoomKey);
-                    }
-                });
-
-            return panelController;
-        }
-
-    }
-}

PepperDashEssentials/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Room.Config
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public class EssentialsHuddleRoomPropertiesConfig : EssentialsRoomPropertiesConfig
-    {
-        public string DefaultDisplayKey { get; set; }
-        public string DefaultAudioKey { get; set; }
-        public string SourceListKey { get; set; }
-        public string DefaultSourceItem { get; set; }
-    }
-}

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

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

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

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

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

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

PepperDashEssentials/UI/DualDisplaySourceSRLController.cs

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

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -1,200 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.PageManagers;
-
-namespace PepperDash.Essentials
-{
-    public class EssentialsTouchpanelController : Device, IHasBasicTriListWithSmartObject
-	{
-		public BasicTriListWithSmartObject Panel { get; private set; }
-
-		public PanelDriverBase PanelDriver { get; private set; }
-
-		CTimer BacklightTransitionedOnTimer;
-
-		public EssentialsTouchpanelController(string key, string name, Tswx52ButtonVoiceControl tsw, 
-			string projectName, string sgdPath)
-			: base(key, name)
-		{
-			Panel = tsw;
-			tsw.LoadSmartObjects(sgdPath);
-			tsw.SigChange += Panel_SigChange;
-		}
-
-        public EssentialsTouchpanelController(string key, string name, Dge100 dge, string projectName, string sgdPath)
-            : base(key, name)
-        {
-            Panel = dge;
-
-            if (!string.IsNullOrEmpty(sgdPath))
-                dge.LoadSmartObjects(sgdPath);
-            else
-                Debug.Console(1, this, "No SGD file path defined");
-
-            dge.SigChange += Panel_SigChange;
-        }
-
-		/// <summary>
-		/// Config constructor
-		/// </summary>
-		public EssentialsTouchpanelController(string key, string name, string type, CrestronTouchpanelPropertiesConfig props, uint id)
-			: base(key, name)
-		{
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating touchpanel hardware...");
-			type = type.ToLower();
-			try
-			{
-                if (type == "crestronapp")
-                {
-                    var app = new CrestronApp(id, Global.ControlSystem);
-                    app.ParameterProjectName.Value = props.ProjectName;
-                    Panel = app;
-                }
-                else if (type == "tsw550")
-                    Panel = new Tsw550(id, Global.ControlSystem);
-                else if (type == "tsw552")
-                    Panel = new Tsw552(id, Global.ControlSystem);
-                else if (type == "tsw560")
-                    Panel = new Tsw560(id, Global.ControlSystem);
-                else if (type == "tsw750")
-                    Panel = new Tsw750(id, Global.ControlSystem);
-                else if (type == "tsw752")
-                    Panel = new Tsw752(id, Global.ControlSystem);
-                else if (type == "tsw760")
-                    Panel = new Tsw760(id, Global.ControlSystem);
-                else if (type == "tsw1050")
-                    Panel = new Tsw1050(id, Global.ControlSystem);
-                else if (type == "tsw1052")
-                    Panel = new Tsw1052(id, Global.ControlSystem);
-                else if (type == "tsw1060")
-                    Panel = new Tsw1060(id, Global.ControlSystem);
-                else
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW controller with type '{0}'", type);
-                    return;
-                }
-			}
-			catch (Exception e)
-			{
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW base class. Panel will not function: {0}", e.Message);
-				return;				
-			}
-
-            // Reserved sigs
-            if (Panel is TswFt5ButtonSystem)
-            {
-                var tsw = Panel as TswFt5ButtonSystem;
-                tsw.ExtenderSystemReservedSigs.Use();
-                tsw.ExtenderSystemReservedSigs.DeviceExtenderSigChange
-                    += ExtenderSystemReservedSigs_DeviceExtenderSigChange;
-
-                tsw.ButtonStateChange += new ButtonEventHandler(Tsw_ButtonStateChange);
-
-            }
-
-            if (Panel.Register() != eDeviceRegistrationUnRegistrationResponse.Success)
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Registration failed. Continuing, but panel may not function: {0}", Panel.RegistrationFailureReason);
-
-            // Give up cleanly if SGD is not present.
-            var sgdName = Global.FilePathPrefix + "sgd" + Global.DirectorySeparator + props.SgdFile;
-            if (!File.Exists(sgdName))
-            {
-                Debug.Console(0, this, "Smart object file '{0}' not present in User folder. Looking for embedded file", sgdName);
-
-                sgdName = Global.ApplicationDirectoryPathPrefix + Global.DirectorySeparator + "SGD" + Global.DirectorySeparator + props.SgdFile;
-
-                if (!File.Exists(sgdName))
-                {
-                    Debug.Console(0, this, "Unable to find SGD file '{0}' in User sgd or application SGD folder. Exiting touchpanel load.", sgdName);
-                    return;
-                }
-            }
-
-            Panel.LoadSmartObjects(sgdName);
-            Panel.SigChange += Panel_SigChange;
-
-		}
-
-		public void LoadAndShowDriver(PanelDriverBase driver)
-		{
-			PanelDriver = driver;
-			driver.Show();
-		}
-
-		void HomePressed()
-		{
-			if (BacklightTransitionedOnTimer == null)
-				PanelDriver.BackButtonPressed();
-		}
-
-
-		void ExtenderSystemReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
-		{
-			// If the sig is transitioning on, mark it in case it was home button that transitioned it
-			var blOnSig = (Panel as TswFt5ButtonSystem).ExtenderSystemReservedSigs.BacklightOnFeedback;
-			if (args.Sig == blOnSig && blOnSig.BoolValue)
-			{
-				BacklightTransitionedOnTimer = new CTimer(o =>
-				{
-					BacklightTransitionedOnTimer = null;
-				}, 200);
-			}
-		}
-
-        public void PulseBool(uint join)
-        {
-            var act = Panel.BooleanInput[join].UserObject as Action<bool>;
-            if (act != null)
-            {
-                act(true);
-                act(false);
-            }
-        }
-
-        public void SetBoolSig(uint join, bool value)
-        {
-            var act = Panel.BooleanInput[join].UserObject as Action<bool>;
-            if (act != null)
-                act(value);
-        }
-
-        public void SetIntSig(uint join, ushort value)
-        {
-            var act = Panel.BooleanInput[join].UserObject as Action<ushort>;
-            if (act != null)
-            {
-                act(value);
-            }
-        }
-
-		void Panel_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
-		{
-			if (Debug.Level == 2)
-				Debug.Console(2, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-			var uo = args.Sig.UserObject;
-			if (uo is Action<bool>)
-				(uo as Action<bool>)(args.Sig.BoolValue);
-			else if (uo is Action<ushort>)
-				(uo as Action<ushort>)(args.Sig.UShortValue);
-			else if (uo is Action<string>)
-				(uo as Action<string>)(args.Sig.StringValue);
-		}
-	
-		void Tsw_ButtonStateChange(GenericBase device, ButtonEventArgs args)
-		{
-			var uo = args.Button.UserObject;
-			if(uo is Action<bool>)
-				(uo as Action<bool>)(args.Button.State == eButtonState.Pressed);
-		}
-	}
-}

PepperDashEssentials/UI/SubpageReferenceListActivityItem.cs

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

PepperDashEssentials/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs

@@ -1,71 +0,0 @@
-using System;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase
-	{
-		/// <summary>
-		/// Assign the appropriate A/V driver.
-		/// Want to keep the AvDriver alive, because it may hold states
-		/// </summary>
-		public IAVDriver AvDriver { get; set; }
-
-        public EssentialsHeaderDriver HeaderDriver { get; set; }
-
-        public EssentialsEnvironmentDriver EnvironmentDriver { get; set; }
-
-		public PanelDriverBase CurrentChildDriver { get; private set; }
-
-		CrestronTouchpanelPropertiesConfig Config;
-
-        /// <summary>
-        /// The main interlock for popups
-        /// </summary>
-        //public JoinedSigInterlock PopupInterlock { get; private set; }
-
-		public EssentialsPanelMainInterfaceDriver(BasicTriListWithSmartObject trilist,
-			CrestronTouchpanelPropertiesConfig config)
-			: base(trilist)
-		{
-			Config = config;
-		}
-
-		public override void Show()
-		{
-			CurrentChildDriver = null;
-			ShowSubDriver(AvDriver as PanelDriverBase);
-			base.Show();
-		}
-
-		public override void Hide()
-		{
-			TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
-			base.Hide();
-		}
-
-		void ShowSubDriver(PanelDriverBase driver)
-		{
-			CurrentChildDriver = driver;
-			if (driver == null)
-				return;
-			this.Hide();
-			driver.Show();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public override void BackButtonPressed()
-		{
-			if(CurrentChildDriver != null)
-				CurrentChildDriver.BackButtonPressed();
-		}
-	}
-}

PepperDash_Essentials.nuspec

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

README.md

@@ -1,24 +1,39 @@
-
 # PepperDash Essentials Framework (c) 2020
 
+## [Latest Release](https://github.com/PepperDash/Essentials/releases/latest)
+
 ## License
+
 Provided under MIT license
 
 ## Overview
+
 PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs.
 
 Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.
 
 ## Minimum Requirements
-- Essentials Framework runs on any Crestron 3-series processor or Crestron's VC-4 platform.
+
+- Essentials Framework runs on any Crestron 3-series processor, **4-series** processor or Crestron's VC-4 platform.
 - To edit and compile the source, Microsoft Visual Studio 2008 Professional with SP1 is required.
 - Crestron's Simpl# Plugin is also required (must be obtained from Crestron).
 
 ## Dependencies
 
-The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required.  It is referenced as a submodule and will be automatically checked out when cloning this repo if set to recurse submodules.  This allows different builds of the PepperDash.Core library to be referenced by checking out the desired submodule commit.
+The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required. It is referenced via nuget. You must have nuget.exe installed and in the `PATH` environment variable to use the following command. Nuget.exe is available at [nuget.org](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe).
+
+### Installing Dependencies
+
+To install dependencies once nuget.exe is installed, run the following command:
+`nuget install .\packages.config -OutputDirectory .\packages -excludeVersion`.
+To verify that the packages installed correctly, open Essentials and make sure that all references are found, then try and build it.
+
+### Installing Different versions of PepperDash Core
+
+If you need a different version of PepperDash Core, use the command `nuget install .\packages.config -OutputDirectory .\packages -excludeVersion -Version {versionToGet}`. Omitting the `-Version` option will pull the version indicated in the packages.config file.
 
 ## Utilization
+
 Essentials was originally conceptualized as a standalone application for running control system logic entirely in Simpl# Pro. It is primarily designed around accomplishing this goal, but during development, it became obvious that it could easily be leveraged to also serve as a partner application to one or more SIMPL Windows programs.
 
 Utilization of Essentials Framework falls into the following categories:
@@ -32,13 +47,17 @@ Utilization of Essentials Framework falls into the following categories:
 - Advanced logic. Some logic operations that cannot be affectively accomplished in SIMPL Windows (ex. JSON/XML serialization/deserialization, database operations, etc.) can be done in the Simpl# Pro environment and the necessary input and output bridged to a SIMPL Windows program via EISC.
 
 3. Hybrid Application that may contain elements of both standalone control and SIMPL partner application integration.
-- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications.  The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
 
- ## Documentation
- For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
+- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications. The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
+
+## Documentation
+
+For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
+
+## Support
+
+* Check out our [Discord Server](https://discord.gg/rWyeRH3K)
 
 ## How-To (Getting Started)
 
 See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
-
-

Sample Presets/SampleDirecTV.json

@@ -1,35 +0,0 @@
-{
-  "name": "Sample DirecTV List",
-  "channels": [
-    {
-      "name": "HBO",
-      "IconUrl": "HBO",
-      "Channel": "501"
-    },
-    {
-      "name": "HBO",
-      "IconUrl": "HBO",
-      "Channel": "501"
-    },
-    {
-      "name": "HBO",
-      "IconUrl": "HBO",
-      "Channel": "501"
-    },
-    {
-      "name": "HBO",
-      "IconUrl": "HBO",
-      "Channel": "501"
-    },
-    {
-      "name": "HBO",
-      "IconUrl": "HBO",
-      "Channel": "501"
-    },
-    {
-      "name": "HBO",
-      "IconUrl": "HBO",
-      "Channel": "501"
-    }
-  ]
-}

devjson commands.json

@@ -1,44 +0,0 @@
-devjson:1 {"deviceKey":"display-1-comMonitor","methodName":"PrintStatus"}
-
-devjson:1 {"deviceKey":"display-1-com","methodName":"SimulateReceive", "params": ["\\x05\\x06taco\\xAA"]}
-
-devjson:1 {"deviceKey":"display-1","methodName":"InputHdmi1", "params": []}
-
-devjson:1 {"deviceKey":"display-1","methodName":"PowerOff", "params": []}
-
-devjson:1 {"deviceKey":"timer","methodName":"Start" }
-
-devjson:1 {"deviceKey":"timer","methodName":"Cancel" }
-
-devjson:1 {"deviceKey":"timer","methodName":"Reset" }
-
-devjson:1 {"deviceKey":"room1","methodName":"Shutdown" }
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"TestIncomingVideoCall", "params": ["123-456-7890"]}
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"TestIncomingAudioCall", "params": ["111-111-1111"]}
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"TestIncomingVideoCall", "params": ["444-444-4444"]}
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"ListCalls"}
-
-devjson:1 {"deviceKey":"room1-emergency", "methodName":"RunEmergencyBehavior"}
-
-devjson:1 {"deviceKey":"microphonePrivacyController-1", "methodName":"TogglePrivacyMute"}
-
-devjson:1 {"deviceKey":"room1.InCallFeedback","methodName":"SetTestValue", "params": [ true ]}
-
-devjson:1 {"deviceKey":"room1.InCallFeedback","methodName":"ClearTestValue", "params": []}
-
-devjson:3 {"deviceKey":"room1.RoomOccupancy.RoomIsOccupiedFeedback","methodName":"SetTestValue", "params": [ true ]}
-
-devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"SendText", "params": ["xcommand dial number: 10.11.50.211\r"]}
-
-devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"Connect", "params": []}
-
-devjson:1 {"deviceKey":"commBridge", "methodName":"ExecuteJoinAction", "params":[ 301, "digital", true ]}
-
-devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [ "I'M GETTING TIRED OF THIS" ]}
-
-devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []} 
-

essentials-framework/Essentials Core/PepperDashEssentialsBase.sln

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/BasicConfig.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.Config
-{
-	/// <summary>
-	///  Override this and splice on specific room type behavior, as well as other properties
-	/// </summary>
-	public class BasicConfig
-	{
-		[JsonProperty("info")]
-		public InfoConfig Info { get; set; }
-
-		[JsonProperty("devices")]
-		public List<DeviceConfig> Devices { get; set; }
-
-		[JsonProperty("sourceLists")]
-		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
-
-		[JsonProperty("tieLines")]
-		public List<TieLineConfig> TieLines { get; set; }
-
-        [JsonProperty("joinMaps")]
-        public Dictionary<string, string> JoinMaps { get; set; }
-
-		/// <summary>
-		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
-		/// </summary>
-		public Dictionary<string, SourceListItem> GetSourceListForKey(string key)
-		{
-			if (string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key))
-				return null;
-			
-			return SourceLists[key];
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/DELETE ComPortController.cs

@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-	public class ComPortController : Device, IBasicCommunication
-	{
-		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-		ComPort Port;
-		ComPort.ComPortSpec Spec;
-		
-		public ComPortController(string key, IComPorts ComDevice, uint comPortNum, ComPort.ComPortSpec spec)
-			: base(key)
-		{
-			Port = ComDevice.ComPorts[comPortNum];
-			Spec = spec;
-
-			Debug.Console(2, "Creating com port '{0}'", key);
-			Debug.Console(2, "Com port spec:\r{0}", JsonConvert.SerializeObject(spec));
-		}
-
-		/// <summary>
-		/// Creates a ComPort if the parameters are correct. Returns and logs errors if not
-		/// </summary>
-		public static ComPortController GetComPortController(string key, 
-			IComPorts comDevice, uint comPortNum, ComPort.ComPortSpec spec)
-		{
-			Debug.Console(1, "Creating com port '{0}'", key);
-			if (comDevice == null)
-				throw new ArgumentNullException("comDevice");
-			if (string.IsNullOrEmpty(key))
-				throw new ArgumentNullException("key");
-			if (comPortNum > comDevice.NumberOfComPorts)
-			{
-				Debug.Console(0, "[{0}] Com port {1} out of range on {2}",
-					key, comPortNum, comDevice.GetType().Name);
-				return null;
-			}
-			var port = new ComPortController(key, comDevice, comPortNum, spec);
-			return port;
-		}
-
-		/// <summary>
-		/// Registers port and sends ComSpec
-		/// </summary>
-		/// <returns>false if either register or comspec fails</returns>
-		public override bool CustomActivate()
-		{
-			var result = Port.Register();
-			if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-			{
-				Debug.Console(0, this, "Cannot register Com port: {0}", result);
-				return false;
-			}
-			var specResult = Port.SetComPortSpec(Spec);
-			if (specResult != 0)
-			{
-				Debug.Console(0, this, "Cannot set comspec");
-				return false;
-			}
-			Port.SerialDataReceived += new ComPortDataReceivedEvent(Port_SerialDataReceived);
-			return true;
-		}
-
-		void Port_SerialDataReceived(ComPort ReceivingComPort, ComPortSerialDataEventArgs args)
-		{
-			if (BytesReceived != null)
-			{
-				var bytes = Encoding.GetEncoding(28591).GetBytes(args.SerialData);
-				BytesReceived(this, new GenericCommMethodReceiveBytesArgs(bytes));
-			}
-			if(TextReceived != null)
-				TextReceived(this, new GenericCommMethodReceiveTextArgs(args.SerialData));
-		}
-
-		public override bool Deactivate()
-		{
-			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
-		}
-
-		#region IBasicCommunication Members
-
-		public void SendText(string text)
-		{
-			Port.Send(text);
-		}
-
-		public void SendBytes(byte[] bytes)
-		{
-
-			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-			Port.Send(text);
-		}
-
-		#endregion
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericComm.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Serves as a generic wrapper class for all styles of IBasicCommuncation ports
-    /// </summary>
-    public class 
-        GenericComm : ReconfigurableDevice
-    {
-        EssentialsControlPropertiesConfig PropertiesConfig;
-
-        public IBasicCommunication CommPort { get; private set; }
-
-        public GenericComm(DeviceConfig config)
-            : base(config)
-        {
-            PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
-
-            CommPort = CommFactory.CreateCommForDevice(config);
-        }
-
-        public void SetPortConfig(string portConfig)
-        {
-            // TODO: Deserialize new EssentialsControlPropertiesConfig and handle as necessary
-            try
-            {
-                PropertiesConfig = JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
-                    (portConfig.ToString());
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error deserializing port config: {0}", e);
-            }
-        }
-
-        protected override void CustomSetConfig(DeviceConfig config)
-        {
-            PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
-
-            ConfigWriter.UpdateDeviceConfig(config);
-        }
-        
-     }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/IRPortHelper.cs

@@ -1,160 +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.Config;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IRPortHelper
-	{
-		public static string IrDriverPathPrefix
-		{
-			get
-			{
-				return Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
-			}
-		}
-
-		/// <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>IrPortConfig object.  The port and or filename will be empty/null 
-		/// if valid values don't exist on config</returns>
-		public static IrOutPortConfig GetIrPort(JToken propsToken)
-		{
-			var control = propsToken["control"];
-			if (control == null)
-				return null;
-			if (control["method"].Value<string>() != "ir")
-			{
-				Debug.Console(0, "IRPortHelper called with non-IR properties");
-				return null;
-			}
-
-			var port = new IrOutPortConfig();
-
-			var portDevKey = control.Value<string>("controlPortDevKey");
-			var portNum = control.Value<uint>("controlPortNumber");
-			if (portDevKey == null || portNum == 0)
-			{
-				Debug.Console(1, "WARNING: Properties is missing port device or port number");
-				return port;
-			}
-
-			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(1, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
-				return port;
-			}
-
-			if (portNum <= irDev.NumberOfIROutputPorts) // success!
-			{
-				var file = IrDriverPathPrefix + control["irFile"].Value<string>();
-				port.Port = irDev.IROutputPorts[portNum];
-				port.FileName = file;
-				return port; // new IrOutPortConfig { Port = irDev.IROutputPorts[portNum], FileName = file };
-			}
-			else
-			{
-				Debug.Console(1, "[Config] Error, device '{0}' IR port {1} out of range",
-					portDevKey, portNum);
-				return port;
-			}
-		}
-
-		/// <summary>
-		/// Returns a ready-to-go IrOutputPortController from a DeviceConfig object.
-		/// </summary>
-		public static IrOutputPortController GetIrOutputPortController(DeviceConfig devConf)
-		{
-			var irControllerKey = devConf.Key + "-ir";
-			if (devConf.Properties == null)
-			{
-				Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
-				return new IrOutputPortController(irControllerKey, null, "");
-			}
-
-			var control = devConf.Properties["control"];
-			if (control == null)
-			{
-				var c = new IrOutputPortController(irControllerKey, null, "");
-				Debug.Console(0, c, "WARNING: Device config does not include control properties.  IR will not function");
-				return c;
-			}
-
-			var portDevKey = control.Value<string>("controlPortDevKey");
-			var portNum = control.Value<uint>("controlPortNumber");
-			IIROutputPorts irDev = null;
-
-			if (portDevKey == null)
-			{
-				var c = new IrOutputPortController(irControllerKey, null, "");
-				Debug.Console(0, c, "WARNING: control properties is missing ir device");
-				return c;
-			}
-
-			if (portNum == 0)
-			{
-				var c = new IrOutputPortController(irControllerKey, null, "");
-				Debug.Console(0, c, "WARNING: control properties is missing ir port number");
-				return c;
-			} 
-
-			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-				|| portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
-				irDev = Global.ControlSystem;
-			else
-				irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
-
-			if (irDev == null)
-			{
-				var c = new IrOutputPortController(irControllerKey, null, "");
-				Debug.Console(0, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
-				return c;
-			}
-
-			if (portNum <= irDev.NumberOfIROutputPorts) // success!
-				return new IrOutputPortController(irControllerKey, irDev.IROutputPorts[portNum],
-					IrDriverPathPrefix + control["irFile"].Value<string>());
-			else
-			{
-				var c = new IrOutputPortController(irControllerKey, null, "");
-				Debug.Console(0, c, "WARNING: device '{0}' IR port {1} out of range",
-					portDevKey, portNum);
-				return c;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Wrapper to help in IR port creation
-	/// </summary>
-	public class IrOutPortConfig
-	{
-		public IROutputPort Port { get; set; }
-		public string FileName { get; set; }
-
-		public IrOutPortConfig()
-		{
-			FileName = "";
-		}
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/C2nRts/C2nRthsController.cs

@@ -1,44 +0,0 @@
-using System;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class C2nRthsController:CrestronGenericBaseDevice
-    {
-        private C2nRths _device;
-
-        public IntFeedback TemperatureFeedback { get; private set; }
-        public IntFeedback HumidityFeedback { get; private set; }
-
-        public C2nRthsController(string key, string name, GenericBase hardware) : base(key, name, hardware)
-        {
-            _device = hardware as C2nRths;
-
-            TemperatureFeedback = new IntFeedback(() => _device.TemperatureFeedback.UShortValue);
-            HumidityFeedback = new IntFeedback(() => _device.HumidityFeedback.UShortValue);
-
-            _device.BaseEvent += DeviceOnBaseEvent;
-        }
-
-        private void DeviceOnBaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case C2nRths.TemperatureFeedbackEventId:
-                    TemperatureFeedback.FireUpdate();
-                    break;
-                case C2nRths.HumidityFeedbackEventId:
-                    HumidityFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-        public void SetTemperatureFormat(bool setToC)
-        {
-            _device.TemperatureFormat.BoolValue = setToC;
-        }
-    }
-}

essentials-framework/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-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs

@@ -1,50 +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 digital input deviced tied to a versiport
-    /// </summary>
-    public class GenericVersiportDigitalInputDevice : Device, IDigitalInput
-    {
-        public Versiport InputPort { get; private set; }
-
-        public BoolFeedback InputStateFeedback { get; private set; }
-
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.DigitalIn;
-            }
-        }
-
-        public GenericVersiportDigitalInputDevice(string key, Versiport inputPort, IOPortConfig props):
-            base(key)
-        {
-            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
-            InputPort = inputPort;
-            InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
-            if (props.DisablePullUpResistor)
-                InputPort.DisablePullUpResistor = true;
-            InputPort.VersiportChange += new VersiportEventHandler(InputPort_VersiportChange);
-
-            Debug.Console(1, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", props.PortNumber, InputPort.DisablePullUpResistor);
-        }
-
-        void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
-        {
-			Debug.Console(1, this, "Versiport change: {0}", args.Event);
-
-            if(args.Event == eVersiportEvent.DigitalInChange)
-                InputStateFeedback.FireUpdate();
-        }
-    }
-}

essentials-framework/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));
-
-            RelayOutput = relay;
-            RelayOutput.Register();
-
-            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-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/StatusSign/StatusSignController.cs

@@ -1,107 +0,0 @@
-using System;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class StatusSignController:CrestronGenericBaseDevice
-    {
-        private StatusSign _device;
-
-        public BoolFeedback RedLedEnabledFeedback { get; private set; }
-        public BoolFeedback GreenLedEnabledFeedback { get; private set; }
-        public BoolFeedback BlueLedEnabledFeedback { get; private set; }
-
-        public IntFeedback RedLedBrightnessFeedback { get; private set; }
-        public IntFeedback GreenLedBrightnessFeedback { get; private set; }
-        public IntFeedback BlueLedBrightnessFeedback { get; private set; }
-
-        public StatusSignController(string key, string name, GenericBase hardware) : base(key, name, hardware)
-        {
-            _device = hardware as StatusSign;
-
-            RedLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint) StatusSign.Led.eLedColor.Red]
-                            .ControlFeedback.BoolValue);
-            GreenLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint) StatusSign.Led.eLedColor.Green]
-                            .ControlFeedback.BoolValue);
-            BlueLedEnabledFeedback =
-                new BoolFeedback(
-                    () =>
-                        _device.Leds[(uint) StatusSign.Led.eLedColor.Blue]
-                            .ControlFeedback.BoolValue);
-
-            RedLedBrightnessFeedback =
-                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Red].BrightnessFeedback);
-            GreenLedBrightnessFeedback =
-                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Green].BrightnessFeedback);
-            BlueLedBrightnessFeedback =
-                new IntFeedback(() => (int) _device.Leds[(uint) StatusSign.Led.eLedColor.Blue].BrightnessFeedback);
-
-            _device.BaseEvent += _device_BaseEvent;
-        }
-
-        void _device_BaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case StatusSign.LedBrightnessFeedbackEventId:
-                    RedLedBrightnessFeedback.FireUpdate();
-                    GreenLedBrightnessFeedback.FireUpdate();
-                    BlueLedBrightnessFeedback.FireUpdate();
-                    break;
-                case StatusSign.LedControlFeedbackEventId:
-                    RedLedEnabledFeedback.FireUpdate();
-                    GreenLedEnabledFeedback.FireUpdate();
-                    BlueLedEnabledFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-        public void EnableLedControl(bool red, bool green, bool blue)
-        {
-            _device.Leds[(uint) StatusSign.Led.eLedColor.Red].Control.BoolValue = red;
-            _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Control.BoolValue = green;
-            _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Control.BoolValue = blue;
-        }
-
-        public void SetColor(uint red, uint green, uint blue)
-        {
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Red].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(red);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Red LED brightness. value: {0}", red);
-            }
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Green].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(green);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Green LED brightness. value: {0}", green);
-            }
-
-            try
-            {
-                _device.Leds[(uint)StatusSign.Led.eLedColor.Blue].Brightness =
-                    (StatusSign.Led.eBrightnessPercentageValues)SimplSharpDeviceHelper.PercentToUshort(blue);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.Console(1, this, "Error converting value to Blue LED brightness. value: {0}", blue);
-            }
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IPower.cs

@@ -1,48 +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.Essentials.Core.SmartObjects;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface IPower
-	{
-		void PowerOn();
-		void PowerOff();
-		void PowerToggle();
-		BoolFeedback PowerIsOnFeedback { get; }
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IPowerExtensions
-	{
-		public static void LinkButtons(this IPower dev, BasicTriList triList)
-		{
-			triList.SetSigFalseAction(101, dev.PowerOn);
-			triList.SetSigFalseAction(102, dev.PowerOff);
-			triList.SetSigFalseAction(103, dev.PowerToggle);
-			dev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
-		}
-
-		public static void UnlinkButtons(this IPower dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(101);
-			triList.ClearBoolSigAction(102);
-			triList.ClearBoolSigAction(103);
-			dev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
-		}
-	}
-}

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

@@ -1,268 +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 steps on all Device class items
-		/// </summary>
-		public static void ActivateAll()
-		{
-            // PreActivate all devices
-            foreach (var d in Devices.Values)
-            {
-                try
-                {
-                    if (d is Device)
-                        (d as Device).PreActivate();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
-                }
-            }
-
-            // Activate all devices
-			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);
-				}
-			}
-
-            // PostActivate all devices
-            foreach (var d in Devices.Values)
-            {
-                try
-                {
-                    if (d is Device)
-                        (d as Device).PostActivate();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(0, d, "ERROR: Device PostActivation 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-framework/Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -1,153 +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 event SourceInfoChangeHandler CurrentSourceChange;
-
-        public string CurrentSourceInfoKey { get; set; }
-        public SourceListItem CurrentSourceInfo
-        {
-            get
-            {
-                return _CurrentSourceInfo;
-            }
-            set
-            {
-                if (value == _CurrentSourceInfo) return;
-
-                var handler = CurrentSourceChange;
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.WillChange);
-
-                _CurrentSourceInfo = value;
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-            }
-        }
-        SourceListItem _CurrentSourceInfo;
-
-		public BoolFeedback 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("PowerOnFeedback", PowerIsOnFeedbackFunc);
-			IsCoolingDownFeedback = new BoolFeedback("IsCoolingDown", IsCoolingDownFeedbackFunc);
-			IsWarmingUpFeedback = new BoolFeedback("IsWarmingUp", IsWarmingUpFeedbackFunc);
-
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-
-            PowerIsOnFeedback.OutputChange += 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 FeedbackCollection<Feedback> Feedbacks
-		{
-			get
-			{
-                return new FeedbackCollection<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-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.Touchpanels;
-
-namespace PepperDash.Essentials.Core
-{
-    public class DeviceFactory
-    {
-		/// <summary>
-		/// A dictionary of factory methods, keyed by config types, added by plugins.
-		/// These methods are looked up and called by GetDevice in this class.
-		/// </summary>
-		static Dictionary<string, Func<DeviceConfig, IKeyed>> FactoryMethods =
-			new Dictionary<string, Func<DeviceConfig, IKeyed>>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Adds a plugin factory method
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-		public static void AddFactoryForType(string type, Func<DeviceConfig, IKeyed> method) 
-		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", type);
-			DeviceFactory.FactoryMethods.Add(type, method);
-		}
-
-		/// <summary>
-		/// The factory method for Core "things". Also iterates the Factory methods that have
-		/// been loaded from plugins
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-        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();
-
-
-            // Check for types that have been added by plugin dlls. 
-            if (FactoryMethods.ContainsKey(typeName))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from plugin", dc.Type);
-                return FactoryMethods[typeName](dc);
-            }
-
-			// Check "core" types 
-            if (typeName == "genericcomm")
-            {
-                Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
-                return new GenericComm(dc);
-            }
-            if (typeName == "ceniodigin104")
-            {
-                var control = CommFactory.GetControlPropertiesConfig(dc);
-                var ipid = control.IpIdInt;
-
-                return new CenIoDigIn104Controller(key, name, new Crestron.SimplSharpPro.GeneralIO.CenIoDi104(ipid, Global.ControlSystem));
-            }
-		    if (typeName == "statussign")
-		    {
-		        var control = CommFactory.GetControlPropertiesConfig(dc);
-		        var cresnetId = control.CresnetIdInt;
-
-                return  new StatusSignController(key, name, new StatusSign(cresnetId, Global.ControlSystem));
-		    }
-		    if (typeName == "c2nrths")
-		    {
-		        var control = CommFactory.GetControlPropertiesConfig(dc);
-		        var cresnetId = control.CresnetIdInt;
-
-		        return new C2nRthsController(key, name, new C2nRths(cresnetId, Global.ControlSystem));
-		    }
-
-            return null;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Scheduler;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Global Scheduler for the system
-    /// </summary>
-    public static class Scheduler
-    {
-        private static Dictionary<string, ScheduledEventGroup> EventGroups = new Dictionary<string,ScheduledEventGroup>();
-
-        static Scheduler()
-        {
-            CrestronConsole.AddNewConsoleCommand(ClearEventsFromGroup, "ClearAllEvents", "Clears all scheduled events for this group", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(ListAllEventGroups, "ListAllEventGroups", "Lists all the event groups by key", ConsoleAccessLevelEnum.AccessOperator);
-        }
-
-        /// <summary>
-        /// Clears (deletes) all events from a group
-        /// </summary>
-        /// <param name="groupName"></param>
-        static void ClearEventsFromGroup(string groupName)
-        {
-            var group = EventGroups[groupName];
-
-            if (group != null)
-                group.ClearAllEvents();
-            else
-                Debug.Console(0, "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.", groupName);
-        }
-
-        static void ListAllEventGroups(string command)
-        {
-            Debug.Console(0, "Event Groups:");
-            foreach (var group in EventGroups)
-            {
-                Debug.Console(0, "{0}", group.Key);
-            }
-        }
-
-        /// <summary>
-        /// Adds the event group to the global list
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public static void AddEventGroup(ScheduledEventGroup eventGroup)
-        {
-            // Add this group to the global collection
-            if (!EventGroups.ContainsKey(eventGroup.Name))
-                EventGroups.Add(eventGroup.Name, eventGroup);
-        }
-
-        /// <summary>
-        /// Removes the event group from the global list
-        /// </summary>
-        /// <param name="eventGroup"></param>
-        public static void RemoveEventGroup(ScheduledEventGroup eventGroup)
-        {
-            if(!EventGroups.ContainsKey(eventGroup.Name))
-                EventGroups.Remove(eventGroup.Name);
-        }
-    }
-
-    public static class SchedulerUtilities
-    {
-        /// <summary>
-        /// Checks the day of week in eventTime to see if it matches the weekdays defined in the recurrence enum.
-        /// </summary>
-        /// <param name="eventTime"></param>
-        /// <param name="recurrence"></param>
-        /// <returns></returns>
-        public static bool CheckIfDayOfWeekMatchesRecurrenceDays(DateTime eventTime, ScheduledEventCommon.eWeekDays recurrence)
-        {
-            bool isMatch = false;
-
-            var dayOfWeek = eventTime.DayOfWeek;
-
-            Debug.Console(1, "[Scheduler]: eventTime day of week is: {0}", dayOfWeek);
-
-            switch (dayOfWeek)
-            {
-                case DayOfWeek.Sunday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Sunday) == ScheduledEventCommon.eWeekDays.Sunday)
-                            isMatch = true;
-                        break;
-                    }
-                case DayOfWeek.Monday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Monday) == ScheduledEventCommon.eWeekDays.Monday)
-                            isMatch = true;
-                        break;
-                    }
-                case DayOfWeek.Tuesday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Tuesday) == ScheduledEventCommon.eWeekDays.Tuesday)
-                            isMatch = true;
-                        break;
-                    }
-                case DayOfWeek.Wednesday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Wednesday) == ScheduledEventCommon.eWeekDays.Wednesday)
-                            isMatch = true;
-                        break;
-                    }
-                case DayOfWeek.Thursday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Thursday) == ScheduledEventCommon.eWeekDays.Thursday)
-                            isMatch = true;
-                        break;
-                    }
-                case DayOfWeek.Friday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Friday) == ScheduledEventCommon.eWeekDays.Friday)
-                            isMatch = true;
-                        break;
-                    }
-                case DayOfWeek.Saturday:
-                    {
-                        if ((recurrence & ScheduledEventCommon.eWeekDays.Saturday) == ScheduledEventCommon.eWeekDays.Saturday)
-                            isMatch = true;
-                        break;
-                    }
-            }
-
-            Debug.Console(1, "[Scheduler]: eventTime day of week matches recurrence days: {0}", isMatch);
-
-            return isMatch;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    public static class JoinMapHelper
-    {
-        /// <summary>
-        /// Attempts to get the serialized join map from config
-        /// </summary>
-        /// <param name="joinMapKey"></param>
-        /// <returns></returns>
-        public static string GetJoinMapForDevice(string joinMapKey)
-        {
-            if (string.IsNullOrEmpty(joinMapKey))
-                return null;
-
-            var joinMap = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
-
-            if (joinMap != null)
-            {
-                return joinMap;
-            }
-            else
-                return null;
-        }
-    }
-
-    /// <summary>
-    /// Base class for join maps
-    /// </summary>
-    public abstract class JoinMapBase
-    {
-        /// <summary>
-        /// Modifies all the join numbers by adding the offset.  This should never be called twice
-        /// </summary>
-        /// <param name="joinStart"></param>
-        public abstract void OffsetJoinNumbers(uint joinStart);
-
-
-    }
-
-
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs

@@ -1,98 +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.Lighting
-{
-    public abstract class LightingBase : Device, ILightingScenes
-    {
-        #region ILightingScenes Members
-
-        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
-        public List<LightingScene> LightingScenes { get; protected set; }
-
-        public LightingScene CurrentLightingScene { get; protected set; }
-		
-		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
-
-        #endregion
-
-
-        public LightingBase(string key, string name)
-            : base(key, name)
-        {
-            LightingScenes = new List<LightingScene>();
-
-            CurrentLightingScene = new LightingScene();
-			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
-        }
-
-        public abstract void SelectScene(LightingScene scene);
-
-        public void SimulateSceneSelect(string sceneName)
-        {
-            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
-
-            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
-
-            if (scene != null)
-            {
-                CurrentLightingScene = scene;
-                OnLightingSceneChange();
-            }
-        }
-
-        /// <summary>
-        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
-        /// </summary>
-        protected void OnLightingSceneChange()
-        {
-            foreach (var scene in LightingScenes)
-            {
-                if (scene == CurrentLightingScene)
-                    scene.IsActive = true;
-					
-                else
-                    scene.IsActive = false;
-            }
-
-            var handler = LightingSceneChange;
-            if (handler != null)
-            {
-                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
-            }
-        }
-
-    }
-
-    public class LightingScene
-    {
-        public string Name { get; set; }
-        public string ID { get; set; }
-        bool _IsActive;
-        public bool IsActive 
-        {
-            get
-            {
-                return _IsActive;
-            }
-            set
-            {
-                _IsActive = value;
-                IsActiveFeedback.FireUpdate();
-            }
-        }
-        public BoolFeedback IsActiveFeedback { get; set; }
-
-        public LightingScene()
-        {
-            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/IPluginDeviceConfig.cs

@@ -1,11 +0,0 @@
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.Plugins
-{
-    public interface IPluginDeviceConfig
-    {
-        string MinimumEssentialsFrameworkVersion { get; }
-        IKeyed BuildDevice(DeviceConfig dc);
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginEntrypointAttribute.cs

@@ -1,19 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Plugins
-{
-    [AttributeUsage(AttributeTargets.Class)]
-    public sealed class PluginEntryPointAttribute : Attribute
-    {
-        private readonly string _uniqueKey;
-
-        public string UniqueKey {
-            get { return _uniqueKey; }
-        }
-
-        public PluginEntryPointAttribute(string key)
-        {
-            _uniqueKey = key;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs

@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-
-//using SSMono.IO;
-
-namespace PepperDash.Essentials.Core.Presets
-{
-	/// <summary>
-	/// Class that represents the model behind presets display
-	/// </summary>
-	public class DevicePresetsModel : Device
-	{
-		public event EventHandler PresetsLoaded;
-
-		public int PulseTime { get; set; }
-		public int DigitSpacingMS { get; set; }
-		public bool PresetsAreLoaded { get; private set; }
-
-		public List<PresetChannel> PresetsList { get { return _PresetsList.ToList(); } }
-		List<PresetChannel> _PresetsList;
-		public int Count { get { return PresetsList != null ? PresetsList.Count : 0; } }
-
-		public bool UseLocalImageStorage { get; set; }
-		public string ImagesLocalHostPrefix { get; set; }
-		public string ImagesPathPrefix { get; set; }
-		public string ListPathPrefix { get; set; }
-
-		/// <summary>
-		/// The methods on the STB device to call when dialing
-		/// </summary>
-		Dictionary<char, Action<bool>> DialFunctions;
-		Action<bool> EnterFunction;
-
-		bool DialIsRunning;
-		string FilePath;
-		bool InitSuccess;
-        //SSMono.IO.FileSystemWatcher ListWatcher;
-
-		public DevicePresetsModel(string key, ISetTopBoxNumericKeypad setTopBox, string fileName)
-			: base(key)
-		{
-			PulseTime = 150;
-			DigitSpacingMS = 150;
-
-			try
-			{
-				// Grab the digit functions from the device
-				// If any fail, the whole thing fails peacefully
-				DialFunctions = new Dictionary<char, Action<bool>>(10)
-				{
-					{ '1', setTopBox.Digit1 },
-					{ '2', setTopBox.Digit2 },
-					{ '3', setTopBox.Digit3 },
-					{ '4', setTopBox.Digit4 },
-					{ '5', setTopBox.Digit5 },
-					{ '6', setTopBox.Digit6 },
-					{ '7', setTopBox.Digit7 },
-					{ '8', setTopBox.Digit8 },
-					{ '9', setTopBox.Digit9 },
-					{ '0', setTopBox.Digit0 },
-					{ '-', setTopBox.Dash }
-				};
-			}
-			catch
-			{
-				Debug.Console(0, "DevicePresets '{0}', not attached to INumericKeypad device. Ignoring", key);
-				DialFunctions = null;
-				return;
-			}
-
-			EnterFunction = setTopBox.KeypadEnter;
-
-			UseLocalImageStorage = true;
-
-			ImagesLocalHostPrefix = "http://" + CrestronEthernetHelper.GetEthernetParameter(
-				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS,0);
-			ImagesPathPrefix = @"/presets/images.zip/";
-			ListPathPrefix = @"/html/presets/lists/";
-
-			SetFileName(fileName);
-
-            //ListWatcher = new FileSystemWatcher(@"\HTML\presets\lists");
-            //ListWatcher.NotifyFilter = NotifyFilters.LastWrite;
-            //ListWatcher.EnableRaisingEvents = true;
-            //ListWatcher.Changed += ListWatcher_Changed;
-			InitSuccess = true;
-		}
-
-
-		public void SetFileName(string path)
-		{
-			FilePath = ListPathPrefix + path;
-			LoadChannels();
-		}	
-
-		public void LoadChannels()
-		{
-			PresetsAreLoaded = false;
-			try
-			{
-				var pl = JsonConvert.DeserializeObject<PresetsList>(Crestron.SimplSharp.CrestronIO.File.ReadToEnd(FilePath, Encoding.ASCII));
-				Name = pl.Name;
-				_PresetsList = pl.Channels;
-			}
-			catch (Exception e)
-			{
-				Debug.Console(2, this, "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}", FilePath, e.Message);
-				// Just save a default empty list
-				_PresetsList = new List<PresetChannel>();
-			}
-			PresetsAreLoaded = true;
-
-			var handler = PresetsLoaded;
-			if (handler != null)
-				handler(this, EventArgs.Empty);
-		}
-
-		public void Dial(int presetNum)
-		{
-			if (presetNum <= _PresetsList.Count)
-				Dial(_PresetsList[presetNum - 1].Channel);
-		}
-
-		public void Dial(string chanNum)
-		{
-			if (DialIsRunning || !InitSuccess) return;
-			if (DialFunctions == null)
-			{
-				Debug.Console(1, "DevicePresets '{0}', not attached to keypad device. Ignoring channel", Key);
-				return;
-			}
-
-			DialIsRunning = true;
-			CrestronInvoke.BeginInvoke(o =>
-				{
-					foreach (var c in chanNum.ToCharArray())
-					{
-						if (DialFunctions.ContainsKey(c))
-							Pulse(DialFunctions[c]);
-						CrestronEnvironment.Sleep(DigitSpacingMS);
-					}
-
-					if (EnterFunction != null)
-						Pulse(EnterFunction);
-					DialIsRunning = false;
-				});
-		}
-
-		void Pulse(Action<bool> act)
-		{
-			act(true);
-			CrestronEnvironment.Sleep(PulseTime);
-			act(false);
-		}
-
-		/// <summary>
-		/// Event handler for filesystem watcher.  When directory changes, this is called
-		/// </summary>
-        //void ListWatcher_Changed(object sender, FileSystemEventArgs e)
-        //{
-        //    Debug.Console(1, this, "folder modified: {0}", e.FullPath);
-        //    if (e.FullPath.Equals(FilePath, StringComparison.OrdinalIgnoreCase))
-        //    {
-        //        Debug.Console(1, this, "File changed: {0}", e.ChangeType);			
-        //        LoadChannels();
-        //    }
-        //}
-	}
-}

essentials-framework/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-framework/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-framework/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-framework/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-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs

@@ -1,100 +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>
-    /// The handler type for a Room's SourceInfoChange
-    /// </summary>
-    public delegate void SourceInfoChangeHandler(/*EssentialsRoomBase room,*/ SourceListItem info, ChangeType type);
-
-
-	//*******************************************************************************************
-	// Interfaces
-
-    /// <summary>
-    /// For rooms with a single presentation source, change event
-    /// </summary>
-    public interface IHasCurrentSourceInfoChange
-    {
-        string CurrentSourceInfoKey { get; set; }
-        SourceListItem CurrentSourceInfo { get; set; }
-        event SourceInfoChangeHandler CurrentSourceChange;
-    }
-
-	/// <summary>
-	/// Defines a class that has a collection of RoutingInputPorts
-	/// </summary>
-	public interface IRoutingInputs : IKeyed
-	{
-		RoutingPortCollection<RoutingInputPort> InputPorts { get; }
-	}
-
-	/// <summary>
-	/// Defines a class that has a collection of RoutingOutputPorts
-	/// </summary>
-
-	public interface IRoutingOutputs : IKeyed
-	{
-		RoutingPortCollection<RoutingOutputPort> OutputPorts { get; }
-	}
-
-	/// <summary>
-	/// For fixed-source endpoint devices
-	/// </summary>
-	public interface IRoutingSinkNoSwitching : IRoutingInputs, IHasCurrentSourceInfoChange
-	{
-
-	}
-
-	/// <summary>
-	/// Endpoint device like a display, that selects inputs
-	/// </summary>
-	public interface IRoutingSinkWithSwitching : IRoutingSinkNoSwitching, IHasCurrentSourceInfoChange
-	{
-		//void ClearRoute();
-		void ExecuteSwitch(object inputSelector);
-	}
-
-	/// <summary>
-	/// For devices like RMCs, baluns, other devices with no switching.
-	/// </summary>
-	public interface IRoutingInputsOutputs : IRoutingInputs, IRoutingOutputs
-	{
-	}
-
-	/// <summary>
-	/// Defines a midpoint device as have internal routing.  Any devices in the middle of the
-	/// signal chain, that do switching, must implement this for routing to work otherwise
-	/// the routing algorithm will treat the IRoutingInputsOutputs device as a passthrough
-	/// device.
-	/// </summary>
-	public interface IRouting : IRoutingInputsOutputs
-	{
-		//void ClearRoute(object outputSelector);
-		void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType);
-    }
-
-    public interface ITxRouting : IRouting
-    {
-        IntFeedback VideoSourceNumericFeedback { get; }
-        IntFeedback AudioSourceNumericFeedback { get; }
-        void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type);
-    }
-
-	/// <summary>
-	/// Defines an IRoutingOutputs devices as being a source - the start of the chain
-	/// </summary>
-	public interface IRoutingSource : IRoutingOutputs
-	{
-	}
-}

essentials-framework/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-framework/Essentials DM/Essentials_DM.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials_DM", "Essentials_DM\Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs

@@ -1,586 +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.Blades;
-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 {
-    /// <summary>
-    /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
-    /// 
-    /// </summary>
-    public class DmBladeChassisController : CrestronGenericBaseDevice, IDmSwitch, IRoutingInputsOutputs, IRouting, IHasFeedback {
-        public DMChassisPropertiesConfig PropertiesConfig { get; set; }
-
-        public Switch Chassis { get; private set; }
-
-        // Feedbacks for EssentialDM
-        public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
-        public Dictionary<uint, IntFeedback> AudioOutputFeedbacks { get; private set; }
-        public Dictionary<uint, BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
-        public Dictionary<uint, BoolFeedback> InputEndpointOnlineFeedbacks { get; private set; }
-        public Dictionary<uint, BoolFeedback> OutputEndpointOnlineFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> InputNameFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> OutputNameFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> OutputVideoRouteNameFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> OutputAudioRouteNameFeedbacks { get; private set; }
-        public Dictionary<uint, IntFeedback> UsbOutputRoutedToFeebacks { get; private set; }
-        public Dictionary<uint, IntFeedback> UsbInputRoutedToFeebacks { get; private set; }
-
-        public IntFeedback SystemIdFeebdack { get; private set; }
-        public BoolFeedback SystemIdBusyFeedback { get; private set; }
-
-
-        public Dictionary<uint, IntFeedback> InputCardHdcpCapabilityFeedbacks { get; private set; }
-
-        public Dictionary<uint, eHdcpCapabilityType> InputCardHdcpCapabilityTypes { 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, string> TxDictionary { get; set; }
-        public Dictionary<uint, string> RxDictionary { get; 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 DmBladeChassisController GetDmChassisController(string key, string name,
-            string type, DMChassisPropertiesConfig properties) {
-            try {
-                type = type.ToLower();
-                uint ipid = properties.Control.IpIdInt;
-
-                BladeSwitch chassis = null;
-                if (type == "dmmd64x64") { chassis = new DmMd64x64(ipid, Global.ControlSystem); }
-                else if (type == "dmmd128x128") { chassis = new DmMd128x128(ipid, Global.ControlSystem); }
-
-
-                if (chassis == null) {
-                    return null;
-                }
-
-                var controller = new DmBladeChassisController(key, name, chassis);
-                // add the cards and port names
-                foreach (var kvp in properties.InputSlots)
-                    controller.AddInputBlade(kvp.Value, kvp.Key);
-                foreach (var kvp in properties.OutputSlots) {
-                    controller.AddOutputBlade(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 DmHdmi4kOutputBladeCard)
-                        audio = (card as DmHdmi4kOutputBladeCard).Hdmi4kOutput.Audio;
-                    if (audio == null)
-                        continue;
-                    // wire up the audio to something here...
-                    controller.AddVolumeControl(outNum, audio);
-                }
-
-                controller.InputNames = properties.InputNames;
-                controller.OutputNames = properties.OutputNames;
-                controller.PropertiesConfig = properties;
-                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 DmBladeChassisController(string key, string name, BladeSwitch chassis)
-            : base(key, name, chassis) {
-            Chassis = chassis;
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-            VolumeControls = new Dictionary<uint, DmCardAudioOutputController>();
-            TxDictionary = new Dictionary<uint, string>();
-            RxDictionary = new Dictionary<uint, string>();
-            IsOnline.OutputChange += new EventHandler<FeedbackEventArgs>(IsOnline_OutputChange);
-            Chassis.DMInputChange += new DMInputEventHandler(Chassis_DMInputChange);
-            Chassis.DMOutputChange += new DMOutputEventHandler(Chassis_DMOutputChange);
-            VideoOutputFeedbacks = new Dictionary<uint, IntFeedback>();
-            UsbOutputRoutedToFeebacks = new Dictionary<uint, IntFeedback>();
-            UsbInputRoutedToFeebacks = new Dictionary<uint, IntFeedback>();
-            VideoInputSyncFeedbacks = new Dictionary<uint, BoolFeedback>();
-            InputNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            OutputNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            OutputVideoRouteNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            OutputAudioRouteNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            InputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
-            OutputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
-
-            InputCardHdcpCapabilityFeedbacks = new Dictionary<uint, IntFeedback>();
-            InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
-
-            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) {
-                var tempX = x;
-
-                if (Chassis.Outputs[tempX] != null) {
-                    VideoOutputFeedbacks[tempX] = new IntFeedback(() => {
-                        if (Chassis.Outputs[tempX].VideoOutFeedback != null) { return (ushort)Chassis.Outputs[tempX].VideoOutFeedback.Number; }
-                        else { return 0; };
-                    });
-
-                    OutputNameFeedbacks[tempX] = new StringFeedback(() => {
-                        if (Chassis.Outputs[tempX].NameFeedback != null) {
-                            return Chassis.Outputs[tempX].NameFeedback.StringValue;
-                        }
-                        else {
-                            return "";
-                        }
-                    });
-                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() => {
-                        if (Chassis.Outputs[tempX].VideoOutFeedback != null) {
-                            return Chassis.Outputs[tempX].VideoOutFeedback.NameFeedback.StringValue;
-                        }
-                        else {
-                            return "";
-                        }
-                    });
-
-                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
-                        //if (Chassis.Outputs[tempX].Endpoint != null)
-                        //    return Chassis.Outputs[tempX].Endpoint.IsOnline;
-                        //else
-                            return Chassis.Outputs[tempX].EndpointOnlineFeedback;
-                    });
-                }
-
-                if (Chassis.Inputs[tempX] != null) {
-                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() => {
-                        if (Chassis.Inputs[tempX].USBRoutedToFeedback != null) { return (ushort)Chassis.Inputs[tempX].USBRoutedToFeedback.Number; }
-                        else { return 0; };
-                    });
-                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() => {
-                        if (Chassis.Inputs[tempX].VideoDetectedFeedback != null)
-                            return Chassis.Inputs[tempX].VideoDetectedFeedback.BoolValue;
-                        else
-                            return false;
-                    });
-                    InputNameFeedbacks[tempX] = new StringFeedback(() => {
-                        if (Chassis.Inputs[tempX].NameFeedback != null) {
-                            return Chassis.Inputs[tempX].NameFeedback.StringValue;
-                        }
-                        else {
-                            return "";
-                        }
-                    });
-
-                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
-                        return Chassis.Inputs[tempX].EndpointOnlineFeedback;
-                    });
-
-                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() => {
-                        var inputCard = Chassis.Inputs[tempX];
-
-                        if (inputCard.Card is DmHdmi4kInputBladeCard) {
-                            InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
-
-                            if ((inputCard.Card as DmHdmi4kInputBladeCard).Hdmi4kInput.HdcpSupportOnFeedback.BoolValue)
-                                return 1;
-                            else
-                                return 0;
-                        }
-
-                        if (inputCard.Card is DmC4kInputBladeCard) {
-                            InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
-
-                            if ((inputCard.Card as DmC4kInputBladeCard).DmInput.HdcpCapabilityFeedback.Equals(eHdcpCapabilityType.HdcpSupportOff))
-                                return 0;
-                            else
-                                return 1;
-                        }
-
-                        else
-                            return 0;
-                    });
-                }
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="number"></param>
-        public void AddInputBlade(string type, uint number) {
-            Debug.Console(2, this, "Adding input blade '{0}', slot {1}", type, number);
-
-            type = type.ToLower();
-
-            if (type == "dmb4kihd") {
-                var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
-                    var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
-                    var cecPort = card as ICec;
-                    AddHdmiInBladePorts(item.Number, cecPort);
-                }
-            }
-
-            else if (type == "dmb4kihddnt") {
-                var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
-                    var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
-                    var cecPort = card as ICec;
-                    AddHdmiInBladePorts(item.Number, cecPort);
-                }
-            }
-
-            else if (type == "dmb4kic") {
-                var inputBlade = new Dmb4kIC(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
-                    AddDmInBladePorts(item.Number);
-                }
-            }
-
-            else if (type == "dmbis") {
-                var inputBlade = new DmbIS(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
-                    AddDmInMmFiberPorts(item.Number);
-                }
-            }
-            else if (type == "dmbis2") {
-                var inputBlade = new DmbIS2(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
-                    AddDmInSmFiberPorts(item.Number);
-                }
-            }
-        }
-
-
-
-        void AddHdmiInBladePorts(uint number, ICec cecPort) {
-            AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort);
-        }
-
-        void AddDmInBladePorts(uint number) {
-            AddInputPortWithDebug(number, "dmCIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat);
-        }
-
-        void AddDmInMmFiberPorts(uint number) {
-            AddInputPortWithDebug(number, "dmMmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
-        }
-
-        void AddDmInSmFiberPorts(uint number) {
-            AddInputPortWithDebug(number, "dmSmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="number"></param>
-        public void AddOutputBlade(string type, uint number) {
-            type = type.ToLower();
-
-            Debug.Console(2, this, "Adding output blade '{0}', slot {1}", type, number);
-            if (type == "dmb4kohd") {
-                var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
-                    AddHdmiOutBladePorts(item.Number);
-                }
-            }
-
-            else if (type == "dmb4kohddnt") {
-                var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
-                    AddHdmiOutBladePorts(item.Number);
-                }
-            }
-
-            else if (type == "dmb4koc") {
-                var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
-                    AddDmOutBladePorts(item.Number);
-                }
-            }
-            else if (type == "dmb4koc") {
-                var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
-                    AddDmOutBladePorts(item.Number);
-                }
-            }
-            else if (type == "dmbos") {
-                var outputBlade = new DmbOS(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
-                    AddDmOutMmFiberBladePorts(item.Number);
-                }
-            }
-            else if (type == "dmbos2") {
-                var outputBlade = new DmbOS2(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
-                    AddDmOutSmFiberBladePorts(item.Number);
-                }
-            }
-        }
-
-        void AddHdmiOutBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("hdmiOut{0}", number) , eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, number);
-        }
-
-        void AddDmOutBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, number);
-        }
-
-        void AddDmOutMmFiberBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, number);
-        }
-
-        void AddDmOutSmFiberBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, number);
-        }
-
-
-        /// <summary>
-        /// Adds InputPort
-        /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType) {
-            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
-
-            InputPorts.Add(inputPort);
-        }
-
-        /// <summary>
-        /// Adds InputPort and sets Port as ICec object
-        /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort) {
-            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
-
-            if (inputPort != null) {
-                if (cecPort != null)
-                    inputPort.Port = cecPort;
-
-                InputPorts.Add(inputPort);
-            }
-            else
-                Debug.Console(2, this, "inputPort is null");
-        }
-
-
-        /// <summary>
-        /// Adds OutputPort
-        /// </summary>
-        void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
-            var portKey = string.Format("{0}--{1}", cardName, portName);
-            Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this));
-        }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void AddVolumeControl(uint number, Audio.Output audio) {
-            VolumeControls.Add(number, new DmCardAudioOutputController(audio));
-        }
-
-        //public void SetInputHdcpSupport(uint input, ePdtHdcpSupport hdcpSetting)
-        //{
-
-        //}
-
-
-        void Chassis_DMInputChange(Switch device, DMInputEventArgs args) {
-
-            switch (args.EventId) {
-                case DMInputEventIds.EndpointOnlineEventId: {
-                        Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                        InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                case DMInputEventIds.OnlineFeedbackEventId: {
-                        Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                        InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                case DMInputEventIds.VideoDetectedEventId: {
-                        Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
-                        VideoInputSyncFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                case DMInputEventIds.InputNameEventId: {
-                        Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                        InputNameFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                case DMInputEventIds.HdcpCapabilityFeedbackEventId: {
-                        Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
-                        InputCardHdcpCapabilityFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                default: {
-                        Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
-                        break;
-                    }
-            }
-        }
-        /// 
-        /// </summary>
-        void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args) 
-        {
-            var output = args.Number;
-
-            switch (args.EventId) {
-                case DMOutputEventIds.VolumeEventId: {
-                        if (VolumeControls.ContainsKey(output)) {
-                            VolumeControls[args.Number].VolumeEventFromChassis();
-                        }
-                        break;
-                    }
-                case DMOutputEventIds.EndpointOnlineEventId: {
-                        Debug.Console(2, this, "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}", args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                        if(Chassis.Outputs[output].Endpoint != null)
-                            Debug.Console(2, this, "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}", args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
-
-                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                        break;
-                    }
-                case DMOutputEventIds.OnlineFeedbackEventId: {
-                        Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}", args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                        break;
-                    }
-                case DMOutputEventIds.VideoOutEventId: {
-                        if (Chassis.Outputs[output].VideoOutFeedback != null) {
-                            Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, Chassis.Outputs[output].VideoOutFeedback.Number, output);
-                        }
-                        if (VideoOutputFeedbacks.ContainsKey(output)) {
-                            VideoOutputFeedbacks[output].FireUpdate();
-
-                        }
-                        if (OutputVideoRouteNameFeedbacks.ContainsKey(output)) {
-                            OutputVideoRouteNameFeedbacks[output].FireUpdate();
-                        }
-                        break;
-                    }
-                case DMOutputEventIds.OutputNameEventId: {
-                        Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                        OutputNameFeedbacks[output].FireUpdate();
-                        break;
-                    }
-                default: {
-                        Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}", args.Number, args.EventId);
-                        break;
-                    }
-            }
-
-        }
-
-
-        /// <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) {
-                Chassis.EnableUSBBreakaway.BoolValue = true;
-
-                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(2, 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);
-                }
-            }
-
-
-
-            var inCard = input == 0 ? null : Chassis.Inputs[input];
-            var outCard = input == 0 ? null : Chassis.Outputs[output];
-
-            // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
-            if ((sigType | eRoutingSignalType.Video) == eRoutingSignalType.Video) {
-                Chassis.VideoEnter.BoolValue = true;
-                Chassis.Outputs[output].VideoOut = inCard;
-            }
-        }
-
-        #endregion
-
-    }
-
-    /*
-    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-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs

@@ -1,285 +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 PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-    /// <summary>
-    /// Exposes the volume levels for Program, Aux1 or Aux2 outputs on a DMPS3 chassis
-    /// </summary>
-    public class DmpsAudioOutputController : Device
-    {
-        Card.Dmps3OutputBase OutputCard;
-
-        public DmpsAudioOutput MasterVolumeLevel { get; private set; }
-        public DmpsAudioOutput SourceVolumeLevel { get; private set; }
-        public DmpsAudioOutput Codec1VolumeLevel { get; private set; }
-        public DmpsAudioOutput Codec2VolumeLevel { get; private set; }
-
-
-        public DmpsAudioOutputController(string key, string name, Card.Dmps3OutputBase card)
-            : base(key, name)
-        {
-            OutputCard = card;
-
-            OutputCard.BaseDevice.DMOutputChange += new DMOutputEventHandler(BaseDevice_DMOutputChange);
-
-            MasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Master);
-            SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
-
-            if (card is Card.Dmps3ProgramOutput)
-            {
-                //(card as Card.Dmps3ProgramOutput).OutputMixer.MicLevel
-                    //TODO:  Hook up mic levels and mutes
-                Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
-                Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
-            }
-            else if (card is Card.Dmps3Aux1Output)
-            {
-                Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
-            }
-            else if (card is Card.Dmps3Aux2Output)
-            {
-                Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
-            }
-        }
-
-        void BaseDevice_DMOutputChange(Switch device, DMOutputEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case DMOutputEventIds.MasterVolumeFeedBackEventId:
-                {
-                    MasterVolumeLevel.VolumeLevelFeedback.FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.MasterMuteOnFeedBackEventId:
-                {
-                    MasterVolumeLevel.MuteFeedback.FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.SourceLevelFeedBackEventId:
-                {
-                    SourceVolumeLevel.VolumeLevelFeedback.FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.Codec1LevelFeedBackEventId:
-                {
-                    if(Codec1VolumeLevel != null)
-                        Codec1VolumeLevel.VolumeLevelFeedback.FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.Codec1MuteOnFeedBackEventId:
-                {
-                    if (Codec1VolumeLevel != null)
-                        Codec1VolumeLevel.MuteFeedback.FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.Codec2LevelFeedBackEventId:
-                {
-                    if (Codec2VolumeLevel != null)
-                        Codec2VolumeLevel.VolumeLevelFeedback.FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.Codec2MuteOnFeedBackEventId:
-                {
-                    if (Codec2VolumeLevel != null)
-                        Codec2VolumeLevel.MuteFeedback.FireUpdate();
-                    break;
-                }
-            }
-        }
-    }
-
-    public class DmpsAudioOutput : IBasicVolumeWithFeedback
-    {
-        Card.Dmps3OutputBase Output;
-
-        UShortInputSig Level;
-
-        eDmpsLevelType Type;
-
-        public BoolFeedback MuteFeedback { get; private set; }
-        public IntFeedback VolumeLevelFeedback { get; private set; }
-
-        Action MuteOnAction;
-        Action MuteOffAction;
-        Action<bool> VolumeUpAction;
-        Action<bool> VolumeDownAction;
- 
-        public DmpsAudioOutput(Card.Dmps3OutputBase output, eDmpsLevelType type)
-        {
-            Output = output;
-
-            Type = type;
-
-            switch (type)
-            {
-                case eDmpsLevelType.Master:
-                    {
-                        Level = output.MasterVolume;
-
-                        MuteFeedback = new BoolFeedback( new Func<bool> (() => Output.MasterMuteOnFeedBack.BoolValue));
-                        VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.MasterVolumeFeedBack.UShortValue));
-                        MuteOnAction = new Action(Output.MasterMuteOn);
-                        MuteOffAction = new Action(Output.MasterMuteOff);
-                        VolumeUpAction = new Action<bool>((b) => Output.MasterVolumeUp.BoolValue = b);
-                        VolumeDownAction = new Action<bool>((b) => Output.MasterVolumeDown.BoolValue = b);
-
-                        
-                        break;
-                    }
-                case eDmpsLevelType.MicsMaster:
-                    {
-                        Level = output.MicMasterLevel;
-
-                        MuteFeedback = new BoolFeedback(new Func<bool>(() => Output.MicMasterMuteOnFeedBack.BoolValue));
-                        VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.MicMasterLevelFeedBack.UShortValue));
-                        MuteOnAction = new Action(Output.MicMasterMuteOn);
-                        MuteOffAction = new Action(Output.MicMasterMuteOff);
-                        VolumeUpAction = new Action<bool>((b) => Output.MicMasterLevelUp.BoolValue = b);
-                        VolumeDownAction = new Action<bool>((b) => Output.MicMasterLevelDown.BoolValue = b);
-
-                        break;
-                    }
-                case eDmpsLevelType.Source:
-                    {
-                        Level = output.SourceLevel;
-
-                        MuteFeedback = new BoolFeedback(new Func<bool>(() => Output.SourceMuteOnFeedBack.BoolValue));
-                        VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.SourceLevelFeedBack.UShortValue));
-                        MuteOnAction = new Action(Output.SourceMuteOn);
-                        MuteOffAction = new Action(Output.SourceMuteOff);
-                        VolumeUpAction = new Action<bool>((b) => Output.SourceLevelUp.BoolValue = b);
-                        VolumeDownAction = new Action<bool>((b) => Output.SourceLevelDown.BoolValue = b);
-                        break;
-                    }
-                case eDmpsLevelType.Codec1:
-                    {
-                        var programOutput = output as Card.Dmps3ProgramOutput;
-
-                        if (programOutput != null)
-                        {
-                            Level = programOutput.Codec1Level;
-
-                            MuteFeedback = new BoolFeedback(new Func<bool>(() => programOutput.CodecMute1OnFeedback.BoolValue));
-                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => programOutput.Codec1LevelFeedback.UShortValue));
-                            MuteOnAction = new Action(programOutput.Codec1MuteOn);
-                            MuteOffAction = new Action(programOutput.Codec1MuteOff);
-                            VolumeUpAction = new Action<bool>((b) => programOutput.Codec1LevelUp.BoolValue = b);
-                            VolumeDownAction = new Action<bool>((b) => programOutput.Codec1LevelDown.BoolValue = b);
-
-                        }
-                        else
-                        {
-                            var auxOutput = output as Card.Dmps3Aux2Output;
-
-                            Level = auxOutput.Codec1Level;
-
-                            MuteFeedback = new BoolFeedback(new Func<bool>(() => auxOutput.CodecMute1OnFeedback.BoolValue));
-                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => auxOutput.Codec1LevelFeedback.UShortValue));
-                            MuteOnAction = new Action(auxOutput.Codec1MuteOn);
-                            MuteOffAction = new Action(auxOutput.Codec1MuteOff);
-                            VolumeUpAction = new Action<bool>((b) => auxOutput.Codec1LevelUp.BoolValue = b);
-                            VolumeDownAction = new Action<bool>((b) => auxOutput.Codec1LevelDown.BoolValue = b);
-                        }
-                        break;
-                    }
-                case eDmpsLevelType.Codec2:
-                    {
-                        var programOutput = output as Card.Dmps3ProgramOutput;
-
-                        if (programOutput != null)
-                        {
-                            Level = programOutput.Codec2Level;
-
-                            MuteFeedback = new BoolFeedback(new Func<bool>(() => programOutput.CodecMute1OnFeedback.BoolValue));
-                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => programOutput.Codec2LevelFeedback.UShortValue));
-                            MuteOnAction = new Action(programOutput.Codec2MuteOn);
-                            MuteOffAction = new Action(programOutput.Codec2MuteOff);
-                            VolumeUpAction = new Action<bool>((b) => programOutput.Codec2LevelUp.BoolValue = b);
-                            VolumeDownAction = new Action<bool>((b) => programOutput.Codec2LevelDown.BoolValue = b);
-
-                        }
-                        else
-                        {
-                            var auxOutput = output as Card.Dmps3Aux1Output;
-
-                            Level = auxOutput.Codec2Level;
-
-                            MuteFeedback = new BoolFeedback(new Func<bool>(() => auxOutput.CodecMute2OnFeedback.BoolValue));
-                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => auxOutput.Codec2LevelFeedback.UShortValue));
-                            MuteOnAction = new Action(auxOutput.Codec2MuteOn);
-                            MuteOffAction = new Action(auxOutput.Codec2MuteOff);
-                            VolumeUpAction = new Action<bool>((b) => auxOutput.Codec2LevelUp.BoolValue = b);
-                            VolumeDownAction = new Action<bool>((b) => auxOutput.Codec2LevelDown.BoolValue = b);
-                        }
-                        break;
-                    }
-            }
-
-        }
-
-        #region IBasicVolumeWithFeedback Members
-
-        public void SetVolume(ushort level)
-        {
-            Level.UShortValue = level;
-        }
-
-        public void MuteOn()
-        {
-            MuteOnAction();
-        }
-
-        public void MuteOff()
-        {
-            MuteOffAction();
-        }
-
-        #endregion
-
-        #region IBasicVolumeControls Members
-
-        public void VolumeUp(bool pressRelease)
-        {
-            VolumeUpAction(pressRelease);
-        }
-
-        public void VolumeDown(bool pressRelease)
-        {
-            VolumeDownAction(pressRelease);
-        }
-
-        public void MuteToggle()
-        {
-            if (MuteFeedback.BoolValue)
-                MuteOff();
-            else
-                MuteOn();
-        }
-
-        #endregion
-    }
-
-    public enum eDmpsLevelType
-    {
-        Master,
-        Source,
-        MicsMaster,
-        Codec1,
-        Codec2,
-        Mic
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs

@@ -1,700 +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.Config;
-
-namespace PepperDash.Essentials.DM
-{
-    public class DmpsRoutingController : Device, IRoutingInputsOutputs, IRouting, IHasFeedback
-    {
-        public CrestronControlSystem Dmps { get; set; }
-        public ISystemControl SystemControl { get; private set; }
-
-        // Feedbacks for EssentialDM
-        public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
-        public Dictionary<uint, IntFeedback> AudioOutputFeedbacks { get; private set; }
-        public Dictionary<uint, BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
-        public Dictionary<uint, BoolFeedback> InputEndpointOnlineFeedbacks { get; private set; }
-        public Dictionary<uint, BoolFeedback> OutputEndpointOnlineFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> InputNameFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> OutputNameFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> OutputVideoRouteNameFeedbacks { get; private set; }
-        public Dictionary<uint, StringFeedback> OutputAudioRouteNameFeedbacks { get; private set; }
-
-        public FeedbackCollection<Feedback> Feedbacks { 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, string> TxDictionary { get; set; }
-        public Dictionary<uint, string> RxDictionary { get; 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>
-        /// Text that represents when an output has no source routed to it
-        /// </summary>
-        public string NoRouteText = "";
-
-        public static DmpsRoutingController GetDmpsRoutingController(string key, string name,
-            DmpsRoutingPropertiesConfig properties)
-        {
-            try
-            {
-                ISystemControl systemControl = null;
- 
-                systemControl = Global.ControlSystem.SystemControl as ISystemControl;
-
-                if (systemControl == null)
-                {
-                    return null;
-                }
-
-                var controller = new DmpsRoutingController(key, name, systemControl);
-
-                controller.InputNames = properties.InputNames;
-                controller.OutputNames = properties.OutputNames;
-
-                if (!string.IsNullOrEmpty(properties.NoRouteText))
-                    controller.NoRouteText = properties.NoRouteText;
-
-                return controller;
-
-            }
-            catch (System.Exception e)
-            {
-                Debug.Console(0, "Error getting DMPS Controller:\r{0}", e);
-            }
-            return null;
-        }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="name"></param>
-        /// <param name="chassis"></param>
-        public DmpsRoutingController(string key, string name, ISystemControl systemControl)
-            : base(key, name)
-        {
-            Dmps = Global.ControlSystem;
-            SystemControl = systemControl;
-
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-            VolumeControls = new Dictionary<uint, DmCardAudioOutputController>();
-            TxDictionary = new Dictionary<uint, string>();
-            RxDictionary = new Dictionary<uint, string>();
-
-            VideoOutputFeedbacks = new Dictionary<uint, IntFeedback>();
-            AudioOutputFeedbacks = new Dictionary<uint, IntFeedback>();
-            VideoInputSyncFeedbacks = new Dictionary<uint, BoolFeedback>();
-            InputNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            OutputNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            OutputVideoRouteNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            OutputAudioRouteNameFeedbacks = new Dictionary<uint, StringFeedback>();
-            InputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
-            OutputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
-
-            Debug.Console(1, this, "{0} Switcher Inputs Present.", Dmps.SwitcherInputs.Count);
-            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
-
-            SetupOutputCards();
-
-            SetupInputCards();
-        }
-
-        public override bool CustomActivate()
-        {
-            // Set input and output names from config
-            if (InputNames != null)
-            {
-                foreach (var kvp in InputNames)
-                {
-                    var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
-                    if (input != null)
-                        input.Name.StringValue = kvp.Value;
-                }
-            }
-            if (OutputNames != null)
-            {
-                foreach (var kvp in OutputNames)
-                {
-                    var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
-                    if (output != null)
-                        output.Name.StringValue = kvp.Value;
-                }
-            }
-
-            // Subscribe to events
-            Dmps.DMInputChange += new DMInputEventHandler(Dmps_DMInputChange);
-            Dmps.DMOutputChange += new DMOutputEventHandler(Dmps_DMOutputChange);
-
-            return base.CustomActivate();
-        }
-
-
-
-        /// <summary>
-        /// Iterate the SwitcherOutputs collection to setup feedbacks and add routing ports
-        /// </summary>
-        void SetupOutputCards()
-        {
-            foreach (var card in Dmps.SwitcherOutputs)
-            {
-
-                var outputCard = card as DMOutput;
-
-                Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
-
-                if (outputCard != null)
-                {
-                    VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
-                    {
-                        if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
-                        else { return 0; };
-                    });
-                    AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
-                    {
-                        if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
-                        else { return 0; };
-                    });
-
-                    OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                    {
-                        if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
-                        {
-                            Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
-                            return outputCard.NameFeedback.StringValue;
-                        }
-                        else
-                        {
-                            return "";
-                        }
-                    });
-
-                    OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                    {
-                        if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
-                        {
-                            return outputCard.VideoOutFeedback.NameFeedback.StringValue;
-                        }
-                        else
-                        {
-                            return NoRouteText;
-                        }
-                    });
-                    OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                    {
-                        if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
-                        {
-                            return outputCard.AudioOutFeedback.NameFeedback.StringValue;
-                        }
-                        else
-                        {
-                            return NoRouteText;
-
-                        }
-                    });
-
-                    OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => { return outputCard.EndpointOnlineFeedback; });
-
-                    AddOutputCard(outputCard.Number, outputCard);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Iterate the SwitcherInputs collection to setup feedbacks and add routing ports
-        /// </summary>
-        void SetupInputCards()
-        {
-            foreach (var card in Dmps.SwitcherInputs)
-            {
-                var inputCard = card as DMInput;
-
-                if (inputCard != null)
-                {
-                    Debug.Console(1, this, "Adding Input Card Number {0} Type: {1}", inputCard.Number, inputCard.CardInputOutputType.ToString());
-
-                    InputEndpointOnlineFeedbacks[inputCard.Number] = new BoolFeedback(() => { return inputCard.EndpointOnlineFeedback; });
-
-                    if (inputCard.VideoDetectedFeedback != null)
-                    {
-                        VideoInputSyncFeedbacks[inputCard.Number] = new BoolFeedback(() =>
-                        {
-                            return inputCard.VideoDetectedFeedback.BoolValue;
-                        });
-                    }
-
-                    InputNameFeedbacks[inputCard.Number] = new StringFeedback(() =>
-                    {
-                        if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue))
-                        {
-                            Debug.Console(2, this, "Input Card {0} Name: {1}", inputCard.Number, inputCard.NameFeedback.StringValue);
-                            return inputCard.NameFeedback.StringValue;
-
-                        }
-                        else
-                        {
-                            Debug.Console(2, this, "Input Card {0} Name is null", inputCard.Number);
-                            return "";
-                        }
-                    });
-
-                    AddInputCard(inputCard.Number, inputCard);
-                }
-                else
-                {
-                    Debug.Console(2, this, "***********Input Card of type {0} is cannot be cast as DMInput*************", card.CardInputOutputType);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Builds the appropriate ports aand callst the appropreate add port method
-        /// </summary>
-        /// <param name="number"></param>
-        /// <param name="inputCard"></param>
-        public void AddInputCard(uint number, DMInput inputCard)
-        {
-            if (inputCard is Card.Dmps3HdmiInputWithoutAnalogAudio)
-            {
-                var hdmiInputCard = inputCard as Card.Dmps3HdmiInputWithoutAnalogAudio;
-
-                var cecPort = hdmiInputCard.HdmiInputPort;
-
-                AddInputPortWithDebug(number, string.Format("HdmiIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort);              
-            }
-            else if (inputCard is Card.Dmps3HdmiInput)
-            {
-                var hdmiInputCard = inputCard as Card.Dmps3HdmiInput;
-
-                var cecPort = hdmiInputCard.HdmiInputPort;
-
-                AddInputPortWithDebug(number, string.Format("HdmiIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort);
-                AddInputPortWithDebug(number, string.Format("HudioIn{1}", number), eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
-            }
-            else if (inputCard is Card.Dmps3HdmiVgaInput)
-            {
-                var hdmiVgaInputCard = inputCard as Card.Dmps3HdmiVgaInput;
-
-                DmpsInternalVirtualHdmiVgaInputController inputCardController = new DmpsInternalVirtualHdmiVgaInputController(Key +
-                    string.Format("-HdmiVgaIn{0}", number), string.Format("InternalInputController-{0}", number), hdmiVgaInputCard);
-
-                DeviceManager.AddDevice(inputCardController);
-
-                AddInputPortWithDebug(number, string.Format("HdmiVgaIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.BackplaneOnly);
-            }
-            else if (inputCard is Card.Dmps3HdmiVgaBncInput)
-            {
-                var hdmiVgaBncInputCard = inputCard as Card.Dmps3HdmiVgaBncInput;
-
-                DmpsInternalVirtualHdmiVgaBncInputController inputCardController = new DmpsInternalVirtualHdmiVgaBncInputController(Key +
-                    string.Format("-HdmiVgaBncIn{0}", number), string.Format("InternalInputController-{0}", number), hdmiVgaBncInputCard);
-
-                DeviceManager.AddDevice(inputCardController);
-
-                AddInputPortWithDebug(number, string.Format("HdmiVgaBncIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.BackplaneOnly);
-
-            }
-            else if (inputCard is Card.Dmps3DmInput)
-            {
-                var hdmiInputCard = inputCard as Card.Dmps3DmInput;
-
-                var cecPort = hdmiInputCard.DmInputPort;
-
-                AddInputPortWithDebug(number, string.Format("DmIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort);
-            }
-            else if (inputCard is Card.Dmps3AirMediaInput)
-            {
-                var airMediaInputCard = inputCard as Card.Dmps3AirMediaInput;
-
-                AddInputPortWithDebug(number, string.Format("AirMediaIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
-            }
-        }
-
-
-        /// <summary>
-        /// Adds InputPort
-        /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType)
-        {
-            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
-
-            InputPorts.Add(inputPort);
-        }
-
-        /// <summary>
-        /// Adds InputPort and sets Port as ICec object
-        /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort)
-        {
-            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
-
-            if (cecPort != null)
-                inputPort.Port = cecPort;
-
-            InputPorts.Add(inputPort);
-        }
-
-        /// <summary>
-        /// Builds the appropriate ports and calls the appropriate add port method
-        /// </summary>
-        /// <param name="number"></param>
-        /// <param name="outputCard"></param>
-        public void AddOutputCard(uint number, DMOutput outputCard)
-        {
-            if (outputCard is Card.Dmps3HdmiOutput)
-            {
-                var hdmiOutputCard = outputCard as Card.Dmps3HdmiOutput;
-
-                var cecPort = hdmiOutputCard.HdmiOutputPort;
-
-                AddHdmiOutputPort(number, cecPort);
-
-                return;
-            }
-            else if (outputCard is Card.Dmps3DmOutput)
-            {
-                var dmOutputCard = outputCard as Card.Dmps3DmOutput;
-
-                var cecPort = dmOutputCard.DmOutputPort;
-
-                AddDmOutputPort(number);
-                return;
-            }
-            else if (outputCard is Card.Dmps3ProgramOutput)
-            {
-                AddAudioOnlyOutputPort(number, "Program");
-
-                var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
-
-                DeviceManager.AddDevice(programOutput);
-
-                return;
-            }
-            else if (outputCard is Card.Dmps3AuxOutput)
-            {
-                if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux1Output)
-                {
-                    AddAudioOnlyOutputPort(number, "Aux1");
-
-                    var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
-
-                    DeviceManager.AddDevice(aux1Output);
-                }
-                else if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux2Output)
-                {
-                    AddAudioOnlyOutputPort(number, "Aux2");
-
-                    var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
-
-                    DeviceManager.AddDevice(aux2Output);
-                }
-                return;
-            }
-            else if (outputCard is Card.Dmps3CodecOutput)
-            {
-                if (number == (uint)CrestronControlSystem.eDmps300cOutputs.Codec1 
-                    || number == (uint)CrestronControlSystem.eDmps3200cOutputs.Codec1
-                    || number == (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1
-                    || number == (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1
-                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
-                else if (number == (uint)CrestronControlSystem.eDmps300cOutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps3200cOutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2
-                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
-                return;
-            }
-            else if (outputCard is Card.Dmps3DialerOutput)
-            {
-                AddAudioOnlyOutputPort(number, "Dialer");
-                return;
-            }
-            else if (outputCard is Card.Dmps3DigitalMixOutput)
-            {
-                if (number == (uint)CrestronControlSystem.eDmps34K250COutputs.Mix1
-                    || number == (uint)CrestronControlSystem.eDmps34K300COutputs.Mix1
-                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Mix1)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix1.ToString());
-                if (number == (uint)CrestronControlSystem.eDmps34K250COutputs.Mix2
-                    || number == (uint)CrestronControlSystem.eDmps34K300COutputs.Mix2
-                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Mix2)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
-                return;
-            }
-            else if (outputCard is Card.Dmps3AecOutput)
-            {
-                AddAudioOnlyOutputPort(number, "Aec");
-                return;
-            }
-            else
-            {
-                Debug.Console(1, this, "Output Card is of a type not currently handled:", outputCard.CardInputOutputType.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Adds an Audio only output port
-        /// </summary>
-        /// <param name="number"></param>
-        void AddAudioOnlyOutputPort(uint number, string portName)
-        {
-            AddOutputPortWithDebug(number, portName, eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio, number);
-        }
-
-        /// <summary>
-        /// Adds an HDMI output port
-        /// </summary>
-        /// <param name="number"></param>
-        /// <param name="cecPort"></param>
-        void AddHdmiOutputPort(uint number, ICec cecPort)
-        {
-            AddOutputPortWithDebug(number, string.Format("hdmiOut{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, number, cecPort);
-        }
-
-        /// <summary>
-        /// Adds a DM output port
-        /// </summary>
-        /// <param name="number"></param>
-        void AddDmOutputPort(uint number)
-        {
-            AddOutputPortWithDebug(number, string.Format("dmOut{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, number);
-        }
-
-        /// <summary>
-        /// Adds OutputPort
-        /// </summary>
-        void AddOutputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector)
-        {
-            var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this));
-        }
-
-        /// <summary>
-        /// Adds OutputPort and sets Port as ICec object
-        /// </summary>
-        void AddOutputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector, ICec cecPort)
-        {
-            var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this);
-
-            if (cecPort != null)
-                outputPort.Port = cecPort;
-
-            OutputPorts.Add(outputPort);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void AddVolumeControl(uint number, Audio.Output audio)
-        {
-            VolumeControls.Add(number, new DmCardAudioOutputController(audio));
-        }
-
-        void Dmps_DMInputChange(Switch device, DMInputEventArgs args)
-        {
-            //Debug.Console(2, this, "DMSwitch:{0} Input:{1} Event:{2}'", this.Name, args.Number, args.EventId.ToString());
-
-            switch (args.EventId)
-            {
-                case (DMInputEventIds.OnlineFeedbackEventId):
-                    {
-                        Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                        InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                case (DMInputEventIds.VideoDetectedEventId):
-                    {
-                        Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
-                        VideoInputSyncFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-                case (DMInputEventIds.InputNameEventId):
-                    {
-                        Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                        InputNameFeedbacks[args.Number].FireUpdate();
-                        break;
-                    }
-            }
-        }
-        /// 
-        /// </summary>
-        void Dmps_DMOutputChange(Switch device, DMOutputEventArgs args)
-        {
-            Debug.Console(2, this, "DMOutputChange Output: {0} EventId: {1}", args.Number, args.EventId.ToString());
-
-            var output = args.Number;
-
-            DMOutput outputCard = Dmps.SwitcherOutputs[output] as DMOutput;
-
-            if (args.EventId == DMOutputEventIds.VolumeEventId &&
-                VolumeControls.ContainsKey(output))
-            {
-                VolumeControls[args.Number].VolumeEventFromChassis();
-            }
-            else if (args.EventId == DMOutputEventIds.OnlineFeedbackEventId
-                && OutputEndpointOnlineFeedbacks.ContainsKey(output))
-            {
-                OutputEndpointOnlineFeedbacks[output].FireUpdate();
-            }
-            else if (args.EventId == DMOutputEventIds.VideoOutEventId)
-            {
-                if (outputCard != null && outputCard.VideoOutFeedback != null)
-                {
-                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, outputCard.VideoOutFeedback.Number, output);
-                }
-                if (VideoOutputFeedbacks.ContainsKey(output))
-                {
-                    VideoOutputFeedbacks[output].FireUpdate();
-                }
-                if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
-                {
-                    OutputVideoRouteNameFeedbacks[output].FireUpdate();
-                }
-            }
-            else if (args.EventId == DMOutputEventIds.AudioOutEventId)
-            {
-                if (outputCard != null && outputCard.AudioOutFeedback != null)
-                {
-                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, outputCard.AudioOutFeedback.Number, output);
-                }
-                if (AudioOutputFeedbacks.ContainsKey(output))
-                {
-                    AudioOutputFeedbacks[output].FireUpdate();
-                }
-            }
-            else if (args.EventId == DMOutputEventIds.OutputNameEventId
-                && OutputNameFeedbacks.ContainsKey(output))
-            {
-                Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                OutputNameFeedbacks[output].FireUpdate();
-            }
-
-        }
-
-        /// <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);
-        }
-
-        #region IRouting Members
-
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType)
-        {
-            try
-            {
-
-                Debug.Console(2, this, "Attempting a DM route from input {0} to output {1} {2}", inputSelector, outputSelector, sigType);
-
-                var input = Convert.ToUInt32(inputSelector); // Cast can sometimes fail
-                var output = Convert.ToUInt32(outputSelector);
-
-                if (input <= Dmps.NumberOfSwitcherInputs && output <= Dmps.NumberOfSwitcherOutputs)
-                {
-                    // 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 (key.Number > 0)
-                    {
-                        if (RouteOffTimers.ContainsKey(key))
-                        {
-                            Debug.Console(2, this, "{0} cancelling route off due to new source", output);
-                            RouteOffTimers[key].Stop();
-                            RouteOffTimers.Remove(key);
-                        }
-                    }
-
-                    DMInput inCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
-                    DMOutput outCard = output == 0 ? null : Dmps.SwitcherOutputs[output] as DMOutput;
-
-                    //if (inCard != null)
-                    //{
-                        // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
-                        if ((sigType | eRoutingSignalType.Video) == eRoutingSignalType.Video)
-                        {
-
-                            //SystemControl.VideoEnter.BoolValue = true;
-                            if (outCard != null)
-                                outCard.VideoOut = inCard;
-                        }
-
-                        if ((sigType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
-                        {
-                            if (outCard != null)
-                                outCard.AudioOut = inCard;
-                        }
-
-                        if ((sigType | eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
-                        {
-                            if (outCard != null)
-                                outCard.USBRoutedTo = inCard;
-                        }
-
-                        if ((sigType | eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
-                        {
-                            if (inCard != null)
-                                inCard.USBRoutedTo = outCard;
-                        }
-                    //}
-                    //else
-                    //{
-                    //    Debug.Console(1, this, "Unable to execute route from input {0} to output {1}.  Input card not available", inputSelector, outputSelector);
-                    //}
-
-                }
-                else
-                {
-                    Debug.Console(1, this, "Unable to execute route from input {0} to output {1}", inputSelector, outputSelector);
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error executing switch: {0}", e);
-            }
-        }
-
-        #endregion
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs

@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM.Chassis
-{
-	public class HdMdNxM4kEController : Device, IRoutingInputsOutputs, IRouting
-	{
-		public HdMdNxM Chassis { get; private set; }
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="chassis"></param>
-		public HdMdNxM4kEController(string key, string name, HdMdNxM chassis, 
-			HdMdNxM4kEPropertiesConfig props)
-			: base(key, name)
-		{
-			Chassis = chassis;
-
-			// logical ports
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-			for (uint i = 1; i <= 4; i++)
-			{
-				InputPorts.Add(new RoutingInputPort("hdmiIn" + i, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-					eRoutingPortConnectionType.Hdmi, i, this));
-			}
-			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-			OutputPorts.Add(new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Hdmi, null, this));
-
-			// physical settings
-			if (props != null && props.Inputs != null)
-			{
-				foreach (var kvp in props.Inputs)
-				{
-					// strip "hdmiIn"
-					var inputNum =  Convert.ToUInt32(kvp.Key.Substring(6));
-
-					var port = chassis.HdmiInputs[inputNum].HdmiInputPort;
-					// set hdcp disables
-					if (kvp.Value.DisableHdcp)
-					{
-						Debug.Console(0, this, "Configuration disables HDCP support on {0}", kvp.Key);
-						port.HdcpSupportOff();
-					}
-					else
-						port.HdcpSupportOn();
-				}
-			}
-		}
-
-		public override bool CustomActivate()
-		{
-			var result = Chassis.Register();
-			if (result != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
-			{
-				Debug.Console(0, this, "Device registration failed: {0}", result);
-				return false;
-			}
-
-			return base.CustomActivate();
-		}
-
-
-
-		#region IRouting Members
-
-		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-		{
-			// Try to make switch only when necessary.  The unit appears to toggle when already selected.
-			var current = Chassis.HdmiOutputs[1].VideoOut;
-			if(current != Chassis.HdmiInputs[(uint)inputSelector])
-				Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
-		}
-
-		#endregion
-
-		/////////////////////////////////////////////////////
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="type"></param>
-		/// <param name="properties"></param>
-		/// <returns></returns>
-		public static HdMdNxM4kEController GetController(string key, string name,
-			string type, HdMdNxM4kEPropertiesConfig properties)
-		{
-			try
-			{
-				var ipid = properties.Control.IpIdInt;
-				var address = properties.Control.TcpSshProperties.Address;
-
-				type = type.ToLower();
-				if (type == "hdmd4x14ke")
-				{
-					var chassis = new HdMd4x14kE(ipid, address, Global.ControlSystem);
-					return new HdMdNxM4kEController(key, name, chassis, properties);
-				}
-				return null;
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, "ERROR Creating device key {0}: \r{1}", key, e);
-				return null;
-			}
-		}
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.AirMedia;
-using Crestron.SimplSharpPro.UI;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.DM.AirMedia;
-using PepperDash.Essentials.DM.Endpoints.DGEs;
-
-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.StartsWith("am"))
-            {
-                if (typeName == "am200" || typeName == "am300")
-                {
-                    var props = JsonConvert.DeserializeObject<AirMediaPropertiesConfig>(properties.ToString());
-                    AmX00 amDevice = null;
-                    if (typeName == "am200")
-                        amDevice = new Crestron.SimplSharpPro.DM.AirMedia.Am200(props.Control.IpIdInt, Global.ControlSystem);
-                    else if (typeName == "am300")
-                        amDevice = new Crestron.SimplSharpPro.DM.AirMedia.Am300(props.Control.IpIdInt, Global.ControlSystem);
-
-                    return new AirMediaController(key, name, amDevice, dc, props);
-                }
-            }
-			else if (typeName.StartsWith("dmmd8x") || typeName.StartsWith("dmmd16x") || typeName.StartsWith("dmmd32x"))
-			{
-				var props = JsonConvert.DeserializeObject
-					<PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(properties.ToString());
-				return PepperDash.Essentials.DM.DmChassisController.
-					GetDmChassisController(key, name, type, props);
-			}
-            else if (typeName.StartsWith("dmmd128x") || typeName.StartsWith("dmmd64x")) {
-                var props = JsonConvert.DeserializeObject
-					<PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(properties.ToString());
-				return PepperDash.Essentials.DM.DmBladeChassisController.
-					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);
-            }
-
-            else if (typeName.Equals("hdmd400ce") || typeName.Equals("hdmd300ce") || typeName.Equals("hdmd200ce") || typeName.Equals("hdmd200c1ge")) {
-                var props = JsonConvert.DeserializeObject
-                    <PepperDash.Essentials.DM.HdMdxxxCEPropertiesConfig>(properties.ToString());
-
-                if (typeName.Equals("hdmd400ce"))
-                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
-                        new HdMd400CE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
-                else if (typeName.Equals("hdmd300ce"))
-                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
-                        new HdMd300CE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
-                else if (typeName.Equals("hdmd200ce"))
-                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
-                        new HdMd200CE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
-                else if (typeName.Equals("hdmd200c1ge"))
-                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
-                        new HdMd200C1GE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
-            } 
-
-			return null;
-		}
-
-
-	}
-
-}

essentials-framework/Essentials DM/Essentials_DM/Config/HdMdNxM4kEPropertiesConfig.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.DM.Config
-{
-	/// <summary>
-	/// Defines the properties section of HdMdNxM boxes
-	/// </summary>
-	public class HdMdNxM4kEPropertiesConfig
-	{
-		[JsonProperty("control")]
-		public ControlPropertiesConfig Control { get; set; }
-
-		[JsonProperty("inputs")]
-		public Dictionary<string, InputPropertiesConfig> Inputs { get; set; }
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Config/InputPropertiesConfig.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.DM.Config
-{
-	public class InputPropertiesConfig
-	{
-		public string Name { get; set; }
-
-		public bool DisableHdcp { get; set; }
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Endpoints/DGEs/DgeController.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.UI;
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.DM.Endpoints.DGEs
-{
-    /// <summary>
-    /// Wrapper class for DGE-100 and DM-DGE-200-C
-    /// </summary>
-    public class DgeController : CrestronGenericBaseDevice, IComPorts, IIROutputPorts
-    {
-        public Dge100 DigitalGraphicsEngine { get; private set; }
-
-        public DeviceConfig DeviceConfig { get; private set; }
-
-        CrestronTouchpanelPropertiesConfig PropertiesConfig;
-
-        public DgeController(string key, string name, Dge100 device, DeviceConfig dc, CrestronTouchpanelPropertiesConfig props)
-            :base(key, name, device)
-        {
-            DigitalGraphicsEngine = device;
-
-            DeviceConfig = dc;
-
-            PropertiesConfig = props;
-        }
-
-        #region IComPorts Members
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return DigitalGraphicsEngine.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return DigitalGraphicsEngine.NumberOfComPorts; }
-        }
-
-        #endregion
-
-        #region IIROutputPorts Members
-
-        public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return DigitalGraphicsEngine.IROutputPorts; }
-        }
-
-        public int NumberOfIROutputPorts
-        {
-            get { return DigitalGraphicsEngine.NumberOfIROutputPorts; }
-        }
-
-        #endregion
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc150SController.cs

@@ -1,112 +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 DmRmc150SController : DmRmcControllerBase, IRoutingInputsOutputs,
-        IIROutputPorts, IComPorts, ICec
-    {
-        public DmRmc150S 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 DmRmc150SController(string key, string name, DmRmc150S rmc)
-            : base(key, name, rmc)
-        {
-            Rmc = rmc;
-            DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DmCat, 0, this);
-            HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
-
-            EdidManufacturerFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Manufacturer.StringValue);
-            EdidNameFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Name.StringValue);
-            EdidPreferredTimingFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.PreferredTiming.StringValue);
-            EdidSerialNumberFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.SerialNumber.StringValue);
-
-            //VideoOutputResolutionFeedback = new StringFeedback(() => Rmc.HdmiOutput.GetVideoResolutionString());
-
-            //Rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
-            Rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
-
-            // Set Ports for CEC
-            HdmiOut.Port = Rmc.HdmiOutput;
-        }
-
-        //void HdmiOutput_OutputStreamChange(EndpointOutputStream outputStream, EndpointOutputStreamEventArgs args)
-        //{
-        //    if (args.EventId == EndpointOutputStreamEventIds.HorizontalResolutionFeedbackEventId || args.EventId == EndpointOutputStreamEventIds.VerticalResolutionFeedbackEventId ||
-        //        args.EventId == EndpointOutputStreamEventIds.FramesPerSecondFeedbackEventId)
-        //    {
-        //        VideoOutputResolutionFeedback.FireUpdate();
-        //    }
-        //}
-
-        void ConnectedDevice_DeviceInformationChange(ConnectedDeviceInformation connectedDevice, ConnectedDeviceEventArgs args)
-        {
-            if (args.EventId == ConnectedDeviceEventIds.ManufacturerEventId)
-            {
-                EdidManufacturerFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.NameEventId)
-            {
-                EdidNameFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.PreferredTimingEventId)
-            {
-                EdidPreferredTimingFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.SerialNumberEventId)
-            {
-                EdidSerialNumberFeedback.FireUpdate();
-            }
-        }
-
-        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.HdmiOutput.StreamCec; } }
-        #endregion
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc200CController.cs

@@ -1,112 +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 DmRmc200CController : DmRmcControllerBase, IRoutingInputsOutputs,
-		IIROutputPorts, IComPorts, ICec
-	{
-		public DmRmc200C 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 DmRmc200CController(string key, string name, DmRmc200C rmc)
-			: base(key, name, rmc)
-		{
-			Rmc = rmc;
-			DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Hdmi, null, this);
-
-            EdidManufacturerFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Manufacturer.StringValue);
-            EdidNameFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Name.StringValue);
-            EdidPreferredTimingFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.PreferredTiming.StringValue);
-            EdidSerialNumberFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.SerialNumber.StringValue);
-
-            VideoOutputResolutionFeedback = new StringFeedback(() => Rmc.HdmiOutput.GetVideoResolutionString());
-
-            Rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
-            Rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
-
-            // Set Ports for CEC
-            HdmiOut.Port = Rmc.HdmiOutput;
-        }
-
-        void HdmiOutput_OutputStreamChange(EndpointOutputStream outputStream, EndpointOutputStreamEventArgs args)
-        {
-            if (args.EventId == EndpointOutputStreamEventIds.HorizontalResolutionFeedbackEventId || args.EventId == EndpointOutputStreamEventIds.VerticalResolutionFeedbackEventId ||
-                args.EventId == EndpointOutputStreamEventIds.FramesPerSecondFeedbackEventId)
-            {
-                VideoOutputResolutionFeedback.FireUpdate();
-            }
-        }
-
-        void ConnectedDevice_DeviceInformationChange(ConnectedDeviceInformation connectedDevice, ConnectedDeviceEventArgs args)
-        {
-            if (args.EventId == ConnectedDeviceEventIds.ManufacturerEventId)
-            {
-                EdidManufacturerFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.NameEventId)
-            {
-                EdidNameFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.PreferredTimingEventId)
-            {
-                EdidPreferredTimingFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.SerialNumberEventId)
-            {
-                EdidSerialNumberFeedback.FireUpdate();
-            }
-        }
-
-		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.HdmiOutput.StreamCec; } }
-		#endregion
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc200SController.cs

@@ -1,112 +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 DmRmc200SController : DmRmcControllerBase, IRoutingInputsOutputs,
-		IIROutputPorts, IComPorts, ICec
-	{
-		public DmRmc200S 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 DmRmc200SController(string key, string name, DmRmc200S rmc)
-			: base(key, name, rmc)
-		{
-			Rmc = rmc;
-			DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Hdmi, null, this);
-
-            EdidManufacturerFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Manufacturer.StringValue);
-            EdidNameFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Name.StringValue);
-            EdidPreferredTimingFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.PreferredTiming.StringValue);
-            EdidSerialNumberFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.SerialNumber.StringValue);
-
-            VideoOutputResolutionFeedback = new StringFeedback(() => Rmc.HdmiOutput.GetVideoResolutionString());
-
-            Rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
-            Rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
-
-            // Set Ports for CEC
-            HdmiOut.Port = Rmc.HdmiOutput;
-        }
-
-        void HdmiOutput_OutputStreamChange(EndpointOutputStream outputStream, EndpointOutputStreamEventArgs args)
-        {
-            if (args.EventId == EndpointOutputStreamEventIds.HorizontalResolutionFeedbackEventId || args.EventId == EndpointOutputStreamEventIds.VerticalResolutionFeedbackEventId ||
-                args.EventId == EndpointOutputStreamEventIds.FramesPerSecondFeedbackEventId)
-            {
-                VideoOutputResolutionFeedback.FireUpdate();
-            }
-        }
-
-        void ConnectedDevice_DeviceInformationChange(ConnectedDeviceInformation connectedDevice, ConnectedDeviceEventArgs args)
-        {
-            if (args.EventId == ConnectedDeviceEventIds.ManufacturerEventId)
-            {
-                EdidManufacturerFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.NameEventId)
-            {
-                EdidNameFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.PreferredTimingEventId)
-            {
-                EdidPreferredTimingFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.SerialNumberEventId)
-            {
-                EdidSerialNumberFeedback.FireUpdate();
-            }
-        }
-
-		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.HdmiOutput.StreamCec; } }
-		#endregion
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -1,257 +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.Receivers;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM.Config;
-
-namespace PepperDash.Essentials.DM
-{
-	public abstract class DmRmcControllerBase : CrestronGenericBaseDevice
-	{
-        public virtual StringFeedback VideoOutputResolutionFeedback { get; protected set; }
-        public virtual StringFeedback EdidManufacturerFeedback { get; protected set; }
-        public virtual StringFeedback EdidNameFeedback { get; protected set; }
-        public virtual StringFeedback EdidPreferredTimingFeedback { get; protected set; }
-        public virtual StringFeedback EdidSerialNumberFeedback { get; protected set; }
-
-		public DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
-			: base(key, name, device)
-		{
-			// if wired to a chassis, skip registration step in base class
-			if (device.DMOutput != null)
-			{
-				this.PreventRegistration = true;
-			}
-            AddToFeedbackList(VideoOutputResolutionFeedback, EdidManufacturerFeedback, EdidSerialNumberFeedback, EdidNameFeedback, EdidPreferredTimingFeedback);
-        }
-	}
-
-    public abstract class DmHdBaseTControllerBase : CrestronGenericBaseDevice
-    {
-        public HDBaseTBase Rmc { get; protected set; }
-
-        /// <summary>
-        ///  Make a Crestron RMC and put it in here
-        /// </summary>
-        public DmHdBaseTControllerBase(string key, string name, HDBaseTBase rmc)
-            : base(key, name, rmc)
-        {
-
-        }
-    }
-
-	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 CrestronGenericBaseDevice 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 DmRmcX100CController(key, name, new DmRmc100C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc100s"))
-                        return new DmRmc100SController(key, name, new DmRmc100S(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc4k100c"))
-                        return new DmRmcX100CController(key, name, new DmRmc4k100C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc4kz100c"))
-                        return new DmRmcX100CController(key, name, new DmRmc4kz100C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc150s"))
-                        return new DmRmc150SController(key, name, new DmRmc150S(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmrmc200c"))
-						return new DmRmc200CController(key, name, new DmRmc200C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc200s"))
-                        return new DmRmc200SController(key, name, new DmRmc200S(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc200s2"))
-                        return new DmRmc200S2Controller(key, name, new DmRmc200S2(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmrmcscalerc"))
-						return new DmRmcScalerCController(key, name, new DmRmcScalerC(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmcscalers"))
-                        return new DmRmcScalerSController(key, name, new DmRmcScalerS(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmcscalers2"))
-                        return new DmRmcScalerS2Controller(key, name, new DmRmcScalerS2(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc4kscalerc"))
-						return new DmRmc4kScalerCController(key, name, new DmRmc4kScalerC(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmrmc4kscalercdsp"))
-                        return new DmRmc4kScalerCDspController(key, name, new DmRmc4kScalerCDsp(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 IDmSwitch))
-				{
-					Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
-						key, pKey);
-					return null;
-				}
-
-                var chassis = (parentDev as IDmSwitch).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;
-				}
-                else
-                {
-                    var controller = (parentDev as IDmSwitch);
-                    controller.RxDictionary.Add(num, key);
-                }
-								// Catch constructor failures, mainly dues to IPID
-				try
-				{
-
-					// Must use different constructor for CPU3 chassis types. No IPID
-					if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
-						chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
-						chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps ||
-                        chassis is DmMd128x128 || chassis is DmMd64x64)
-					{
-						if (typeName.StartsWith("hdbasetrx"))
-							return new HDBaseTRxController(key, name, new HDRx3CB(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4k100c1g"))
-							return new DmRmc4k100C1GController(key, name, new DmRmc4K100C1G(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc100c"))
-							return new DmRmcX100CController(key, name, new DmRmc100C(chassis.Outputs[num]));
-                        if (typeName.StartsWith("dmrmc100s"))
-                            return new DmRmc100SController(key, name, new DmRmc100S(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4k100c"))
-							return new DmRmcX100CController(key, name, new DmRmc4k100C(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4kz100c"))
-							return new DmRmcX100CController(key, name, new DmRmc4kz100C(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc150s"))
-							return new DmRmc150SController(key, name, new DmRmc150S(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc200c"))
-							return new DmRmc200CController(key, name, new DmRmc200C(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc200s"))
-							return new DmRmc200SController(key, name, new DmRmc200S(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc200s2"))
-							return new DmRmc200S2Controller(key, name, new DmRmc200S2(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmcscalerc"))
-							return new DmRmcScalerCController(key, name, new DmRmcScalerC(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmcscalers"))
-							return new DmRmcScalerSController(key, name, new DmRmcScalerS(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmcscalers2"))
-							return new DmRmcScalerS2Controller(key, name, new DmRmcScalerS2(chassis.Outputs[num]));
-                        if (typeName.StartsWith("dmrmc4kscalerc"))
-							return new DmRmc4kScalerCController(key, name, new DmRmc4kScalerC(chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4kscalercdsp"))
-							return new DmRmc4kScalerCDspController(key, name, new DmRmc4kScalerCDsp(chassis.Outputs[num]));
-					}
-					else
-					{
-						if (typeName.StartsWith("hdbasetrx"))
-							return new HDBaseTRxController(key, name, new HDRx3CB(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4k100c1g"))
-							return new DmRmc4k100C1GController(key, name, new DmRmc4K100C1G(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc100c"))
-							return new DmRmcX100CController(key, name, new DmRmc100C(ipid, chassis.Outputs[num]));
-                        if (typeName.StartsWith("dmrmc100s"))
-                            return new DmRmc100SController(key, name, new DmRmc100S(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4k100c"))
-							return new DmRmcX100CController(key, name, new DmRmc4k100C(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4kz100c"))
-							return new DmRmcX100CController(key, name, new DmRmc4kz100C(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc150s"))
-							return new DmRmc150SController(key, name, new DmRmc150S(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc200c"))
-							return new DmRmc200CController(key, name, new DmRmc200C(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc200s"))
-							return new DmRmc200SController(key, name, new DmRmc200S(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc200s2"))
-							return new DmRmc200S2Controller(key, name, new DmRmc200S2(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmcscalerc"))
-							return new DmRmcScalerCController(key, name, new DmRmcScalerC(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmcscalers"))
-							return new DmRmcScalerSController(key, name, new DmRmcScalerS(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmcscalers2"))
-							return new DmRmcScalerS2Controller(key, name, new DmRmcScalerS2(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4kscalerc"))
-							return new DmRmc4kScalerCController(key, name, new DmRmc4kScalerC(ipid, chassis.Outputs[num]));
-						if (typeName.StartsWith("dmrmc4kscalercdsp"))
-							return new DmRmc4kScalerCDspController(key, name, new DmRmc4kScalerCDsp(ipid, chassis.Outputs[num]));
-					}
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-RMC device: {1}", key, e.Message);
-				}
-			}
-
-			return null;
-		}
-	}
-
-}

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcScalerCController.cs

@@ -1,115 +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.Audio | eRoutingSignalType.Video, 
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-				eRoutingPortConnectionType.Hdmi, null, this);
-
-            EdidManufacturerFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Manufacturer.StringValue);
-            EdidNameFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.Name.StringValue);
-            EdidPreferredTimingFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.PreferredTiming.StringValue);
-            EdidSerialNumberFeedback = new StringFeedback(() => Rmc.HdmiOutput.ConnectedDevice.SerialNumber.StringValue);
-
-            VideoOutputResolutionFeedback = new StringFeedback(() => Rmc.HdmiOutput.GetVideoResolutionString());
-
-            Rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
-            Rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
-
-            // Set Ports for CEC
-            HdmiOut.Port = Rmc.HdmiOutput;
-        }
-
-        void HdmiOutput_OutputStreamChange(EndpointOutputStream outputStream, EndpointOutputStreamEventArgs args)
-        {
-            if (args.EventId == EndpointOutputStreamEventIds.HorizontalResolutionFeedbackEventId || args.EventId == EndpointOutputStreamEventIds.VerticalResolutionFeedbackEventId ||
-                args.EventId == EndpointOutputStreamEventIds.FramesPerSecondFeedbackEventId)
-            {
-                VideoOutputResolutionFeedback.FireUpdate();
-            }
-        }
-
-        void ConnectedDevice_DeviceInformationChange(ConnectedDeviceInformation connectedDevice, ConnectedDeviceEventArgs args)
-        {
-            if (args.EventId == ConnectedDeviceEventIds.ManufacturerEventId)
-            {
-                EdidManufacturerFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.NameEventId)
-            {
-                EdidNameFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.PreferredTimingEventId)
-            {
-                EdidPreferredTimingFeedback.FireUpdate();
-            }
-            else if (args.EventId == ConnectedDeviceEventIds.SerialNumberEventId)
-            {
-                EdidSerialNumberFeedback.FireUpdate();
-            }
-        }
-
-		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-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcX100CController.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 (both 4K and non-4K) with Com and IR ports and no control functions
-	/// 
-	/// </summary>
-	public class DmRmcX100CController : 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 DmRmcX100CController(string key, string name, DmRmc100C rmc)
-			: base(key, name, rmc)
-		{
-			Rmc = rmc;
-			DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-				eRoutingPortConnectionType.DmCat, 0, this);
-			HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
-				eRoutingPortConnectionType.Hdmi, null, this);
-
-            // Set Ports for CEC
-            HdmiOut.Port = Rmc; // Unique case, this class has no HdmiOutput port and ICec is implemented on the receiver class itself
-		}
-
-		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-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -1,182 +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 BasicDmTxControllerBase 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("dmtx200"))
-                        return new DmTx200Controller(key, name, new DmTx200C2G(ipid, Global.ControlSystem));
-					if (typeName.StartsWith("dmtx201"))
-						return new DmTx201XController(key, name, new DmTx201S(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmtx4k202"))
-                        return new DmTx4k202CController(key, name, new DmTx4k202C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmtx4kz202"))
-                        return new DmTx4k202CController(key, name, new DmTx4kz202C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmtx4k302"))
-						return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, Global.ControlSystem));
-                    if (typeName.StartsWith("dmtx4kz302"))
-                        return new DmTx4kz302CController(key, name, new DmTx4kz302C(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);
-				}
-			}
-			else
-			{
-				var parentDev = DeviceManager.GetDeviceForKey(pKey);
-				if (!(parentDev is IDmSwitch))
-				{
-					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 IDmSwitch);
-				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;
-				}
-                else
-                {
-                    var controller = (parentDev as IDmSwitch);
-                    controller.TxDictionary.Add(num, key);
-                }
-
-				// Catch constructor failures, mainly dues to IPID
-				try
-				{
-					// Must use different constructor for CPU3 chassis types. No IPID
-					if (chassis is DmMd8x8Cpu3 || chassis is DmMd16x16Cpu3 ||
-					chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
-					chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps||
-                    chassis is DmMd128x128 || chassis is DmMd64x64)
-					{
-						if (typeName.StartsWith("dmtx200"))
-							return new DmTx200Controller(key, name, new DmTx200C2G(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx201"))
-							return new DmTx201XController(key, name, new DmTx201C(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4k100"))
-							return new DmTx4k100Controller(key, name, new DmTx4K100C1G(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4k202"))
-							return new DmTx4k202CController(key, name, new DmTx4k202C(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4kz202"))
-							return new DmTx4k202CController(key, name, new DmTx4kz202C(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4k302"))
-							return new DmTx4k302CController(key, name, new DmTx4k302C(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4kz302"))
-							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx401"))
-							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
-					}
-					else
-					{
-						if (typeName.StartsWith("dmtx200"))
-							return new DmTx200Controller(key, name, new DmTx200C2G(ipid, chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx201"))
-							return new DmTx201XController(key, name, new DmTx201C(ipid, chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4k100"))
-							return new DmTx4k100Controller(key, name, new DmTx4K100C1G(ipid, chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4k202"))
-							return new DmTx4k202CController(key, name, new DmTx4k202C(ipid, chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4kz202"))
-							return new DmTx4k202CController(key, name, new DmTx4kz202C(ipid, chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4k302"))
-							return new DmTx4k302CController(key, name, new DmTx4k302C(ipid, chassis.Inputs[num]));
-						if (typeName.StartsWith("dmtx4kz302"))
-							return new DmTx4kz302CController(key, name, new DmTx4kz302C(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);
-				}
-			}
-			
-			return null;
-		}
-	}
-
-    public abstract class BasicDmTxControllerBase : CrestronGenericBaseDevice
-    {
-        public BasicDmTxControllerBase(string key, string name, GenericBase hardware)
-            : base(key, name, hardware)
-        {
-
-        }
-    }
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class DmTxControllerBase : BasicDmTxControllerBase
-	{
-        public virtual void SetPortHdcpCapability(eHdcpCapabilityType hdcpMode, uint port) { }
-        public virtual eHdcpCapabilityType HdcpSupportCapability { get; protected set; }
-        public abstract StringFeedback ActiveVideoInputFeedback { get; protected set; }
-        public RoutingInputPortWithVideoStatuses AnyVideoInput { get; protected set; }
-
-        public DmTxControllerBase(string key, string name, EndpointTransmitterBase hardware)
-			: base(key, name, hardware) 
-		{
-			// if wired to a chassis, skip registration step in base class
-			if (hardware.DMInput != null)
-			{
-				this.PreventRegistration = true;
-			}
-            AddToFeedbackList(ActiveVideoInputFeedback);
-		}
-	}
-    //public enum ePdtHdcpSupport
-    //{
-    //    HdcpOff = 0,
-    //    Hdcp1 = 1,
-    //    Hdcp2 = 2,
-    //    Hdcp2_2= 3,
-    //    Auto = 99
-    //}
-}