Resolves issue with RoomVacancyShutdownTimer in InShutDownWarning mode

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/scripts/GenerateVersionNumber.ps1

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

.github/scripts/UpdateAssemblyVersion.ps1

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

.github/scripts/ZipBuildOutput.ps1

@@ -1,43 +0,0 @@
-# Uncomment these for local testing
-# $Env:GITHUB_WORKSPACE = "C:\Working Directories\PD\essentials"
-# $Env:SOLUTION_FILE = "PepperDashEssentials"
-# $Env:VERSION = "0.0.0-buildType-test"
-
-# Sets the root directory for the operation
-$destination = "$($Env:GITHUB_HOME)\output"
-New-Item -ItemType Directory -Force -Path ($destination)
-Get-ChildItem ($destination)
-$exclusions = @(git submodule foreach --quiet 'echo $name')
-# Trying to get any .json schema files (not currently working)
-# Gets any files with the listed extensions.
-Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz" | 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\*.cpz | Rename-Item -NewName { "$($_.BaseName)-$($Env:VERSION)$($_.Extension)" }
-Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
-Write-Host "Output Contents post Zip"
-Get-ChildItem -Path $destination

.github/workflows/docker.yml

@@ -1,253 +0,0 @@
-name: Branch Build Using Docker
-
-on:
-  push:
-    branches:
-      - feature/*
-      - hotfix/*
-      - bugfix/*
-      - release/*
-      - development
-
-env:
-  # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
-  SOLUTION_PATH: PepperDashEssentials
-  SOLUTION_FILE: PepperDashEssentials
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Debug
-  # Defaults to master as the release branch.  Change as necessary
-  RELEASE_BRANCH: master
-jobs:
-  Build_Project:
-    runs-on: windows-latest
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      # And any submodules
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          git config --global url."https://github.com/".insteadOf "git@github.com:"
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-        # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          $version = ./.github/scripts/GenerateVersionNumber.ps1
-          Write-Output "::set-env name=VERSION::$version"
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          Write-Output ${{ env.VERSION }}
-          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
-      # 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/master.yml

@@ -1,229 +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
-        # Write the version to a file to be consumed by the push jobs
-      - name: Write Version
-        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
-      # Upload the build output as an artifact
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: Build
-          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-      # Upload the Version file as an artifact
-      - name: Upload version.txt
-        uses: actions/upload-artifact@v1
-        with:
-          name: Version
-          path: ${{env.GITHUB_HOME}}\output\version.txt
-      # Upload the build package to the release
-      - name: Upload Release Package
-        id: upload_release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Internal_Push_Output:
-    needs: Build_Project
-    runs-on: windows-latest
-    steps:
-      # Checkout the repo
-      - name: Checkout Builds Repo
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.BUILDS_TOKEN }}
-          repository: PepperDash-Engineering/essentials-builds
-          ref: ${{ Env.GITHUB_REF }}
-      # Download the version artifact from the build job
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Check Directory
-        run: Get-ChildItem "./"
-      # Set the version number environment variable from the file we just downloaded
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      # Checkout/Create the branch
-      - name: Checkout Master branch
-        run: git checkout master
-      # Download the build output into the repo
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Check directory
-        run: Get-ChildItem ./
-      # Unzip the build package file
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Check directory again
-        run: Get-ChildItem ./
-        # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      # Commits the build output to the branch and tags it with the version
-      - name: Commit build output and tag the commit
-        shell: powershell
-        run: |
-          git config user.email "actions@pepperdash.com"
-          git config user.name "GitHub Actions"
-          git add .
-          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
-          Write-Host "Commit: $commit"
-          git commit -m $commit
-          git tag $($Env:VERSION)
-      # Push the commit
-      - name: Push to Builds Repo
-        shell: powershell
-        run: git push -u origin master --force
-      # Push the tags
-      - name: Push tags
-        run: git push --tags origin
-      - name: Check Directory
-        run: Get-ChildItem ./
-  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
-  Public_Push_Output:
-    needs: Build_Project
-    runs-on: windows-latest
-    steps:
-      # Checkout the repo
-      - name: Checkout Builds Repo
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.BUILDS_TOKEN }}
-          repository: PepperDash/Essentials-Builds
-          ref: ${{ Env.GITHUB_REF }}
-      # Download the version artifact from the build job
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Check Directory
-        run: Get-ChildItem "./"
-      # Set the version number environment variable from the file we just downloaded
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      # Checkout master branch
-      - name: Create new branch
-        run: git checkout master
-      # Download the build output into the repo
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Check directory
-        run: Get-ChildItem ./
-      # Unzip the build package file
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Check directory again
-        run: Get-ChildItem ./
-        # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      # Commits the build output to the branch and tags it with the version
-      - name: Commit build output and tag the commit
-        shell: powershell
-        run: |
-          git config user.email "actions@pepperdash.com"
-          git config user.name "GitHub Actions"
-          git add .
-          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
-          Write-Host "Commit: $commit"
-          git commit -m $commit
-          git tag $($Env:VERSION)
-      # Push the commit
-      - name: Push to Builds Repo
-        shell: powershell
-        run: git push -u origin master --force
-      # Push the tags
-      - name: Push tags
-        run: git push --tags origin
-      - name: Check Directory
-        run: Get-ChildItem ./

.gitignore

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

.gitmodules

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

CONTRIBUTING.md

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

LICENSE.md

@@ -1,7 +0,0 @@
-Copyright (c) <2020> PepperDash Technology Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

PepperDashEssentials.sln

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

PepperDashEssentials/AppServer/CotijaConfig.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-    public class MobileControlConfig
+    public class CotijaConfig
     {       
 		[JsonProperty("serverUrl")]
         public string ServerUrl { get; set; }
@@ -25,7 +25,7 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-	public class MobileControlDdvc01RoomBridgePropertiesConfig
+	public class CotijaDdvc01RoomBridgePropertiesConfig
 	{
 		[JsonProperty("eiscId")]
 		public string EiscId { get; set; }

PepperDashEssentials/AppServer/CotijaDdvc01DeviceBridge.cs

@@ -8,19 +8,19 @@ using Crestron.SimplSharpPro.EthernetCommunication;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
 	/// <summary>
 	/// Represents a generic device connection through to and EISC for DDVC01
 	/// </summary>
-	public class MobileControlDdvc01DeviceBridge : Device, IChannel, INumericKeypad 
+	public class CotijaDdvc01DeviceBridge : Device, IChannel, INumericKeypad 
 	{
 		/// <summary>
 		/// EISC used to talk to Simpl
 		/// </summary>
 		ThreeSeriesTcpIpEthernetIntersystemCommunications EISC;
 
-		public MobileControlDdvc01DeviceBridge(string key, string name, ThreeSeriesTcpIpEthernetIntersystemCommunications eisc)
+		public CotijaDdvc01DeviceBridge(string key, string name, ThreeSeriesTcpIpEthernetIntersystemCommunications eisc)
 			: base(key, name)
 		{
 			EISC = eisc;

PepperDashEssentials/AppServer/CotijaSystemController.cs

@@ -14,19 +14,16 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Room.MobileControl;
-using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Room.Cotija;
 
 namespace PepperDash.Essentials
 {
-    public class MobileControlSystemController : Device
+    public class CotijaSystemController : Device
     {
 		WebSocketClient WSClient;
 
-		//bool LinkUp;
-
 		/// <summary>
 		/// Prevents post operations from stomping on each other and getting lost
 		/// </summary>
@@ -34,14 +31,12 @@ namespace PepperDash.Essentials
 
 		CEvent RegisterLockEvent = new CEvent(true, true);
 
-		public MobileControlConfig Config { get; private set; }
+		public CotijaConfig 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;
@@ -50,11 +45,9 @@ namespace PepperDash.Essentials
 
         long ServerReconnectInterval = 5000;
 
-        DateTime LastAckMessage;
+        string SystemUuid;
 
-        public string SystemUuid;
-
-		List<MobileControlBridgeBase> RoomBridges = new List<MobileControlBridgeBase>();
+		List<CotijaBridgeBase> RoomBridges = new List<CotijaBridgeBase>();
 
         long ButtonHeartbeatInterval = 1000;
 
@@ -69,16 +62,13 @@ namespace PepperDash.Essentials
 		/// <param name="key"></param>
 		/// <param name="name"></param>
 		/// <param name="config"></param>
-        public MobileControlSystemController(string key, string name, MobileControlConfig config) : base(key, name)
+        public CotijaSystemController(string key, string name, CotijaConfig 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);
+				"mobileauth", "Authorizes system to talk to cotija server", ConsoleAccessLevelEnum.AccessOperator);
 			CrestronConsole.AddNewConsoleCommand(s => ShowInfo(),
 				"mobileinfo", "Shows information for current mobile control session", ConsoleAccessLevelEnum.AccessOperator);
 			CrestronConsole.AddNewConsoleCommand(s => { 
@@ -93,65 +83,25 @@ namespace PepperDash.Essentials
 			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(PrintActionDictionaryPaths, "showactionpaths", "Prints the paths in teh Action Dictionary", 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)
+            if (programEventType == eProgramStatusEventType.Stopping && WSClient.Connected)
             {
-				CleanUpWebsocketClient();
+                SendMessageToServer(JObject.FromObject( new
+                {
+                    type = "/system/close"
+                }));
+
             }
         }
 
@@ -196,7 +146,7 @@ namespace PepperDash.Essentials
 		/// 
 		/// </summary>
 		/// <param name="bridge"></param>
-		public void AddBridge(MobileControlBridgeBase bridge)
+		public void AddBridge(CotijaBridgeBase bridge)
 		{
 			RoomBridges.Add(bridge);
 			var b = bridge as IDelayedConfiguration;
@@ -208,7 +158,6 @@ namespace PepperDash.Essentials
 			else
 			{
 				Debug.Console(0, this, "Adding room bridge and sending configuration");
-                //SystemUuid = ConfigReader.ConfigObject.SystemUuid;
 				RegisterSystemToServer();
 			}
 		}
@@ -221,7 +170,6 @@ namespace PepperDash.Essentials
 		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();
 		}
@@ -241,8 +189,6 @@ namespace PepperDash.Essentials
 		/// <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.");
@@ -275,7 +221,6 @@ namespace PepperDash.Essentials
 						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)
@@ -290,10 +235,6 @@ namespace PepperDash.Essentials
 									SystemUuid);
 							}
 						}
-						else
-						{
-							Debug.Console(0, "Authorization failed, code {0}: {1}", r.Code, r.ContentString);
-						}
 					}
 					else
 						Debug.Console(0, this, "Error {0} in authorizing system", e);
@@ -324,19 +265,14 @@ namespace PepperDash.Essentials
 				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);
+	System UUID: {2}
+	System User code: {3}
+	Connected?: {4}", url, name, SystemUuid, 
+					code, conn);
 		}
 
         /// <summary>
@@ -345,103 +281,58 @@ namespace PepperDash.Essentials
         /// <param name="url">URL of the server, including the port number, if not 80.  Format: "serverUrlOrIp:port"</param>
         void RegisterSystemToServer()
         {
-			ConnectWebsocketClient();
+
+
+			var ready = RegisterLockEvent.Wait(20000);
+			if (!ready)
+			{
+				Debug.Console(1, this, "RegisterSystemToServer failed to enter after 20 seconds.  Ignoring");
+				return;
+			}
+			RegisterLockEvent.Reset();
+
+			try
+            {
+				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);
+
+				string postBody = JsonConvert.SerializeObject(confObject);
+				SystemUuid = confObject.SystemUuid;
+
+                if (string.IsNullOrEmpty(postBody))
+                {
+                    Debug.Console(1, this, "ERROR: Config body is empty. Cannot register with server.");
+                }
+                else
+                {
+					var regClient = new HttpClient();
+					regClient.Verbose = true;
+					regClient.KeepAlive = true;
+
+					string url = string.Format("http://{0}/api/system/join/{1}", Config.ServerUrl, SystemUuid);
+					Debug.Console(1, this, "Joining server at {0}", url);
+
+                    HttpClientRequest request = new HttpClientRequest();
+                    request.Url.Parse(url);
+                    request.RequestType = RequestType.Post;
+                    request.Header.SetHeaderValue("Content-Type", "application/json");
+                    request.ContentString = postBody;
+
+					var err = regClient.DispatchAsync(request, RegistrationConnectionCallback);
+                }
+
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "ERROR: Initilizing Room: {0}", e);
+				RegisterLockEvent.Set();
+				StartReconnectTimer();
+            }
+
         }
 
-		/// <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>
@@ -449,72 +340,78 @@ namespace PepperDash.Essentials
         /// <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");
-
+				Debug.Console(1, this, "Message TX: {0}", message);
                 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);
-				}
+				WSClient.Send(messageBytes, (uint)messageBytes.Length, WebSocketClient.WEBSOCKET_PACKET_TYPES.LWS_WS_OPCODE_07__TEXT_FRAME);
+				//WSClient.SendAsync(messageBytes, (uint)messageBytes.Length, WebSocketClient.WEBSOCKET_PACKET_TYPES.LWS_WS_OPCODE_07__TEXT_FRAME);
             }
-			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()
+        void DisconnectStreamClient(string command)
         {
-			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;
-			}
+			//if(SseClient != null)
+			//    SseClient.Disconnect();
+
+			if (WSClient != null && WSClient.Connected)
+				WSClient.Disconnect();
+
+            if (ServerHeartbeatCheckTimer != null)
+            {
+                ServerHeartbeatCheckTimer.Stop();
+
+                ServerHeartbeatCheckTimer = null;
+            }
         }
+        
+        /// <summary>
+        /// The callback that fires when we get a response from our registration attempt
+        /// </summary>
+        /// <param name="resp"></param>
+        /// <param name="err"></param>
+        void RegistrationConnectionCallback(HttpClientResponse resp, HTTP_CALLBACK_ERROR err)
+        {
+			CheckHttpDebug(resp, err);
+			Debug.Console(1, this, "RegistrationConnectionCallback: {0}", err);
+            try
+            {
+                if (resp != null && resp.Code == 200)
+                {
+                    if(ServerReconnectTimer != null)
+                    {
+                        ServerReconnectTimer.Stop();
+                        ServerReconnectTimer = 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;
-			}
-		}
+					// Success here!
+                    ConnectStreamClient();
+                }
+                else
+                {
+					if (resp != null)
+						Debug.Console(1, this, "Response from server: {0}\n{1}", resp.Code, err);
+					else
+					{
+						Debug.Console(1, this, "Null response received from server.");
+					}
+					StartReconnectTimer();
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error Initializing Stream Client: {0}", e);
+				StartReconnectTimer();
+            }
+			RegisterLockEvent.Set();
+        }
 
         /// <summary>
         /// Executes when we don't get a heartbeat message in time.  Triggers reconnect.
@@ -528,8 +425,23 @@ namespace PepperDash.Essentials
                 ServerHeartbeatCheckTimer.Stop();
                 ServerHeartbeatCheckTimer = null;
             }
-			CleanUpWebsocketClient();
-            StartServerReconnectTimer();
+            StartReconnectTimer();
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="dueTime"></param>
+		/// <param name="repeatTime"></param>
+        void StartReconnectTimer()
+        {
+            // Start the reconnect timer
+			if (ServerReconnectTimer == null)
+			{
+				ServerReconnectTimer = new CTimer(ReconnectToServerTimerCallback, null, ServerReconnectInterval, ServerReconnectInterval);
+				Debug.Console(1, this, "Reconnect Timer Started.");
+			}
+			ServerReconnectTimer.Reset(ServerReconnectInterval, ServerReconnectInterval);
         }
 
 		/// <summary>
@@ -539,41 +451,36 @@ namespace PepperDash.Essentials
 		/// <param name="repeatTime"></param>
         void ResetOrStartHearbeatTimer()
         {
-			if (ServerHeartbeatCheckTimer == null)
-			{
+            if (ServerHeartbeatCheckTimer == null)
+            {
 				ServerHeartbeatCheckTimer = new CTimer(HeartbeatExpiredTimerCallback, null, ServerHeartbeatInterval, ServerHeartbeatInterval);
-				Debug.Console(1, this, "Heartbeat Timer Started.");
-			}
-			else
-			{
-				ServerHeartbeatCheckTimer.Reset(ServerHeartbeatInterval, ServerHeartbeatInterval);
-			}
+
+                Debug.Console(1, this, "Heartbeat Timer Started.");
+            }
+
+			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>
+        /// Connects the SSE Client
+        /// </summary>
+        /// <param name="o"></param>
+        void ConnectStreamClient()
+        {
+            Debug.Console(0, this, "Initializing Stream client to server.");
 
+			if (WSClient == null)
+			{
+				WSClient = new WebSocketClient();
+			}
+			WSClient.URL = string.Format("wss://{0}/system/join/{1}", Config.ServerUrl, this.SystemUuid);
+			WSClient.Connect();
+			Debug.Console(0, this, "Websocket connected");
+			WSClient.ReceiveCallBack = WebsocketReceiveCallback;
+			//WSClient.SendCallBack = WebsocketSendCallback;
+			WSClient.ReceiveAsync();
+        }
 
 		/// <summary>
 		/// Resets reconnect timer and updates usercode
@@ -607,26 +514,12 @@ namespace PepperDash.Essentials
 		{
 			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);
-				}
+				Debug.Console(0, this, "------ Begin HTTP Debug ---------------------------------------");
+				Debug.Console(0, this, "HTTP Response URL: {0}", r.ResponseUrl.ToString());
+				Debug.Console(0, this, "HTTP Response 'error' {0}", e);
+				Debug.Console(0, this, "HTTP Response code: {0}", r.Code);
+				Debug.Console(0, this, "HTTP Response content: \r{0}", r.ContentString);
+				Debug.Console(0, this, "------ End HTTP Debug -----------------------------------------");
 			}
 		}
 
@@ -637,28 +530,14 @@ namespace PepperDash.Essentials
 		/// <param name="length"></param>
 		/// <param name="opcode"></param>
 		/// <param name="err"></param>
-		int Websocket_ReceiveCallback(byte[] data, uint length, WebSocketClient.WEBSOCKET_PACKET_TYPES opcode,
+		int WebsocketReceiveCallback(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;
+			var rx = System.Text.Encoding.UTF8.GetString(data, 0, (int)length);
+			if(rx.Length > 0)
+				ParseStreamRx(rx);
+			WSClient.ReceiveAsync();
+			return 1;
 		}
 
         /// <summary>
@@ -666,11 +545,11 @@ namespace PepperDash.Essentials
         /// </summary>
         /// <param name="result"></param>
         /// <returns></returns>
-        int Websocket_SendCallback(Crestron.SimplSharp.CrestronWebSocketClient.WebSocketClient.WEBSOCKET_RESULT_CODES result)
+        int WebsocketSendCallback(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;
+            Debug.Console(1, this, "SendCallback result: {0}", result);
+
+            return 1;
         }
 
 		/// <summary>
@@ -683,15 +562,7 @@ namespace PepperDash.Essentials
             if(string.IsNullOrEmpty(message))
                 return;
 
-			if (!message.Contains("/system/heartbeat"))
-			{
-				Debug.Console(1, this, "Message RX: {0}", message);
-			}
-			else
-			{
-				LastAckMessage = DateTime.Now;
-			}
-
+            Debug.Console(1, this, "Message RX: '{0}'", message);
             try
             {
                 var messageObj = JObject.Parse(message);
@@ -700,25 +571,19 @@ namespace PepperDash.Essentials
 
                 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();
+					WSClient.Disconnect();
 
-					if (ServerHeartbeatCheckTimer != null)
-						ServerHeartbeatCheckTimer.Stop();
+					ServerHeartbeatCheckTimer.Stop();
+					// Start the reconnect timer
+					StartReconnectTimer();
 				}
 				else
 				{
@@ -755,7 +620,7 @@ namespace PepperDash.Essentials
 										}
 									case "held":
 										{
-											if (PushedActions.ContainsKey(type))
+											if (!PushedActions.ContainsKey(type))
 											{
 												PushedActions[type].Reset(ButtonHeartbeatInterval, ButtonHeartbeatInterval);
 											}

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IChannelExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class IChannelExtensions
     {
-        public static void LinkActions(this IChannel dev, MobileControlSystemController controller)
+        public static void LinkActions(this IChannel dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
         }
 
-        public static void UnlinkActions(this IChannel dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this IChannel dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IColorExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class IColorExtensions
     {
-        public static void LinkActions(this IColor dev, MobileControlSystemController controller)
+        public static void LinkActions(this IColor dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "blue", new PressAndHoldAction(dev.Blue));
         }
 
-        public static void UnlinkActions(this IColor dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this IColor dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDPadExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class IDPadExtensions
     {
-        public static void LinkActions(this IDPad dev, MobileControlSystemController controller)
+        public static void LinkActions(this IDPad dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
         }
 
-        public static void UnlinkActions(this IDPad dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this IDPad dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDvrExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class IDvrExtensions
     {
-        public static void LinkActions(this IDvr dev, MobileControlSystemController controller)
+        public static void LinkActions(this IDvr dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
         }
 
-        public static void UnlinkActions(this IDvr dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this IDvr dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/INumericExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class INumericExtensions
     {
-        public static void LinkActions(this INumericKeypad dev, MobileControlSystemController controller)
+        public static void LinkActions(this INumericKeypad dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -29,7 +29,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             // Deal with the Accessory functions on the numpad later
         }
 
-        public static void UnlinkActions(this INumericKeypad dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this INumericKeypad dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IPowerExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class IPowerExtensions
     {
-        public static void LinkActions(this IPower dev, MobileControlSystemController controller)
+        public static void LinkActions(this IPower dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "powerToggle", new Action(dev.PowerToggle));
         }
 
-        public static void UnlinkActions(this IPower dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this IPower dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ISetTopBoxControlsExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class ISetTopBoxControlsExtensions
     {
-        public static void LinkActions(this ISetTopBoxControls dev, MobileControlSystemController controller)
+        public static void LinkActions(this ISetTopBoxControls dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "replay", new PressAndHoldAction(dev.Replay));
         }
 
-        public static void UnlinkActions(this ISetTopBoxControls dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this ISetTopBoxControls dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ITransportExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
     public static class ITransportExtensions
     {
-        public static void LinkActions(this ITransport dev, MobileControlSystemController controller)
+        public static void LinkActions(this ITransport dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -24,7 +24,7 @@ namespace PepperDash.Essentials.Room.MobileControl
             controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
         }
 
-        public static void UnlinkActions(this ITransport dev, MobileControlSystemController controller)
+        public static void UnlinkActions(this ITransport dev, CotijaSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/Interfaces.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
 	/// <summary>
 	/// Represents a room whose configuration is derived from runtime data,
@@ -19,3 +19,42 @@ namespace PepperDash.Essentials.Room.MobileControl
 	}
 }
 
+namespace PepperDash.Essentials
+{
+	/// <summary>
+	/// For rooms with a single presentation source, change event
+	/// </summary>
+	public interface IHasCurrentSourceInfoChange
+	{
+		string CurrentSourceInfoKey { get; }
+		SourceListItem CurrentSourceInfo { get; }
+		event SourceInfoChangeHandler CurrentSingleSourceChange;
+	}
+
+
+	/// <summary>
+	/// For rooms with routing
+	/// </summary>
+	public interface IRunRouteAction
+	{
+		void RunRouteAction(string routeKey);
+
+		void RunRouteAction(string routeKey, Action successCallback);
+	}
+
+	/// <summary>
+	/// For rooms that default presentation only routing
+	/// </summary>
+	public interface IRunDefaultPresentRoute
+	{
+		bool RunDefaultPresentRoute();
+	}
+
+	/// <summary>
+	/// For rooms that have default presentation and calling routes
+	/// </summary>
+	public interface IRunDefaultCallRoute : IRunDefaultPresentRoute
+	{
+		bool RunDefaultCallRoute();
+	}
+}

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

@@ -1,174 +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.Core;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class CameraBaseMessenger : MessengerBase
-    {
-        /// <summary>
-        /// Device being bridged
-        /// </summary>
-        public CameraBase Camera { get; set; }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="camera"></param>
-        /// <param name="messagePath"></param>
-        public CameraBaseMessenger(string key, CameraBase camera, string messagePath)
-            : base(key, messagePath)
-        {
-            if (camera == null)
-                throw new ArgumentNullException("camera");
-
-            Camera = camera;
-
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            if (presetsCamera != null)
-            {
-                presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>(presetsCamera_PresetsListHasChanged);
-            }
- 
-        }
-
-        void presetsCamera_PresetsListHasChanged(object sender, EventArgs e)
-        {
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            var presetList = new List<CameraPreset>();
-
-            if (presetsCamera != null)
-                presetList = presetsCamera.Presets;
-
-            PostStatusMessage(new
-            {
-                presets = presetList
-            });
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendCameraFullMessageObject));
-
-            var ptzCamera = Camera as IHasCameraPtzControl;
-
-            if (ptzCamera != null)
-            {
-                
-                //  Need to evaluate how to pass through these P&H actions.  Need a method that takes a bool maybe?
-                AppServerController.AddAction(MessagePath + "/cameraUp", new PressAndHoldAction((b) =>
-                    {
-                        if (b)
-                            ptzCamera.TiltUp();
-                        else
-                            ptzCamera.TiltStop();
-                    }));
-                AppServerController.AddAction(MessagePath + "/cameraDown", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.TiltDown();
-                    else
-                        ptzCamera.TiltStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraLeft", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.PanLeft();
-                    else
-                        ptzCamera.PanStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraRight", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.PanRight();
-                    else
-                        ptzCamera.PanStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraZoomIn", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.ZoomIn();
-                    else
-                        ptzCamera.ZoomStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraZoomOut", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.ZoomOut();
-                    else
-                        ptzCamera.ZoomStop();
-                }));
-            }
-
-            if (Camera is IHasCameraAutoMode)
-            {
-                appServerController.AddAction(MessagePath + "/cameraModeAuto", new Action((Camera as IHasCameraAutoMode).CameraAutoModeOn));
-                appServerController.AddAction(MessagePath + "/cameraModeManual", new Action((Camera as IHasCameraAutoMode).CameraAutoModeOff));
-            }
-
-            if (Camera is IPower)
-            {
-                appServerController.AddAction(MessagePath + "/cameraModeOff", new Action((Camera as IPower).PowerOff));
-            }
-
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            if (presetsCamera != null)
-            {
-                for(int i = 1; i <= 6; i++)
-                {
-                    var preset = i;
-                    appServerController.AddAction(MessagePath + "/cameraPreset" + i, new Action<int>((p) => presetsCamera.PresetSelect(preset)));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Helper method to update the full status of the camera
-        /// </summary>
-        void SendCameraFullMessageObject()
-        {
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            var presetList = new List<CameraPreset>();
-
-            if (presetsCamera != null)
-                presetList = presetsCamera.Presets;
-
-            PostStatusMessage(new
-            {
-                cameraMode = GetCameraMode(),
-                hasPresets = Camera is IHasCameraPresets,
-                presets = presetList
-            });
-        }
-
-        /// <summary>
-        /// Computes the current camera mode
-        /// </summary>
-        /// <returns></returns>
-        string GetCameraMode()
-        {
-            string m;
-            if (Camera is IHasCameraAutoMode && (Camera as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.BoolValue)
-                m = eCameraControlMode.Auto.ToString().ToLower();
-            else if (Camera is IPower && !(Camera as IPower).PowerIsOnFeedback.BoolValue)
-                m = eCameraControlMode.Off.ToString().ToLower();
-            else
-                m = eCameraControlMode.Manual.ToString().ToLower();
-            return m;
-        }
-    }
-}

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

@@ -1,81 +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.AppServer.Messengers
-{
-    public class IRunRouteActionMessenger : MessengerBase
-    {
-        /// <summary>
-        /// Device being bridged
-        /// </summary>
-        public IRunRouteAction RoutingDevice {get; private set;}
-
-        public IRunRouteActionMessenger(string key, IRunRouteAction routingDevice, string messagePath)
-            : base(key, messagePath)
-        {
-            if (routingDevice == null)
-                throw new ArgumentNullException("routingDevice");
-
-            RoutingDevice = routingDevice;
-
-            var routingSink = RoutingDevice as IRoutingSinkNoSwitching;
-
-            if (routingSink != null)
-            {
-                routingSink.CurrentSourceChange += new SourceInfoChangeHandler(routingSink_CurrentSourceChange);
-            }
-        }
-
-        void routingSink_CurrentSourceChange(SourceListItem info, ChangeType type)
-        {
-            SendRoutingFullMessageObject();
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendRoutingFullMessageObject));
-
-            appServerController.AddAction(MessagePath + "/source", new Action<SourceSelectMessageContent>(c =>
-                    {
-                        RoutingDevice.RunRouteAction(c.SourceListItem, c.SourceListKey);
-                    }));
-
-            var sinkDevice = RoutingDevice as IRoutingSinkNoSwitching;
-            if(sinkDevice != null)
-            {
-                sinkDevice.CurrentSourceChange += new SourceInfoChangeHandler((o, a) =>
-                {
-                    SendRoutingFullMessageObject();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Helper method to update full status of the routing device
-        /// </summary>
-        void SendRoutingFullMessageObject()
-        {
-            var sinkDevice = RoutingDevice as IRoutingSinkNoSwitching;
-
-            if(sinkDevice != null) 
-            {
-                var sourceKey = sinkDevice.CurrentSourceInfoKey;
-
-                if (string.IsNullOrEmpty(sourceKey))
-                    sourceKey = "none";
-
-                PostStatusMessage(new
-                {
-                    selectedSourceKey = sourceKey
-                });
-            }
-        }
-    }
-}

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

@@ -1,230 +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 SIMPLAtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-        public SIMPLAtcJoinMap JoinMap {get; private set;}
-
-        ///// <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 SIMPLAtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-            EISC = eisc;
-
-            JoinMap = new SIMPLAtcJoinMap(201);
-
-			CurrentCallItem = new CodecActiveCallItem();
-			CurrentCallItem.Type = eCodecCallType.Audio;
-			CurrentCallItem.Id = "-audio-";
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-            
-
-			this.PostStatusMessage(new
-			{				
-				calls = GetCurrentCallList(),
-				currentCallString = EISC.GetString(JoinMap.CurrentCallName.JoinNumber),
-				currentDialString = EISC.GetString(JoinMap.CurrentDialString.JoinNumber),
-                isInCall = EISC.GetString(JoinMap.HookState.JoinNumber) == "Connected"
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
-
-            EISC.SetStringSigAction(JoinMap.HookState.JoinNumber, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-                //GetCurrentCallList();
-				SendFullStatus();
-			});
-
-            EISC.SetStringSigAction(JoinMap.CurrentCallNumber.JoinNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                SendCallsList();
-			});
-
-            EISC.SetStringSigAction(JoinMap.CurrentCallName.JoinNumber, s =>
-            {
-                CurrentCallItem.Name = s;
-                SendCallsList();
-            });
-
-            EISC.SetStringSigAction(JoinMap.CallDirection.JoinNumber, 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", JoinMap.EndCall.JoinNumber);
-            addAction("/endAllCalls", JoinMap.EndCall.JoinNumber);
-            addAction("/acceptById", JoinMap.IncomingAnswer.JoinNumber);
-            addAction("/rejectById", JoinMap.IncomingReject.JoinNumber);
-
-            var speeddialStart = JoinMap.SpeedDialStart.JoinNumber;
-            var speeddialEnd = JoinMap.SpeedDialStart.JoinNumber + JoinMap.SpeedDialStart.JoinSpan;
-
-            var speedDialIndex = 1;
-            for (uint i = speeddialStart; i < speeddialEnd; i++)
-            {
-                addAction(string.Format("/speedDial{0}", speedDialIndex), i);
-                speedDialIndex++;
-            }
-
-			// Get status
-			AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatus));
-			// Dial on string
-            AppServerController.AddAction(MessagePath + "/dial", new Action<string>(s => EISC.SetString(JoinMap.CurrentDialString.JoinNumber, s)));
-			// Pulse DTMF
-			AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-			{
-                var join = JoinMap.Joins[s];           
-                if (join != null)
-                {
-                    if (join.JoinNumber > 0)
-                    {
-                        EISC.PulseBool(join.JoinNumber, 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/SIMPLCameraMessenger.cs

@@ -1,149 +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.Core.Bridges;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class SIMPLCameraMessenger : MessengerBase
-    {
-        BasicTriList EISC;
-
-        CameraControllerJoinMap JoinMap;
-
-
-        public SIMPLCameraMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
-            : base(key, messagePath)
-        {
-            EISC = eisc;
-
-            JoinMap = new CameraControllerJoinMap(joinStart);
-
-            EISC.SetUShortSigAction(JoinMap.NumberOfPresets.JoinNumber, (u) => SendCameraFullMessageObject());
-
-            EISC.SetBoolSigAction(JoinMap.CameraModeAuto.JoinNumber, (b) => PostCameraMode());
-            EISC.SetBoolSigAction(JoinMap.CameraModeManual.JoinNumber, (b) => PostCameraMode());
-            EISC.SetBoolSigAction(JoinMap.CameraModeOff.JoinNumber, (b) => PostCameraMode());
-        }
-
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            var asc = appServerController;
-
-            asc.AddAction(MessagePath + "/fullStatus", new Action(SendCameraFullMessageObject));
-
-            // Add press and holds using helper action
-            Action<string, uint> addPHAction = (s, u) =>
-                asc.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-            addPHAction("/cameraUp", JoinMap.TiltUp.JoinNumber);
-            addPHAction("/cameraDown", JoinMap.TiltDown.JoinNumber);
-            addPHAction("/cameraLeft", JoinMap.PanLeft.JoinNumber);
-            addPHAction("/cameraRight", JoinMap.PanRight.JoinNumber);
-            addPHAction("/cameraZoomIn", JoinMap.ZoomIn.JoinNumber);
-            addPHAction("/cameraZoomOut", JoinMap.ZoomOut.JoinNumber);
-
-            Action<string, uint> addAction = (s, u) =>
-                asc.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-
-            addAction("/cameraModeAuto", JoinMap.CameraModeAuto.JoinNumber);
-            addAction("/cameraModeManual", JoinMap.CameraModeManual.JoinNumber);
-            addAction("/cameraModeOff", JoinMap.CameraModeOff.JoinNumber);
-
-            var presetStart = JoinMap.PresetRecallStart.JoinNumber;
-            var presetEnd = JoinMap.PresetRecallStart.JoinNumber + JoinMap.PresetRecallStart.JoinSpan;
-
-            int presetId = 1;
-            // camera presets
-            for (uint i = presetStart; i <= presetEnd; i++)
-            {
-                addAction("/cameraPreset" + (presetId), i);
-                presetId++;
-            }
-        }
-
-        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.RemoveAction(MessagePath + "/fullStatus");
-
-            appServerController.RemoveAction(MessagePath + "/cameraUp");
-            appServerController.RemoveAction(MessagePath + "/cameraDown");
-            appServerController.RemoveAction(MessagePath + "/cameraLeft");
-            appServerController.RemoveAction(MessagePath + "/cameraRight");
-            appServerController.RemoveAction(MessagePath + "/cameraZoomIn");
-            appServerController.RemoveAction(MessagePath + "/cameraZoomOut");
-            appServerController.RemoveAction(MessagePath + "/cameraModeAuto");
-            appServerController.RemoveAction(MessagePath + "/cameraModeManual");
-            appServerController.RemoveAction(MessagePath + "/cameraModeOff");
-
-            EISC.SetUShortSigAction(JoinMap.NumberOfPresets.JoinNumber, null);
-
-            EISC.SetBoolSigAction(JoinMap.CameraModeAuto.JoinNumber, null);
-            EISC.SetBoolSigAction(JoinMap.CameraModeManual.JoinNumber, null);
-            EISC.SetBoolSigAction(JoinMap.CameraModeOff.JoinNumber, null);
-        }
-
-        /// <summary>
-        /// Helper method to update the full status of the camera
-        /// </summary>
-        void SendCameraFullMessageObject()
-        {
-            var presetList = new List<CameraPreset>();
-
-            // Build a list of camera presets based on the names and count 
-            if (EISC.GetBool(JoinMap.SupportsPresets.JoinNumber))
-            {
-                var presetStart = JoinMap.PresetLabelStart.JoinNumber;
-                var presetEnd = JoinMap.PresetLabelStart.JoinNumber + JoinMap.NumberOfPresets.JoinNumber;
-
-                var presetId = 1;
-                for (uint i = presetStart; i < presetEnd; i++)
-                {
-                    var presetName = EISC.GetString(i);
-                    var preset = new CameraPreset(presetId, presetName, string.IsNullOrEmpty(presetName), true);
-                    presetList.Add(preset);
-                    presetId++;
-                }
-            }
-
-            PostStatusMessage(new
-            {
-                cameraMode = GetCameraMode(),
-                hasPresets = EISC.GetBool(JoinMap.SupportsPresets.JoinNumber),
-                presets = presetList
-            });
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void PostCameraMode()
-        {
-            PostStatusMessage(new
-            {
-                cameraMode = GetCameraMode()
-            });
-        }
-
-        /// <summary>
-        /// Computes the current camera mode
-        /// </summary>
-        /// <returns></returns>
-        string GetCameraMode()
-        {
-            string m;
-            if (EISC.GetBool(JoinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
-            else if (EISC.GetBool(JoinMap.CameraModeManual.JoinNumber)) m = eCameraControlMode.Manual.ToString().ToLower();
-            else m = eCameraControlMode.Off.ToString().ToLower();
-            return m;
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/SIMPLRouteMessenger.cs

@@ -1,73 +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;
-
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class SIMPLRouteMessenger : MessengerBase
-    {
-        BasicTriList EISC;
-
-        uint JoinStart;
-
-        public class StringJoin
-        {
-            /// <summary>
-            /// 1
-            /// </summary>
-            public const uint CurrentSource = 1;
-        }
-
-        public SIMPLRouteMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
-            : base(key, messagePath)
-        {
-            EISC = eisc;
-            JoinStart = joinStart - 1;
-
-            EISC.SetStringSigAction(JoinStart + StringJoin.CurrentSource, (s) => SendRoutingFullMessageObject(s));
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(() =>
-                {
-                    SendRoutingFullMessageObject(EISC.GetString(JoinStart + StringJoin.CurrentSource));
-                }));
-
-            appServerController.AddAction(MessagePath +"/source", new Action<SourceSelectMessageContent>(c =>
-                {
-                    EISC.SetString(JoinStart + StringJoin.CurrentSource, c.SourceListItem);
-                }));
-
-        }
-
-        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.RemoveAction(MessagePath + "/fullStatus");
-            appServerController.RemoveAction(MessagePath + "/source");
-
-            EISC.SetStringSigAction(JoinStart + StringJoin.CurrentSource, null);
-        }
-
-        /// <summary>
-        /// Helper method to update full status of the routing device
-        /// </summary>
-        void SendRoutingFullMessageObject(string sourceKey)
-        {
-            if (string.IsNullOrEmpty(sourceKey))
-                sourceKey = "none";
-
-            PostStatusMessage(new
-            {
-                selectedSourceKey = sourceKey
-            });
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/SIMPLVtcMessenger.cs

@@ -1,665 +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;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	public class SIMPLVtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-        public SIMPLVtcJoinMap JoinMap { get; private set; }
-
-        ///********* 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 BDirectoryHasChanged = 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 = 701;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="eisc"></param>
-		/// <param name="messagePath"></param>
-		public SIMPLVtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-			EISC = eisc;
-
-            JoinMap = new SIMPLVtcJoinMap(701);
-
-			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(JoinMap.HookState.JoinNumber, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-				PostFullStatus(); // SendCallsList();
-			});
-
-			EISC.SetStringSigAction(JoinMap.CurrentCallNumber.JoinNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                PostCallsList();
-			});
-
-            EISC.SetStringSigAction(JoinMap.CurrentCallName.JoinNumber, s =>
-            {
-                CurrentCallItem.Name = s;
-                PostCallsList();
-            });
-
-            EISC.SetStringSigAction(JoinMap.CallDirection.JoinNumber, s =>
-            {
-                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
-                PostCallsList();
-            });
-
-			EISC.SetBoolSigAction(JoinMap.IncomingCall.JoinNumber, b =>
-			{
-				if (b)
-				{
-					var ica = new CodecActiveCallItem()
-					{
-						Direction = eCodecCallDirection.Incoming,
-						Id = "-video-incoming",
-						Name = EISC.GetString(JoinMap.IncomingCallName.JoinNumber),
-						Number = EISC.GetString(JoinMap.IncomingCallNumber.JoinNumber),
-						Status = eCodecCallStatus.Ringing,
-						Type = eCodecCallType.Video
-					};
-					IncomingCallItem = ica;
-				}
-				else
-				{
-					IncomingCallItem = null;
-				}
-				PostCallsList();
-			});
-
-			EISC.SetBoolSigAction(JoinMap.CameraSupportsAutoMode.JoinNumber, b =>
-			{
-				PostStatusMessage(new
-				{	
-					cameraSupportsAutoMode = b
-				});
-			});
-			EISC.SetBoolSigAction(JoinMap.CameraSupportsOffMode.JoinNumber, b =>
-			{
-				PostStatusMessage(new
-				{
-					cameraSupportsOffMode = b
-				});
-			});
-
-			// Directory insanity
-			EISC.SetUShortSigAction(JoinMap.DirectoryRowCount.JoinNumber, 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(JoinMap.DirectoryEntriesStart.JoinNumber + PreviousDirectoryLength - 1);
-				}
-				EISC.SetStringSigAction(JoinMap.DirectoryEntriesStart.JoinNumber + u - 1, s => PostDirectory());
-				PreviousDirectoryLength = u;
-			});
-
-			EISC.SetStringSigAction(JoinMap.DirectoryEntrySelectedName.JoinNumber, s =>
-			{
-				PostStatusMessage(new
-				{
-					directoryContactSelected = new
-					{
-						name = EISC.GetString(JoinMap.DirectoryEntrySelectedName.JoinNumber),
-					}
-				});
-			});
-
-			EISC.SetStringSigAction(JoinMap.DirectoryEntrySelectedNumber.JoinNumber, s =>
-			{
-				PostStatusMessage(new
-				{
-					directoryContactSelected = new
-					{
-						number = EISC.GetString(JoinMap.DirectoryEntrySelectedNumber.JoinNumber),
-					}
-				});
-			});
-
-			EISC.SetStringSigAction(JoinMap.DirectorySelectedFolderName.JoinNumber, s => PostStatusMessage(new
-			{
-				directorySelectedFolderName = EISC.GetString(JoinMap.DirectorySelectedFolderName.JoinNumber)
-			}));
-
-			EISC.SetSigTrueAction(JoinMap.CameraModeAuto.JoinNumber, () => PostCameraMode());
-			EISC.SetSigTrueAction(JoinMap.CameraModeManual.JoinNumber, () => PostCameraMode());
-			EISC.SetSigTrueAction(JoinMap.CameraModeOff.JoinNumber, () => PostCameraMode());
-
-			EISC.SetBoolSigAction(JoinMap.CameraSelfView.JoinNumber, b => PostStatusMessage(new 
-				{
-					cameraSelfView = b
-				}));
-
-			EISC.SetUShortSigAction(JoinMap.CameraNumberSelect.JoinNumber, (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", JoinMap.CameraTiltUp.JoinNumber);
-			addPHAction("/cameraDown", JoinMap.CameraTiltDown.JoinNumber);
-			addPHAction("/cameraLeft", JoinMap.CameraPanLeft.JoinNumber);
-			addPHAction("/cameraRight", JoinMap.CameraPanRight.JoinNumber);
-			addPHAction("/cameraZoomIn", JoinMap.CameraZoomIn.JoinNumber);
-			addPHAction("/cameraZoomOut", JoinMap.CameraZoomOut.JoinNumber);
-
-			// 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", JoinMap.EndCall.JoinNumber);
-			addAction("/endAllCalls", JoinMap.EndCall.JoinNumber);
-            addAction("/acceptById", JoinMap.IncomingAnswer.JoinNumber);
-            addAction("/rejectById", JoinMap.IncomingReject.JoinNumber);
-
-            var speeddialStart = JoinMap.SpeedDialStart.JoinNumber;
-            var speeddialEnd = JoinMap.SpeedDialStart.JoinNumber + JoinMap.SpeedDialStart.JoinSpan;
-
-            var speedDialIndex = 1;
-            for (uint i = speeddialStart; i < speeddialEnd; i++)
-            {
-                addAction(string.Format("/speedDial{0}", speedDialIndex), i);
-                speedDialIndex++;
-            }
-
-			addAction("/cameraModeAuto", JoinMap.CameraModeAuto.JoinNumber);
-			addAction("/cameraModeManual", JoinMap.CameraModeManual.JoinNumber);
-			addAction("/cameraModeOff", JoinMap.CameraModeOff.JoinNumber);
-			addAction("/cameraSelfView", JoinMap.CameraSelfView.JoinNumber);
-			addAction("/cameraLayout", JoinMap.CameraLayout.JoinNumber);
-
-			asc.AddAction("/cameraSelect", new Action<string>(SelectCamera));
-
-			// camera presets
-			for(uint i = 0; i < 6; i++) 
-			{
-				addAction("/cameraPreset" + (i + 1), JoinMap.CameraPresetStart.JoinNumber + 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(JoinMap.CurrentDialString.JoinNumber, s)));
-            // Pulse DTMF
-            AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-            {
-                var join = JoinMap.Joins[s];           
-                if (join != null)
-                {
-                    if (join.JoinNumber > 0)
-                    {
-                        EISC.PulseBool(join.JoinNumber, 100);
-                    }
-                }
-            }));
-
-			// Directory madness
-			asc.AddAction(MessagePath + "/directoryRoot", new Action(() => EISC.PulseBool(JoinMap.DirectoryRoot.JoinNumber)));
-			asc.AddAction(MessagePath + "/directoryBack", new Action(() => EISC.PulseBool(JoinMap.DirectoryFolderBack.JoinNumber)));
-			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(JoinMap.DirectorySelectRow.JoinNumber, u);
-					EISC.PulseBool(JoinMap.DirectoryLineSelected.JoinNumber);
-				}
-				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(JoinMap.DirectorySelectRow.JoinNumber, u);
-					EISC.PulseBool(JoinMap.DirectoryLineSelected.JoinNumber);
-				}
-				catch
-				{
-					
-				}
-			}));
-			asc.AddAction(MessagePath + "/directoryDialContact", new Action(() => {
-				EISC.PulseBool(JoinMap.DirectoryDialSelectedLine.JoinNumber);
-			}));
-			asc.AddAction(MessagePath + "/getDirectory", new Action(() =>
-			{
-				if (EISC.GetUshort(JoinMap.DirectoryRowCount.JoinNumber) > 0)
-				{
-					PostDirectory();
-				}
-				else
-				{
-                    EISC.PulseBool(JoinMap.DirectoryRoot.JoinNumber);
-				}
-			}));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostFullStatus()
-		{
-			this.PostStatusMessage(new
-			{
-				calls = GetCurrentCallList(),
-				cameraMode = GetCameraMode(),
-				cameraSelfView = EISC.GetBool(JoinMap.CameraSelfView.JoinNumber),
-				cameraSupportsAutoMode = EISC.GetBool(JoinMap.CameraSupportsAutoMode.JoinNumber),
-				cameraSupportsOffMode = EISC.GetBool(JoinMap.CameraSupportsOffMode.JoinNumber),
-				currentCallString = EISC.GetString(JoinMap.CurrentCallNumber.JoinNumber),
-				currentDialString = EISC.GetString(JoinMap.CurrentDialString.JoinNumber),
-				directoryContactSelected = new
-				{
-					name = EISC.GetString(JoinMap.DirectoryEntrySelectedName.JoinNumber),
-					number = EISC.GetString(JoinMap.DirectoryEntrySelectedNumber.JoinNumber)
-				},
-				directorySelectedFolderName = EISC.GetString(JoinMap.DirectorySelectedFolderName.JoinNumber),
-                isInCall = EISC.GetString(JoinMap.HookState.JoinNumber) == "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(JoinMap.DirectoryRowCount.JoinNumber);
-			var items = new List<object>();
-			for (uint i = 0; i < u; i++)
-			{
-				var name = EISC.GetString(JoinMap.DirectoryEntriesStart.JoinNumber + 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(JoinMap.DirectoryIsRoot.JoinNumber),
-					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(JoinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
-            else if (EISC.GetBool(JoinMap.CameraModeManual.JoinNumber)) m = eCameraControlMode.Manual.ToString().ToLower();
-            else m = eCameraControlMode.Off.ToString().ToLower();
-			return m;
-		}
-
-		void PostSelectedCamera()
-		{
-			PostStatusMessage(new
-			{
-				selectedCamera = GetSelectedCamera()
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		string GetSelectedCamera()
-		{
-            var num = EISC.GetUshort(JoinMap.CameraNumberSelect.JoinNumber);
-			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(JoinMap.CameraNumberSelect.JoinNumber, 100);
-			}
-			else
-			{
-                EISC.SetUshort(JoinMap.CameraNumberSelect.JoinNumber, 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(JoinMap.IncomingCall.JoinNumber))
-            {
-
-			}
-			return list;
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/SimplMessengerPropertiesConfig.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core.Bridges;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    /// <summary>
-    /// Properties to configure a SIMPL Messenger
-    /// </summary>
-    public class SimplMessengerPropertiesConfig : EiscApiPropertiesConfig.ApiDevicePropertiesConfig
-    {
-    }
-}

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

@@ -7,34 +7,37 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-using PepperDash.Core;
-
 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
+	/// Provides a messaging bridge for a VideoCodecBase
 	/// </summary>
-	public class VideoCodecBaseMessenger : MessengerBase
+	public class VideoCodecBaseMessenger
 	{
 		/// <summary>
 		/// 
 		/// </summary>
 		public VideoCodecBase Codec { get; private set; }
 
+		public CotijaSystemController AppServerController { get; private set; }
+
+		public string MessagePath { get; private set; }
+
 		/// <summary>
 		/// 
 		/// </summary>
 		/// <param name="codec"></param>
-		public VideoCodecBaseMessenger(string key, VideoCodecBase codec, string messagePath)
-            : base(key, messagePath)
+		public VideoCodecBaseMessenger(VideoCodecBase codec, string messagePath)
 		{
 			if (codec == null)
 				throw new ArgumentNullException("codec");
+			if (string.IsNullOrEmpty(messagePath))
+				throw new ArgumentException("messagePath must not be empty or null");
 
+			MessagePath = messagePath;
 			Codec = codec;
 			codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
 			codec.IsReadyChange += new EventHandler<EventArgs>(codec_IsReadyChange);
@@ -43,33 +46,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			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>
 		/// 
@@ -78,73 +56,13 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// <param name="e"></param>
 		void dirCodec_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-            SendDirectory((Codec as IHasDirectory).CurrentDirectoryResult, e.DirectoryIsOnRoot);
+			var dir = e.Directory;
+			PostStatusMessage(new
+			{
+				currentDirectory = e.Directory
+			});
 		}
 
-        /// <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>
@@ -159,11 +77,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		}
 
 		/// <summary>
-		/// Called from base's RegisterWithAppServer method
+		/// Registers this codec's messaging with an app server controller
 		/// </summary>
 		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+		public void RegisterWithAppServer(CotijaSystemController appServerController)
 		{
+			if (appServerController == null)
+				throw new ArgumentNullException("appServerController");
+			
+			AppServerController = 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)));
@@ -187,77 +110,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				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));
-            }
-			var cameraCodec = Codec as IHasCodecCameras;
-            if (cameraCodec != null)
-            {
-                Debug.Console(2, this, "Adding IHasCodecCameras Actions");
-
-                cameraCodec.CameraSelected += new EventHandler<CameraSelectedEventArgs>(cameraCodec_CameraSelected);
-
-                appServerController.AddAction(MessagePath + "/cameraSelect", new Action<string>(s => cameraCodec.SelectCamera(s)));
-
-                MapCameraActions();
-
-                var presetsCodec = Codec as IHasCodecRoomPresets;
-                if (presetsCodec != null)
-                {
-                    Debug.Console(2, this, "Adding IHasCodecRoomPresets Actions");
-
-                    presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CameraPresetsListHasChanged);
-
-                    appServerController.AddAction(MessagePath + "/cameraPreset", new Action<int>(u => presetsCodec.CodecRoomPresetSelect(u)));
-                    appServerController.AddAction(MessagePath + "/cameraPresetStore", new Action<CodecRoomPreset>(p => presetsCodec.CodecRoomPresetStore(p.ID, p.Description)));
-                }
-
-                var speakerTrackCodec = Codec as IHasCameraAutoMode;
-                if (speakerTrackCodec != null)
-                {
-                    Debug.Console(2, this, "Adding IHasCameraAutoMode Actions");
-
-                    speakerTrackCodec.CameraAutoModeIsOnFeedback.OutputChange += new EventHandler<PepperDash.Essentials.Core.FeedbackEventArgs>(CameraAutoModeIsOnFeedback_OutputChange);
-
-                    appServerController.AddAction(MessagePath + "/cameraAuto", new Action(speakerTrackCodec.CameraAutoModeOn));
-                    appServerController.AddAction(MessagePath + "/cameraManual", new Action(speakerTrackCodec.CameraAutoModeOff));
-                }
-            }
-
-            var selfViewCodec = Codec as IHasCodecSelfView;
-
-            if (selfViewCodec != null)
-            {
-                Debug.Console(2, this, "Adding IHasCodecSelfView Actions");
-
-                appServerController.AddAction(MessagePath + "/cameraSelfView", new Action(selfViewCodec.SelfViewModeToggle));
-            }
-
-            var layoutsCodec = Codec as IHasCodecLayouts;
-
-            if (layoutsCodec != null)
-            {
-                Debug.Console(2, this, "Adding IHasCodecLayouts Actions");
-
-                appServerController.AddAction(MessagePath + "/cameraRemoteView", new Action(layoutsCodec.LocalLayoutToggle));
-            }
-
-            Debug.Console(2, this, "Adding Privacy & Standby Actions");
-
+			appServerController.AddAction(MessagePath + "/directoryRoot", 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 + "/privacyModeOn", new Action(Codec.PrivacyModeOn));
 			appServerController.AddAction(MessagePath + "/privacyModeOff", new Action(Codec.PrivacyModeOff));
 			appServerController.AddAction(MessagePath + "/privacyModeToggle", new Action(Codec.PrivacyModeToggle));
@@ -267,107 +122,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			appServerController.AddAction(MessagePath + "/standbyOff", new Action(Codec.StandbyDeactivate));
 		}
 
-        void presetsCodec_CameraPresetsListHasChanged(object sender, EventArgs e)
-        {
-            PostCameraPresets();
-        }
-
-        void CameraAutoModeIsOnFeedback_OutputChange(object sender, PepperDash.Essentials.Core.FeedbackEventArgs e)
-        {
-            PostCameraMode();
-        }
-
-
-        void cameraCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
-        {
-            MapCameraActions();
-            PostSelectedCamera();
-        }
-
-        /// <summary>
-        /// Maps the camera control actions to the current selected camera on the codec
-        /// </summary>
-        void MapCameraActions()
-        {
-            var cameraCodec = Codec as IHasCameras;
-
-            if (cameraCodec != null && cameraCodec.SelectedCamera != null)
-            {
-
-                AppServerController.RemoveAction(MessagePath + "/cameraUp");
-                AppServerController.RemoveAction(MessagePath + "/cameraDown");
-                AppServerController.RemoveAction(MessagePath + "/cameraLeft");
-                AppServerController.RemoveAction(MessagePath + "/cameraRight");
-                AppServerController.RemoveAction(MessagePath + "/cameraZoomIn");
-                AppServerController.RemoveAction(MessagePath + "/cameraZoomOut");
-                AppServerController.RemoveAction(MessagePath + "/cameraHome");
-
-                var camera = cameraCodec.SelectedCamera as IHasCameraPtzControl;
-                if (camera != null)
-                {
-                    AppServerController.AddAction(MessagePath + "/cameraUp", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.TiltUp(); else camera.TiltStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraDown", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.TiltDown(); else camera.TiltStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraLeft", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.PanLeft(); else camera.PanStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraRight", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.PanRight(); else camera.PanStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraZoomIn", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.ZoomIn(); else camera.ZoomStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraZoomOut", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.ZoomOut(); else camera.ZoomStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraHome", new Action(camera.PositionHome));
-
-                    var focusCamera = cameraCodec as IHasCameraFocusControl;
-
-                    AppServerController.RemoveAction(MessagePath + "/cameraAutoFocus");
-                    AppServerController.RemoveAction(MessagePath + "/cameraFocusNear");
-                    AppServerController.RemoveAction(MessagePath + "/cameraFocusFar");
-
-                    if (focusCamera != null)
-                    {
-                        AppServerController.AddAction(MessagePath + "/cameraAutoFocus", new Action(focusCamera.TriggerAutoFocus));
-                        AppServerController.AddAction(MessagePath + "/cameraFocusNear", new PressAndHoldAction(new Action<bool>(b => { if (b)focusCamera.FocusNear(); else focusCamera.FocusStop(); })));
-                        AppServerController.AddAction(MessagePath + "/cameraFocusFar", new PressAndHoldAction(new Action<bool>(b => { if (b)focusCamera.FocusFar(); else focusCamera.FocusStop(); })));
-                    }
-                }
-            }
-        }
-
-        string GetCameraMode()
-        {
-            string m = "";
-
-            var speakerTrackCodec = Codec as IHasCameraAutoMode;
-            if (speakerTrackCodec != null)
-            {
-                if (speakerTrackCodec.CameraAutoModeIsOnFeedback.BoolValue) m = eCameraControlMode.Auto.ToString();
-                else m = eCameraControlMode.Manual.ToString();
-            }
-
-            var cameraOffCodec = Codec as IHasCameraOff;
-            if (cameraOffCodec != null)
-            {
-                if (cameraOffCodec.CameraIsOffFeedback.BoolValue)
-                    m = eCameraControlMode.Off.ToString();
-            }
-
-            return m;
-        }
-
-        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()
 		{
 
@@ -430,28 +184,12 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				return;
 			}
 
-            dirCodec.SetCurrentDirectoryToRoot();
-
-            //PostStatusMessage(new
-            //{
-            //    currentDirectory = dirCodec.DirectoryRoot
-            //});
+			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>
@@ -482,22 +220,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				return;
 			}
 
-            object cameraInfo = null;
-
-            var camerasCodec = Codec as IHasCodecCameras;
-            if (camerasCodec != null)
-            {
-                cameraInfo = new
-                {
-                    cameraManualSupported = true, // For now, we assume manual mode is supported and selectively hide controls based on camera selection
-                    cameraAutoSupported = Codec is IHasCameraAutoMode,
-                    cameraOffSupported = Codec is IHasCameraOff,
-                    cameraMode = GetCameraMode(),
-                    cameraList = camerasCodec.Cameras,
-                    selectedCamera = GetSelectedCamera(camerasCodec)
-                };
-            }
-
 			var info = Codec.CodecInfo;
 			PostStatusMessage(new
 			{
@@ -517,80 +239,21 @@ namespace PepperDash.Essentials.AppServer.Messengers
 					sipURI = info.SipUri
 				},
 				showSelfViewByDefault = Codec.ShowSelfViewByDefault,
-				hasDirectory = Codec is IHasDirectory,
-                hasDirectorySearch = true,
-                hasRecents = Codec is IHasCallHistory,
-                hasCameras = Codec is IHasCameras,
-                cameras = cameraInfo,
-                presets = GetCurrentPresets()
+				hasDirectory = Codec is IHasDirectory
 			});
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        void PostCameraMode()
-        {
-            PostStatusMessage(new
-            {
-                cameras = new
-                {
-                    cameraMode = GetCameraMode()
-                }
-            });
-        }
-
-        void PostSelectedCamera()
-        {
-            var camerasCodec = Codec as IHasCodecCameras;
-
-            PostStatusMessage(new
-            {
-                cameras = new
-                {
-                    selectedCamera = GetSelectedCamera(camerasCodec)
-                },
-                presets = GetCurrentPresets()
-            });
-        }
-
-        void PostCameraPresets()
-        {
-
-            PostStatusMessage(new
-            {
-                presets = GetCurrentPresets()
-			});
+		/// <summary>
+		/// Helper for posting status message
+		/// </summary>
+		/// <param name="contentObject">The contents of the content object</param>
+		void PostStatusMessage(object contentObject)
+		{
+			AppServerController.SendMessageToServer(JObject.FromObject(new
+			{
+				type = MessagePath,
+				content = contentObject
+			}));
 		}
-		
-        object GetSelectedCamera(IHasCodecCameras camerasCodec)
-        {
-            return new
-                    {
-                        key = camerasCodec.SelectedCameraFeedback.StringValue,
-                        isFarEnd = camerasCodec.ControllingFarEndCameraFeedback.BoolValue,
-                        capabilites = new
-                        {
-                            canPan = camerasCodec.SelectedCamera.CanPan,
-                            canTilt = camerasCodec.SelectedCamera.CanTilt,
-                            canZoom = camerasCodec.SelectedCamera.CanZoom,
-                            canFocus = camerasCodec.SelectedCamera.CanFocus
-                        }
-                    };
-        }
-
-        List<CodecRoomPreset> GetCurrentPresets()
-        {
-            var presetsCodec = Codec as IHasCodecRoomPresets;
-
-            List<CodecRoomPreset> currentPresets = null;
-
-            if (presetsCodec != null && Codec is IHasFarEndCameraControl && (Codec as IHasFarEndCameraControl).ControllingFarEndCameraFeedback.BoolValue)
-                currentPresets = presetsCodec.FarEndRoomPresets;
-            else
-                currentPresets = presetsCodec.NearEndPresets;
-
-            return currentPresets;
-        }
 	}
 }

PepperDashEssentials/AppServer/RoomBridges/CotijaBridgeBase.cs

@@ -12,15 +12,15 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-	public abstract class MobileControlBridgeBase: Device
+	public abstract class CotijaBridgeBase: Device
 	{
-		public MobileControlSystemController Parent { get; private set; }
+		public CotijaSystemController Parent { get; private set; }
 
 		public string UserCode { get; private set; }
 
 		public abstract string RoomName { get; }
 
-		public MobileControlBridgeBase(string key, string name)
+		public CotijaBridgeBase(string key, string name)
 			: base(key, name)
 		{
 		}
@@ -30,7 +30,7 @@ namespace PepperDash.Essentials
 		/// as adding actions to parent
 		/// </summary>
 		/// <param name="parent"></param>
-		public virtual void AddParent(MobileControlSystemController parent)
+		public virtual void AddParent(CotijaSystemController parent)
 		{
 			Parent = parent;
 		}

PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs

@@ -0,0 +1,670 @@
+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.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Room.Config;
+
+
+namespace PepperDash.Essentials.Room.Cotija
+{
+	public class CotijaDdvc01RoomBridge : CotijaBridgeBase, IDelayedConfiguration
+	{
+		public class BoolJoin
+		{
+			/// <summary>
+			/// 301
+			/// </summary>
+			public const uint RoomIsOn = 301;
+
+			/// <summary>
+			/// 51
+			/// </summary>
+			public const uint ActivitySharePress = 51;
+			/// <summary>
+			/// 52
+			/// </summary>
+			public const uint ActivityPhoneCallPress = 52;
+			/// <summary>
+			/// 53
+			/// </summary>
+			public const uint ActivityVideoCallPress = 53;
+
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint MasterVolumeIsMuted = 1;
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint MasterVolumeMuteToggle = 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 = 72;
+			/// <summary>
+			/// 501
+			/// </summary>
+			public const uint ConfigIsReady = 501;
+		}
+
+		public class UshortJoin
+		{
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint MasterVolumeLevel = 1;
+
+			/// <summary>
+			/// 61
+			/// </summary>
+			public const uint ShutdownPromptDuration = 61;
+		}
+
+		public class StringJoin
+		{
+			/// <summary>
+			/// 71
+			/// </summary>
+			public const uint SelectedSourceKey = 71;
+			
+			/// <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>
+		/// 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;
+			}
+		}
+
+		CotijaDdvc01DeviceBridge SourceBridge;
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="name"></param>
+		/// <param name="ipId"></param>
+		public CotijaDdvc01RoomBridge(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 CotijaDdvc01DeviceBridge(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();
+
+			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);
+
+			CrestronConsole.AddNewConsoleCommand(s => LoadConfigValues(), "loadddvc", "", ConsoleAccessLevelEnum.AccessOperator);
+
+			return base.CustomActivate();
+		}
+
+
+		/// <summary>
+		/// Setup the actions to take place on various incoming API calls
+		/// </summary>
+		void SetupFunctions()
+		{
+
+			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.ActivitySharePress)));
+
+			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/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)));
+
+
+            // Source Device (Current Source)'
+
+            SourceDeviceMapDictionary sourceJoinMap = new SourceDeviceMapDictionary();
+
+            var prefix = @"/device/currentSource/";
+
+            foreach (var item in sourceJoinMap)
+            {
+                Parent.AddAction(string.Format("{0}{1}", prefix, item.Key), new PressAndHoldAction(b => EISC.SetBool(item.Value, 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
+                        }
+                    }
+                }));
+
+			EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b =>
+                PostStatusMessage(new
+                {
+                    volumes = new
+                    {
+                        master = new
+                        {
+                            muted = b
+                        }
+                    }
+                }));
+
+
+			// 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);
+		}
+
+		/// <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)
+				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[501].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[503].StringValue;
+			rmProps.Help.Message = EISC.StringOutput[502].StringValue;
+
+			rmProps.Environment = new EssentialsEnvironmentPropertiesConfig(); // enabled defaults to false
+
+			rmProps.RoomPhoneNumber = EISC.StringOutput[504].StringValue;
+			rmProps.RoomURI = EISC.StringOutput[505].StringValue;
+			rmProps.SpeedDials = new List<DDVC01SpeedDial>();
+			// add speed dials as long as there are more - up to 4
+			for (uint i = 512; i <= 519; i = i + 2)
+			{
+				var num = EISC.StringOutput[i].StringValue;
+				if (string.IsNullOrEmpty(num))
+					break;
+				var name = EISC.StringOutput[i + 1].StringValue;
+				rmProps.SpeedDials.Add(new DDVC01SpeedDial { Number = num, Name = name});
+			}
+			// volume control names
+			var volCount = EISC.UShortOutput[701].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 cotija 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));
+			
+			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 sources...
+			for (uint i = 0; i<= 19; i++)
+			{
+				var name = EISC.StringOutput[601 + i].StringValue;
+				if(string.IsNullOrEmpty(name))
+					break;
+				var icon = EISC.StringOutput[651 + i].StringValue;
+				var key = EISC.StringOutput[671 + i].StringValue;
+				var type = EISC.StringOutput[701 + i].StringValue;
+
+				Debug.Console(0, this, "Adding source {0} '{1}'", key, name);
+				var newSLI = new SourceListItem{
+					Icon = icon,
+					Name = name,
+					Order = (int)i + 1,
+					SourceKey = key,
+				};
+				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);
+			}
+
+			co.SourceLists.Add("default", newSl);
+
+			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;
+		}
+
+		void SendFullStatus()
+		{
+			if (ConfigIsLoaded)
+			{
+                var count = EISC.UShortOutput[801].UShortValue;
+
+                Debug.Console(1, this, "The Fader Count is : {0}", count);
+
+                // build volumes object, serialize and put in content of method below
+
+                var auxFaders = new List<Volume>();
+
+                // Create auxFaders
+                for (uint i = 2; i <= count; i++)
+                {
+                    auxFaders.Add(
+                        new Volume(string.Format("level-{0}", i), 
+                            EISC.UShortOutput[i].UShortValue,
+                            EISC.BooleanOutput[i].BoolValue,
+                            EISC.StringOutput[800 + 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[801].StringValue,
+				                true,
+				                "something.png");
+
+                volumes.AuxFaders = auxFaders;
+
+                PostStatusMessage(new
+                    {
+                        isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue,
+                        selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue,
+                        volumes = volumes
+                    });			
+			}
+			else
+			{
+				PostStatusMessage(new
+				{
+					error = "systemNotReady"
+				});
+			}
+		}
+
+		/// <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" },
+				{ "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;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="oldKey"></param>
+		/// <param name="newKey"></param>
+		void SourceChange(string oldKey, string newKey)
+		{
+			/* 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);
+			//    }
+
+
+			//    var huddleRoom = room as EssentialsHuddleSpaceRoom;
+			//    JObject roomStatus = new JObject();
+			//    roomStatus.Add("selectedSourceKey", huddleRoom.CurrentSourceInfoKey);
+
+			//    JObject message = new JObject();
+
+			//    message.Add("type", "/room/status/");
+			//    message.Add("content", roomStatus);
+
+			//    Parent.PostToServer(message);
+			//}
+			//else
+			//{
+			//    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);
+			//    }
+			//}
+		}
+	}
+}

PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs

@@ -9,25 +9,19 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.AppServer.Messengers;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.MobileControl;
+using PepperDash.Essentials.Room.Cotija;
 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 class CotijaEssentialsHuddleSpaceRoomBridge : CotijaBridgeBase
     {
 
         public EssentialsRoomBase Room { get; private set; }
 
 		public VideoCodecBaseMessenger VCMessenger { get; private set; }
 
-        public AudioCodecBaseMessenger ACMessenger { get; private set; }
-
-        public Dictionary<string, MessengerBase> DeviceMessengers { get; private set; }
-
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -44,7 +38,7 @@ namespace PepperDash.Essentials
 		/// </summary>
 		/// <param name="parent"></param>
 		/// <param name="room"></param>
-        public MobileConrolEssentialsHuddleSpaceRoomBridge(EssentialsRoomBase room):
+        public CotijaEssentialsHuddleSpaceRoomBridge(EssentialsRoomBase room):
 			base("mobileControlBridge-essentialsHuddle", "Essentials Mobile Control Bridge-Huddle")
         {
             Room = room;   
@@ -54,7 +48,7 @@ namespace PepperDash.Essentials
 		/// 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)
+		public override void AddParent(CotijaSystemController parent)
 		{
 			base.AddParent(parent);
 
@@ -69,15 +63,7 @@ namespace PepperDash.Essentials
 			var routeRoom = Room as IRunRouteAction;
 			if(routeRoom != null)
 				Parent.AddAction(string.Format(@"/room/{0}/source", Room.Key), new Action<SourceSelectMessageContent>(c => 
-                    {
-                        if(string.IsNullOrEmpty(c.SourceListKey))
-                            routeRoom.RunRouteAction(c.SourceListItem, Room.SourceListKey);
-                        else
-                        {
-                            routeRoom.RunRouteAction(c.SourceListItem, c.SourceListKey);
-                        }
-                    }));
-
+					routeRoom.RunRouteAction(c.SourceListItem)));
 
 			var defaultRoom = Room as IRunDefaultPresentRoute;
 			if(defaultRoom != null)
@@ -88,7 +74,7 @@ namespace PepperDash.Essentials
 			{
 				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(() => 
+				Parent.AddAction(string.Format(@"/room/{0}/volumes/master/mute", Room.Key), new Action(() => 
 					volumeRoom.CurrentVolumeControls.MuteToggle()));
 				volumeRoom.CurrentVolumeDeviceChange += new EventHandler<VolumeDeviceChangeEventArgs>(Room_CurrentVolumeDeviceChange);
 
@@ -96,37 +82,39 @@ namespace PepperDash.Essentials
 				var currentVolumeDevice = volumeRoom.CurrentVolumeControls as IBasicVolumeWithFeedback;
 				if (currentVolumeDevice != null)
 				{
-					currentVolumeDevice.MuteFeedback.OutputChange += MuteFeedback_OutputChange;
+					currentVolumeDevice.MuteFeedback.OutputChange += VolumeLevelFeedback_OutputChange;
 					currentVolumeDevice.VolumeLevelFeedback.OutputChange += VolumeLevelFeedback_OutputChange;
 				}
 			}
 
 			var sscRoom = Room as IHasCurrentSourceInfoChange;
 			if(sscRoom != null)
-				sscRoom.CurrentSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
+				sscRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
 
 			var vcRoom = Room as IHasVideoCodec;
-			if (vcRoom != null && vcRoom.VideoCodec != null)
+			if (vcRoom != null)
 			{
 				var codec = vcRoom.VideoCodec;
-                var key = vcRoom.VideoCodec.Key + "-" + parent.Key;
-				VCMessenger = new VideoCodecBaseMessenger(key, vcRoom.VideoCodec, "/device/videoCodec");
+				VCMessenger = new VideoCodecBaseMessenger(vcRoom.VideoCodec, "/device/videoCodec");
 				VCMessenger.RegisterWithAppServer(Parent);
 
+				// May need to move this or remove this 
+				codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
+
 				vcRoom.IsSharingFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(IsSharingFeedback_OutputChange);
+
+				//Parent.AddAction("/device/videoCodec/dial", new Action<string>(s => codec.Dial(s)));
+				//Parent.AddAction("/device/videoCodec/endCall", new Action<string>(s =>
+				//{
+				//    var call = codec.ActiveCalls.FirstOrDefault(c => c.Id == s);
+				//    if (call != null)
+				//    {
+				//        codec.EndCall(call);
+				//    }
+				//}));
+				//Parent.AddAction("/device/videoCodec/endAllCalls", new Action(() => codec.EndAllCalls()));
 			}
 
-            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);
-            }
-
-            SetupDeviceMessengers();
-
 			var defCallRm = Room as IRunDefaultCallRoute;
 			if (defCallRm != null)
 			{
@@ -146,36 +134,6 @@ namespace PepperDash.Essentials
 			Room.ShutdownPromptTimer.WasCancelled += ShutdownPromptTimer_WasCancelled;
 		}
 
-        /// <summary>
-        /// Set up the messengers for each device type
-        /// </summary>
-        void SetupDeviceMessengers()
-        {
-            DeviceMessengers = new Dictionary<string,MessengerBase>();
-
-            foreach (var device in DeviceManager.AllDevices)
-            {
-                Debug.Console(2, this, "Attempting to set up device messenger for device: {0}", device.Key);
-
-                if (device is Essentials.Devices.Common.Cameras.CameraBase)
-                {
-                    var camDevice = device as Essentials.Devices.Common.Cameras.CameraBase;
-                    Debug.Console(2, this, "Adding CameraBaseMessenger for device: {0}", device.Key);
-                    var cameraMessenger = new CameraBaseMessenger(device.Key + "-" + Parent.Key, camDevice, "/device/" + device.Key);
-                    DeviceMessengers.Add(device.Key, cameraMessenger);
-                    cameraMessenger.RegisterWithAppServer(Parent);
-                }
-                if (device is Essentials.Devices.Common.SoftCodec.BlueJeansPc)
-                {
-                    var softCodecDevice = device as Essentials.Devices.Common.SoftCodec.BlueJeansPc;
-                    Debug.Console(2, this, "Adding IRunRouteActionMessnger for device: {0}", device.Key);
-                    var routeMessenger = new IRunRouteActionMessenger(device.Key + "-" + Parent.Key, softCodecDevice, "/device/" + device.Key);
-                    DeviceMessengers.Add(device.Key, routeMessenger);
-                    routeMessenger.RegisterWithAppServer(Parent);
-                }
-            }
-        }
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -211,6 +169,19 @@ namespace PepperDash.Essentials
 			});
 		}
 
+		/// <summary>
+		/// Handler for codec changes
+		/// </summary>
+		void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+		{
+			PostStatusMessage(new
+			{
+				calls = GetCallsMessageObject(),
+				//vtc = GetVtcCallsMessageObject()
+			});
+
+		}
+
 		/// <summary>
 		/// Helper for posting status message
 		/// </summary>
@@ -363,7 +334,7 @@ namespace PepperDash.Essentials
         }
 
 
-        void Room_CurrentSingleSourceChange(PepperDash.Essentials.Core.SourceListItem info, ChangeType type)
+        void Room_CurrentSingleSourceChange(EssentialsRoomBase room, PepperDash.Essentials.Core.SourceListItem info, ChangeType type)
         {
             /* Example message
              * {
@@ -424,14 +395,11 @@ namespace PepperDash.Essentials
                     if (dev is ITransport)
                         (dev as ITransport).LinkActions(Parent);
 
-					var srcRm = Room as IHasCurrentSourceInfoChange;
-                    if (srcRm != null)
-                    {
-                        PostStatusMessage(new
-                        {
-                            selectedSourceKey = srcRm.CurrentSourceInfoKey
-                        });
-                    }
+					var srcRm = room as IHasCurrentSourceInfoChange;
+					PostStatusMessage(new
+					{
+						selectedSourceKey = srcRm.CurrentSourceInfoKey
+					});
                 }
             }
         }
@@ -449,7 +417,7 @@ namespace PepperDash.Essentials
 			if (rmVc != null)
 			{
 				var vc = rmVc.CurrentVolumeControls as IBasicVolumeWithFeedback;
-				if (vc != null)
+				if (rmVc != null)
 				{
 					volumes.Master = new Volume("master", vc.VolumeLevelFeedback.UShortValue, vc.MuteFeedback.BoolValue, "Volume", true, "");
 				}
@@ -457,13 +425,53 @@ namespace PepperDash.Essentials
 
 			PostStatusMessage(new
 			{
-                //calls = GetCallsMessageObject(),
+				calls = GetCallsMessageObject(),
 				isOn = room.OnFeedback.BoolValue,
 				selectedSourceKey = sourceKey,
-                //vtc = GetVtcCallsMessageObject(),
+				vtc = GetVtcCallsMessageObject(),
 				volumes = volumes
 			});
         }
+
+		/// <summary>
+		/// Helper to return a anonymous object with the call data for JSON message
+		/// </summary>
+		/// <returns></returns>
+		object GetCallsMessageObject()
+		{
+			var callRm = Room as IHasVideoCodec;
+			if (callRm == null)
+				return null;
+			return new
+			{
+				activeCalls = callRm.VideoCodec.ActiveCalls,
+				callType = callRm.CallTypeFeedback.IntValue,
+				inCall = callRm.InCallFeedback.BoolValue,
+				isSharing = callRm.IsSharingFeedback.BoolValue,
+				privacyModeIsOn = callRm.PrivacyModeIsOnFeedback.BoolValue
+			};
+		}
+
+		/// <summary>
+		/// Helper method to build call status for vtc
+		/// </summary>
+		/// <returns></returns>
+		object GetVtcCallsMessageObject()
+		{
+			var callRm = Room as IHasVideoCodec;
+			object vtc = null;
+			if (callRm != null)
+			{
+				var codec = callRm.VideoCodec;
+				vtc = new
+				{
+					isInCall = codec.IsInCall,
+					calls = codec.ActiveCalls
+				};
+			}
+			return vtc;
+		}
+     
     }
 
 	/// <summary>
@@ -472,7 +480,6 @@ namespace PepperDash.Essentials
     public class SourceSelectMessageContent
     {
 		public string SourceListItem { get; set; }
-        public string SourceListKey { get; set; }
     }
 
 	/// <summary>

PepperDashEssentials/AppServer/RoomBridges/MobileControlSIMPLRoomBridge.cs

@@ -1,828 +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;
-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 MobileControlSIMPLRoomBridge : MobileControlBridgeBase, IDelayedConfiguration
-	{
-		/// <summary>
-		/// Fires when config is ready to go
-		/// </summary>
-		public event EventHandler<EventArgs> ConfigurationIsReady;
-
-		public ThreeSeriesTcpIpEthernetIntersystemCommunications EISC { get; private set; }
-
-        public MobileControlSIMPLRoomJoinMap JoinMap { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public bool ConfigIsLoaded { get; private set; }
-
-		public override string RoomName
-		{
-			get { 
-				var name = EISC.StringOutput[JoinMap.ConfigRoomName.JoinNumber].StringValue;
-				return string.IsNullOrEmpty(name) ? "Not Loaded" : name;
-			}
-		}
-
-		MobileControlDdvc01DeviceBridge SourceBridge;
-
-		SIMPLAtcMessenger AtcMessenger;
-		SIMPLVtcMessenger VtcMessenger;
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="name"></param>
-		/// <param name="ipId"></param>
-		public MobileControlSIMPLRoomBridge(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);
-
-                JoinMap = new MobileControlSIMPLRoomJoinMap(1);
-
-				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 SIMPLAtcMessenger(atcKey, EISC, "/device/audioCodec");
-			AtcMessenger.RegisterWithAppServer(Parent);
-
-            var vtcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			VtcMessenger = new SIMPLVtcMessenger(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}. Use Essentials Config={2}",
-                    a.DeviceOnLine, EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue, EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue);
-
-				if (a.DeviceOnLine && EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue)
-					LoadConfigValues();
-
-                if (a.DeviceOnLine && EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue)
-                    UseEssentialsConfig();
-			};
-			// load config if it's already there
-			if (EISC.IsOnline && EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue) // || EISC.BooleanInput[JoinMap.ConfigIsReady].BoolValue)
-				LoadConfigValues();
-
-            if (EISC.IsOnline && EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue)
-            {
-                UseEssentialsConfig();
-            }
-
-			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();
-		}
-
-        void UseEssentialsConfig()
-        {
-            ConfigIsLoaded = false;
-
-            SetupDeviceMessengers();
-
-            Debug.Console(0, this, "******* ESSENTIALS CONFIG: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
-
-            var handler = ConfigurationIsReady;
-            if (handler != null)
-            {
-                handler(this, new EventArgs());
-            }
-
-            ConfigIsLoaded = true;
-        }
-
-		/// <summary>
-		/// Setup the actions to take place on various incoming API calls
-		/// </summary>
-		void SetupFunctions()
-		{
-			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(JoinMap.PromptForCode.JoinNumber)));
-			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(JoinMap.ClientJoined.JoinNumber)));
-
-			Parent.AddAction(@"/room/room1/status", new Action(SendFullStatus));
-
-			Parent.AddAction(@"/room/room1/source", new Action<SourceSelectMessageContent>(c =>
-			{
-				EISC.SetString(JoinMap.CurrentSourceKey.JoinNumber, c.SourceListItem);
-				EISC.PulseBool(JoinMap.SourceHasChanged.JoinNumber);
-			}));
-
-			Parent.AddAction(@"/room/room1/defaultsource", new Action(() => 
-				EISC.PulseBool(JoinMap.ActivityShare.JoinNumber)));
-			Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
-				EISC.PulseBool(JoinMap.ActivityPhoneCall.JoinNumber)));
-			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
-				EISC.PulseBool(JoinMap.ActivityVideoCall.JoinNumber)));
-
-			Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u => 
-				EISC.SetUshort(JoinMap.MasterVolume.JoinNumber, u)));
-			Parent.AddAction(@"/room/room1/volumes/master/muteToggle", new Action(() => 
-				EISC.PulseBool(JoinMap.MasterVolume.JoinNumber)));
-			Parent.AddAction(@"/room/room1/volumes/master/privacyMuteToggle", new Action(() =>
-				EISC.PulseBool(JoinMap.PrivacyMute.JoinNumber)));
-
-
-			// /xyzxyz/volumes/master/muteToggle ---> BoolInput[1]
-
-            var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
-            var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
-
-            for (uint i = volumeStart; i <= volumeEnd; 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(JoinMap.ShutdownStart.JoinNumber)));
-			Parent.AddAction(@"/room/room1/shutdownEnd", new Action(() =>
-				EISC.PulseBool(JoinMap.ShutdownEnd.JoinNumber)));
-			Parent.AddAction(@"/room/room1/shutdownCancel", new Action(() =>
-				EISC.PulseBool(JoinMap.ShutdownCancel.JoinNumber)));
-		}
-
-
-
-
-		/// <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(JoinMap.RoomIsOn.JoinNumber, b =>
-				PostStatusMessage(new
-					{
-						isOn = b
-					}));
-
-			// Source change things
-			EISC.SetSigTrueAction(JoinMap.SourceHasChanged.JoinNumber, () =>
-				PostStatusMessage(new
-					{
-						selectedSourceKey = EISC.StringOutput[JoinMap.CurrentSourceKey.JoinNumber].StringValue
-					}));
-
-			// Volume things
-			EISC.SetUShortSigAction(JoinMap.MasterVolume.JoinNumber, u =>
-                PostStatusMessage(new
-                {
-                    volumes = new
-                    {
-                        master = new
-                        {
-                            level = u
-                        }
-                    }
-                }));
-
-			// map MasterVolumeIsMuted join -> status/volumes/master/muted
-			// 
-
-			EISC.SetBoolSigAction(JoinMap.MasterVolume.JoinNumber, b =>
-                PostStatusMessage(new
-                {
-                    volumes = new
-                    {
-                        master = new
-                        {
-                            muted = b
-                        }
-                    }
-                }));
-			EISC.SetBoolSigAction(JoinMap.PrivacyMute.JoinNumber, b => 
-				PostStatusMessage(new
-				{
-					volumes = new 
-					{
-						master = new 
-						{
-							privacyMuted = b
-						}
-					}
-				}));
-
-            var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
-            var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
-
-            for (uint i = volumeStart; i <= volumeEnd; 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(JoinMap.NumberOfAuxFaders.JoinNumber, u => 
-				PostStatusMessage(new {
-					volumes = new {
-						numberOfAuxFaders = u,
-					}
-				}));
-
-			// shutdown things
-			EISC.SetSigTrueAction(JoinMap.ShutdownCancel.JoinNumber, new Action(() =>
-				PostMessage("/room/shutdown/", new
-				{
-					state = "wasCancelled"
-				})));
-			EISC.SetSigTrueAction(JoinMap.ShutdownEnd.JoinNumber, new Action(() =>
-				PostMessage("/room/shutdown/", new
-				{
-					state = "hasFinished"
-				})));
-			EISC.SetSigTrueAction(JoinMap.ShutdownStart.JoinNumber, new Action(() =>
-				PostMessage("/room/shutdown/", new
-				{
-					state = "hasStarted",
-					duration = EISC.UShortOutput[JoinMap.ShutdownPromptDuration.JoinNumber].UShortValue
-				})));
-
-			// Config things
-			EISC.SetSigTrueAction(JoinMap.ConfigIsReady.JoinNumber, LoadConfigValues);
-
-			// Activity modes
-			EISC.SetSigTrueAction(JoinMap.ActivityShare.JoinNumber, () => UpdateActivity(1));
-			EISC.SetSigTrueAction(JoinMap.ActivityPhoneCall.JoinNumber, () => UpdateActivity(2));
-			EISC.SetSigTrueAction(JoinMap.ActivityVideoCall.JoinNumber, () => 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[JoinMap.ConfigRoomName.JoinNumber].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[JoinMap.ConfigHelpNumber.JoinNumber].StringValue;
-			rmProps.Help.Message = EISC.StringOutput[JoinMap.ConfigHelpMessage.JoinNumber].StringValue;
-
-			rmProps.Environment = new EssentialsEnvironmentPropertiesConfig(); // enabled defaults to false
-
-			rmProps.RoomPhoneNumber = EISC.StringOutput[JoinMap.ConfigRoomPhoneNumber.JoinNumber].StringValue;
-			rmProps.RoomURI = EISC.StringOutput[JoinMap.ConfigRoomURI.JoinNumber].StringValue;
-			rmProps.SpeedDials = new List<DDVC01SpeedDial>();
-
-			// This MAY need a check 
-			rmProps.AudioCodecKey = "audioCodec";
-			rmProps.VideoCodecKey = "videoCodec";
-
-			// volume control names
-			var volCount = EISC.UShortOutput[JoinMap.NumberOfAuxFaders.JoinNumber].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[JoinMap.SourceNameJoinStart.JoinNumber + i].StringValue;
-				if (EISC.BooleanOutput[JoinMap.UseSourceEnabled.JoinNumber].BoolValue
-					&& !EISC.BooleanOutput[JoinMap.SourceIsEnabledJoinStart.JoinNumber + i].BoolValue)
-				{
-					continue;
-				}		
-				else if(!EISC.BooleanOutput[JoinMap.UseSourceEnabled.JoinNumber].BoolValue && string.IsNullOrEmpty(name))
-					break;
-				var icon = EISC.StringOutput[JoinMap.SourceIconJoinStart.JoinNumber + i].StringValue;
-				var key = EISC.StringOutput[JoinMap.SourceKeyJoinStart.JoinNumber + i].StringValue;
-				var type = EISC.StringOutput[JoinMap.SourceTypeJoinStart.JoinNumber + i].StringValue;
-				var disableShare = EISC.BooleanOutput[JoinMap.SourceShareDisableJoinStart.JoinNumber + 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(JoinMap.SpeedDialVisibleStartJoin.JoinNumber + i))
-					{
-						break;
-					}
-					acFavs.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem()
-					{
-						Name = EISC.GetString(JoinMap.SpeedDialNameStartJoin.JoinNumber + i),
-						Number = EISC.GetString(JoinMap.SpeedDialNumberStartJoin.JoinNumber + 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 + JoinMap.CameraNearNameStart.JoinNumber);
-					if (!string.IsNullOrEmpty(name))
-					{
-						camsProps.Add(new
-						{
-							name = name,
-							selector = "camera" + (i + 1),
-						});
-					}
-				}
-				var farName = EISC.GetString(JoinMap.CameraFarName.JoinNumber);
-				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);
-			}
-
-            SetupDeviceMessengers();
-
-			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>
-        /// Iterates device config and adds messengers as neede for each device type
-        /// </summary>
-        void SetupDeviceMessengers()
-        {
-            try
-            {
-                foreach (var device in ConfigReader.ConfigObject.Devices)
-                {
-                    if (device.Group.Equals("simplmessenger"))
-                    {
-                        var props = JsonConvert.DeserializeObject<SimplMessengerPropertiesConfig>(device.Properties.ToString());
-
-                        var messengerKey = string.Format("device-{0}-{1}", this.Key, Parent.Key);
-
-                        if (DeviceManager.GetDeviceForKey(messengerKey) != null)
-                        {
-                            Debug.Console(2, this, "Messenger with key: {0} already exists. Skipping...", messengerKey);
-                            continue;
-                        }
-
-                        var dev = ConfigReader.ConfigObject.GetDeviceForKey(props.DeviceKey);
-
-                        if (dev == null)
-                        {
-                            Debug.Console(1, this, "Unable to find device config for key: '{0}'", props.DeviceKey);
-                            continue;
-                        }
-
-                        var type = device.Type.ToLower();
-                        MessengerBase messenger = null;
-
-                        if (type.Equals("simplcameramessenger"))
-                        {
-                            Debug.Console(2, this, "Adding SIMPLCameraMessenger for: '{0}'", props.DeviceKey);
-                            messenger = new SIMPLCameraMessenger(messengerKey, EISC, "/device/" + props.DeviceKey, props.JoinStart);
-                        }
-                        else if (type.Equals("simplroutemessenger"))
-                        {
-                            Debug.Console(2, this, "Adding SIMPLRouteMessenger for: '{0}'", props.DeviceKey);
-                            messenger = new SIMPLRouteMessenger(messengerKey, EISC, "/device/" + props.DeviceKey, props.JoinStart);
-                        }
-
-                        if (messenger != null)
-                        {
-                            DeviceManager.AddDevice(messenger);
-                            messenger.RegisterWithAppServer(Parent);
-                        }
-                        else
-                        {
-                            Debug.Console(2, this, "Unable to add messenger for device: '{0}' of type: '{1}'", props.DeviceKey, type);
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error Setting up Device Managers: {0}", e);
-            }
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-			if (ConfigIsLoaded)
-			{
-                var count = EISC.UShortOutput[JoinMap.NumberOfAuxFaders.JoinNumber].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>();
-
-                var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
-                var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
-
-                for (uint i = volumeStart; 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[JoinMap.MasterVolume.JoinNumber].UShortValue,
-                                EISC.BooleanOutput[JoinMap.MasterVolume.JoinNumber].BoolValue,
-                  				EISC.StringOutput[JoinMap.MasterVolume.JoinNumber].StringValue,
-				                true,
-				                "something.png");
-				volumes.Master.HasPrivacyMute = true;
-				volumes.Master.PrivacyMuted = EISC.BooleanOutput[JoinMap.PrivacyMute.JoinNumber].BoolValue;
-
-                volumes.AuxFaders = auxFaderDict;
-				volumes.NumberOfAuxFaders = EISC.UShortInput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
-
-                PostStatusMessage(new
-                    {
-						activityMode = GetActivityMode(),
-                        isOn = EISC.BooleanOutput[JoinMap.RoomIsOn.JoinNumber].BoolValue,
-                        selectedSourceKey = EISC.StringOutput[JoinMap.CurrentSourceKey.JoinNumber].StringValue,
-                        volumes = volumes
-                    });			
-			}
-			else
-			{
-				PostStatusMessage(new
-				{
-					error = "systemNotReady"
-				});
-			}
-		}
-
-		/// <summary>
-		/// Returns the activity mode int
-		/// </summary>
-		/// <returns></returns>
-		int GetActivityMode()
-		{
-			if (EISC.BooleanOutput[JoinMap.ActivityPhoneCall.JoinNumber].BoolValue) return 2;
-			else if (EISC.BooleanOutput[JoinMap.ActivityShare.JoinNumber].BoolValue) return 1;
-			else if (EISC.BooleanOutput[JoinMap.ActivityVideoCall.JoinNumber].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 != null)
-            {
-                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[JoinMap.UserCodeToSystem.JoinNumber].StringValue = UserCode;
-			EISC.StringInput[JoinMap.ServerUrl.JoinNumber].StringValue = Parent.Config.ClientAppUrl;
-		}
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/SourceDeviceMapDictionary.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
 
     /// <summary>

PepperDashEssentials/AppServer/SIMPLJoinMaps/MobileControlSIMPLRoomJoinMap.cs

@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer
-{
-    public class MobileControlSIMPLRoomJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("MasterVolume")]
-        public JoinDataComplete MasterVolume = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() {Label = "Master Volume Mute Toggle/FB/Level/Label", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalogSerial });
-        [JoinName("VolumeJoinStart")]
-        public JoinDataComplete VolumeJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 8 }, new JoinMetadata() {Label = "Volume Mute Toggle/FB/Level/Label", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalogSerial });
-
-        [JoinName("PrivacyMute")]
-        public JoinDataComplete PrivacyMute = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "Privacy Mute Toggle/FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("PromptForCode")]
-        public JoinDataComplete PromptForCode = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 1 }, new JoinMetadata() {Label = "Prompt User for Code", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ClientJoined")]
-        public JoinDataComplete ClientJoined = new JoinDataComplete(new JoinData() { JoinNumber = 42, JoinSpan = 1 }, new JoinMetadata() { Label = "Client Joined", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ActivityShare")]
-        public JoinDataComplete ActivityShare = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() {Label = "Activity Share", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ActivityPhoneCall")]
-        public JoinDataComplete ActivityPhoneCall = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Activity Phone Call", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ActivityVideoCall")]
-        public JoinDataComplete ActivityVideoCall = new JoinDataComplete(new JoinData() { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata() { Label = "Activity Video Call", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("ShutdownPromptDuration")]
-        public JoinDataComplete ShutdownPromptDuration = new JoinDataComplete(new JoinData() { JoinNumber = 61, JoinSpan = 1 }, new JoinMetadata() { Label ="Shutdown Cancel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        [JoinName("ShutdownCancel")]
-        public JoinDataComplete ShutdownCancel = new JoinDataComplete(new JoinData() { JoinNumber = 61, JoinSpan = 1 }, new JoinMetadata() { Label ="Shutdown Cancel", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ShutdownEnd")]
-        public JoinDataComplete ShutdownEnd = new JoinDataComplete(new JoinData() { JoinNumber = 62, JoinSpan = 1 }, new JoinMetadata() { Label = "Shutdown End", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ShutdownStart")]
-        public JoinDataComplete ShutdownStart = new JoinDataComplete(new JoinData() { JoinNumber = 63, JoinSpan = 1 }, new JoinMetadata() { Label = "Shutdown Start", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceHasChanged")]
-        public JoinDataComplete SourceHasChanged = new JoinDataComplete(new JoinData() { JoinNumber = 71, JoinSpan = 1 }, new JoinMetadata() { Label = "Source Changed", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CurrentSourceKey")]
-        public JoinDataComplete CurrentSourceKey = new JoinDataComplete(new JoinData() { JoinNumber = 71, JoinSpan = 1 }, new JoinMetadata() { Label = "Key of selected source", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Serial });
-
-
-        [JoinName("ConfigIsLocal")]
-        public JoinDataComplete ConfigIsLocal = new JoinDataComplete(new JoinData() { JoinNumber = 100, JoinSpan = 1 }, new JoinMetadata() { Label = "Config is local to Essentials", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("NumberOfAuxFaders")]
-        public JoinDataComplete NumberOfAuxFaders = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Number of Auxilliary Faders", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("SpeedDialNameStartJoin")]
-        public JoinDataComplete SpeedDialNameStartJoin = new JoinDataComplete(new JoinData() { JoinNumber = 241, JoinSpan = 10 }, new JoinMetadata() { Label = "Speed Dial names", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SpeedDialNumberStartJoin")]
-        public JoinDataComplete SpeedDialNumberStartJoin = new JoinDataComplete(new JoinData() { JoinNumber = 251, JoinSpan = 10 }, new JoinMetadata() { Label = "Speed Dial numbers", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("SpeedDialVisibleStartJoin")]
-        public JoinDataComplete SpeedDialVisibleStartJoin = new JoinDataComplete(new JoinData() { JoinNumber = 261, JoinSpan = 10 }, new JoinMetadata() { Label =  "Speed Dial Visible", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-      
-        [JoinName("RoomIsOn")]
-        public JoinDataComplete RoomIsOn = new JoinDataComplete(new JoinData() { JoinNumber = 301, JoinSpan = 1 }, new JoinMetadata() { Label = "Room Is On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("UserCodeToSystem")]
-        public JoinDataComplete UserCodeToSystem = new JoinDataComplete(new JoinData() { JoinNumber = 401, JoinSpan = 1 }, new JoinMetadata() { Label = "User Ccde", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ServerUrl")]
-        public JoinDataComplete ServerUrl = new JoinDataComplete(new JoinData() { JoinNumber = 402, JoinSpan = 1 }, new JoinMetadata() { Label ="Server URL", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        [JoinName("ConfigRoomName")]
-        public JoinDataComplete ConfigRoomName = new JoinDataComplete(new JoinData() { JoinNumber = 501, JoinSpan = 1 }, new JoinMetadata() {Label = "Room Nnme", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigHelpMessage")]
-        public JoinDataComplete ConfigHelpMessage = new JoinDataComplete(new JoinData() { JoinNumber = 502, JoinSpan = 1 }, new JoinMetadata() { Label = "Room help message", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigHelpNumber")]
-        public JoinDataComplete ConfigHelpNumber = new JoinDataComplete(new JoinData() { JoinNumber = 503, JoinSpan = 1 }, new JoinMetadata() {  Label = "Room help number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigRoomPhoneNumber")]
-        public JoinDataComplete ConfigRoomPhoneNumber = new JoinDataComplete(new JoinData() { JoinNumber = 504, JoinSpan = 1 }, new JoinMetadata() { Label = "Room phone number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigRoomURI")]
-        public JoinDataComplete ConfigRoomURI = new JoinDataComplete(new JoinData() { JoinNumber = 505, JoinSpan = 1 }, new JoinMetadata() {  Label = "Room URI", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("ConfigIsReady")]
-        public JoinDataComplete ConfigIsReady = new JoinDataComplete(new JoinData() { JoinNumber = 501, JoinSpan = 1 }, new JoinMetadata() { Label =  "Config info from SIMPL is ready", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("HideVideoConfRecents")]
-        public JoinDataComplete HideVideoConfRecents = new JoinDataComplete(new JoinData() { JoinNumber = 502, JoinSpan = 1 }, new JoinMetadata() { Label = "Hide Video Conference Recents", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ShowCameraWhenNotInCall")]
-        public JoinDataComplete ShowCameraWhenNotInCall = new JoinDataComplete(new JoinData() { JoinNumber = 503, JoinSpan = 1 }, new JoinMetadata() { Label = "Show camera when not in call", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("UseSourceEnabled")]
-        public JoinDataComplete UseSourceEnabled = new JoinDataComplete(new JoinData() { JoinNumber = 504, JoinSpan = 1 }, new JoinMetadata() { Label = "Use Source Enabled Joins", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-
-        [JoinName("SourceShareDisableJoinStart")]
-        public JoinDataComplete SourceShareDisableJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 601, JoinSpan = 20 }, new JoinMetadata() { Label = "Source is not sharable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SourceIsEnabledJoinStart")]
-        public JoinDataComplete SourceIsEnabledJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 621, JoinSpan = 20 }, new JoinMetadata() { Label = "Source is enabled", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceNameJoinStart")]
-        public JoinDataComplete SourceNameJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 601, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Names", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SourceIconJoinStart")]
-        public JoinDataComplete SourceIconJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 621, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Icons", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SourceKeyJoinStart")]
-        public JoinDataComplete SourceKeyJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 641, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Keys", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SourceTypeJoinStart")]
-        public JoinDataComplete SourceTypeJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 661, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Types", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("CameraNearNameStart")]
-        public JoinDataComplete CameraNearNameStart = new JoinDataComplete(new JoinData() { JoinNumber = 761, JoinSpan = 10 }, new JoinMetadata() { Label = "Near End Camera Names", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CameraFarName")]
-        public JoinDataComplete CameraFarName = new JoinDataComplete(new JoinData() { JoinNumber = 770, JoinSpan = 1 }, new JoinMetadata() { Label = "Far End Camera Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        public MobileControlSIMPLRoomJoinMap(uint joinStart)
-            :base(joinStart)
-        {
-         
-        }
-    }
-}

PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLAtcJoinMap.cs

@@ -1,69 +0,0 @@
-using System.Linq;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer
-{
-    public class SIMPLAtcJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("EndCall")]
-        public JoinDataComplete EndCall = new JoinDataComplete(new JoinData() {  JoinNumber = 21, JoinSpan = 1 }, new JoinMetadata() { Label = "Hang Up", JoinCapabilities = eJoinCapabilities.ToSIMPL,  JoinType = eJoinType.Digital });
-        [JoinName("IncomingAnswer")]
-        public JoinDataComplete IncomingAnswer = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Answer Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingReject")]
-        public JoinDataComplete IncomingReject = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Reject Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SpeedDialStart")]
-        public JoinDataComplete SpeedDialStart = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 4 }, new JoinMetadata() { Label = "Speed Dial", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CurrentDialString")]
-        public JoinDataComplete CurrentDialString = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Dial String", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallNumber")]
-        public JoinDataComplete CurrentCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallName")]
-        public JoinDataComplete CurrentCallName = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("HookState")]
-        public JoinDataComplete HookState = new JoinDataComplete(new JoinData() { JoinNumber = 21, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Hook State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CallDirection")]
-        public JoinDataComplete CallDirection = new JoinDataComplete(new JoinData() { JoinNumber = 22, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Direction", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("IncomingCallName")]
-        public JoinDataComplete IncomingCallName = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("IncomingCallNumber")]
-        public JoinDataComplete IncomingCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("0")]
-        public JoinDataComplete Dtmf0 = new JoinDataComplete(new JoinData() { JoinNumber = 10, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 0", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("1")]
-        public JoinDataComplete Dtmf1 = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("2")]
-        public JoinDataComplete Dtmf2 = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("3")]
-        public JoinDataComplete Dtmf3 = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 3", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("4")]
-        public JoinDataComplete Dtmf4 = new JoinDataComplete(new JoinData() { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 4", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("5")]
-        public JoinDataComplete Dtmf5 = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 5", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("6")]
-        public JoinDataComplete Dtmf6 = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 6", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("7")]
-        public JoinDataComplete Dtmf7 = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 7", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("8")]
-        public JoinDataComplete Dtmf8 = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 8", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("9")]
-        public JoinDataComplete Dtmf9 = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 9", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("*")]
-        public JoinDataComplete DtmfStar = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF *", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("#")]
-        public JoinDataComplete DtmfPound = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF #", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor that passes the joinStart to the base class
-        /// </summary>
-        /// <param name="joinStart"></param>
-        public SIMPLAtcJoinMap(uint joinStart)
-            : base(joinStart)
-        {
-
-        }
-    }
-}

PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLVtcJoinMap.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer
-{
-    public class SIMPLVtcJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("EndCall")]
-        public JoinDataComplete EndCall = new JoinDataComplete(new JoinData() { JoinNumber = 24, JoinSpan = 1 }, new JoinMetadata() { Label = "Hang Up", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingCall")]
-        public JoinDataComplete IncomingCall = new JoinDataComplete(new JoinData() { JoinNumber = 50, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingAnswer")]
-        public JoinDataComplete IncomingAnswer = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Answer Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingReject")]
-        public JoinDataComplete IncomingReject = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Reject Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SpeedDialStart")]
-        public JoinDataComplete SpeedDialStart = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 4 }, new JoinMetadata() { Label = "Speed Dial", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DirectorySearchBusy")]
-        public JoinDataComplete DirectorySearchBusy = new JoinDataComplete(new JoinData() { JoinNumber = 100, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Search Busy FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryLineSelected")]
-        public JoinDataComplete DirectoryLineSelected = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Line Selected FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryEntryIsContact")]
-        public JoinDataComplete DirectoryEntryIsContact = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Selected Entry Is Contact FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryIsRoot")]
-        public JoinDataComplete DirectoryIsRoot = new JoinDataComplete(new JoinData() { JoinNumber = 102, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory is on Root FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DDirectoryHasChanged")]
-        public JoinDataComplete DDirectoryHasChanged = new JoinDataComplete(new JoinData() { JoinNumber = 103, JoinSpan = 1 }, new JoinMetadata() {Label = "Directory has changed FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryRoot")]
-        public JoinDataComplete DirectoryRoot = new JoinDataComplete(new JoinData() { JoinNumber = 104, JoinSpan = 1 }, new JoinMetadata() { Label = "Go to Directory Root", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryFolderBack")]
-        public JoinDataComplete DirectoryFolderBack = new JoinDataComplete(new JoinData() { JoinNumber = 105, JoinSpan = 1 }, new JoinMetadata() { Label = "Go back one directory level", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryDialSelectedLine")]
-        public JoinDataComplete DirectoryDialSelectedLine = new JoinDataComplete(new JoinData() { JoinNumber = 106, JoinSpan = 1 }, new JoinMetadata() { Label = "Dial selected directory line", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraTiltUp")]
-        public JoinDataComplete CameraTiltUp = new JoinDataComplete(new JoinData() { JoinNumber = 111, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Tilt Up", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraTiltDown")]
-        public JoinDataComplete CameraTiltDown = new JoinDataComplete(new JoinData() { JoinNumber = 112, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Tilt Down", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraPanLeft")]
-        public JoinDataComplete CameraPanLeft = new JoinDataComplete(new JoinData() { JoinNumber = 113, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Pan Left", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraPanRight")]
-        public JoinDataComplete CameraPanRight = new JoinDataComplete(new JoinData() { JoinNumber = 114, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Pan Right", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraZoomIn")]
-        public JoinDataComplete CameraZoomIn = new JoinDataComplete(new JoinData() { JoinNumber = 115, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Zoom In", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraZoomOut")]
-        public JoinDataComplete CameraZoomOut = new JoinDataComplete(new JoinData() { JoinNumber = 116, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Zoom Out", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        [JoinName("CameraPresetStart")]
-        public JoinDataComplete CameraPresetStart = new JoinDataComplete(new JoinData() { JoinNumber = 121, JoinSpan = 5 }, new JoinMetadata() { Label = "Camera Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-         [JoinName("CameraModeAuto")]
-        public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData() { JoinNumber = 131, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeManual")]
-        public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData() { JoinNumber = 132, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeOff")]
-        public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData() { JoinNumber = 133, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraSelfView")]
-        public JoinDataComplete CameraSelfView = new JoinDataComplete(new JoinData() { JoinNumber = 141, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Self View Toggle/FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraLayout")]
-        public JoinDataComplete CameraLayout = new JoinDataComplete(new JoinData() { JoinNumber = 142, JoinSpan = 1 }, new JoinMetadata() { Label =  "Camera Layout Toggle", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraSupportsAutoMode")]
-        public JoinDataComplete CameraSupportsAutoMode = new JoinDataComplete(new JoinData() { JoinNumber = 143, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Supports Auto Mode FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraSupportsOffMode")]
-        public JoinDataComplete CameraSupportsOffMode = new JoinDataComplete(new JoinData() { JoinNumber = 144, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Supports Off Mode FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraNumberSelect")]
-        public JoinDataComplete CameraNumberSelect = new JoinDataComplete(new JoinData() { JoinNumber = 60, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Number Select/FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectorySelectRow")]
-        public JoinDataComplete DirectorySelectRow = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Select Row", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryRowCount")]
-        public JoinDataComplete DirectoryRowCount = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Row Count FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CurrentDialString")]
-        public JoinDataComplete CurrentDialString = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Dial String", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallName")]
-        public JoinDataComplete CurrentCallName = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallNumber")]
-        public JoinDataComplete CurrentCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("HookState")]
-        public JoinDataComplete HookState = new JoinDataComplete(new JoinData() { JoinNumber = 31, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Hook State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CallDirection")]
-        public JoinDataComplete CallDirection = new JoinDataComplete(new JoinData() { JoinNumber = 22, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Direction", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("IncomingCallName")]
-        public JoinDataComplete IncomingCallName = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("IncomingCallNumber")]
-        public JoinDataComplete IncomingCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("DirectorySearchString")]
-        public JoinDataComplete DirectorySearchString = new JoinDataComplete(new JoinData() { JoinNumber = 100, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Search String", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("DirectoryEntriesStart")]
-        public JoinDataComplete DirectoryEntriesStart = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 255 }, new JoinMetadata() { Label = "Directory Entries", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("DirectoryEntrySelectedName")]
-        public JoinDataComplete DirectoryEntrySelectedName = new JoinDataComplete(new JoinData() { JoinNumber = 356, JoinSpan = 1 }, new JoinMetadata() { Label = "Selected Directory Entry Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("DirectoryEntrySelectedNumber")]
-        public JoinDataComplete DirectoryEntrySelectedNumber = new JoinDataComplete(new JoinData() { JoinNumber = 357, JoinSpan = 1 }, new JoinMetadata() { Label = "Selected Directory Entry Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("DirectorySelectedFolderName")]
-        public JoinDataComplete DirectorySelectedFolderName = new JoinDataComplete(new JoinData() { JoinNumber = 358, JoinSpan = 1 }, new JoinMetadata() { Label = "Selected Directory Folder Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("1")]
-        public JoinDataComplete Dtmf1 = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("2")]
-        public JoinDataComplete Dtmf2 = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("3")]
-        public JoinDataComplete Dtmf3 = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 3", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("4")]
-        public JoinDataComplete Dtmf4 = new JoinDataComplete(new JoinData() { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 4", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("5")]
-        public JoinDataComplete Dtmf5 = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 5", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("6")]
-        public JoinDataComplete Dtmf6 = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 6", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("7")]
-        public JoinDataComplete Dtmf7 = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 7", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("8")]
-        public JoinDataComplete Dtmf8 = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 8", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("9")]
-        public JoinDataComplete Dtmf9 = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 9", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("0")]
-        public JoinDataComplete Dtmf0 = new JoinDataComplete(new JoinData() { JoinNumber = 10, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 0", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("*")]
-        public JoinDataComplete DtmfStar = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF *", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("#")]
-        public JoinDataComplete DtmfPound = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF #", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        public SIMPLVtcJoinMap(uint joinStart)
-            :base(joinStart)
-        {
-        }
-
-    }
-}

PepperDashEssentials/AppServer/Volumes.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Room.MobileControl
+namespace PepperDash.Essentials.Room.Cotija
 {
 	public class Volumes
 	{
@@ -14,14 +14,11 @@ namespace PepperDash.Essentials.Room.MobileControl
 		public Volume Master { get; set; }
 
 		[JsonProperty("auxFaders")]
-		public Dictionary<string, Volume> AuxFaders { get; set; }
-
-		[JsonProperty("numberOfAuxFaders")]
-		public int NumberOfAuxFaders { get; set; }
+		public List<Volume> AuxFaders { get; set; }
 
 		public Volumes()
 		{
-			AuxFaders = new Dictionary<string, Volume>();	
+			AuxFaders = new List<Volume>();	
 		}
 	}
 
@@ -42,13 +39,6 @@ namespace PepperDash.Essentials.Room.MobileControl
 		[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; }
 

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

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

PepperDashEssentials/Bridges/AppleTvBridge.cs

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

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -0,0 +1,214 @@
+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;
+using PepperDash.Essentials.Core.Devices;
+
+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 ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+
+
+        public EiscApi(string key, uint ipid, string hostname) :
+            base(key)
+        {
+            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(ipid, hostname, Global.ControlSystem);
+
+            Eisc.SigChange += new Crestron.SimplSharpPro.DeviceSupport.SigEventHandler(Eisc_SigChange);
+
+            Eisc.Register();
+        }
+
+        /// <summary>
+        /// Handles incoming sig changes
+        /// </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, "BridgeApi 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>
+    /// Defines each type and it's matching API type
+    /// </summary>
+    public static class DeviceApiFactory
+    {
+        public static Dictionary<Type, Type> TypeMap = new Dictionary<Type, Type>
+        {
+            { typeof(DmChassisController), typeof(DmChassisControllerApi) },
+            { typeof(IBasicCommunication), typeof(IBasicCommunicationApi) }
+            //{ typeof(SomeShittyDisplayController), typeof(SomeShittyDisplayControllerApi) }
+        };
+    }
+
+
+    /// <summary>
+    /// API class for IBasicCommunication devices
+    /// </summary>
+    public class IBasicCommunicationApi : DeviceApiBase
+    {
+        public IBasicCommunication Device { get; set; }
+
+        SerialFeedback TextReceivedFeedback;
+
+        public IBasicCommunicationApi(IBasicCommunication dev)
+        {
+            TextReceivedFeedback = new SerialFeedback();
+
+            Device = dev;
+
+            SetupFeedbacks();
+
+            ActionApi = new Dictionary<string, Object>
+            {
+                { "connect", new Action(Device.Connect) },
+                { "disconnect", new Action(Device.Disconnect) },
+                { "connectstate", new Action<bool>( b => ConnectByState(b) ) },
+                { "sendtext", new Action<string>( s => Device.SendText(s) ) }
+
+            };
+
+            FeedbackApi = new Dictionary<string, Feedback>
+            {
+                { "isconnected", new BoolFeedback( () => Device.IsConnected ) },
+                { "textrecieved", TextReceivedFeedback }
+            };
+        }
+
+        /// <summary>
+        /// Controls connection based on state of input
+        /// </summary>
+        /// <param name="state"></param>
+        void ConnectByState(bool state)
+        {
+            if (state)
+                Device.Connect();
+            else
+                Device.Disconnect();                             
+        }
+
+        void SetupFeedbacks()
+        {
+            Device.TextReceived += new EventHandler<GenericCommMethodReceiveTextArgs>(Device_TextReceived);
+
+            if(Device is ISocketStatus)
+                (Device as ISocketStatus).ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(IBasicCommunicationApi_ConnectionChange);
+        }
+
+        void IBasicCommunicationApi_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
+        {
+            FeedbackApi["isconnected"].FireUpdate();
+        }
+
+        void Device_TextReceived(object sender, GenericCommMethodReceiveTextArgs e)
+        {
+            TextReceivedFeedback.FireUpdate(e.Text);
+        }
+    }
+
+ 
+
+    public class DmChassisController : Device
+    {
+        public DmChassisController(string key)
+            : base(key)
+        {
+
+        }
+
+        public void SetInput(int input)
+        {
+            Debug.Console(2, this, "Dm Chassis {0}, input {1}", Key, input);
+        }
+    }
+
+    /// <summary>
+    /// Each flavor of API is a static class with static properties and a static constructor that
+    /// links up the things to do.
+    /// </summary>
+    public class DmChassisControllerApi : DeviceApiBase
+    {
+        IntFeedback Output1Feedback;
+        IntFeedback Output2Feedback;
+
+        public DmChassisControllerApi(DmChassisController dev)
+        {
+            Output1Feedback = new IntFeedback( new Func<int>(() => 1));
+            Output2Feedback = new IntFeedback( new Func<int>(() => 2));
+
+            ActionApi = new Dictionary<string, Object>
+            {
+                
+            };
+
+            FeedbackApi = new Dictionary<string, Feedback>
+            {
+                { "Output-1/fb", Output1Feedback },
+                { "Output-2/fb", Output2Feedback }
+            };
+        }
+
+        /// <summary>
+        /// Factory method
+        /// </summary>
+        /// <param name="dev"></param>
+        /// <returns></returns>
+        public static DmChassisControllerApi GetActionApiForDevice(DmChassisController dev)
+        {
+            return new DmChassisControllerApi(dev);
+        }
+    }
+
+
+}

PepperDashEssentials/Bridges/BridgeFactory.cs

@@ -9,38 +9,83 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Core.Bridges;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
-namespace PepperDash.Essentials
+namespace PepperDash.Essentials 
 {
-    public class BridgeFactory
+	public class BridgeFactory 
     {
-        public static IKeyed GetDevice(DeviceConfig dc)
+		public static IKeyed GetDevice(PepperDash.Essentials.Core.Config.DeviceConfig dc) 
         {
-            // ? why is this static JTA 2018-06-13? 
+			// ? why is this static JTA 2018-06-13? 
+			
+			var key = dc.Key;
+			var name = dc.Name;
+			var type = dc.Type;
+			var properties = dc.Properties;
+			var propAnon = new { };
+			JsonConvert.DeserializeAnonymousType(dc.Properties.ToString(), propAnon);
+			
+			var typeName = dc.Type.ToLower();
+			var groupName = dc.Group.ToLower();
 
-            var key = dc.Key;
-            var name = dc.Name;
-            var type = dc.Type;
-            var properties = dc.Properties;
-            var propAnon = new { };
-
-            var typeName = dc.Type.ToLower();
-            var groupName = dc.Group.ToLower();
-
-            //Debug.Console(2, "Name {0}, Key {1}, Type {2}, Properties {3}", name, key, type, properties.ToString());
-
-            if (typeName == "eiscapi")
+			Debug.Console(0, "Name {0}, Key {1}, Type {2}, Properties {3}", name, key, type, properties.ToString());
+			if (typeName == "dm") 
             {
-                return new EiscApi(dc);
+			    return new DmBridge(key, name, properties);
+			}
+            else if (typeName == "comm")
+            {
+                return new CommBridge(key, name, properties);
             }
+            else
+			    return null;
+		}
+	}
 
-            return null;
-        }
-    }
+	public class DmBridge : Device 
+    {
+        public EiscBridgeProperties Properties { get; private set; }
 
+        public PepperDash.Essentials.DM.DmChassisController DmSwitch { get; private set; }
+
+		public DmBridge(string key, string name, JToken properties) : base(key, name) 
+        {
+	        Properties = JsonConvert.DeserializeObject<EiscBridgeProperties>(properties.ToString());
+	    }
+
+		public override bool CustomActivate() 
+        {
+			// Create EiscApis 
+			if (Properties.Eiscs != null) 
+            {
+				foreach (var eisc in Properties.Eiscs) 
+                {
+					var ApiEisc = new BridgeApiEisc(eisc.IpId, eisc.Hostname);
+
+					ApiEisc.Eisc.SetUShortSigAction(101, u => DmSwitch.ExecuteSwitch(u,1, eRoutingSignalType.Video));
+					ApiEisc.Eisc.SetUShortSigAction(102, u => DmSwitch.ExecuteSwitch(u,2, eRoutingSignalType.Video));								
+				}
+			}
+
+			foreach (var device in DeviceManager.AllDevices) 
+            {
+				if (device.Key == this.Properties.ParentDeviceKey) 
+                {
+					Debug.Console(0, "deviceKey {0} Matches", device.Key);
+					DmSwitch = DeviceManager.GetDeviceForKey(device.Key) as PepperDash.Essentials.DM.DmChassisController;
+				} 
+				else 
+                {
+					Debug.Console(0, "deviceKey {0} doesn't match", device.Key);
+				}
+			}
+
+			Debug.Console(0, "Bridge {0} Activated", this.Name);
+			return true;
+		}
+	}
 
     public class CommBridge : Device
     {
@@ -89,10 +134,10 @@ namespace PepperDash.Essentials
     }
 
 
-    public class EiscBridgeProperties
+	public class EiscBridgeProperties 
     {
         public string ParentDeviceKey { get; set; }
-        public eApiType ApiType { get; set; }
+        public eApiType ApiType { get; set; } 
         public List<EiscProperties> Eiscs { get; set; }
         public string ApiOverrideFilePath { get; set; }
 
@@ -101,7 +146,7 @@ namespace PepperDash.Essentials
             public string IpId { get; set; }
             public string Hostname { get; set; }
         }
-    }
+	}
 
     public class CommBridgeProperties : EiscBridgeProperties
     {
@@ -110,30 +155,30 @@ namespace PepperDash.Essentials
 
     public enum eApiType { Eisc = 0 }
 
-    public class BridgeApiEisc
+	public class BridgeApiEisc 
     {
         public uint Ipid { get; private set; }
         public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
 
-        public BridgeApiEisc(string ipid, string hostname)
+		public BridgeApiEisc(string ipid, string hostname) 
         {
-            Ipid = (UInt32)int.Parse(ipid, System.Globalization.NumberStyles.HexNumber);
-            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(Ipid, hostname, Global.ControlSystem);
-            Eisc.Register();
-            Eisc.SigChange += Eisc_SigChange;
-            Debug.Console(0, "BridgeApiEisc Created at Ipid {0}", ipid);
-        }
-        void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
+			Ipid = (UInt32)int.Parse(ipid, System.Globalization.NumberStyles.HexNumber);
+			Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(Ipid, hostname, Global.ControlSystem);
+			Eisc.Register();
+			Eisc.SigChange += Eisc_SigChange;
+			Debug.Console(0, "BridgeApiEisc Created at Ipid {0}", ipid);
+		}
+		void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args) 
         {
-            if (Debug.Level >= 1)
-                Debug.Console(1, "BridgeApiEisc change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-            var uo = args.Sig.UserObject;
-            if (uo is Action<bool>)
-                (uo as Action<bool>)(args.Sig.BoolValue);
-            else if (uo is Action<ushort>)
-                (uo as Action<ushort>)(args.Sig.UShortValue);
-            else if (uo is Action<string>)
-                (uo as Action<string>)(args.Sig.StringValue);
-        }
-    }
-}
+			if (Debug.Level >= 1)
+				Debug.Console(1, "BridgeApiEisc change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+			var uo = args.Sig.UserObject;
+			if (uo is Action<bool>)
+				(uo as Action<bool>)(args.Sig.BoolValue);
+			else if (uo is Action<ushort>)
+				(uo as Action<ushort>)(args.Sig.UShortValue);
+			else if (uo is Action<string>)
+				(uo as Action<string>)(args.Sig.StringValue);
+		}
+	}
+}

PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs

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

PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

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

PepperDashEssentials/Bridges/CameraControllerBridge.cs

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

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

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

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

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

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

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

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

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

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

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

PepperDashEssentials/Bridges/DspControllerBridge.cs

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

PepperDashEssentials/Bridges/EssentialComms.cs

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

PepperDashEssentials/Bridges/EssentialDM.cs

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

PepperDashEssentials/Bridges/EssentialDsp.cs

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

PepperDashEssentials/Bridges/EssentialTVOne.cs

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

PepperDashEssentials/Bridges/GenericLightingBridge.cs

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

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

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

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

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

PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs

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

PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

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

PepperDashEssentials/Bridges/IDigitalInputBridge.cs

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

PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

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

PepperDashEssentials/Bridges/StatusSignControllerBridge.cs

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

PepperDashEssentials/Bridges/SystemMonitorBridge.cs

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

PepperDashEssentials/Configuration Original/Builders/TPConfig.cs

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

PepperDashEssentials/Configuration Original/ConfigTieLine.cs

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

PepperDashEssentials/Configuration Original/Configuration.cs

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

PepperDashEssentials/Configuration Original/ConfigurationHelpers.cs

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

PepperDashEssentials/Configuration Original/Factories/CommFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/DeviceMonitorFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/DisplayFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/DmFactory.cs

@@ -80,11 +80,6 @@ namespace PepperDash.Essentials
 					var dm = new DmMd8x8(ipId, Global.ControlSystem);
 					//dev = new DmChassisController(devKey, devName, dm);
 				}
-				else if (devType.Equals("dmmd16x16", StringComparison.OrdinalIgnoreCase))
-				{
-					var dm = new DmMd16x16(ipId, Global.ControlSystem);
-					//dev = new DmChassisController(devKey, devName, dm);
-				}
 			}
 			catch (Exception e)
 			{

PepperDashEssentials/Configuration Original/Factories/FactoryHelper.cs

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

PepperDashEssentials/Configuration Original/Factories/MAYBE SetTopBoxFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/PcFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/REMOVE DiscPlayerFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/RemoteFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/TouchpanelFactory.cs

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

PepperDashEssentials/ControlSystem.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.CrestronThread;
-using Crestron.SimplSharpPro.Diagnostics;
-using Crestron.SimplSharp.Reflection;
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
@@ -15,48 +11,33 @@ using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM;
 using PepperDash.Essentials.Fusion;
 using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Room.MobileControl;
-
-using Newtonsoft.Json;
+using PepperDash.Essentials.Room.Cotija;
 
 namespace PepperDash.Essentials
 {
-    public class ControlSystem : CrestronControlSystem
-    {
+	public class ControlSystem : CrestronControlSystem
+	{
         HttpLogoServer LogoServer;
 
+		public ControlSystem()
+			: base()
+		{
+			Thread.MaxNumberOfUserThreads = 400;
+			Global.ControlSystem = this;
+			DeviceManager.Initialize(this);        
+		}
 
-        public ControlSystem()
-            : base()
-        {
-            Thread.MaxNumberOfUserThreads = 400;
-            Global.ControlSystem = this;
-            DeviceManager.Initialize(this);
-        }
-
-        /// <summary>
-        /// Entry point for the program
-        /// </summary>
-        public override void InitializeSystem()
-        {
+		/// <summary>
+		/// Git 'er goin'
+		/// </summary>
+		public override void InitializeSystem()
+		{
             DeterminePlatform();
 
-            if (Debug.DoNotLoadOnNextBoot)
-            {
-                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
-                    ConsoleAccessLevelEnum.AccessOperator);
-            }
+            //CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+            //    ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(PluginLoader.ReportAssemblyVersions, "reportversions", "Reports the versions of the loaded assemblies", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(Core.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(s =>
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "CONSOLE MESSAGE: {0}", s);
-            }, "appdebugmessage", "Writes message to log", ConsoleAccessLevelEnum.AccessOperator);
+           // CrestronConsole.AddNewConsoleCommand(S => { ConfigWriter.WriteConfigFile(null); }, "writeconfig", "writes the current config to a file", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
@@ -65,191 +46,139 @@ namespace PepperDash.Essentials
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(s =>
-            {
-                CrestronConsole.ConsoleCommandResponse
-                    ("Current running configuration. This is the merged system and template configuration");
-                CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
-                    (ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
-            }, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s =>
+			{
+				CrestronConsole.ConsoleCommandResponse
+					("Current running configuration. This is the merged system and template configuration");
+				CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
+					(ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
+			}, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(s =>
-                {
-                    CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
-                        "System URL:   {0}\r" +
-                        "Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
-                }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s =>
+				{
+					CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
+						"System URL:   {0}\r" +
+						"Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
+				}, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
-            LoadDeviceTypesFromFactories();
-
-            if (!Debug.DoNotLoadOnNextBoot)
-                GoWithLoad();
-        }
+            GoWithLoad();
+		}
 
         /// <summary>
-        /// Instantiates each of the device factories to load thier device types
-        /// </summary>
-        void LoadDeviceTypesFromFactories()
-        {
-            // Instantiate the Device Factories
-            new CoreDeviceFactory();
-            new DmDeviceFactory();
-        }
-
-
-
-        /// <summary>
-        /// Determines if the program is running on a processor (appliance) or server (VC-4).
+        /// Determines if the program is running on a processor (appliance) or server (XiO Edge).
         /// 
-        /// Sets Global.FilePathPrefix and Global.ApplicationDirectoryPathPrefix based on platform
+        /// Sets Global.FilePathPrefix based on platform
         /// </summary>
         public void DeterminePlatform()
         {
-            try
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
+
+            string filePathPrefix;
+
+            var dirSeparator = Global.DirectorySeparator;
+
+            var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+
+            var versionString = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
+
+            string directoryPrefix;
+
+            directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
+
+            //directoryPrefix = "";
+
+            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
+                filePathPrefix = directoryPrefix + dirSeparator + "NVRAM" 
+                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
 
-                string filePathPrefix;
-
-                var dirSeparator = Global.DirectorySeparator;
-
-                string directoryPrefix;
-
-                directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
-
-                var fullVersion = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
-
-                AssemblyInformationalVersionAttribute fullVersionAtt = fullVersion[0] as AssemblyInformationalVersionAttribute;
-
-                Global.SetAssemblyVersion(fullVersionAtt.InformationalVersion);
-
-                if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", Global.AssemblyVersion);
-
-                    // Check if User/ProgramX exists
-                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
-                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
-                    {
-                        Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + "User"
-                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
-                    }
-                    // Check if Nvram/Programx exists
-                    else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
-                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
-                    {
-                        Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
-                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
-                    }
-                    // If neither exists, set path to User/ProgramX
-                    else
-                    {
-                        Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + "User"
-                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
-                    }
-                }
-                else   // Handles Linux OS (Virtual Control)
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on Virtual Control Server", Global.AssemblyVersion);
-
-                    // Set path to User/
-                    filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
-                }
-
-                Global.SetFilePathPrefix(filePathPrefix);
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", versionString);
             }
-            catch (Exception e)
+            else
             {
-                Debug.Console(0, "Unable to Determine Platform due to Exception: {0}", e.Message);
+                filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on Virtual Control Server", versionString);
             }
+
+            Global.SetFilePathPrefix(filePathPrefix);
         }
 
-        /// <summary>
-        /// Begins the process of loading resources including plugins and configuration data
-        /// </summary>
-        public void GoWithLoad()
-        {
-            try
-            {
-                Debug.SetDoNotLoadOnNextBoot(false);
+		/// <summary>
+		/// Do it, yo
+		/// </summary>
+		public void GoWithLoad()
+		{
+			try
+			{
+                CrestronConsole.AddNewConsoleCommand(EnablePortalSync, "portalsync", "Loads Portal Sync",
+                    ConsoleAccessLevelEnum.AccessOperator);
 
+                //PortalSync = new PepperDashPortalSyncClient();
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
 
-                PluginLoader.AddProgramAssemblies();
-
-                var filesReady = SetupFilesystem();
-                if (filesReady)
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Checking for plugins");
-                    PluginLoader.LoadPlugins();
-
+				var filesReady = SetupFilesystem();
+				if (filesReady)
+				{
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
-                    if (!ConfigReader.LoadConfig2())
-                        return;
+					if (!ConfigReader.LoadConfig2())
+						return;
 
-                    Load();
+					Load();
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r" +
-                        "-------------------------------------------------------------");
-                }
-                else
-                {
-                    Debug.Console(0,
-                        @"----------------------------------------------
-                        ------------------------------------------------
-                        ------------------------------------------------
-                        Essentials file structure setup completed.
-                        Please load config, sgd and ir files and
-                        restart program.
-                        ------------------------------------------------
-                        ------------------------------------------------
-                        ------------------------------------------------");
-                }
-
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
+						"-------------------------------------------------------------");
+				}
+				else
+				{
+					Debug.Console(0,
+						"------------------------------------------------\r" +
+						"------------------------------------------------\r" +
+						"------------------------------------------------\r" +
+						"Essentials file structure setup completed.\r" +
+						"Please load config, sgd and ir files and\r" +
+						"restart program.\r" +
+						"------------------------------------------------\r" +
+						"------------------------------------------------\r" +
+						"------------------------------------------------");
+				}
             }
+			catch (Exception e)
+			{
+				Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
+			}
 
-            // Notify the OS that the program intitialization has completed
-            SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
+		}
 
-        }
+		/// <summary>
+		/// Verifies filesystem is set up. IR, SGD, and program1 folders
+		/// </summary>
+		bool SetupFilesystem()
+		{
+			Debug.Console(0, "Verifying and/or creating folder structure");
+			var configDir = Global.FilePathPrefix;
+			var configExists = Directory.Exists(configDir);
+			if (!configExists)
+				Directory.Create(configDir);
 
-       
-
-        /// <summary>
-        /// Verifies filesystem is set up. IR, SGD, and programX folders
-        /// </summary>
-        bool SetupFilesystem()
-        {
-            Debug.Console(0, "Verifying and/or creating folder structure");
-            var configDir = Global.FilePathPrefix;
-            var configExists = Directory.Exists(configDir);
-            if (!configExists)
-                Directory.Create(configDir);
-
-            var irDir = Global.FilePathPrefix + "ir";
-            if (!Directory.Exists(irDir))
-                Directory.Create(irDir);
+			var irDir = Global.FilePathPrefix + "ir";
+			if (!Directory.Exists(irDir))
+				Directory.Create(irDir);
 
             var sgdDir = Global.FilePathPrefix + "sgd";
 			if (!Directory.Exists(sgdDir))
 				Directory.Create(sgdDir);
 
-            var pluginDir = Global.FilePathPrefix + "plugins";
-            if (!Directory.Exists(pluginDir))
-                Directory.Create(pluginDir);
-
 			return configExists;
 		}
 
-		/// <summary>
-		/// 
-		/// </summary>
+        public void EnablePortalSync(string s)
+        {
+            if (s.ToLower() == "enable")
+            {
+                CrestronConsole.ConsoleCommandResponse("Portal Sync features enabled");
+            }
+        }
+
 		public void TearDown()
 		{
 			Debug.Console(0, "Tearing down existing system");
@@ -274,48 +203,24 @@ namespace PepperDash.Essentials
 			LoadLogoServer();
 
 			DeviceManager.ActivateAll();
-
-            LinkSystemMonitorToAppServer();
-        }
-
-        void LinkSystemMonitorToAppServer()
-        {
-            var sysMon = DeviceManager.GetDeviceForKey("systemMonitor") as PepperDash.Essentials.Core.Monitoring.SystemMonitorController;
-
-            var appServer = DeviceManager.GetDeviceForKey("appServer") as MobileControlSystemController;
+		}
 
 
-            if (sysMon != null && appServer != null)
-            {
-                var key = sysMon.Key + "-" + appServer.Key;
-                var messenger = new PepperDash.Essentials.AppServer.Messengers.SystemMonitorMessenger
-                    (key, sysMon, "/device/systemMonitor");
-
-                messenger.RegisterWithAppServer(appServer);
-
-                DeviceManager.AddDevice(messenger);
-            }
-        }
-
-        /// <summary>
-        /// Reads all devices from config and adds them to DeviceManager
-        /// </summary>
-        public void LoadDevices()
-        {
-
+		/// <summary>
+		/// Reads all devices from config and adds them to DeviceManager
+		/// </summary>
+		public void LoadDevices()
+		{
             // Build the processor wrapper class
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
 
-            // Add global System Monitor device
-            DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+			foreach (var devConf in ConfigReader.ConfigObject.Devices)
+			{
 
-            foreach (var devConf in ConfigReader.ConfigObject.Devices)
-            {
-
-                try
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}', type '{1}'", devConf.Key, devConf.Type);
-                    // Skip this to prevent unnecessary warnings
+				try
+				{
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}'", devConf.Key);
+					// Skip this to prevent unnecessary warnings
                     if (devConf.Key == "processor")
                     {
                         if (devConf.Type.ToLower() != Global.ControlSystem.ControllerPrompt.ToLower())
@@ -323,147 +228,91 @@ namespace PepperDash.Essentials
                                 "WARNING: Config file defines processor type as '{0}' but actual processor is '{1}'!  Some ports may not be available",
                                 devConf.Type.ToUpper(), Global.ControlSystem.ControllerPrompt.ToUpper());
 
-                        // Check if the processor is a DMPS model
-                        if (this.ControllerPrompt.IndexOf("dmps", StringComparison.OrdinalIgnoreCase) > -1)
-                        {
-                            Debug.Console(2, "Adding DmpsRoutingController for {0} to Device Manager.", this.ControllerPrompt);
-
-                            var propertiesConfig = JsonConvert.DeserializeObject<DM.Config.DmpsRoutingPropertiesConfig>(devConf.Properties.ToString());
-
-                            if(propertiesConfig == null)
-                                propertiesConfig =  new DM.Config.DmpsRoutingPropertiesConfig();
-
-                            var dmpsRoutingController = DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig);
-
-                            DeviceManager.AddDevice(dmpsRoutingController);
-                        }
-                        else if (this.ControllerPrompt.IndexOf("mpc3", StringComparison.OrdinalIgnoreCase) > -1)
-                        {
-                            Debug.Console(2, "MPC3 processor type detected.  Adding Mpc3TouchpanelController.");
-
-                            var butToken = devConf.Properties["buttons"];
-                            if (butToken != null)
-                            {
-                                var buttons = butToken.ToObject<Dictionary<string, Essentials.Core.Touchpanels.KeypadButton>>();
-                                var tpController = new Essentials.Core.Touchpanels.Mpc3TouchpanelController(devConf.Key, devConf.Name, Global.ControlSystem, buttons);
-                                DeviceManager.AddDevice(tpController);
-                            }
-                            else
-                            {
-                                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Unable to deserialize buttons collection for device: {0}", devConf.Key);
-                            }
-                            
-                        }
-                        else
-                        {
-                            Debug.Console(2, "************Processor is not DMPS type***************");
-                        }
-
-                        
-
                         continue;
                     }
 
-                    // Try local factories first
-                    var newDev = DeviceFactory.GetDevice(devConf);
-
-                    if (newDev == null)
-                        newDev = BridgeFactory.GetDevice(devConf);
-
-                    // Then associated library factories
-                    if (newDev == null)
-                        newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
+					// Try local factory first
+					var newDev = DeviceFactory.GetDevice(devConf);
 
+					// Then associated library factories
 					if (newDev == null)
 						newDev = PepperDash.Essentials.Devices.Common.DeviceFactory.GetDevice(devConf);
+					if (newDev == null)
+						newDev = PepperDash.Essentials.DM.DeviceFactory.GetDevice(devConf);
 					if (newDev == null)
 						newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
 
-					//if (newDev == null) // might want to consider the ability to override an essentials "type"
-					//{
-					//    // iterate plugin factories
-					//    foreach (var f in FactoryObjects)
-					//    {
-					//        var cresFactory = f as IGetCrestronDevice;
-					//        if (cresFactory != null)
-					//        {
-					//            newDev = cresFactory.GetDevice(devConf, this);
-					//        }
-					//    }
-					//}
-
 					if (newDev != null)
 						DeviceManager.AddDevice(newDev);
 					else
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
-                }
-                catch (Exception e)
-                {
+				}
+				catch (Exception e)
+				{
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
-                }
-            }
+				} 
+			}
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
 
-        }
+		}
 
+		/// <summary>
+		/// Helper method to load tie lines.  This should run after devices have loaded
+		/// </summary>
+		public void LoadTieLines()
+		{
+			// In the future, we can't necessarily just clear here because devices
+			// might be making their own internal sources/tie lines
 
-        /// <summary>
-        /// Helper method to load tie lines.  This should run after devices have loaded
-        /// </summary>
-        public void LoadTieLines()
-        {
-            // In the future, we can't necessarily just clear here because devices
-            // might be making their own internal sources/tie lines
+			var tlc = TieLineCollection.Default;
+			//tlc.Clear();
+			if (ConfigReader.ConfigObject.TieLines == null)
+			{
+				return;
+			}
 
-            var tlc = TieLineCollection.Default;
-            //tlc.Clear();
-            if (ConfigReader.ConfigObject.TieLines == null)
-            {
-                return;
-            }
-
-            foreach (var tieLineConfig in ConfigReader.ConfigObject.TieLines)
-            {
-                var newTL = tieLineConfig.GetTieLine();
-                if (newTL != null)
-                    tlc.Add(newTL);
-            }
+			foreach (var tieLineConfig in ConfigReader.ConfigObject.TieLines)
+			{
+				var newTL = tieLineConfig.GetTieLine();
+				if (newTL != null)
+					tlc.Add(newTL);
+			}
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Tie Lines Loaded.");
 
-        }
+		}
 
-        /// <summary>
-        /// Reads all rooms from config and adds them to DeviceManager
-        /// </summary>
-        public void LoadRooms()
-        {
-            if (ConfigReader.ConfigObject.Rooms == null)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
-                return;
-            }
+		/// <summary>
+		/// Reads all rooms from config and adds them to DeviceManager
+		/// </summary>
+		public void LoadRooms()
+		{
+			if (ConfigReader.ConfigObject.Rooms == null)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
+				return;
+			}
 
-            foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
-            {
+			foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
+			{
                 var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
-                if (room != null)
-                {
+				if (room != null)
+				{
                     if (room is EssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
+                        DeviceManager.AddDevice(new EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
 
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
-                        // Mobile Control bridge
-                        var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
-                        AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-                        DeviceManager.AddDevice(bridge);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
+						// Cotija bridge
+						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
+						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
+						DeviceManager.AddDevice(bridge);
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Cotija Bridge Added...");
                     }
                     else if (room is EssentialsHuddleVtc1Room)
                     {
@@ -472,60 +321,60 @@ namespace PepperDash.Essentials
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
-                        // Mobile Control bridge
-                        var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room);
-                        AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-                        DeviceManager.AddDevice(bridge);
-                    }
+						Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
+						// Cotija bridge
+						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room);
+						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
+						DeviceManager.AddDevice(bridge);				
+                    }					
                     else
                     {
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion");
                         DeviceManager.AddDevice(room);
                     }
 
-                }
-                else
+				}
+				else
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
-            }
+			}
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
 
-        }
+		}
 
-        /// <summary>
-        /// Helps add the post activation steps that link bridges to main controller
-        /// </summary>
-        /// <param name="bridge"></param>
-        void AddBridgePostActivationHelper(MobileControlBridgeBase bridge)
-        {
-            bridge.AddPostActivationAction(() =>
-            {
-                var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;
-                if (parent == null)
-                {
-                    Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
-                    return;
-                }
-                Debug.Console(0, bridge, "Linking to parent controller");
-                bridge.AddParent(parent);
-                parent.AddBridge(bridge);
-            });
-        }
+		/// <summary>
+		/// Helps add the post activation steps that link bridges to main controller
+		/// </summary>
+		/// <param name="bridge"></param>
+		void AddBridgePostActivationHelper(CotijaBridgeBase bridge)
+		{
+			bridge.AddPostActivationAction(() =>
+			{
+				var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
+				if (parent == null)
+				{
+					Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
+					return;
+				}
+				Debug.Console(0, bridge, "Linking to parent controller");
+				bridge.AddParent(parent);
+				parent.AddBridge(bridge);
+			});
+		}
 
-        /// <summary>
-        /// Fires up a logo server if not already running
-        /// </summary>
-        void LoadLogoServer()
-        {
-            try
-            {
+		/// <summary>
+		/// Fires up a logo server if not already running
+		/// </summary>
+		void LoadLogoServer()
+		{
+			try
+			{
                 LogoServer = new HttpLogoServer(8080, Global.DirectorySeparator + "html" + Global.DirectorySeparator + "logo");
             }
-            catch (Exception)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
-            }
-        }
-    }
+			catch (Exception)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
+			}
+		}
+	}
 }

PepperDashEssentials/ControlSystem.cs.orig

@@ -5,7 +5,7 @@ using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.CrestronThread;
 using PepperDash.Core;
-// using PepperDash.Core.PortalSync;
+using PepperDash.Core.PortalSync;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM;
@@ -16,7 +16,7 @@ namespace PepperDash.Essentials
 {
 	public class ControlSystem : CrestronControlSystem
 	{
-		// PepperDashPortalSyncClient PortalSync;
+		PepperDashPortalSyncClient PortalSync;
         HttpLogoServer LogoServer;
 
 		public ControlSystem()
@@ -32,6 +32,16 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public override void InitializeSystem()
 		{
+<<<<<<< HEAD
+            DeterminePlatform();
+
+            //CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+            //    ConsoleAccessLevelEnum.AccessOperator);
+=======
+            CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                ConsoleAccessLevelEnum.AccessOperator);
+>>>>>>> 600b9f11ff1bbc186f7c2a2945955731b3523b3c
+
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
@@ -54,9 +64,49 @@ namespace PepperDash.Essentials
 						"Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
 				}, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
-            GoWithLoad();
+            //GoWithLoad();
 		}
 
+        /// <summary>
+        /// Determines if the program is running on a processor (appliance) or server (XiO Edge).
+        /// 
+        /// Sets Global.FilePathPrefix based on platform
+        /// </summary>
+        public void DeterminePlatform()
+        {
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
+
+            string filePathPrefix;
+
+            var dirSeparator = Global.DirectorySeparator;
+
+            var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+
+            var versionString = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
+
+            string directoryPrefix;
+
+            //directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
+#warning ^ For use with beta Include4.dat for XiO Edge
+            directoryPrefix = "";
+
+            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
+            {
+                filePathPrefix = directoryPrefix + dirSeparator + "NVRAM" 
+                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", versionString);
+            }
+            else
+            {
+                filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on XiO Edge Server", versionString);
+            }
+
+            Global.SetFilePathPrefix(filePathPrefix);
+        }
+
 		/// <summary>
 		/// Do it, yo
 		/// </summary>
@@ -68,18 +118,17 @@ namespace PepperDash.Essentials
                     ConsoleAccessLevelEnum.AccessOperator);
 
                 //PortalSync = new PepperDashPortalSyncClient();
-
-				Debug.Console(0, "Starting Essentials load from configuration");
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
 
 				var filesReady = SetupFilesystem();
 				if (filesReady)
 				{
-					Debug.Console(0, "Folder structure verified. Loading config...");
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
 					if (!ConfigReader.LoadConfig2())
 						return;
 
 					Load();
-					Debug.Console(0, "Essentials load complete\r" +
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r" +
 						"-------------------------------------------------------------");
 				}
 				else
@@ -109,17 +158,16 @@ namespace PepperDash.Essentials
 		bool SetupFilesystem()
 		{
 			Debug.Console(0, "Verifying and/or creating folder structure");
-			var appNum = InitialParametersClass.ApplicationNumber;
-			var configDir = @"\NVRAM\Program" + appNum;
+			var configDir = Global.FilePathPrefix;
 			var configExists = Directory.Exists(configDir);
 			if (!configExists)
 				Directory.Create(configDir);
 
-			var irDir = string.Format(@"\NVRAM\Program{0}\ir", appNum);
+			var irDir = Global.FilePathPrefix + "ir";
 			if (!Directory.Exists(irDir))
 				Directory.Create(irDir);
 
-			var sgdDir = string.Format(@"\NVRAM\Program{0}\sgd", appNum);
+            var sgdDir = Global.FilePathPrefix + "sgd";
 			if (!Directory.Exists(sgdDir))
 				Directory.Create(sgdDir);
 
@@ -131,7 +179,7 @@ namespace PepperDash.Essentials
             if (s.ToLower() == "enable")
             {
                 CrestronConsole.ConsoleCommandResponse("Portal Sync features enabled");
-                // PortalSync = new PepperDashPortalSyncClient();
+                PortalSync = new PepperDashPortalSyncClient();
             }
         }
 
@@ -172,7 +220,7 @@ namespace PepperDash.Essentials
 
 				try
 				{
-					Debug.Console(0, "Creating device '{0}'", devConf.Key);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}'", devConf.Key);
 					// Skip this to prevent unnecessary warnings
 					if (devConf.Key == "processor")
 						continue;
@@ -187,19 +235,19 @@ namespace PepperDash.Essentials
 						newDev = PepperDash.Essentials.DM.DeviceFactory.GetDevice(devConf);
 					if (newDev == null)
 						newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
-					if (newDev == null)
-						newDev = PepperDash.Essentials.BridgeFactory.GetDevice(devConf);
 
 					if (newDev != null)
 						DeviceManager.AddDevice(newDev);
 					else
-						Debug.Console(0, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
 				}
 				catch (Exception e)
 				{
-					Debug.Console(0, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
 				} 
 			}
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
+
 		}
 
 		/// <summary>
@@ -223,6 +271,9 @@ namespace PepperDash.Essentials
 				if (newTL != null)
 					tlc.Add(newTL);
 			}
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Tie Lines Loaded.");
+
 		}
 
 		/// <summary>
@@ -232,7 +283,7 @@ namespace PepperDash.Essentials
 		{
 			if (ConfigReader.ConfigObject.Rooms == null)
 			{
-				Debug.Console(0, "WARNING: Configuration contains no rooms");
+				Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
 				return;
 			}
 
@@ -245,31 +296,38 @@ namespace PepperDash.Essentials
                     {
                         DeviceManager.AddDevice(room);
 
-                        Debug.Console(1, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
 
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
 						// Cotija bridge
 						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
 						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
 						DeviceManager.AddDevice(bridge);
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Cotija Bridge Added...");
                     }
                     else if (room is EssentialsHuddleVtc1Room)
                     {
                         DeviceManager.AddDevice(room);
 
-                        Debug.Console(1, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
                     }					
                     else
                     {
-                        Debug.Console(1, "Room is NOT EssentialsHuddleSpaceRoom, attempting to add to DeviceManager w/o Fusion");
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsHuddleSpaceRoom, attempting to add to DeviceManager w/o Fusion");
                         DeviceManager.AddDevice(room);
                     }
 
 				}
 				else
-					Debug.Console(0, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
 			}
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
+
 		}
 
 		/// <summary>
@@ -298,11 +356,11 @@ namespace PepperDash.Essentials
 		{
 			try
 			{
-				LogoServer = new HttpLogoServer(8080, @"\html\logo");
-			}
+                LogoServer = new HttpLogoServer(8080, Global.FilePathPrefix + "html" + Global.DirectorySeparator + "logo");
+            }
 			catch (Exception)
 			{
-				Debug.Console(0, "NOTICE: Logo server cannot be started. Likely already running in another program");
+				Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
 			}
 		}
 	}

PepperDashEssentials/Devices/Amplifier.cs

@@ -12,32 +12,6 @@ namespace PepperDash.Essentials
 {
     public class Amplifier : Device, IRoutingSinkNoSwitching
     {
-        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 RoutingInputPort AudioIn { get; private set; }
 
         public Amplifier(string key, string name)

PepperDashEssentials/Devices/DiscPlayer/OppoExtendedBdp.cs

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

PepperDashEssentials/Devices/NUMERIC AppleTV.cs

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

PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json

@@ -1,232 +0,0 @@
-{
-    "system": {},
-    "system_url": "",
-    "template_url": "",
-    "template": {
-        "sourceLists": {
-            "default": {
-                "source-2": {
-                    "order": 6,
-                    "type": "route",
-                    "altIcon": "Blank",
-                    "icon": "",
-                    "sourceKey": "wePresent-1",
-                    "includeInSourceList": true,
-                    "volumeControlKey": "$defaultAudio",
-                    "routeList": [
-                        {
-                            "sourceKey": "wePresent-1",
-                            "type": "audioVideo",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                },
-                "source-1": {
-                    "order": 5,
-                    "type": "route",
-                    "altIcon": "Blank",
-                    "icon": "",
-                    "sourceKey": "inRoomPc-1",
-                    "includeInSourceList": true,
-                    "volumeControlKey": "$defaultAudio",
-                    "routeList": [
-                        {
-                            "sourceKey": "inRoomPc-1",
-                            "type": "audioVideo",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                },
-                "roomOff": {
-                    "sourceKey": "$off",
-                    "type": "off",
-                    "routeList": [
-                        {
-                            "sourceKey": "$off",
-                            "type": "audioVideo",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                }
-            }
-        },
-        "devices": [
-            {
-                "name": "RMC3",
-                "group": "processor",
-                "properties": {
-                    "numberOfIrPorts": 2,
-                    "numberOfComPorts": 1
-                },
-                "supportedSystemTypes": [
-                    "hudType",
-                    "presType",
-                    "vtcType",
-                    "custom"
-                ],
-                "type": "rmc3",
-                "supportedConfigModes": [
-                    "compliance",
-                    "essentials"
-                ],
-                "supportsCompliance": true,
-                "key": "processor",
-                "uid": 0
-            },
-            {
-                "name": "Room PC",
-                "key": "inRoomPc-1",
-                "type": "inRoomPc",
-                "group": "pc",
-                "uid": 8,
-                "properties": {
-                    "hasAudio": true,
-                    "hasControls": false,
-                    "isDefault": true
-                }
-            },
-            {
-                "name": "Wireless Video",
-                "key": "wePresent-1",
-                "type": "wePresent",
-                "group": "genericSource",
-                "uid": 9,
-                "properties": {
-                    "isDefault": false
-                }
-            },
-            {
-                "name": "Samsung QM Series Display",
-                "key": "display-1",
-                "type": "samsungmdc",
-                "group": "display",
-                "uid": 11,
-                "properties": {
-                    "id": "01",
-                    "control": {
-                        "controlPortDevKey": "processor",
-                        "comParams": {
-                            "parity": "None",
-                            "protocol": "RS232",
-                            "baudRate": 9600,
-                            "softwareHandshake": "None",
-                            "dataBits": 8,
-                            "hardwareHandshake": "None",
-                            "stopBits": 1
-                        },
-                        "controlPortNumber": 1,
-                        "method": "com"
-                    }
-                }
-            },
-            {
-                "name": "TSW-760",
-                "key": "tsw760-1",
-                "type": "tsw760",
-                "group": "touchpanel",
-                "uid": 14,
-                "properties": {
-                    "control": {
-                        "method": "ipid",
-                        "ipid": "03",
-                        "params": {
-                            "deviceReadyResponsePattern": ".*>",
-                            "endOfLineString": "\n"
-                        }
-                    },
-                    "showVolumeGauge": true,
-                    "roomListKey": "",
-                    "showDate": true,
-                    "headerStyle": "Verbose",
-                    "sgdFile": "PepperDash Essentials TSW-760.sgd",
-                    "showTime": true,
-                    "sourcesOverflowCount": 4,
-                    "usesSplashPage": false,
-                    "defaultRoomKey": "room1"
-                }
-            },
-            {
-                "name": "iPad",
-                "key": "crestronApp-1",
-                "type": "crestronApp",
-                "group": "touchpanel",
-                "uid": 15,
-                "properties": {
-                    "control": {
-                        "method": "ipid",
-                        "ipid": "04",
-                        "params": {
-                            "deviceReadyResponsePattern": ".*>",
-                            "endOfLineString": "\n"
-                        }
-                    },
-                    "showVolumeGauge": true,
-                    "roomListKey": "",
-                    "showDate": false,
-                    "headerStyle": "Verbose",
-                    "sgdFile": "PepperDash Essentials iPad.sgd",
-                    "showTime": false,
-                    "sourcesOverflowCount": 5,
-                    "projectName": "PepperDash Essentials iPad",
-                    "defaultRoomKey": "room1",
-                    "usesSplashPage": false
-                }
-            }
-        ],
-        "info": {
-            "processorType": "rmc3",
-            "lastUid": 16,
-            "lastModifiedDate": "2018-02-16T17:54:41.315Z",
-            "systemType": "huddle",
-            "comment": "",
-            "requiredControlSofwareVersion": ""
-        },
-        "tieLines": [
-            {
-                "sourceKey": "inRoomPc-1",
-                "sourcePort": "anyVideoOut",
-                "destinationKey": "display-1",
-                "destinationPort": "HdmiIn1",
-                "type": "audioVideo"
-            },
-            {
-                "sourceKey": "wePresent-1",
-                "sourcePort": "anyOut",
-                "destinationKey": "display-1",
-                "destinationPort": "HdmiIn2",
-                "type": "audioVideo"
-            }
-        ],
-        "rooms": [
-            {
-                "type": "huddle",
-                "name": "Essentials Huddle 2 Inputs",
-                "key": "room1",
-                "properties": {
-                    "defaultDisplayKey": "display-1",
-                    "logo": {
-                        "type": "system",
-                        "url": ""
-                    },
-                    "description": "Huddle Space with 2 sources. RMC3 processor. iPad + TSW-560",
-                    "defaultSourceItem": "source-1",
-                    "hasDsp": false,
-                    "helpMessage": "",
-                    "sourceListKey": "default",
-                    "volumes": {
-                        "master": {
-                            "level": 40,
-                            "deviceKey": "display-1",
-                            "label": "Volume"
-                        }
-                    },
-                    "defaultAudioKey": "display-1",
-                    "defaultVideoBehavior": "basic",
-                    "tech": {
-                        "password": "1234"
-                    }
-                }
-            }
-        ]
-    }
-}

PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json

@@ -1,387 +0,0 @@
-{
-    "system": {
-        "rooms": [
-            {
-                "name": "Example Room",
-                "key": "room1",
-                "properties": {
-                    "occupancy": {
-                        "timeoutMinutes": "60"
-                    }
-                }
-            }
-        ],
-        "devices": [
-            {
-                "key": "hdMd4x14kE-1",
-                "uid": 4,
-                "properties": {
-                    "control": {
-                        "tcpSshProperties": {
-                            "address": "0.0.0.0"
-                        }
-                    }
-                }
-            },
-            {
-                "key": "mockCodec-1",
-                "uid": 5,
-                "properties": {
-                    "control": {
-                        "tcpSshProperties": {
-                            "address": "0.0.0.0"
-                        }
-                    }
-                }
-            }
-        ],
-        "info": {
-            "lastModifiedDate": "2019-02-26T21:08:09.195Z"
-        }
-    },
-    "system_url": "",
-    "template_url": "",
-    "template": {
-        "rooms": [
-            {
-                "type": "huddleVtc1",
-                "name": "Essentials DIN-AP3 - DM4x1",
-                "key": "room1",
-                "properties": {
-                    "defaultDisplayKey": "display-1",
-                    "description": "",
-                    "helpMessage": "",
-                    "sourceListKey": "default",
-                    "defaultVideoBehavior": "basic",
-                    "logo": {
-                        "type": "system",
-                        "url": ""
-                    },
-                    "occupancy": {
-                        "timeoutMinutes": "60",
-                        "deviceKey": "glsOdtCCn-1"
-                    },
-                    "defaultSourceItem": "source-1",
-                    "videoCodecKey": "mockCodec-1",
-                    "hasDsp": false,
-                    "volumes": {
-                        "master": {
-                            "level": 40,
-                            "deviceKey": "mockCodec-1",
-                            "label": "Volume"
-                        }
-                    },
-                    "defaultAudioKey": "display-1",
-                    "tech": {
-                        "password": "1234"
-                    }
-                }
-            }
-        ],
-        "devices": [
-            {
-                "name": "DIN-AP3",
-                "key": "processor",
-                "type": "dinAp3",
-                "group": "processor",
-                "uid": 0,
-                "properties": {
-                }
-            },
-            {
-                "name": "Room PC",
-                "key": "inRoomPc-1",
-                "type": "inRoomPc",
-                "properties": {
-                    "hasAudio": true,
-                    "hasControls": false,
-                    "isDefault": true
-                },
-                "group": "pc",
-                "uid": 1
-            },
-            {
-                "name": "Laptop",
-                "key": "laptop-1",
-                "type": "laptop",
-                "properties": {
-                    "hasAudio": true,
-                    "hasControls": false
-                },
-                "group": "pc",
-                "uid": 2
-            },
-            {
-                "name": "Wireless Video",
-                "key": "wePresent-1",
-                "type": "wePresent",
-                "properties": {},
-                "group": "genericSource",
-                "uid": 3
-            },
-            {
-                "name": "HD-MD4x1-4k-E HDMI Switch 1",
-                "key": "hdMd4x14kE-1",
-                "type": "hdMd4x14kE",
-                "properties": {
-                    "control": {
-                        "params": {
-                            "deviceReadyResponsePattern": ".*>",
-                            "endOfLineString": "\n"
-                        },
-                        "ipid": "10",
-                        "method": "ipidTcp",
-                        "tcpSshProperties": {
-                            "port": 0,
-                            "address": ""
-                        }
-                    },
-                    "parentDeviceKey": "processor",
-                    "inputs": {
-                        "hdmiIn2": {
-                            "disableHdcp": true
-                        },
-                        "hdmiIn3": {
-                            "disableHdcp": true
-                        },
-                        "hdmiIn4": {
-                            "disableHdcp": true
-                        },
-                        "hdmiIn1": {
-                            "disableHdcp": true
-                        }
-                    }
-                },
-                "group": "hdMdSwitch",
-                "uid": 4
-            },
-            {
-                "name": "Mock Video Codec 1",
-                "key": "mockCodec-1",
-                "type": "mockVc",
-                "properties": {
-                    "favorites": [
-                        {
-                            "name": "Corporate WebEx",
-                            "number": "5555555555"
-                        }
-                    ]
-                },
-                "group": "videoCodec",
-                "uid": 5
-            },
-            {
-                "name": "Samsung MDC Protocol 1",
-                "key": "display-1",
-                "type": "samsungmdc",
-                "properties": {
-                    "id": "01",
-                    "control": {
-                        "controlPortDevKey": "processor",
-                        "controlPortNumber": 1,
-                        "method": "com",
-                        "comParams": {
-                            "protocol": "RS232",
-                            "baudRate": 9600,
-                            "hardwareHandshake": "None",
-                            "softwareHandshake": "None",
-                            "dataBits": 8,
-                            "parity": "None",
-                            "stopBits": 1
-                        }
-                    }
-                },
-                "group": "display",
-                "uid": 6
-            },
-            {
-                "name": "Crestron GLS-ODT-C-CN 1",
-                "key": "glsOdtCCn-1",
-                "type": "glsOdtCCn",
-                "properties": {
-                    "control": {
-                        "method": "cresnet",
-                        "cresnetId": "97"
-                    }
-                },
-                "group": "occupancy",
-                "uid": 7
-            },
-            {
-                "name": "TSW-760",
-                "key": "tsw760-1",
-                "type": "tsw760",
-                "properties": {
-                    "control": {
-                        "params": {
-                            "deviceReadyResponsePattern": ".*>",
-                            "endOfLineString": "\n"
-                        },
-                        "ipid": "03",
-                        "method": "ipid"
-                    },
-                    "showVolumeGauge": true,
-                    "sourcesOverflowCount": 4,
-                    "showDate": true,
-                    "headerStyle": "Verbose",
-                    "sgdFile": "PepperDash Essentials TSW-760.sgd",
-                    "showTime": true,
-                    "roomListKey": "",
-                    "usesSplashPage": false,
-                    "defaultRoomKey": "room1"
-                },
-                "group": "touchpanel",
-                "uid": 8
-            },
-            {
-                "name": "Crestron XPanel",
-                "key": "crestronApp-1",
-                "type": "crestronApp",
-                "properties": {
-                    "control": {
-                        "params": {
-                            "deviceReadyResponsePattern": ".*>",
-                            "endOfLineString": "\n"
-                        },
-                        "ipid": "04",
-                        "method": "ipid"
-                    },
-                    "showVolumeGauge": true,
-                    "sourcesOverflowCount": 5,
-                    "showDate": true,
-                    "headerStyle": "Verbose",
-                    "sgdFile": "PepperDash Essentials iPad.sgd",
-                    "showTime": true,
-                    "roomListKey": "",
-                    "projectName": "PepperDash Essentials iPad",
-                    "defaultRoomKey": "room1",
-                    "usesSplashPage": false
-                },
-                "group": "touchpanel",
-                "uid": 9
-            }
-        ],
-        "info": {
-            "comment": "",
-            "lastUid": 10,
-            "lastModifiedDate": "2018-07-02T17:41:06.550Z",
-            "systemType": "huddle",
-            "processorType": "dinAp3",
-            "requiredControlSofwareVersion": ""
-        },
-        "tieLines": [
-            {
-                "type": "audioVideo",
-                "sourceKey": "hdMd4x14kE-1",
-                "destinationKey": "mockCodec-1",
-                "destinationPort": "HdmiIn2",
-                "sourcePort": "hdmiOut"
-            },
-            {
-                "type": "audioVideo",
-                "sourceKey": "mockCodec-1",
-                "destinationKey": "display-1",
-                "destinationPort": "HdmiIn1",
-                "sourcePort": "HdmiOut1"
-            },
-            {
-                "type": "audioVideo",
-                "sourceKey": "laptop-1",
-                "destinationKey": "hdMd4x14kE-1",
-                "destinationPort": "hdmiIn1",
-                "sourcePort": "anyOut"
-            },
-            {
-                "type": "audioVideo",
-                "sourceKey": "inRoomPc-1",
-                "destinationKey": "mockCodec-1",
-                "destinationPort": "HdmiIn3",
-                "sourcePort": "anyVideoOut"
-            },
-            {
-                "type": "audioVideo",
-                "sourceKey": "wePresent-1",
-                "destinationKey": "hdMd4x14kE-1",
-                "destinationPort": "hdmiIn2",
-                "sourcePort": "anyOut"
-            }
-        ],
-        "sourceLists": {
-            "default": {
-                "source-2": {
-                    "order": 6,
-                    "icon": "",
-                    "altIcon": "Blank",
-                    "type": "route",
-                    "sourceKey": "laptop-1",
-                    "includeInSourceList": true,
-                    "volumeControlKey": "$defaultAudio",
-                    "routeList": [
-                        {
-                            "type": "audioVideo",
-                            "sourceKey": "laptop-1",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                },
-                "source-3": {
-                    "order": 7,
-                    "icon": "",
-                    "altIcon": "Blank",
-                    "type": "route",
-                    "sourceKey": "wePresent-1",
-                    "includeInSourceList": true,
-                    "volumeControlKey": "$defaultAudio",
-                    "routeList": [
-                        {
-                            "type": "audioVideo",
-                            "sourceKey": "wePresent-1",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                },
-                "source-1": {
-                    "order": 5,
-                    "icon": "",
-                    "altIcon": "Blank",
-                    "type": "route",
-                    "sourceKey": "inRoomPc-1",
-                    "includeInSourceList": true,
-                    "volumeControlKey": "$defaultAudio",
-                    "routeList": [
-                        {
-                            "type": "audioVideo",
-                            "sourceKey": "inRoomPc-1",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                },
-                "roomOff": {
-                    "type": "off",
-                    "sourceKey": "$off",
-                    "routeList": [
-                        {
-                            "type": "audioVideo",
-                            "sourceKey": "$off",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                },
-                "codecOsd": {
-                    "order": 1,
-                    "name": "None",
-                    "type": "route",
-                    "includeInSourceList": true,
-                    "sourceKey": "",
-                    "routeList": [
-                        {
-                            "type": "audioVideo",
-                            "sourceKey": "mockCodec-1[osd]",
-                            "destinationKey": "$defaultAll"
-                        }
-                    ]
-                }
-            }
-        }
-    }
-}

PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json

@@ -1,439 +0,0 @@
-{
-  "system_url": "",
-  "template": {
-    "info": {
-      "comment": "",
-      "requiredControlSofwareVersion": "",
-      "systemType": "huddle",
-      "lastModifiedDate": "2018-07-09T20:00:47.873Z",
-      "lastUid": 23,
-      "processorType": "rmc3"
-    },
-    "devices": [
-      {
-        "key": "processor",
-        "group": "processor",
-        "uid": 0,
-        "supportsCompliance": true,
-        "type": "rmc3",
-        "properties": {},
-        "name": "RMC3"
-      },
-      {
-        "key": "comm-1",
-        "uid": 1,
-        "name": "Generic comm 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "comParams": {
-              "hardwareHandshake": "None",
-              "parity": "None",
-              "protocol": "RS232",
-              "baudRate": 9600,
-              "dataBits": 8,
-              "softwareHandshake": "None",
-              "stopBits": 1
-            },
-            "controlPortNumber": 1,
-            "controlPortDevKey": "processor",
-            "method": "Com"
-          }
-        }
-      },
-      {
-        "key": "tcp-1",
-        "uid": 2,
-        "name": "Generic TCP 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "tcpSshProperties": {
-              "username": "",
-              "autoReconnect": true,
-              "AutoReconnectIntervalMs": 2000,
-              "port": 23,
-              "address": "0.0.0.0",
-              "password": ""
-            },
-            "method": "Tcpip"
-          }
-        }
-      },
-      {
-        "key": "ssh-1",
-        "uid": 3,
-        "name": "Generic SSH 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "tcpSshProperties": {
-              "username": "crestron",
-              "autoReconnect": true,
-              "AutoReconnectIntervalMs": 2000,
-              "port": 22,
-              "address": "10.11.50.135",
-              "password": "2H3Zu&OvgXp6"
-            },
-            "method": "Ssh"
-          }
-        }
-      },
-      {
-        "key": "eisc-1A",
-        "uid": 4,
-        "type": "eiscApi",
-        "group": "api",
-        "properties": {
-          "control": {
-            "tcpSshProperties": {
-              "address": "127.0.0.2",
-              "port": 0
-            },
-            "ipId": "1A"
-          },
-          "devices": [
-            {
-              "deviceKey": "comm-1",
-              "joinStart": 3001
-            },
-            {
-              "deviceKey": "tcp-1",
-              "joinStart": 3011
-            },
-            {
-              "deviceKey": "ssh-1",
-              "joinStart": 3021
-            },
-            {
-              "deviceKey": "dmMd8x8-1",
-              "joinStart": 1
-            },
-            {
-              "deviceKey": "dmTx201C-1",
-              "joinStart": 3051
-            },
-            {
-              "deviceKey": "dmRmc4kScalerC-1",
-              "joinStart": 3061
-            },
-            {
-              "deviceKey": "dmRmc200C-1",
-              "joinStart": 3071
-            },
-            {
-              "deviceKey": "dmRmc100C-1",
-              "joinStart": 3081
-            },
-            {
-              "deviceKey": "comm-2",
-              "joinStart": 2501
-            },
-            {
-              "deviceKey": "comm-3",
-              "joinStart": 2511
-            },
-            {
-              "deviceKey": "comm-4",
-              "joinStart": 2521
-            },
-            {
-              "deviceKey": "cec-1",
-              "joinStart": 2531
-            },
-            {
-              "deviceKey": "cec-2",
-              "joinStart": 2541
-            },
-            {
-              "deviceKey": "cec-3",
-              "joinStart": 2551
-            },
-            {
-              "deviceKey": "cec-4",
-              "joinStart": 2561
-            },
-            {
-              "deviceKey": "cec-5",
-              "joinStart": 2571
-            },
-            {
-              "deviceKey": "cec-6",
-              "joinStart": 2581
-            },
-            {
-              "deviceKey": "cec-7",
-              "joinStart": 2591
-            },
-            {
-              "deviceKey": "gls-oir-1",
-              "joinStart": 2701
-            },
-            {
-              "deviceKey": "gls-odt-1",
-              "joinStart": 2751
-            }
-          ]
-        }
-      },
-      {
-        "key": "dmMd8x8-1",
-        "uid": 5,
-        "name": "DM-MD8x8 Chassis 1",
-        "type": "dmMd8x8",
-        "group": "dmChassis",
-        "properties": {
-          "control": {
-            "method": "ipid",
-            "ipid": "40",
-            "params": {
-              "endOfLineString": "\n",
-              "deviceReadyResponsePattern": ".*>"
-            }
-          },
-          "volumeControls": {},
-          "inputSlots": {
-            "1": "dmcHdDsp",
-            "2": "dmcHdDsp",
-            "3": "dmcDvi",
-            "4": "dmcDvi",
-            "5": "dmcC",
-            "6": "dmcCDsp"
-          },
-          "outputSlots": {
-            "1": "dmcCoHd",
-            "2": "dmcCoHd"
-          },
-          "inputNames": {
-            "1": "Input 1",
-            "2": "Input 2",
-            "3": "Input 3",
-            "4": "Input 4",
-            "5": "Input 5",
-            "6": "Input 6"
-          },
-          "parentDeviceKey": "processor",
-          "outputNames": {
-            "1": "Output 1",
-            "2": "Output 2",
-            "3": "Output 3",
-            "4": "Output 4"
-          }
-        }
-      },
-      {
-        "key": "dmTx201C-1",
-        "uid": 6,
-        "name": "DM-TX-201C 1",
-        "type": "dmTx201C",
-        "group": "dmEndpoint",
-        "properties": {
-          "control": {
-            "method": "ipid",
-            "ipid": "45",
-            "params": {
-              "endOfLineString": "\n",
-              "deviceReadyResponsePattern": ".*>"
-            }
-          },
-          "parentDeviceKey": "dmMd8x8-1",
-          "parentInputNumber": "5"
-        }
-      },
-      {
-        "key": "dmRmc4kScalerC-1",
-        "uid": 7,
-        "name": "DM-RMC-4K-SCALER-C Out 1",
-        "type": "dmRmc4kScalerC",
-        "group": "dmEndpoint",
-        "properties": {
-          "control": {
-            "method": "ipid",
-            "ipid": "61",
-            "params": {
-              "endOfLineString": "\n",
-              "deviceReadyResponsePattern": ".*>"
-            }
-          },
-          "parentDeviceKey": "dmMd8x8-1",
-          "parentOutputNumber": "1"
-        }
-      },
-      {
-        "key": "dmRmc200C-1",
-        "uid": 8,
-        "name": "DM-RMC-200-C Out 2",
-        "type": "dmRmc200C",
-        "group": "dmEndpoint",
-        "properties": {
-          "control": {
-            "method": "ipid",
-            "ipid": "62",
-            "params": {
-              "endOfLineString": "\n",
-              "deviceReadyResponsePattern": ".*>"
-            }
-          },
-          "parentDeviceKey": "dmMd8x8-1",
-          "parentOutputNumber": "2"
-        }
-      },
-      {
-        "key": "dmRmc100C-1",
-        "uid": 9,
-        "name": "DM-RMC-100-C Out 3",
-        "type": "dmRmc100C",
-        "group": "dmEndpoint",
-        "properties": {
-          "control": {
-            "method": "ipid",
-            "ipid": "63",
-            "params": {
-              "endOfLineString": "\n",
-              "deviceReadyResponsePattern": ".*>"
-            }
-          },
-          "parentDeviceKey": "dmMd8x8-1",
-          "parentOutputNumber": "3"
-        }
-      },
-      {
-        "key": "comm-2",
-        "uid": 10,
-        "name": "Rmc comm 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "comParams": {
-              "hardwareHandshake": "None",
-              "parity": "None",
-              "protocol": "RS232",
-              "baudRate": 9600,
-              "dataBits": 8,
-              "softwareHandshake": "None",
-              "stopBits": 1
-            },
-            "controlPortNumber": 1,
-            "controlPortDevKey": "dmRmc4kScalerC-1",
-            "method": "Com"
-          }
-        }
-      },
-      {
-        "key": "comm-3",
-        "uid": 11,
-        "name": "Rmc comm 2",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "comParams": {
-              "hardwareHandshake": "None",
-              "parity": "None",
-              "protocol": "RS232",
-              "baudRate": 9600,
-              "dataBits": 8,
-              "softwareHandshake": "None",
-              "stopBits": 1
-            },
-            "controlPortNumber": 1,
-            "controlPortDevKey": "dmRmc200C-1",
-            "method": "Com"
-          }
-        }
-      },
-      {
-        "key": "cec-1",
-        "uid": 13,
-        "name": "Tx 5 cec 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "controlPortName": "HdmiIn",
-            "controlPortDevKey": "dmTx201C-1",
-            "method": "Cec"
-          }
-        }
-      },
-      {
-        "key": "cec-5",
-        "uid": 17,
-        "name": "Rmc 1 cec 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "controlPortName": "HdmiOut",
-            "controlPortDevKey": "dmRmc4kScalerC-1",
-            "method": "Cec"
-          }
-        }
-      },
-      {
-        "key": "cec-6",
-        "uid": 18,
-        "name": "Dm Chassis In 1 cec 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "controlPortName": "inputCard1--hdmiIn",
-            "controlPortDevKey": "dmMd8x8-1",
-            "method": "Cec"
-          }
-        }
-      },
-      {
-        "key": "cec-7",
-        "uid": 19,
-        "name": "Dm Chassis Out 1 cec 1",
-        "type": "genericComm",
-        "group": "comm",
-        "properties": {
-          "control": {
-            "controlPortName": "outputCard1--hdmiOut1",
-            "controlPortDevKey": "dmMd8x8-1",
-            "method": "Cec"
-          }
-        }
-      },
-      {
-        "key": "gls-oir-1",
-        "uid": 19,
-        "name": "GLS-OIR-CN 1",
-        "type": "glsoirccn",
-        "group": "occupancy",
-        "properties": {
-          "control": {
-            "cresnetId": "41",
-            "method": "cresnet"
-          }
-        }
-      },
-      {
-        "key": "gls-odt-1",
-        "uid": 19,
-        "name": "GLS-ODT-CN 1",
-        "type": "glsodtccn",
-        "group": "occupancy",
-        "properties": {
-          "control": {
-            "cresnetId": "42",
-            "method": "cresnet"
-          }
-        }
-      }
-    ],
-    "rooms": [],
-    "sourceLists": {},
-    "tieLines": []
-  },
-  "template_url": "",
-  "system": {
-  }
-}

PepperDashEssentials/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json

@@ -1,70 +0,0 @@
-{
-    "system_url": "",
-    "template": {    
-        "info": {
-            "comment": "",
-            "requiredControlSofwareVersion": "",
-            "systemType": "huddle",
-            "lastModifiedDate": "2018-07-09T20:00:47.873Z",
-            "lastUid": 23,
-            "processorType": "dmps3300c"
-        },
-        "devices": [
-            {
-                "key": "processor",
-                "group": "processor",
-                "uid": 0,
-                "supportsCompliance": true,
-                "type": "dmps3300c",
-                "properties": {
-                },
-                "name": "DMPS3-300-C"
-            },           
-            {
-                "key": "eisc-A",
-                "uid":4,
-                "type": "eiscApi",
-                "group":"api",
-                "properties": {
-                    "control":{
-                        "tcpSshProperties":{
-                            "address":"127.0.0.2",
-                            "port":0
-                        },
-                        "ipId":"1A"
-                    },
-                  "devices": [
-                    {
-                      "deviceKey":"processor-avRouting",
-                      "joinStart":1                    
-                    },
-                    {
-                        "deviceKey":"processor-programAudioOutput",
-                        "joinStart":3001
-                    },
-                    {
-                        "deviceKey":"processor-aux1AudioOutput",
-                        "joinStart":3011
-                    },
-                    {
-                        "deviceKey":"processor-aux2AudioOutput",
-                        "joinStart":3021
-                    }
-                  ] 
-                }
-              }            
-        ],
-        "rooms": [
-            
-        ],
-        "sourceLists": {
-            
-        },
-        "tieLines": [
-        ]   
-    },
-    "template_url": "",
-    "system": {
-        
-    }
-}

PepperDashEssentials/FOR REFERENCE UI/PageControllers/DevicePageControllerBase.cs

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/LargeTouchpanelControllerBase.cs

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/PageControllerLaptop.cs

@@ -0,0 +1,28 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using Crestron.SimplSharp;
+//using Crestron.SimplSharpPro;
+//using Crestron.SimplSharpPro.DeviceSupport;
+
+//using PepperDash.Core;
+//using PepperDash.Essentials.Core;
+//using PepperDash.Essentials.Core.Presets;
+
+
+//namespace PepperDash.Essentials
+//{
+//    public class PageControllerLaptop : DevicePageControllerBase
+//    {
+//        public PageControllerLaptop(BasicTriListWithSmartObject tl)
+//            : base(tl)
+//        {
+//            FixedObjectSigs = new List<BoolInputSig> 
+//            {
+//                tl.BooleanInput[10092], // well
+//                tl.BooleanInput[11001] // Laptop info
+//            };
+//        }
+//    }
+//}

PepperDashEssentials/FOR REFERENCE UI/PageControllers/PageControllerLargeDvd.cs

@@ -0,0 +1,46 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using Crestron.SimplSharp;
+//using Crestron.SimplSharpPro;
+//using Crestron.SimplSharpPro.DeviceSupport;
+
+//using PepperDash.Core;
+//using PepperDash.Essentials.Core;
+//using PepperDash.Essentials.Core.Presets;
+
+//namespace PepperDash.Essentials
+//{
+//    /// <summary>
+//    /// 
+//    /// </summary>
+//    public class PageControllerLargeDvd : DevicePageControllerBase
+//    {
+//        IDiscPlayerControls Device;
+
+//        public PageControllerLargeDvd(BasicTriListWithSmartObject tl, IDiscPlayerControls device)
+//            : base(tl)
+//        {
+
+//            Device = device;
+//            FixedObjectSigs = new List<BoolInputSig>
+//            {
+//                tl.BooleanInput[10093],		// well
+//                tl.BooleanInput[10411],		// DVD Dpad
+//                tl.BooleanInput[10412]		// everything else
+//            };
+//        }
+
+//        protected override void CustomSetVisible(bool state)
+//        {
+//            // Hook up smart objects if applicable
+//            if (Device != null)
+//            {
+//#warning rewire this
+//                //var uos = (Device as IHasCueActionList).CueActionList;
+//                //SmartObjectHelper.LinkDpadWithUserObjects(TriList, 10411, uos, state);
+//            }
+//        }
+//    }
+//}