Merge pull request #464 from PepperDash/bugfix/logo-server-crashing

Logo Server Updates

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/scripts/GenerateVersionNumber.ps1

@@ -0,0 +1,59 @@
+$latestVersions = $(git tag --merged origin/main)
+$latestVersion = [version]"0.0.0"
+Write-Host "GITHUB_REF: $($Env:GITHUB_REF)"
+Write-Host "GITHUB_HEAD_REF: $($Env:GITHUB_HEAD_REF)"
+Write-Host "GITHUB_BASE_REF: $($Env:GITHUB_BASE_REF)"
+Foreach ($version in $latestVersions) {
+  Write-Host $version
+  try {
+    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\/pull\/*.' {
+    $splitRef = $Env:GITHUB_REF -split "/"
+    $phase = "pr$($splitRef[2])"
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/main*.' {
+    $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, $newVersion.Build
+  }
+  '^refs\/heads\/feature\/*.' {
+    $phase = 'alpha'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/release\/*.' {
+    $splitRef = $Env:GITHUB_REF -split "/"
+    $version = [version]($splitRef[-1] -replace "v", "")
+    $phase = 'rc'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $version.Major, $version.Minor, $version.Build, $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/development*.' {
+    $phase = 'beta'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/hotfix\/*.' {
+    $phase = 'hotfix'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  '^refs\/heads\/bugfix\/*.' {
+    $phase = 'hotfix'
+    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
+  }
+  
+}
+
+
+Write-Output $newVersionString

.github/scripts/UpdateAssemblyVersion.ps1

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

.github/scripts/ZipBuildOutput.ps1

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

.github/workflows/docker.yml

@@ -0,0 +1,311 @@
+name: Branch Build Using Docker
+
+on:
+  push:
+    branches:
+      - feature/*
+      - hotfix/*
+      - bugfix/*
+      - release/*
+      - development
+  pull_request:
+    branches:
+      - 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 main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
+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
+          submodules: true
+        # 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 }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      # Build the solutions in the docker image
+      - name: Build Solution
+        shell: powershell
+        run: |
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+      # Zip up the output files as needed
+      - name: Zip Build Output
+        shell: powershell
+        run: ./.github/scripts/ZipBuildOutput.ps1
+      # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
+      # Upload the build output as an artifact
+      - name: Upload Build Output
+        uses: actions/upload-artifact@v1
+        with:
+          name: Build
+          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
+      # Create the release on the source repo
+      - name: Create tag for non-rc builds
+        if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
+        run: |
+          git tag $($Env:VERSION)
+          git push --tags origin
+      - name: Create Release
+        id: create_release
+        # using contributor's version to allow for pointing at the right commit
+        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
+        uses: fleskesvor/create-release@feature/support-target-commitish
+        with:
+          tag_name: ${{ env.VERSION  }}
+          release_name: ${{ env.VERSION }}
+          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Upload the build package to the release
+      - name: Upload Release Package
+        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
+        id: upload_release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
+  # This step always runs and pushes the build to the internal build rep
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: check Github ref
+        run: ${{toJson(github.ref)}}
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+      # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is main 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, 'main') || contains(github.ref, '/release/')
+    steps:
+      # Checkout the repo
+      - name: check Github ref
+        run: ${{toJson(github.ref)}}
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.github/workflows/main.yml

@@ -0,0 +1,277 @@
+name: main Build using Docker
+
+on:
+  release:
+    types:
+      - created
+    branches:
+      - main
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Release
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
+jobs:
+  Build_Project:
+    runs-on: windows-latest
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      # And any submodules
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        env:
+          TAG_NAME: ${{ github.event.release.tag_name }}
+        run: Write-Output "::set-env name=VERSION::$($Env:TAG_NAME)"
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          Write-Output ${{ env.VERSION }}
+          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      # 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 }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
+  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 main branch
+        run: git checkout main
+      # 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 main --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 main 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 main branch
+      - name: Create new branch
+        run: git checkout main
+      # 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 main --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.gitignore

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

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "essentials-framework"]
-	path = essentials-framework
-	url = https://bitbucket.org/Pepperdash_Products/essentials-framework.git
+[submodule "Essentials-Template-UI"]
+	path = Essentials-Template-UI
+	url = https://github.com/PepperDash/Essentials-Template-UI.git

CONTRIBUTING.md

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

LICENSE.md

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

PepperDashEssentials/AppServer/CotijaConfig.cs

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

PepperDashEssentials/AppServer/CotijaDdvc01DeviceBridge.cs

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

PepperDashEssentials/AppServer/CotijaSystemController.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IChannelExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IColorExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDPadExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDvrExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/INumericExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IPowerExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ISetTopBoxControlsExtensions.cs

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

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ITransportExtensions.cs

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

PepperDashEssentials/AppServer/Interfaces.cs

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

@@ -1,187 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Codec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	public class Ddvc01AtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-		const uint BDialHangup = 221;
-		const uint BIncomingAnswer = 251;
-		const uint BIncomingReject = 252;
-		const uint BSpeedDial1 = 241;
-		const uint BSpeedDial2 = 242;
-		const uint BSpeedDial3 = 243;
-		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>
-		/// 
-		/// </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 },
-		};
-
-		CodecActiveCallItem CurrentCallItem;
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="eisc"></param>
-		/// <param name="messagePath"></param>
-		public Ddvc01AtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-			EISC = eisc;
-
-			CurrentCallItem = new CodecActiveCallItem();
-			CurrentCallItem.Type = eCodecCallType.Audio;
-			CurrentCallItem.Id = "-audio-";
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-            
-
-			this.PostStatusMessage(new
-			{				
-				calls = GetCurrentCallList(),
-				currentCallString = EISC.GetString(SCurrentCallNumber),
-				currentDialString = EISC.GetString(SCurrentDialString),
-                isInCall = EISC.GetString(SHookState) == "Connected"
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
-		{
-            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
-
-			EISC.SetStringSigAction(SHookState, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-                //GetCurrentCallList();
-				SendCallsList();
-			});
-
-			EISC.SetStringSigAction(SCurrentCallNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                SendCallsList();
-			});
-
-            EISC.SetStringSigAction(SCurrentCallName, s =>
-            {
-                CurrentCallItem.Name = s;
-                SendCallsList();
-            });
-
-            EISC.SetStringSigAction(SCallDirection, s =>
-            {
-                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
-                SendCallsList();
-            });
-
-			// Add press and holds using helper
-			Action<string, uint> addPHAction = (s, u) => 
-				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-
-			// Add straight pulse calls
-			Action<string, uint> addAction = (s, u) =>
-				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-            addAction("/endCallById", BDialHangup);
-            addAction("/acceptById", BIncomingAnswer);
-            addAction("/rejectById", BIncomingReject);
-			addAction("/speedDial1", BSpeedDial1);
-			addAction("/speedDial2", BSpeedDial2);
-			addAction("/speedDial3", BSpeedDial3);
-			addAction("/speedDial4", BSpeedDial4);
-
-			// Get status
-			AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatus));
-			// Dial on string
-			AppServerController.AddAction(MessagePath + "/dial", new Action<string>(s => EISC.SetString(SCurrentDialString, s)));
-			// Pulse DTMF
-			AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-			{
-				if (DTMFMap.ContainsKey(s))
-				{
-					EISC.PulseBool(DTMFMap[s], 100);
-				}
-			}));
-		}
-
-        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/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(CotijaSystemController 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/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 CotijaSystemController 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(CotijaSystemController 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(CotijaSystemController appServerController);
-
-		/// <summary>
-		/// Helper for posting status message
-		/// </summary>
-		/// <param name="contentObject">The contents of the content object</param>
-		protected void PostStatusMessage(object contentObject)
-		{
-            if (AppServerController != null)
-            {
-                AppServerController.SendMessageToServer(JObject.FromObject(new
-                {
-                    type = MessagePath,
-                    content = contentObject
-                }));
-            }
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.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 += new EventHandler<EventArgs>(SysMon_SystemMonitorPropertiesChanged);
-
-            foreach (var p in SysMon.ProgramStatusFeedbackCollection)
-            {
-                p.Value.ProgramInfoChanged += new EventHandler<ProgramInfoEventArgs>(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)
-        {
-            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(CotijaSystemController appServerController)
-        {
-            AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatusMessage));
-        }
-
-    }
-}

PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs

@@ -1,279 +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.VideoCodec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	/// <summary>
-	/// Provides a messaging bridge for a VideoCodecBase device
-	/// </summary>
-	public class VideoCodecBaseMessenger : MessengerBase
-	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public VideoCodecBase Codec { get; private set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="codec"></param>
-		public VideoCodecBaseMessenger(string key, VideoCodecBase codec, string messagePath)
-            : base(key, messagePath)
-		{
-			if (codec == null)
-				throw new ArgumentNullException("codec");
-
-			Codec = codec;
-			codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
-			codec.IsReadyChange += new EventHandler<EventArgs>(codec_IsReadyChange);
-
-			var dirCodec = codec as IHasDirectory;
-			if (dirCodec != null)
-			{
-				dirCodec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dirCodec_DirectoryResultReturned);
-			}
-
-            var recCodec = codec as IHasCallHistory;
-            if (recCodec != null)
-            {
-                recCodec.CallHistory.RecentCallsListHasChanged += new EventHandler<EventArgs>(CallHistory_RecentCallsListHasChanged);
-            }
-		}
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void CallHistory_RecentCallsListHasChanged(object sender, EventArgs e)
-        {
-            var recents = (sender as CodecCallHistory).RecentCalls;
-
-            if (recents != null)
-            {
-                PostStatusMessage(new
-                {
-                    recentCalls = recents
-                });
-            }
-        }
-		
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void dirCodec_DirectoryResultReturned(object sender, DirectoryEventArgs e)
-		{
-			PostStatusMessage(new
-			{
-				currentDirectory = e.Directory
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		void codec_IsReadyChange(object sender, EventArgs e)
-		{
-			PostStatusMessage(new
-			{
-				isReady = true
-			});
-		}
-
-		/// <summary>
-		/// Called from base's RegisterWithAppServer method
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
-		{
-			appServerController.AddAction("/device/videoCodec/isReady", new Action(SendIsReady));
-			appServerController.AddAction("/device/videoCodec/fullStatus", new Action(SendVtcFullMessageObject));
-			appServerController.AddAction("/device/videoCodec/dial", new Action<string>(s => Codec.Dial(s)));
-			appServerController.AddAction("/device/videoCodec/endCallById", new Action<string>(s =>
-			{
-				var call = GetCallWithId(s);
-				if (call != null)
-					Codec.EndCall(call);
-			}));
-			appServerController.AddAction(MessagePath + "/endAllCalls", new Action(Codec.EndAllCalls));
-			appServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s => Codec.SendDtmf(s)));
-			appServerController.AddAction(MessagePath + "/rejectById", new Action<string>(s =>
-			{
-				var call = GetCallWithId(s);
-				if (call != null)
-					Codec.RejectCall(call);
-			}));
-			appServerController.AddAction(MessagePath + "/acceptById", new Action<string>(s =>
-			{
-				var call = GetCallWithId(s);
-				if (call != null)
-					Codec.AcceptCall(call);
-			}));
-			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 + "/getCallHistory", new Action(GetCallHistory));
-			appServerController.AddAction(MessagePath + "/privacyModeOn", new Action(Codec.PrivacyModeOn));
-			appServerController.AddAction(MessagePath + "/privacyModeOff", new Action(Codec.PrivacyModeOff));
-			appServerController.AddAction(MessagePath + "/privacyModeToggle", new Action(Codec.PrivacyModeToggle));
-			appServerController.AddAction(MessagePath + "/sharingStart", new Action(Codec.StartSharing));
-			appServerController.AddAction(MessagePath + "/sharingStop", new Action(Codec.StopSharing));
-			appServerController.AddAction(MessagePath + "/standbyOn", new Action(Codec.StandbyActivate));
-			appServerController.AddAction(MessagePath + "/standbyOff", new Action(Codec.StandbyDeactivate));
-		}
-
-        void GetCallHistory()
-        {
-            var codec = (Codec as IHasCallHistory);
-
-            if (codec != null)
-            {
-                var recents = codec.CallHistory.RecentCalls;
-
-                if (recents != null)
-                {
-                    PostStatusMessage(new
-                    {
-                        recentCalls = recents
-                    });
-                }
-            }
-        }
-
-		public void GetFullStatusMessage()
-		{
-
-		}
-
-		/// <summary>
-		/// Helper to grab a call with string ID
-		/// </summary>
-		/// <param name="id"></param>
-		/// <returns></returns>
-		CodecActiveCallItem GetCallWithId(string id)
-		{
-			return Codec.ActiveCalls.FirstOrDefault(c => c.Id == id);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="s"></param>
-		void DirectorySearch(string s)
-		{
-			var dirCodec = Codec as IHasDirectory;
-			if (dirCodec != null)
-			{
-				dirCodec.SearchDirectory(s);
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="id"></param>
-		void GetDirectory(string id)
-		{
-			var dirCodec = Codec as IHasDirectory;
-			if(dirCodec == null)
-			{
-				return;
-			}
-			dirCodec.GetDirectoryFolderContents(id);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void GetDirectoryRoot()
-		{
-			var dirCodec = Codec as IHasDirectory;
-			if (dirCodec == null)
-			{
-				// do something else?
-				return;
-			}
-			if (!dirCodec.PhonebookSyncState.InitialSyncComplete)
-			{
-				PostStatusMessage(new
-				{
-					initialSyncComplete = false
-				});
-				return;
-			}
-
-			PostStatusMessage(new
-			{
-				currentDirectory = dirCodec.DirectoryRoot
-			});
-		}
-
-		/// <summary>
-		/// Handler for codec changes
-		/// </summary>
-		void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
-		{
-			SendVtcFullMessageObject();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendIsReady()
-		{
-			PostStatusMessage(new
-			{
-				isReady = Codec.IsReady
-			});
-		}
-
-		/// <summary>
-		/// Helper method to build call status for vtc
-		/// </summary>
-		/// <returns></returns>
-		void SendVtcFullMessageObject()
-		{
-			if (!Codec.IsReady)
-			{
-				return;
-			}
-
-			var info = Codec.CodecInfo;
-			PostStatusMessage(new
-			{
-				isInCall = Codec.IsInCall,
-				privacyModeIsOn = Codec.PrivacyModeIsOnFeedback.BoolValue,
-				sharingContentIsOn = Codec.SharingContentIsOnFeedback.BoolValue,
-				sharingSource = Codec.SharingSourceFeedback.StringValue,
-				standbyIsOn = Codec.StandbyIsOnFeedback.StringValue,
-				calls = Codec.ActiveCalls,
-				info = new
-				{
-					autoAnswerEnabled = info.AutoAnswerEnabled,
-					e164Alias = info.E164Alias,
-					h323Id = info.H323Id,
-					ipAddress = info.IpAddress,
-					sipPhoneNumber = info.SipPhoneNumber,
-					sipURI = info.SipUri
-				},
-				showSelfViewByDefault = Codec.ShowSelfViewByDefault,
-				hasDirectory = Codec is IHasDirectory,
-                hasRecents = Codec is IHasCallHistory,
-                hasCameras = Codec is IHasCameraControl
-			});
-		}
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/CotijaBridgeBase.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class CotijaBridgeBase: Device
-	{
-		public CotijaSystemController Parent { get; private set; }
-
-		public string UserCode { get; private set; }
-
-		public abstract string RoomName { get; }
-
-		public CotijaBridgeBase(string key, string name)
-			: base(key, name)
-		{
-		}
-
-		/// <summary>
-		/// Set the parent.  Does nothing else.  Override to add functionality such
-		/// as adding actions to parent
-		/// </summary>
-		/// <param name="parent"></param>
-		public virtual void AddParent(CotijaSystemController parent)
-		{
-			Parent = parent;
-		}
-
-		/// <summary>
-		/// Sets the UserCode on the bridge object. Called from controller. A changed code will
-		/// fire method UserCodeChange.  Override that to handle changes
-		/// </summary>
-		/// <param name="code"></param>
-		public void SetUserCode(string code)
-		{
-			var changed = UserCode != code;
-			UserCode = code;
-			if (changed)
-			{
-				UserCodeChange();
-			}
-		}
-
-		/// <summary>
-		/// Empty method in base class.  Override this to add functionality
-		/// when code changes
-		/// </summary>
-		protected virtual void UserCodeChange()
-		{
-
-		}
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs

@@ -1,679 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-using PepperDash.Essentials.AppServer.Messengers;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Room.Config;
-
-
-namespace PepperDash.Essentials.Room.Cotija
-{
-	public class CotijaDdvc01RoomBridge : CotijaBridgeBase, IDelayedConfiguration
-	{
-		public class BoolJoin
-		{
-			/// <summary>
-			/// 301
-			/// </summary>
-			public const uint RoomIsOn = 301;
-
-			/// <summary>
-			/// 41
-			/// </summary>
-			public const uint PromptForCode = 41;
-			/// <summary>
-			/// 42
-			/// </summary>
-			public const uint ClientJoined = 42;
-			/// <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>
-			/// 261 - The start of the range of speed dial visibles
-			/// </summary>
-			public const uint SpeedDialVisibleStartJoin = 261;
-			/// <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>
-			/// 241
-			/// </summary>
-			public const uint SpeedDialNameStartJoin = 241;
-
-			/// <summary>
-			/// 251
-			/// </summary>
-			public const uint SpeedDialNumberStartJoin = 251;
-			
-			/// <summary>
-			/// 501
-			/// </summary>
-			public const uint ConfigRoomName = 501;
-			/// <summary>
-			/// 502
-			/// </summary>
-			public const uint ConfigHelpMessage = 502;
-			/// <summary>
-			/// 503
-			/// </summary>
-			public const uint ConfigHelpNumber = 503;
-			/// <summary>
-			/// 504
-			/// </summary>
-			public const uint ConfigRoomPhoneNumber = 504;
-			/// <summary>
-			/// 505
-			/// </summary>
-			public const uint ConfigRoomURI = 505;
-			/// <summary>
-			/// 401
-			/// </summary>
-			public const uint UserCodeToSystem = 401;
-			/// <summary>
-			/// 402
-			/// </summary>
-			public const uint ServerUrl = 402;
-		}
-
-		/// <summary>
-		/// 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;
-
-		Ddvc01AtcMessenger AtcMessenger;
-
-
-		/// <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();
-
-            var key = this.Key + "-" + Parent.Key;
-			AtcMessenger = new Ddvc01AtcMessenger(key, EISC, "/device/audioCodec");
-			AtcMessenger.RegisterWithAppServer(Parent);
-
-			EISC.SigChange += EISC_SigChange;
-			EISC.OnlineStatusChange += (o, a) =>
-			{
-				Debug.Console(1, this, "DDVC EISC online={0}. Config is ready={1}", a.DeviceOnLine, EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue);
-				if (a.DeviceOnLine && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue)
-					LoadConfigValues();
-			};
-			// load config if it's already there
-			if (EISC.IsOnline && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue) // || EISC.BooleanInput[BoolJoin.ConfigIsReady].BoolValue)
-				LoadConfigValues();
-
-
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				for (uint i = 1; i < 1000; i++)
-				{
-					if (s.ToLower().Equals("b"))
-					{
-						CrestronConsole.ConsoleCommandResponse("D{0,6} {1} - ", i, EISC.BooleanOutput[i].BoolValue);
-					}
-					else if (s.ToLower().Equals("u"))
-					{
-						CrestronConsole.ConsoleCommandResponse("U{0,6} {1,8} - ", i, EISC.UShortOutput[i].UShortValue);
-					}
-					else if (s.ToLower().Equals("s"))
-					{
-						var val = EISC.StringOutput[i].StringValue;
-						if(!string.IsNullOrEmpty(val))
-							CrestronConsole.ConsoleCommandResponse("S{0,6} {1}\r", i, EISC.StringOutput[i].StringValue);
-					}
-
-				}
-			}, "mobilebridgedump", "Dumps DDVC01 bridge EISC data b,u,s", ConsoleAccessLevelEnum.AccessOperator);
-
-			return base.CustomActivate();
-		}
-
-
-		/// <summary>
-		/// Setup the actions to take place on various incoming API calls
-		/// </summary>
-		void SetupFunctions()
-		{
-#warning need join numbers for these
-			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(BoolJoin.PromptForCode)));
-			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(BoolJoin.ClientJoined)));
-
-			Parent.AddAction(@"/room/room1/status", new Action(SendFullStatus));
-
-			Parent.AddAction(@"/room/room1/source", new Action<SourceSelectMessageContent>(c =>
-			{
-				EISC.SetString(StringJoin.SelectedSourceKey, c.SourceListItem);
-				EISC.PulseBool(BoolJoin.SourceHasChanged);
-			}));
-
-			Parent.AddAction(@"/room/room1/defaultsource", new Action(() => 
-				EISC.PulseBool(BoolJoin.ActivitySharePress)));
-			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityVideoCallPress)));
-			Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityPhoneCallPress)));
-
-			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)));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="devKey"></param>
-		void SetupSourceFunctions(string devKey)
-		{
-			SourceDeviceMapDictionary sourceJoinMap = new SourceDeviceMapDictionary();
-
-			var prefix = string.Format("/device/{0}/", devKey);
-
-			foreach (var item in sourceJoinMap)
-			{
-				var join = item.Value;
-				Parent.AddAction(string.Format("{0}{1}", prefix, item.Key), new PressAndHoldAction(b => EISC.SetBool(join, b)));
-			}
-		}
-
-
-		/// <summary>
-		/// Links feedbacks to whatever is gonna happen!
-		/// </summary>
-		void SetupFeedbacks()
-		{
-			// Power 
-			EISC.SetBoolSigAction(BoolJoin.RoomIsOn, b =>
-				PostStatusMessage(new
-					{
-						isOn = b
-					}));
-
-			// Source change things
-			EISC.SetSigTrueAction(BoolJoin.SourceHasChanged, () =>
-				PostStatusMessage(new
-					{
-						selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue
-					}));
-
-			// Volume things
-			EISC.SetUShortSigAction(UshortJoin.MasterVolumeLevel, u =>
-                PostStatusMessage(new
-                {
-                    volumes = new
-                    {
-                        master = new
-                        {
-                            level = u
-                        }
-                    }
-                }));
-
-			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)
-			// 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[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});
-			}
-
-			// This MAY need a check 
-			rmProps.AudioCodecKey = "audioCodec";
-			rmProps.VideoCodecKey = null; // "videoCodec";
-
-			// 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)
-				|| 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 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,
-					Type = eSourceListItemType.Route
-				};
-				newSl.Add(key, newSLI);
-                
-				string group = "genericsource";
-				if (groupMap.ContainsKey(type))
-				{
-					group = groupMap[type];
-				}
-				
-				// add dev to devices list
-				var devConf = new DeviceConfig {
-					Group = group,
-					Key = key,
-					Name = name,
-					Type = type
-				};
-				co.Devices.Add(devConf);
-
-				if (group.ToLower().StartsWith("settopbox")) // Add others here as needed
-				{
-					SetupSourceFunctions(key);
-				}
-			}
-
-			co.SourceLists.Add("default", newSl);
-
-			// build "audioCodec" config if we need
-			if (!string.IsNullOrEmpty(rmProps.AudioCodecKey))
-			{
-				var acFavs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
-				for (uint i = 0; i < 4; i++)
-				{
-					if (!EISC.GetBool(BoolJoin.SpeedDialVisibleStartJoin + i))
-					{
-						break;
-					}
-					acFavs.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem()
-					{
-						Name = EISC.GetString(StringJoin.SpeedDialNameStartJoin + i),
-						Number = EISC.GetString(StringJoin.SpeedDialNumberStartJoin + i),
-						Type = PepperDash.Essentials.Devices.Common.Codec.eCodecCallType.Audio
-					});
-				}
-
-				var acProps = new
-				{
-					favorites = acFavs
-				};
-
-				var acStr = "audioCodec";
-				var acConf = new DeviceConfig()
-				{
-					Group = acStr,
-					Key = acStr,
-					Name = acStr,
-					Type = acStr,
-					Properties = JToken.FromObject(acProps)
-				};
-				co.Devices.Add(acConf);
-			}	
-
-			Debug.Console(0, this, "******* CONFIG FROM DDVC: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
-
-			var handler = ConfigurationIsReady;
-			if (handler != null)
-			{
-				handler(this, new EventArgs());
-			}
-
-			ConfigIsLoaded = true;
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-			if (ConfigIsLoaded)
-			{
-                var count = EISC.UShortOutput[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;
-		}
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs

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

PepperDashEssentials/AppServer/RoomBridges/SourceDeviceMapDictionary.cs

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

PepperDashEssentials/AppServer/Volumes.cs

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

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -0,0 +1,61 @@
+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

@@ -0,0 +1,41 @@
+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

@@ -1,187 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Lighting;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.DM;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.Bridges
-{
-    /// <summary>
-    /// Base class for all bridge class variants
-    /// </summary>
-    public class BridgeBase : Device
-    {
-        public BridgeApi Api { get; private set; }
-
-        public BridgeBase(string key) :
-            base(key)
-        {
-
-        }
-            
-    }
-
-    /// <summary>
-    /// Base class for bridge API variants
-    /// </summary>
-    public abstract class BridgeApi : Device
-    {
-        public BridgeApi(string key) :
-            base(key)
-        {
-
-        }
-
-    }
-
-    /// <summary>
-    /// Bridge API using EISC
-    /// </summary>
-    public class EiscApi : BridgeApi
-    {
-        public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
-
-        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
-
-
-        public EiscApi(DeviceConfig dc) :
-            base(dc.Key)
-        {
-            PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
-
-            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
-
-            Eisc.SigChange += new Crestron.SimplSharpPro.DeviceSupport.SigEventHandler(Eisc_SigChange);
-
-            Eisc.Register();
-
-            AddPostActivationAction( () =>
-            {
-                Debug.Console(1, this, "Linking Devices...");
-
-                foreach (var d in PropertiesConfig.Devices)
-                {
-                    var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                    if (device != null)
-                    {
-                        if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
-                        {
-                            (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is GenericComm)
-                        {
-                            (device as GenericComm).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-						else if (device is CameraBase)
-						{
-							(device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-						else if (device is PepperDash.Essentials.Core.TwoWayDisplayBase)
-						{
-							(device as TwoWayDisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-                        else if (device is DmChassisController)
-                        {
-                            (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-						
-                        else if (device is DmTxControllerBase)
-                        {
-                            (device as DmTxControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DmRmcControllerBase)
-                        {
-                            (device as DmRmcControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is GenericRelayDevice)
-                        {
-                            (device as GenericRelayDevice).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is IDigitalInput)
-                        {
-                            (device as IDigitalInput).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-						else if (device is LightingBase)
-						{
-							(device as LightingBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-						else if (device is DigitalLogger)
-						{
-							(device as DigitalLogger).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-                    }
-                }
-
-                Debug.Console(1, this, "Devices Linked.");
-            });
-        }
-
-        /// <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, "EiscApi 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);
-        }
-    }
-
-    public class EiscApiPropertiesConfig
-    {
-        [JsonProperty("control")]
-        public EssentialsControlPropertiesConfig Control { get; set; }
-
-        [JsonProperty("devices")]
-        public List<ApiDevice> Devices { get; set; }
-
-
-        public class ApiDevice
-        {
-            [JsonProperty("deviceKey")]
-            public string DeviceKey { get; set; }
-
-            [JsonProperty("joinStart")]
-            public uint JoinStart { get; set; }
-
-            [JsonProperty("joinMapKey")]
-            public string JoinMapKey { get; set; }
-        }
-
-    }
-
-
-}

PepperDashEssentials/Bridges/BridgeFactory.cs

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

PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

@@ -0,0 +1,38 @@
+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

@@ -7,181 +7,163 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Devices.Common.Cameras;
 
-namespace PepperDash.Essentials.Bridges
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
 {
-	public static class CameraControllerApiExtensions
-	{
+    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);
 
-		public static BasicTriList _TriList;
-		public static CameraControllerJoinMap JoinMap; 
-		public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-		{
-			JoinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as CameraControllerJoinMap;
-			
-			_TriList = trilist;
-			if (JoinMap == null)
-			{
-				JoinMap = new CameraControllerJoinMap();
-			}
-			
-			JoinMap.OffsetJoinNumbers(joinStart);
-			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-			Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
+            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
 
-			var commMonitor = cameraDevice as ICommunicationMonitor;
-			commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
+            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());
 
-			trilist.SetBoolSigAction(JoinMap.Left, (b) =>
-				{
-					if (b)
-					{
-						cameraDevice.PanLeft();
-					}
-					else
-					{
-						cameraDevice.Stop();
-					}
-				});
-			trilist.SetBoolSigAction(JoinMap.Right, (b) =>
-			{
-				if (b)
-				{
-					cameraDevice.PanRight();
-				}
-				else
-				{
-					cameraDevice.Stop();
-				}
-			});
+            var commMonitor = cameraDevice as ICommunicationMonitor;
+            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
 
-			trilist.SetBoolSigAction(JoinMap.Up, (b) =>
-			{
-				if (b)
-				{
-					cameraDevice.TiltUp();
-				}
-				else
-				{
-					cameraDevice.Stop();
-				}
-			});
-			trilist.SetBoolSigAction(JoinMap.Down, (b) =>
-			{
-				if (b)
-				{
-					cameraDevice.TiltDown();
-				}
-				else
-				{
-					cameraDevice.Stop();
-				}
-			});
+            var ptzCamera = cameraDevice as IHasCameraPtzControl;
 
-			trilist.SetBoolSigAction(JoinMap.ZoomIn, (b) =>
-			{
-				if (b)
-				{
-					cameraDevice.ZoomIn();
-				}
-				else
-				{
-					cameraDevice.Stop();
-				}
-			});
+            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.ZoomOut, (b) =>
-			{
-				if (b)
-				{
-					cameraDevice.ZoomOut();
-				}
-				else
-				{
-					cameraDevice.Stop();
-				}
-			});
+                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();
+                    }
+                });
 
-			if (cameraDevice.GetType().Name.ToString().ToLower() == "cameravisca")
-			{
-				var viscaCamera = cameraDevice as PepperDash.Essentials.Devices.Common.Cameras.CameraVisca;
-				trilist.SetSigTrueAction(JoinMap.PowerOn, () => viscaCamera.PowerOn());
-				trilist.SetSigTrueAction(JoinMap.PowerOff, () => viscaCamera.PowerOff());
+                trilist.SetBoolSigAction(joinMap.ZoomOut.JoinNumber, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomOut();
+                    }
+                    else
+                    {
+                        ptzCamera.ZoomStop();
+                    }
+                });
+            }
 
-				viscaCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.PowerOn]);
-				viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[JoinMap.PowerOff]);
+            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]);
+            }
 
-				viscaCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
-				for (int i = 0; i < JoinMap.NumberOfPresets; i++)
-					{	
-						int tempNum = i;
-						trilist.SetSigTrueAction((ushort)(JoinMap.PresetRecallOffset + tempNum), () =>
-							{
-								viscaCamera.RecallPreset(tempNum);
-							});
-						trilist.SetSigTrueAction((ushort)(JoinMap.PresetSaveOffset + tempNum), () =>
-						{
-							viscaCamera.SavePreset(tempNum);
-						});
-					}
-			}
+            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 = "" ;
 
-	}
-	public class CameraControllerJoinMap : JoinMapBase
-	{
-		public uint IsOnline { get; set; }
-		public uint PowerOff { get; set; }
-		public uint PowerOn { get; set; }
-		public uint Up { get; set; }
-		public uint Down { get; set; }
-		public uint Left { get; set; }
-		public uint Right { get; set; }
-		public uint ZoomIn { get; set; }
-		public uint ZoomOut { get; set; }
-		public uint PresetRecallOffset { get; set; }
-		public uint PresetSaveOffset { get; set; }
-		public uint NumberOfPresets { get; set;  }
+                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
 
-		public CameraControllerJoinMap()
-		{
-			// Digital
-			IsOnline = 9;
-			PowerOff = 8;
-			PowerOn = 7;
-			Up = 1;
-			Down = 2;
-			Left = 3;
-			Right = 4;
-			ZoomIn = 5;
-			ZoomOut = 6;
-			PresetRecallOffset = 10;
-			PresetSaveOffset = 30;
-			NumberOfPresets = 5;
-			// Analog
-		}
+                        if (preset != null)
+                            label = preset.Description;
 
-		public override void OffsetJoinNumbers(uint joinStart)
-		{
-			var joinOffset = joinStart - 1;
+                        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);
+                        });
+                }
+            }
+        }
+    }
 
-			IsOnline = IsOnline + joinOffset;
-			PowerOff = PowerOff + joinOffset;
-			PowerOn = PowerOn + joinOffset;
-			Up = Up + joinOffset;
-			Down = Down + joinOffset;
-			Left = Left + joinOffset;
-			Right = Right + joinOffset;
-			ZoomIn = ZoomIn + joinOffset;
-			ZoomOut = ZoomOut + joinOffset;
-			PresetRecallOffset = PresetRecallOffset + joinOffset;
-			PresetSaveOffset = PresetSaveOffset + joinOffset;
-		}
-	}
 }

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -1,77 +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 DigitalLoggerApiExtensions
-	{
-		public static void LinkToApi(this DigitalLogger DigitalLogger, BasicTriList trilist, uint joinStart, string joinMapKey)
-		{
-			var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DigitalLoggerJoinMap;
-
-			if (joinMap == null)
-				joinMap = new DigitalLoggerJoinMap();
-
-			joinMap.OffsetJoinNumbers(joinStart);
-			Debug.Console(1, DigitalLogger, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-			for (uint i = 1; i <= DigitalLogger.CircuitCount; i++)
-            {
-                var circuit = i;
-				DigitalLogger.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
-				DigitalLogger.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
-				DigitalLogger.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
-				trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => DigitalLogger.CycleCircuit(circuit - 1));
-				trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => DigitalLogger.TurnOnCircuit(circuit - 1));
-				trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => DigitalLogger.TurnOffCircuit(circuit - 1));
-
-			}
-		}
-	}
-	public class DigitalLoggerJoinMap : JoinMapBase
-	{
-		public uint IsOnline { get; set; }
-		public uint CircuitNames { get; set; }
-		public uint CircuitState { get; set; }
-		public uint CircuitCycle { get; set; }
-		public uint CircuitIsCritical { get; set; }
-		public uint CircuitOnCmd { get; set; }
-		public uint CircuitOffCmd { get; set; }
-		public DigitalLoggerJoinMap()
-		{
-			// Digital
-			IsOnline = 9;
-			CircuitState = 0;
-			CircuitCycle = 0;
-			CircuitIsCritical = 10;
-			CircuitOnCmd = 10;
-			CircuitOffCmd = 20;
-			// Serial
-			CircuitNames = 0;
-			// Analog
-		}
-
-		public override void OffsetJoinNumbers(uint joinStart)
-		{
-			var joinOffset = joinStart - 1;
-
-			IsOnline = IsOnline + joinOffset;
-			CircuitNames = CircuitNames + joinOffset;
-			CircuitState = CircuitState + joinOffset;
-			CircuitCycle = CircuitCycle + joinOffset;
-			CircuitIsCritical = CircuitIsCritical + joinOffset;
-			CircuitOnCmd = CircuitOnCmd + joinOffset;
-			CircuitOffCmd = CircuitOffCmd + joinOffset;
-
-
-
-		}
-	}
-
-}

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -1,171 +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 DisplayControllerApiExtensions
-	{
-
-		public static BasicTriList _TriList;
-		public static DisplayControllerJoinMap JoinMap;
-		public static int InputNumber;
-		public static IntFeedback InputNumberFeedback;
-		public static List<string> InputKeys = new List<string>();
-		public static void LinkToApi(this PepperDash.Essentials.Core.TwoWayDisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-		{
-			JoinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DisplayControllerJoinMap;
-			_TriList = trilist;
-
-			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 Bridge Type {0}", displayDevice.GetType().Name.ToString());
-
-			trilist.StringInput[JoinMap.Name].StringValue = displayDevice.GetType().Name.ToString();
-
-			InputNumberFeedback = new IntFeedback(() => { return InputNumber;});
-			InputNumberFeedback.LinkInputSig(trilist.UShortInput[JoinMap.InputSelect]);
-			var commMonitor = displayDevice as ICommunicationMonitor;
-			commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
-			
-			// Poewer Off
-			trilist.SetSigTrueAction(JoinMap.PowerOff, () => 
-				{
-					InputNumber = 102;
-					InputNumberFeedback.FireUpdate();
-					displayDevice.PowerOff();
-				});
-
-			displayDevice.PowerIsOnFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(PowerIsOnFeedback_OutputChange);
-			displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[JoinMap.PowerOff]);
-
-			// Poewer On
-			trilist.SetSigTrueAction(JoinMap.PowerOn, () => 
-				{
-					InputNumber = 0;
-					InputNumberFeedback.FireUpdate();
-					displayDevice.PowerOn();
-				}); 
-
-
-			displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.PowerOn]);
-			
-			int count = 1;
-			foreach (var input in displayDevice.InputPorts)
-			{
-				InputKeys.Add(input.Key.ToString());
-				var tempKey = InputKeys.ElementAt(count - 1);
-				trilist.SetSigTrueAction((ushort)(JoinMap.InputSelectOffset + count), () => { displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector); }); 
-				trilist.StringInput[(ushort)(JoinMap.InputNamesOffset + count)].StringValue = input.Key.ToString();
-				count++;
-			}
-
-			displayDevice.CurrentInputFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(CurrentInputFeedback_OutputChange);
-			trilist.SetUShortSigAction(JoinMap.InputSelect, (a) =>
-			{
-				if (a == 0)
-				{
-					displayDevice.PowerOff();
-					InputNumber = 0;
-				}
-				else if (a > 0 && a < displayDevice.InputPorts.Count && a != InputNumber)
-				{
-					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-					InputNumber = a;
-				}
-				else if (a == 102)
-				{
-					displayDevice.PowerToggle();
-					
-				}
-				InputNumberFeedback.FireUpdate();
-			});
-	
-		}
-
-		static void CurrentInputFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-
-			Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", e.StringValue);
-
-		}
-
-		static void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
-		{
-
-			// Debug.Console(0, "PowerIsOnFeedback_OutputChange {0}",  e.BoolValue);
-			if (!e.BoolValue)
-			{
-				InputNumber = 102;
-				InputNumberFeedback.FireUpdate();
-
-			}
-			else
-			{
-				InputNumber = 0;
-				InputNumberFeedback.FireUpdate();
-			}
-		}
-
-
-
-
-	}
-	public class DisplayControllerJoinMap : JoinMapBase
-	{
-		public uint Name { get; set; }
-		public uint InputNamesOffset { get; set; }
-		public uint InputSelectOffset { get; set; } 
-		public uint IsOnline { get; set; }
-		public uint PowerOff { get; set; }
-		public uint InputSelect { 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 = 50;
-			PowerOff = 1;
-			PowerOn = 2;
-			InputSelect = 4;
-			IntegrationIdSet = 1;
-			LightingSceneOffset = 10;
-			ButtonVisibilityOffset = 40;
-			Name = 1;
-			InputNamesOffset = 10;
-			InputSelectOffset = 4;
-			// 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;
-			Name = Name + joinOffset;
-			InputNamesOffset = InputNamesOffset + joinOffset;
-			InputSelectOffset = InputSelectOffset + joinOffset;
-
-		}
-	}
-}

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -1,130 +1,288 @@
-using System;
+
+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;
 
-namespace PepperDash.Essentials.Bridges
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Bridges
 {
-    public static class DmChassisControllerApiExtentions 
+    public static class DmChassisControllerApiExtentions
     {
         public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmChassisControllerJoinMap;
+            DmChassisControllerJoinMap joinMap = new DmChassisControllerJoinMap();
 
-            if (joinMap == null)
-                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 - 1; i++)
+            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)));
-				if (dmChassis.TxDictionary.ContainsKey(ioSlot))
-				{
-					Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
-					var TxKey = dmChassis.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 (dmChassis.RxDictionary.ContainsKey(ioSlot))
-				{
-					Debug.Console(2, "Creating Rx Feedbacks {0}", ioSlot);
-					var RxKey = dmChassis.RxDictionary[ioSlot];
-					var RxDevice = DeviceManager.GetDeviceForKey(RxKey) as DmRmcControllerBase;
-					RxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
-				}
+                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.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + 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.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-               // dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                
+                dmChassis.OutputDisabledByHdcpFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputDisabledByHdcp + ioSlot]);
             }
         }
 
-
-        public class DmChassisControllerJoinMap : JoinMapBase
+        static void SetHdcpStateAction(bool hdcpTypeSimple, HdmiInputWithCEC port, uint join, BasicTriList trilist)
         {
-            public uint IsOnline { get; set; }
-            public uint OutputVideo { get; set; }
-            public uint OutputAudio { get; set; }
-            public uint VideoSyncStatus { get; set; }
-            public uint InputNames { get; set; }
-            public uint OutputNames { get; set; }
-            public uint OutputCurrentVideoInputNames { get; set; }
-            public uint OutputCurrentAudioInputNames { get; set; }
-            public uint InputCurrentResolution { get; set; }
-            public uint InputEndpointOnline { get; set; }
-            public uint OutputEndpointOnline { get; set; }
-            //public uint HdcpSupport { get; set; }
-            //public uint HdcpSupportCapability { get; set; }
-
-
-            public DmChassisControllerJoinMap()
+            if (hdcpTypeSimple)
             {
-                IsOnline = 11;
-                OutputVideo = 100; //101-299
-                OutputAudio = 300; //301-499
-                VideoSyncStatus = 100; //101-299
-                InputNames = 100; //101-299
-                OutputNames = 300; //301-499
-                OutputCurrentVideoInputNames = 2000; //2001-2199
-                OutputCurrentAudioInputNames = 2200; //2201-2399
-                InputCurrentResolution = 2400; // 2401-2599
-                InputEndpointOnline = 500;
-                OutputEndpointOnline = 700;
-                //HdcpSupport = 1000; //1001-1199
-               //HdcpSupportCapability = 1200; //1201-1399
-
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
             }
-
-            public override void OffsetJoinNumbers(uint joinStart)
+            else
             {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                OutputVideo = OutputVideo + joinOffset;
-                OutputAudio = OutputAudio + joinOffset;
-                VideoSyncStatus = VideoSyncStatus + joinOffset;
-                InputNames = InputNames + joinOffset;
-                OutputNames = OutputNames + joinOffset;
-                OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
-                OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
-                InputCurrentResolution = InputCurrentResolution + joinOffset;
-                InputEndpointOnline = InputEndpointOnline + joinOffset;
-                OutputEndpointOnline = OutputEndpointOnline + joinOffset;
-                //HdcpSupport = HdcpSupport + joinOffset;
-                //HdcpSupportCapability = HdcpSupportCapability + joinOffset;
+                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

@@ -9,16 +9,20 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM;
 
-namespace PepperDash.Essentials.Bridges
+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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmRmcControllerJoinMap;
+            DmRmcControllerJoinMap joinMap = new DmRmcControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new DmRmcControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmRmcControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -36,40 +40,5 @@ namespace PepperDash.Essentials.Bridges
             if(rmc.EdidSerialNumberFeedback != null)
                 rmc.EdidSerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidSerialNumber]);
         }
-
-        public class DmRmcControllerJoinMap : JoinMapBase
-        {
-            public uint IsOnline { get; set; }
-            public uint CurrentOutputResolution { get; set; }
-            public uint EdidManufacturer { get; set; }
-            public uint EdidName { get; set; }
-            public uint EdidPrefferedTiming { get; set; }
-            public uint EdidSerialNumber { get; set; }
-
-            public DmRmcControllerJoinMap()
-            {
-                // Digital
-                IsOnline = 1;
-
-                // Serial
-                CurrentOutputResolution = 1;
-                EdidManufacturer = 2;
-                EdidName = 3;
-                EdidPrefferedTiming = 4;
-                EdidSerialNumber = 5;
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                CurrentOutputResolution = CurrentOutputResolution + joinOffset;
-                EdidManufacturer = EdidManufacturer + joinOffset;
-                EdidName = EdidName + joinOffset;
-                EdidPrefferedTiming = EdidPrefferedTiming + joinOffset;
-                EdidSerialNumber = EdidSerialNumber + joinOffset;
-            }
-        }
     }
 }

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

@@ -12,16 +12,20 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM;
 
-namespace PepperDash.Essentials.Bridges
+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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmTxControllerJoinMap;
+            DmTxControllerJoinMap joinMap = new DmTxControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new DmTxControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmTxControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -30,7 +34,7 @@ namespace PepperDash.Essentials.Bridges
             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]);
-            //tx.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportCapability]);
+            trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
 
             bool hdcpTypeSimple;
 
@@ -53,7 +57,7 @@ namespace PepperDash.Essentials.Bridges
 
                 trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
 
-                if(txR.InputPorts[DmPortName.HdmiIn] != null)
+                if (txR.InputPorts[DmPortName.HdmiIn] != null)
                 {
                     var inputPort = txR.InputPorts[DmPortName.HdmiIn];
 
@@ -67,7 +71,7 @@ namespace PepperDash.Essentials.Bridges
                         SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist);
                     }
                 }
-                
+
                 if (txR.InputPorts[DmPortName.HdmiIn1] != null)
                 {
                     var inputPort = txR.InputPorts[DmPortName.HdmiIn1];
@@ -99,6 +103,22 @@ namespace PepperDash.Essentials.Bridges
                 }
 
             }
+
+            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)
@@ -128,46 +148,6 @@ namespace PepperDash.Essentials.Bridges
             }
         }
 
-        public class DmTxControllerJoinMap : JoinMapBase
-        {
-            public uint IsOnline { get; set; }
-            public uint VideoSyncStatus { get; set; }
-            public uint CurrentInputResolution { get; set; }
-            public uint HdcpSupportCapability { get; set; }
-            public uint VideoInput { get; set; }
-            public uint AudioInput { get; set; }
-            public uint Port1HdcpState { get; set; }
-            public uint Port2HdcpState { get; set; }
 
-
-            public DmTxControllerJoinMap()
-            {
-                // Digital
-                IsOnline = 1;
-                VideoSyncStatus = 2;
-                // Serial
-                CurrentInputResolution = 1;
-                // Analog
-                VideoInput = 1;
-                AudioInput = 2;
-                HdcpSupportCapability = 3;
-                Port1HdcpState = 4;
-                Port2HdcpState = 5;
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                VideoSyncStatus = VideoSyncStatus + joinOffset;
-                CurrentInputResolution = CurrentInputResolution + joinOffset;
-                VideoInput = VideoInput + joinOffset;
-                AudioInput = AudioInput + joinOffset;
-                HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-                Port1HdcpState = Port1HdcpState + joinOffset;
-                Port2HdcpState = Port2HdcpState + joinOffset;
-            }
-        }
     }
 }

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

@@ -0,0 +1,75 @@
+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

@@ -0,0 +1,128 @@
+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/EiscBridge.cs

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

PepperDashEssentials/Bridges/GenericLightingBridge.cs

@@ -8,96 +8,67 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
 
-namespace PepperDash.Essentials.Bridges
+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)
-		{
-			var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as GenericLightingJoinMap;
+    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();
 
-			if (joinMap == null)
-				joinMap = new GenericLightingJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
-			joinMap.OffsetJoinNumbers(joinStart);
-			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            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;
 
 			
-
-			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++)
+            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));
+                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 GenericLightingJoinMap : JoinMapBase
-	{
-		public uint IsOnline { get; set; }
-		public uint SelectScene { get; set; }
-		public uint LightingSceneOffset { get; set; }
-		public uint ButtonVisibilityOffset { get; set; }
-		public uint IntegrationIdSet { get; set; }
-
-		public GenericLightingJoinMap()
-		{
-			// Digital
-			IsOnline = 1;
-			SelectScene = 1;
-			IntegrationIdSet = 1;
-			LightingSceneOffset = 10;
-			ButtonVisibilityOffset = 40;
-			// Analog
-		}
-
-		public override void OffsetJoinNumbers(uint joinStart)
-		{
-			var joinOffset = joinStart - 1;
-
-			IsOnline = IsOnline + joinOffset;
-			SelectScene = SelectScene + joinOffset;
-			LightingSceneOffset = LightingSceneOffset + joinOffset;
-			ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
-			
-
-
-		}
-	}
+            }
+             */
+        }
+    }
 }

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

@@ -5,21 +5,24 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
-namespace PepperDash.Essentials.Bridges
+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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as GenericRelayControllerJoinMap;
+            GenericRelayControllerJoinMap joinMap = new GenericRelayControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new GenericRelayControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -45,22 +48,4 @@ namespace PepperDash.Essentials.Bridges
         }
 
     }
-
-    public class GenericRelayControllerJoinMap : JoinMapBase
-    {
-        //Digital
-        public uint Relay { get; set; }
-
-        public GenericRelayControllerJoinMap()
-        {
-            Relay = 1;
-        }
-
-        public override void  OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            Relay = Relay + joinOffset;
-        }
-    }
 }

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

@@ -0,0 +1,125 @@
+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

@@ -0,0 +1,66 @@
+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

@@ -8,17 +8,20 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Bridges
+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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as IBasicCommunicationJoinMap;
+            IBasicCommunicationJoinMap joinMap = new IBasicCommunicationJoinMap();
 
-            if (joinMap == null)
-                joinMap = new IBasicCommunicationJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
             joinMap.OffsetJoinNumbers(joinStart);
 
             if (comm.CommPort == null)
@@ -30,10 +33,14 @@ namespace PepperDash.Essentials.Bridges
             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) => trilist.SetString(joinMap.TextReceived, a.Text);
+            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 + 1, new Action<string>(s => comm.SetPortConfig(s)));
-        
+            trilist.SetStringSigAction(joinMap.SetPortConfig, new Action<string>(s => comm.SetPortConfig(s)));
+
 
             var sComm = comm.CommPort as ISocketStatus;
             if (sComm != null)
@@ -58,46 +65,5 @@ namespace PepperDash.Essentials.Bridges
                 }));
             }
         }
-
-
-
-        public class IBasicCommunicationJoinMap : JoinMapBase
-        {
-            //Digital
-            public uint Connect { get; set; }
-            public uint Connected { get; set; }
-
-            //Analog
-            public uint Status { get; set; }
-
-            // Serial
-            public uint TextReceived { get; set; }
-            public uint SendText { get; set; }
-            public uint SetPortConfig { get; set; }
-
-
-            public IBasicCommunicationJoinMap()
-            {
-                TextReceived = 1;
-                SendText = 1;
-                SetPortConfig = 2;
-                Connect = 1;
-                Connected = 1;
-                Status = 1;
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                TextReceived = TextReceived + joinOffset;
-                SendText = SendText + joinOffset;
-                SetPortConfig = SetPortConfig + joinOffset;
-                Connect = Connect + joinOffset;
-                Connected = Connected + joinOffset;
-                Status = Status + joinOffset;
-            }
-        }
     }
-
 }

PepperDashEssentials/Bridges/IBridge.cs

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

PepperDashEssentials/Bridges/IDigitalInputBridge.cs

@@ -6,18 +6,23 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
-namespace PepperDash.Essentials.Bridges
+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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as IDigitalInputApiJoinMap;
+            IDigitalInputJoinMap joinMap = new IDigitalInputJoinMap();
 
-            if (joinMap == null)
-                joinMap = new IDigitalInputApiJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -35,25 +40,5 @@ namespace PepperDash.Essentials.Bridges
                 return;
             }
         }
-
-        
-    }
-
-    public class IDigitalInputApiJoinMap : JoinMapBase
-    {
-        //Digital
-        public uint InputState { get; set; }
-
-        public IDigitalInputApiJoinMap()
-        {
-            InputState = 1;
-        }
-
-        public override void  OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            InputState = InputState + joinOffset;
-        }
-    }
+    } 
 }

PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

@@ -0,0 +1,128 @@
+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/JoinMapBase.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class JoinMapHelper
-    {
-        /// <summary>
-        /// Attempts to get the join map from config
-        /// </summary>
-        /// <param name="joinMapKey"></param>
-        /// <returns></returns>
-        public static JoinMapBase GetJoinMapForDevice(string joinMapKey)
-        {
-            if (!string.IsNullOrEmpty(joinMapKey))
-                return null;
-
-            // FUTURE TODO: Get the join map from the ConfigReader.ConfigObject 
-
-            return null;
-        }
-    }
-
-
-    public abstract class JoinMapBase
-    {
-        /// <summary>
-        /// Modifies all the join numbers by adding the offset.  This should never be called twice
-        /// </summary>
-        /// <param name="joinStart"></param>
-        public abstract void OffsetJoinNumbers(uint joinStart);
-
-
-    }
-
-
-}

PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs

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

PepperDashEssentials/Bridges/StatusSignControllerBridge.cs

@@ -0,0 +1,65 @@
+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,150 +1,108 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Diagnostics;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Monitoring;
 
-namespace PepperDash.Essentials.Bridges
+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 = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as SystemMonitorJoinMap;
+            var joinMap = new SystemMonitorJoinMap();
 
-            if (joinMap == null)
-                joinMap = new SystemMonitorJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if(!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<SystemMonitorJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
-            //Debug.Console(1, systemMonitorController, "Linking API starting at join: {0}", 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]);
-            //trilist.SetUShortSigAction(joinMap.TimeZone, new Action<ushort>(u => systemMonitorController.SetTimeZone(u)));
             systemMonitorController.TimeZoneTextFeedback.LinkInputSig(trilist.StringInput[joinMap.TimeZoneName]);
 
-            systemMonitorController.IOControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
+            systemMonitorController.IoControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
             systemMonitorController.SnmpVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.SnmpAppVersion]);
-            systemMonitorController.BACnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
+            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)
             {
-
-                // TODO: link feedbacks for each program slot
                 var programNumber = p.Value.Program.Number;
 
-                //Debug.Console(1, systemMonitorController, "Linking API for Program Slot: {0} starting at join: {1}", programNumber, programSlotJoinStart);
-
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart, new Action<bool>
-                    (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start));
+                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, new Action<bool>
-                    (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Stop));
+                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, new Action<bool>
-                    (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Register));
-                p.Value.ProgramRegisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramRegister]);
+                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, new Action<bool>
-                    (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister));
-                p.Value.ProgramUnregisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]);
+                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;
             }
-
-        }
-
-
-    }
-
-    public class SystemMonitorJoinMap : JoinMapBase
-    {
-        /// <summary>
-        /// Offset to indicate where the range of iterated program joins will start
-        /// </summary>
-        public uint ProgramStartJoin { get; set; }
-
-        /// <summary>
-        /// Offset between each program join set
-        /// </summary>
-        public uint ProgramOffsetJoin { get; set; }
-
-        //Digital
-        public uint ProgramStart { get; set; }
-        public uint ProgramStop { get; set; }
-        public uint ProgramRegister { get; set; }
-        public uint ProgramUnregister { get; set; }
-
-        //Analog
-        public uint TimeZone { get; set; }
-
-        //Serial
-        public uint TimeZoneName { get; set; }
-        public uint IOControllerVersion { get; set; }
-        public uint SnmpAppVersion { get; set; }
-        public uint BACnetAppVersion { get; set; }
-        public uint ControllerVersion { get; set; }
-
-        public uint ProgramName { get; set; }
-        public uint ProgramCompiledTime { get; set; }
-        public uint ProgramCrestronDatabaseVersion { get; set; }
-        public uint ProgramEnvironmentVersion { get; set; }
-        public uint AggregatedProgramInfo { get; set; }
-
-        public SystemMonitorJoinMap()
-        {
-            TimeZone = 1;
-
-            TimeZoneName = 1;
-            IOControllerVersion = 2;
-            SnmpAppVersion = 3;
-            BACnetAppVersion = 4;
-            ControllerVersion = 5;
-
-            
-            ProgramStartJoin = 10;
-            
-            ProgramOffsetJoin = 5;
-
-            // Offset in groups of 5 joins
-            ProgramStart = 1;
-            ProgramStop = 2;
-            ProgramRegister = 3;
-            ProgramUnregister = 4;
-
-            ProgramName = 1;
-            ProgramCompiledTime = 2;
-            ProgramCrestronDatabaseVersion = 3;
-            ProgramEnvironmentVersion = 4;
-            AggregatedProgramInfo = 5;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            TimeZone = TimeZone + joinOffset;
-
-            TimeZoneName = TimeZoneName + joinOffset;
-            IOControllerVersion = IOControllerVersion + joinOffset;
-            SnmpAppVersion = SnmpAppVersion + joinOffset;
-            BACnetAppVersion = BACnetAppVersion + joinOffset;
-            ControllerVersion = ControllerVersion + joinOffset;
-
-            // Sets the initial join value where the iterated program joins will begin
-            ProgramStartJoin = ProgramStartJoin + joinOffset;
         }
     }
 }

PepperDashEssentials/Configuration Original/Builders/TPConfig.cs

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

PepperDashEssentials/Configuration Original/ConfigTieLine.cs

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

PepperDashEssentials/Configuration Original/Configuration.cs

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

PepperDashEssentials/Configuration Original/ConfigurationHelpers.cs

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

PepperDashEssentials/Configuration Original/Factories/CommFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/DeviceMonitorFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/DisplayFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/FactoryHelper.cs

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

PepperDashEssentials/Configuration Original/Factories/MAYBE SetTopBoxFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/PcFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/REMOVE DiscPlayerFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/RemoteFactory.cs

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

PepperDashEssentials/Configuration Original/Factories/TouchpanelFactory.cs

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

PepperDashEssentials/ControlSystem.cs

@@ -1,51 +1,72 @@
 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.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM;
 using PepperDash.Essentials.Fusion;
 using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Room.Cotija;
+//using PepperDash.Essentials.Room.MobileControl;
+
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 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);        
-		}
+        private CTimer _startTimer;
+        private const long StartupTime = 500;
 
-		/// <summary>
-		/// Git 'er goin'
-		/// </summary>
-		public override void InitializeSystem()
-		{
+        public ControlSystem()
+            : base()
+        {
+            Thread.MaxNumberOfUserThreads = 400;
+            Global.ControlSystem = this;
+            DeviceManager.Initialize(this);
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
+        }
 
+        /// <summary>
+        /// Entry point for the program
+        /// </summary>
+        public override void InitializeSystem()
+        {
+            _startTimer = new CTimer(StartSystem,StartupTime);
+        }
+
+        private void StartSystem(object obj)
+        {
             DeterminePlatform();
 
-            //CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
-            //    ConsoleAccessLevelEnum.AccessOperator);
+            if (Debug.DoNotLoadOnNextBoot)
+            {
+                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                    ConsoleAccessLevelEnum.AccessOperator);
+            }
 
-           // CrestronConsole.AddNewConsoleCommand(S => { ConfigWriter.WriteConfigFile(null); }, "writeconfig", "writes the current config to a file", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Notice, "CONSOLE MESSAGE: {0}", s);
-			}, "appdebugmessage", "Writes message to log", 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(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 =>
             {
@@ -54,145 +75,196 @@ 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);
 
-            GoWithLoad();
-		}
+
+            CrestronConsole.AddNewConsoleCommand(DeviceManager.GetRoutingPorts,
+                "getroutingports", "Reports all routing ports, if any.  Requires a device key", ConsoleAccessLevelEnum.AccessOperator);
+
+            if (!Debug.DoNotLoadOnNextBoot)
+            {
+                GoWithLoad();
+                return;
+            }
+
+            SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
+        }
 
         /// <summary>
-        /// Determines if the program is running on a processor (appliance) or server (XiO Edge).
+        /// Determines if the program is running on a processor (appliance) or server (VC-4).
         /// 
-        /// Sets Global.FilePathPrefix based on platform
+        /// Sets Global.FilePathPrefix and Global.ApplicationDirectoryPathPrefix 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();
-
-            //directoryPrefix = "";
-
-            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
+            try
             {
-                filePathPrefix = directoryPrefix + dirSeparator + "NVRAM" 
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
 
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", versionString);
+                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);
             }
-            else
+            catch (Exception e)
             {
-                filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on Virtual Control Server", versionString);
+                Debug.Console(0, "Unable to Determine Platform due to Exception: {0}", e.Message);
             }
-
-            Global.SetFilePathPrefix(filePathPrefix);
         }
 
-		/// <summary>
-		/// Do it, yo
-		/// </summary>
-		public void GoWithLoad()
-		{
-			try
-			{
-                CrestronConsole.AddNewConsoleCommand(EnablePortalSync, "portalsync", "Loads Portal Sync",
-                    ConsoleAccessLevelEnum.AccessOperator);
+        /// <summary>
+        /// Begins the process of loading resources including plugins and configuration data
+        /// </summary>
+        public void GoWithLoad()
+        {
+            try
+            {
+                Debug.SetDoNotLoadOnNextBoot(false);
+
+                PluginLoader.AddProgramAssemblies();
+
+                new Core.DeviceFactory();
+                new Devices.Common.DeviceFactory();
+                new DM.DeviceFactory();
+                new DeviceFactory();
 
-                //PortalSync = new PepperDashPortalSyncClient();
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
 
-				var filesReady = SetupFilesystem();
-				if (filesReady)
-				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
-					if (!ConfigReader.LoadConfig2())
-						return;
+                var filesReady = SetupFilesystem();
+                if (filesReady)
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Checking for plugins");
+                    PluginLoader.LoadPlugins();
 
-					Load();
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r" +
-						"-------------------------------------------------------------");
-				}
-				else
-				{
-					Debug.Console(0,
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"Essentials file structure setup completed.\r" +
-						"Please load config, sgd and ir files and\r" +
-						"restart program.\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------");
-				}
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
+                    if (!ConfigReader.LoadConfig2())
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Essentials Load complete with errors");
+                        return;
+                    }
+
+                    Load();
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r\n" +
+                                                                 "-------------------------------------------------------------");
+                }
+                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);
+            catch (Exception e)
+            {
+                Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r\n{0}", e);
+            }
+            finally
+            {
+                // Notify the OS that the program intitialization has completed
+                SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
+            }
 
+        }
 
-			}
+       
 
-            // Notify the 
-            SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
+        /// <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);
 
-		}
-
-		/// <summary>
-		/// Verifies filesystem is set up. IR, SGD, and program1 folders
-		/// </summary>
-		bool SetupFilesystem()
-		{
-			Debug.Console(0, "Verifying and/or creating folder structure");
-			var configDir = Global.FilePathPrefix;
-			var configExists = Directory.Exists(configDir);
-			if (!configExists)
-				Directory.Create(configDir);
-
-			var irDir = Global.FilePathPrefix + "ir";
-			if (!Directory.Exists(irDir))
-				Directory.Create(irDir);
+            var 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;
 		}
 
-        public void EnablePortalSync(string s)
-        {
-            if (s.ToLower() == "enable")
-            {
-                CrestronConsole.ConsoleCommandResponse("Portal Sync features enabled");
-            }
-        }
-
+		/// <summary>
+		/// 
+		/// </summary>
 		public void TearDown()
 		{
 			Debug.Console(0, "Tearing down existing system");
@@ -218,47 +290,56 @@ namespace PepperDash.Essentials
 
 			DeviceManager.ActivateAll();
 
-            LinkSystemMonitorToAppServer();
+		    var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl;
+
+		    if (mobileControl == null) return;
+
+            mobileControl.LinkSystemMonitorToAppServer();
+		    //LinkSystemMonitorToAppServer();
 		}
 
-        void 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()
         {
-            var sysMon = DeviceManager.GetDeviceForKey("systemMonitor") as PepperDash.Essentials.Core.Monitoring.SystemMonitorController;
 
-            var appServer = DeviceManager.GetDeviceForKey("appServer") as CotijaSystemController;
-
-
-            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()
-		{
-# warning Missing PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
-			// Build the processor wrapper class
-            // DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
+            // 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"));
+            if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
+            {
+                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}'", devConf.Key);
-					// Skip this to prevent unnecessary warnings
+                try
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}', type '{1}'", devConf.Key, devConf.Type);
+                    // Skip this to prevent unnecessary warnings
                     if (devConf.Key == "processor")
                     {
                         if (devConf.Type.ToLower() != Global.ControlSystem.ControllerPrompt.ToLower())
@@ -266,98 +347,130 @@ 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);
+                    // Try local factories first
+                    IKeyed newDev = null;
 
-                    if (newDev == null)
-                        newDev = BridgeFactory.GetDevice(devConf);
-
-					// Then associated library factories
                     if (newDev == null)
                         newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
-					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)
-						newDev = PepperDash.Essentials.BridgeFactory.GetDevice(devConf);
+
+                    //
+                    //if (newDev == null)
+                    //    newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
+                    //
+
 					if (newDev != null)
 						DeviceManager.AddDevice(newDev);
 					else
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
-				}
-				catch (Exception e)
-				{
+                }
+                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.Notice, "Notice: Configuration contains no rooms - Is this intentional?  This may be a valid configuration.");
+                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 EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
+                        DeviceManager.AddDevice(new Core.Fusion.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, "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, "Cotija Bridge Added...");
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is EssentialsHuddleVtc1Room)
                     {
@@ -366,60 +479,112 @@ 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 Cotija Bridge...");
-						// Cotija bridge
-						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room);
-						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-						DeviceManager.AddDevice(bridge);				
-                    }					
+                        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);
+
+                        CreateMobileControlBridge(room);
+                    }
                     else
                     {
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion");
                         DeviceManager.AddDevice(room);
                     }
 
-				}
-				else
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
-			}
+                }
+                else
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Cannot create room from config, key '{0}' - Is this intentional?  This may be a valid configuration.", roomConfig.Key);
+            }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
 
-		}
+        }
 
-		/// <summary>
-		/// Helps add the post activation steps that link bridges to main controller
-		/// </summary>
-		/// <param name="bridge"></param>
-		void AddBridgePostActivationHelper(CotijaBridgeBase bridge)
-		{
-			bridge.AddPostActivationAction(() =>
-			{
-				var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
-				if (parent == null)
-				{
-					Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
-					return;
-				}
-				Debug.Console(0, bridge, "Linking to parent controller");
-				bridge.AddParent(parent);
-				parent.AddBridge(bridge);
-			});
-		}
+        private static void CreateMobileControlBridge(EssentialsRoomBase room)
+        {
+            var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl;
 
-		/// <summary>
-		/// Fires up a logo server if not already running
-		/// </summary>
-		void LoadLogoServer()
-		{
-			try
-			{
+            if (mobileControl == null) return;
+
+            mobileControl.CreateMobileControlRoomBridge(room);
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
+        }
+
+        /// <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>
+        /// Fires up a logo server if not already running
+        /// </summary>
+        void LoadLogoServer()
+        {
+            if (ConfigReader.ConfigObject.Rooms == null)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured. Bypassing Logo server startup.");
+                return;
+            }
+
+            if (
+                !ConfigReader.ConfigObject.Rooms.Any(
+                    CheckRoomConfig))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured to use system Logo server. Bypassing Logo server startup");
+                return;
+            }
+
+            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");
+            }
+        }
+
+        private bool CheckRoomConfig(DeviceConfig c)
+        {
+            string logoDark = null;
+            string logoLight = null;
+            string logo = null;
+
+            if (c.Properties["logoDark"] != null)
+            {
+                logoDark = c.Properties["logoDark"].Value<string>("type");
+            }
+
+            if (c.Properties["logoLight"] != null)
+            {
+                logoLight = c.Properties["logoLight"].Value<string>("type");
+            }
+
+            if (c.Properties["logo"] != null)
+            {
+                logo = c.Properties["logo"].Value<string>("type");
+            }
+
+            return ((logoDark != null && logoDark == "system") ||
+                    (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
+        }
+    }
 }

PepperDashEssentials/Devices/Amplifier.cs

@@ -6,12 +6,39 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 
 namespace PepperDash.Essentials
 {
-    public class Amplifier : Device, IRoutingSinkNoSwitching
+    public class Amplifier : EssentialsDevice, 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)
@@ -28,4 +55,18 @@ namespace PepperDash.Essentials
 
         #endregion
     }
+
+    public class AmplifierFactory : EssentialsDeviceFactory<Amplifier>
+    {
+        public AmplifierFactory()
+        {
+            TypeNames = new List<string>() { "amplifier" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Amplifier Device");
+            return new Amplifier(dc.Key, dc.Name);
+        }
+    }
 }

PepperDashEssentials/Devices/DiscPlayer/OppoExtendedBdp.cs

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

PepperDashEssentials/Devices/NUMERIC AppleTV.cs

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

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

@@ -0,0 +1,232 @@
+{
+    "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"
+                    }
+                }
+            }
+        ]
+    }
+}