Merge pull request #88 from PepperDash/feature/fix-get-name-attribute-issue

Feature/fix get name attribute issue

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/scripts/GenerateVersionNumber.ps1

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

.github/scripts/UpdateAssemblyVersion.ps1

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

.github/scripts/ZipBuildOutput.ps1

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

.github/workflows/docker.yml

@@ -0,0 +1,253 @@
+name: Branch Build Using Docker
+
+on:
+  push:
+    branches:
+      - feature/*
+      - hotfix/*
+      - bugfix/*
+      - release/*
+      - development
+
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Debug
+  # Defaults to master as the release branch.  Change as necessary
+  RELEASE_BRANCH: master
+jobs:
+  Build_Project:
+    runs-on: windows-latest
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      # And any submodules
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        # Fetch all tags
+      - name: Fetch tags
+        run: git fetch --tags
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          $version = ./.github/scripts/GenerateVersionNumber.ps1
+          Write-Output "::set-env name=VERSION::$version"
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          Write-Output ${{ env.VERSION }}
+          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      # Build the solutions in the docker image
+      - name: Build Solution
+        shell: powershell
+        run: |
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+      # Zip up the output files as needed
+      - name: Zip Build Output
+        shell: powershell
+        run: ./.github/scripts/ZipBuildOutput.ps1
+      # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
+      # Upload the build output as an artifact
+      - name: Upload Build Output
+        uses: actions/upload-artifact@v1
+        with:
+          name: Build
+          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
+      # Create the release on the source repo
+      - name: Create Release
+        id: create_release
+        # using contributor's version to allow for pointing at the right commit
+        uses: fleskesvor/create-release@feature/support-target-commitish
+        with:
+          tag_name: ${{ env.VERSION  }}
+          release_name: ${{ env.VERSION }}
+          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Upload the build package to the release
+      - name: Upload Release Package
+        id: upload_release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # This step always runs and pushes the build to the internal build rep
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+      # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    if: contains(github.ref, 'master') || contains(github.ref, 'release')
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.github/workflows/master.yml

@@ -0,0 +1,227 @@
+name: Master Build using Docker
+
+on:
+  release:
+    types:
+      - created
+    branches:
+      - master
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Release
+  # Defaults to master as the release branch.  Change as necessary
+  RELEASE_BRANCH: master
+jobs:
+  Build_Project:
+    runs-on: windows-latest
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      # And any submodules
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      # Fetch all tags
+      - name: Fetch tags
+        run: git fetch --tags
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        env:
+          TAG_NAME: ${{ github.event.release.tag_name }}
+        run: Write-Output "::set-env name=VERSION::$($Env:TAG_NAME)"
+      # Use the version number to set the version of the assemblies
+      - name: Update AssemblyInfo.cs
+        shell: powershell
+        run: |
+          Write-Output ${{ env.VERSION }}
+          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      # Build the solutions in the docker image
+      - name: Build Solution
+        shell: powershell
+        run: |
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+      # Zip up the output files as needed
+      - name: Zip Build Output
+        shell: powershell
+        run: ./.github/scripts/ZipBuildOutput.ps1
+      - name: Upload Build Output
+        uses: actions/upload-artifact@v1
+        with:
+          name: Build
+          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the build package to the release
+      - name: Upload Release Package
+        id: upload_release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # This step always runs and pushes the build to the internal build rep
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+      # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    if: contains(github.ref, 'master') || contains(github.ref, 'release')
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.gitignore

@@ -22,3 +22,6 @@ _ReSharper*/
 SIMPLSharpLogs/
 *.projectinfo
 essentials-framework/EssentialDMTestConfig/
+output/
+
+PepperDashEssentials-0.0.0-buildType-test.zip

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "essentials-framework/pepperdashcore-builds"]
 	path = essentials-framework/pepperdashcore-builds
-	url = https://bitbucket.org/Pepperdash_Products/pepperdashcore-builds.git
+	url = https://github.com/ndorin/PepperDashCore-Builds.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,21 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", ".\PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}"
+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}"
+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}"
+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

PepperDashEssentials/AppServer/Messengers/CameraBaseMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/Ddvc01AtcMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/Ddvc01VtcMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/IRunRouteActionMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/SIMPLAtcMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/SIMPLCameraMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/SIMPLRouteMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/SIMPLVtcMessenger.cs

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

PepperDashEssentials/AppServer/Messengers/SimplMessengerPropertiesConfig.cs

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

PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs

@@ -1,11 +1,5 @@
 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;
 
@@ -23,11 +17,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
             SysMon = sysMon;
 
-            SysMon.SystemMonitorPropertiesChanged += new EventHandler<EventArgs>(SysMon_SystemMonitorPropertiesChanged);
+            SysMon.SystemMonitorPropertiesChanged += SysMon_SystemMonitorPropertiesChanged;
 
             foreach (var p in SysMon.ProgramStatusFeedbackCollection)
             {
-                p.Value.ProgramInfoChanged += new EventHandler<ProgramInfoEventArgs>(ProgramInfoChanged);
+                p.Value.ProgramInfoChanged += ProgramInfoChanged;
             }
 
             CrestronConsole.AddNewConsoleCommand(s => SendFullStatusMessage(), "SendFullSysMonStatus", "Sends the full System Monitor Status", ConsoleAccessLevelEnum.AccessOperator);
@@ -72,18 +66,15 @@ namespace PepperDash.Essentials.AppServer.Messengers
             Debug.Console(1, "Posting System Monitor Status Message.");
 
             // This takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke((o) =>
+            CrestronInvoke.BeginInvoke(o => PostStatusMessage(new
             {
-                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
-                });
-            });
+                timeZone = SysMon.TimeZoneFeedback.IntValue,
+                timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
+                ioControllerVersion = SysMon.IoControllerVersionFeedback.StringValue,
+                snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
+                bacnetVersion = SysMon.BaCnetAppVersionFeedback.StringValue,
+                controllerVersion = SysMon.ControllerVersionFeedback.StringValue
+            }));
         }
 
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)

PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs

@@ -7,6 +7,8 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
+using PepperDash.Core;
+
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
@@ -202,6 +204,59 @@ namespace PepperDash.Essentials.AppServer.Messengers
             {
                 appServerController.AddAction(MessagePath + "/getCallHistory", new Action(GetCallHistory));
             }
+			var cameraCodec = Codec as IHasCodecCameras;
+            if (cameraCodec != null)
+            {
+                Debug.Console(2, this, "Adding IHasCodecCameras Actions");
+
+                cameraCodec.CameraSelected += new EventHandler<CameraSelectedEventArgs>(cameraCodec_CameraSelected);
+
+                appServerController.AddAction(MessagePath + "/cameraSelect", new Action<string>(s => cameraCodec.SelectCamera(s)));
+
+                MapCameraActions();
+
+                var presetsCodec = Codec as IHasCodecRoomPresets;
+                if (presetsCodec != null)
+                {
+                    Debug.Console(2, this, "Adding IHasCodecRoomPresets Actions");
+
+                    presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CameraPresetsListHasChanged);
+
+                    appServerController.AddAction(MessagePath + "/cameraPreset", new Action<int>(u => presetsCodec.CodecRoomPresetSelect(u)));
+                    appServerController.AddAction(MessagePath + "/cameraPresetStore", new Action<CodecRoomPreset>(p => presetsCodec.CodecRoomPresetStore(p.ID, p.Description)));
+                }
+
+                var speakerTrackCodec = Codec as IHasCameraAutoMode;
+                if (speakerTrackCodec != null)
+                {
+                    Debug.Console(2, this, "Adding IHasCameraAutoMode Actions");
+
+                    speakerTrackCodec.CameraAutoModeIsOnFeedback.OutputChange += new EventHandler<PepperDash.Essentials.Core.FeedbackEventArgs>(CameraAutoModeIsOnFeedback_OutputChange);
+
+                    appServerController.AddAction(MessagePath + "/cameraAuto", new Action(speakerTrackCodec.CameraAutoModeOn));
+                    appServerController.AddAction(MessagePath + "/cameraManual", new Action(speakerTrackCodec.CameraAutoModeOff));
+                }
+            }
+
+            var selfViewCodec = Codec as IHasCodecSelfView;
+
+            if (selfViewCodec != null)
+            {
+                Debug.Console(2, this, "Adding IHasCodecSelfView Actions");
+
+                appServerController.AddAction(MessagePath + "/cameraSelfView", new Action(selfViewCodec.SelfViewModeToggle));
+            }
+
+            var layoutsCodec = Codec as IHasCodecLayouts;
+
+            if (layoutsCodec != null)
+            {
+                Debug.Console(2, this, "Adding IHasCodecLayouts Actions");
+
+                appServerController.AddAction(MessagePath + "/cameraRemoteView", new Action(layoutsCodec.LocalLayoutToggle));
+            }
+
+            Debug.Console(2, this, "Adding Privacy & Standby Actions");
 
 			appServerController.AddAction(MessagePath + "/privacyModeOn", new Action(Codec.PrivacyModeOn));
 			appServerController.AddAction(MessagePath + "/privacyModeOff", new Action(Codec.PrivacyModeOff));
@@ -212,6 +267,89 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			appServerController.AddAction(MessagePath + "/standbyOff", new Action(Codec.StandbyDeactivate));
 		}
 
+        void presetsCodec_CameraPresetsListHasChanged(object sender, EventArgs e)
+        {
+            PostCameraPresets();
+        }
+
+        void CameraAutoModeIsOnFeedback_OutputChange(object sender, PepperDash.Essentials.Core.FeedbackEventArgs e)
+        {
+            PostCameraMode();
+        }
+
+
+        void cameraCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
+        {
+            MapCameraActions();
+            PostSelectedCamera();
+        }
+
+        /// <summary>
+        /// Maps the camera control actions to the current selected camera on the codec
+        /// </summary>
+        void MapCameraActions()
+        {
+            var cameraCodec = Codec as IHasCameras;
+
+            if (cameraCodec != null && cameraCodec.SelectedCamera != null)
+            {
+
+                AppServerController.RemoveAction(MessagePath + "/cameraUp");
+                AppServerController.RemoveAction(MessagePath + "/cameraDown");
+                AppServerController.RemoveAction(MessagePath + "/cameraLeft");
+                AppServerController.RemoveAction(MessagePath + "/cameraRight");
+                AppServerController.RemoveAction(MessagePath + "/cameraZoomIn");
+                AppServerController.RemoveAction(MessagePath + "/cameraZoomOut");
+                AppServerController.RemoveAction(MessagePath + "/cameraHome");
+
+                var camera = cameraCodec.SelectedCamera as IHasCameraPtzControl;
+                if (camera != null)
+                {
+                    AppServerController.AddAction(MessagePath + "/cameraUp", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.TiltUp(); else camera.TiltStop(); })));
+                    AppServerController.AddAction(MessagePath + "/cameraDown", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.TiltDown(); else camera.TiltStop(); })));
+                    AppServerController.AddAction(MessagePath + "/cameraLeft", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.PanLeft(); else camera.PanStop(); })));
+                    AppServerController.AddAction(MessagePath + "/cameraRight", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.PanRight(); else camera.PanStop(); })));
+                    AppServerController.AddAction(MessagePath + "/cameraZoomIn", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.ZoomIn(); else camera.ZoomStop(); })));
+                    AppServerController.AddAction(MessagePath + "/cameraZoomOut", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.ZoomOut(); else camera.ZoomStop(); })));
+                    AppServerController.AddAction(MessagePath + "/cameraHome", new Action(camera.PositionHome));
+
+                    var focusCamera = cameraCodec as IHasCameraFocusControl;
+
+                    AppServerController.RemoveAction(MessagePath + "/cameraAutoFocus");
+                    AppServerController.RemoveAction(MessagePath + "/cameraFocusNear");
+                    AppServerController.RemoveAction(MessagePath + "/cameraFocusFar");
+
+                    if (focusCamera != null)
+                    {
+                        AppServerController.AddAction(MessagePath + "/cameraAutoFocus", new Action(focusCamera.TriggerAutoFocus));
+                        AppServerController.AddAction(MessagePath + "/cameraFocusNear", new PressAndHoldAction(new Action<bool>(b => { if (b)focusCamera.FocusNear(); else focusCamera.FocusStop(); })));
+                        AppServerController.AddAction(MessagePath + "/cameraFocusFar", new PressAndHoldAction(new Action<bool>(b => { if (b)focusCamera.FocusFar(); else focusCamera.FocusStop(); })));
+                    }
+                }
+            }
+        }
+
+        string GetCameraMode()
+        {
+            string m = "";
+
+            var speakerTrackCodec = Codec as IHasCameraAutoMode;
+            if (speakerTrackCodec != null)
+            {
+                if (speakerTrackCodec.CameraAutoModeIsOnFeedback.BoolValue) m = eCameraControlMode.Auto.ToString();
+                else m = eCameraControlMode.Manual.ToString();
+            }
+
+            var cameraOffCodec = Codec as IHasCameraOff;
+            if (cameraOffCodec != null)
+            {
+                if (cameraOffCodec.CameraIsOffFeedback.BoolValue)
+                    m = eCameraControlMode.Off.ToString();
+            }
+
+            return m;
+        }
+
         void GetCallHistory()
         {
             var codec = (Codec as IHasCallHistory);
@@ -344,6 +482,22 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				return;
 			}
 
+            object cameraInfo = null;
+
+            var camerasCodec = Codec as IHasCodecCameras;
+            if (camerasCodec != null)
+            {
+                cameraInfo = new
+                {
+                    cameraManualSupported = true, // For now, we assume manual mode is supported and selectively hide controls based on camera selection
+                    cameraAutoSupported = Codec is IHasCameraAutoMode,
+                    cameraOffSupported = Codec is IHasCameraOff,
+                    cameraMode = GetCameraMode(),
+                    cameraList = camerasCodec.Cameras,
+                    selectedCamera = GetSelectedCamera(camerasCodec)
+                };
+            }
+
 			var info = Codec.CodecInfo;
 			PostStatusMessage(new
 			{
@@ -366,8 +520,77 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				hasDirectory = Codec is IHasDirectory,
                 hasDirectorySearch = true,
                 hasRecents = Codec is IHasCallHistory,
-                hasCameras = Codec is IHasCodecCameras
+                hasCameras = Codec is IHasCameras,
+                cameras = cameraInfo,
+                presets = GetCurrentPresets()
 			});
 		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void PostCameraMode()
+        {
+            PostStatusMessage(new
+            {
+                cameras = new
+                {
+                    cameraMode = GetCameraMode()
+                }
+            });
+        }
+
+        void PostSelectedCamera()
+        {
+            var camerasCodec = Codec as IHasCodecCameras;
+
+            PostStatusMessage(new
+            {
+                cameras = new
+                {
+                    selectedCamera = GetSelectedCamera(camerasCodec)
+                },
+                presets = GetCurrentPresets()
+            });
+        }
+
+        void PostCameraPresets()
+        {
+
+            PostStatusMessage(new
+            {
+                presets = GetCurrentPresets()
+			});
+		}
+		
+        object GetSelectedCamera(IHasCodecCameras camerasCodec)
+        {
+            return new
+                    {
+                        key = camerasCodec.SelectedCameraFeedback.StringValue,
+                        isFarEnd = camerasCodec.ControllingFarEndCameraFeedback.BoolValue,
+                        capabilites = new
+                        {
+                            canPan = camerasCodec.SelectedCamera.CanPan,
+                            canTilt = camerasCodec.SelectedCamera.CanTilt,
+                            canZoom = camerasCodec.SelectedCamera.CanZoom,
+                            canFocus = camerasCodec.SelectedCamera.CanFocus
+                        }
+                    };
+        }
+
+        List<CodecRoomPreset> GetCurrentPresets()
+        {
+            var presetsCodec = Codec as IHasCodecRoomPresets;
+
+            List<CodecRoomPreset> currentPresets = null;
+
+            if (presetsCodec != null && Codec is IHasFarEndCameraControl && (Codec as IHasFarEndCameraControl).ControllingFarEndCameraFeedback.BoolValue)
+                currentPresets = presetsCodec.FarEndRoomPresets;
+            else
+                currentPresets = presetsCodec.NearEndPresets;
+
+            return currentPresets;
+        }
 	}
 }

PepperDashEssentials/AppServer/MobileControlSystemController.cs

@@ -290,6 +290,10 @@ namespace PepperDash.Essentials
 									SystemUuid);
 							}
 						}
+						else
+						{
+							Debug.Console(0, "Authorization failed, code {0}: {1}", r.Code, r.ContentString);
+						}
 					}
 					else
 						Debug.Console(0, this, "Error {0} in authorizing system", e);

PepperDashEssentials/AppServer/RoomBridges/MobileControlEssentialsHuddleSpaceRoomBridge.cs

@@ -25,6 +25,8 @@ namespace PepperDash.Essentials
 
         public AudioCodecBaseMessenger ACMessenger { get; private set; }
 
+        public Dictionary<string, MessengerBase> DeviceMessengers { get; private set; }
+
 
 		/// <summary>
 		/// 
@@ -67,7 +69,15 @@ namespace PepperDash.Essentials
 			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)));
+                    {
+                        if(string.IsNullOrEmpty(c.SourceListKey))
+                            routeRoom.RunRouteAction(c.SourceListItem, Room.SourceListKey);
+                        else
+                        {
+                            routeRoom.RunRouteAction(c.SourceListItem, c.SourceListKey);
+                        }
+                    }));
+
 
 			var defaultRoom = Room as IRunDefaultPresentRoute;
 			if(defaultRoom != null)
@@ -115,6 +125,8 @@ namespace PepperDash.Essentials
                 ACMessenger.RegisterWithAppServer(Parent);
             }
 
+            SetupDeviceMessengers();
+
 			var defCallRm = Room as IRunDefaultCallRoute;
 			if (defCallRm != null)
 			{
@@ -134,6 +146,36 @@ namespace PepperDash.Essentials
 			Room.ShutdownPromptTimer.WasCancelled += ShutdownPromptTimer_WasCancelled;
 		}
 
+        /// <summary>
+        /// Set up the messengers for each device type
+        /// </summary>
+        void SetupDeviceMessengers()
+        {
+            DeviceMessengers = new Dictionary<string,MessengerBase>();
+
+            foreach (var device in DeviceManager.AllDevices)
+            {
+                Debug.Console(2, this, "Attempting to set up device messenger for device: {0}", device.Key);
+
+                if (device is Essentials.Devices.Common.Cameras.CameraBase)
+                {
+                    var camDevice = device as Essentials.Devices.Common.Cameras.CameraBase;
+                    Debug.Console(2, this, "Adding CameraBaseMessenger for device: {0}", device.Key);
+                    var cameraMessenger = new CameraBaseMessenger(device.Key + "-" + Parent.Key, camDevice, "/device/" + device.Key);
+                    DeviceMessengers.Add(device.Key, cameraMessenger);
+                    cameraMessenger.RegisterWithAppServer(Parent);
+                }
+                if (device is Essentials.Devices.Common.SoftCodec.BlueJeansPc)
+                {
+                    var softCodecDevice = device as Essentials.Devices.Common.SoftCodec.BlueJeansPc;
+                    Debug.Console(2, this, "Adding IRunRouteActionMessnger for device: {0}", device.Key);
+                    var routeMessenger = new IRunRouteActionMessenger(device.Key + "-" + Parent.Key, softCodecDevice, "/device/" + device.Key);
+                    DeviceMessengers.Add(device.Key, routeMessenger);
+                    routeMessenger.RegisterWithAppServer(Parent);
+                }
+            }
+        }
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -430,6 +472,7 @@ namespace PepperDash.Essentials
     public class SourceSelectMessageContent
     {
 		public string SourceListItem { get; set; }
+        public string SourceListKey { get; set; }
     }
 
 	/// <summary>

PepperDashEssentials/AppServer/RoomBridges/MobileControlSIMPLRoomBridge.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
+using PepperDash.Essentials.AppServer;
 using PepperDash.Essentials.AppServer.Messengers;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
@@ -18,204 +19,8 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials.Room.MobileControl
 {
-	public class MobileControlDdvc01RoomBridge : MobileControlBridgeBase, IDelayedConfiguration
+	public class MobileControlSIMPLRoomBridge : MobileControlBridgeBase, IDelayedConfiguration
 	{
-		public class BoolJoin
-		{
-			/// <summary>
-			/// 301
-			/// </summary>
-			public const uint RoomIsOn = 301;
-
-			/// <summary>
-			/// 12
-			/// </summary>
-			public const uint PrivacyMute = 12;
-
-			/// <summary>
-			/// 41
-			/// </summary>
-			public const uint PromptForCode = 41;
-			/// <summary>
-			/// 42
-			/// </summary>
-			public const uint ClientJoined = 42;
-			/// <summary>
-			/// 51
-			/// </summary>
-			public const uint ActivityShare = 51;
-			/// <summary>
-			/// 52
-			/// </summary>
-			public const uint ActivityPhoneCall = 52;
-			/// <summary>
-			/// 53
-			/// </summary>
-			public const uint ActivityVideoCall = 53;
-
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint MasterVolumeIsMuted = 1;
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint MasterVolumeMuteToggle = 1;
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint VolumeMutesJoinStart = 1;
-			/// <summary>
-			/// 61
-			/// </summary>
-			public const uint ShutdownCancel = 61;
-			/// <summary>
-			/// 62
-			/// </summary>
-			public const uint ShutdownEnd = 62;			
-			/// <summary>
-			/// 63
-			/// </summary>
-			public const uint ShutdownStart = 63;
-			/// <summary>
-			/// 72
-			/// </summary>
-			public const uint SourceHasChanged = 71;
-
-			/// <summary>
-			/// 261 - The start of the range of speed dial visibles
-			/// </summary>
-			public const uint SpeedDialVisibleStartJoin = 261;
-			/// <summary>
-			/// 501
-			/// </summary>
-			public const uint ConfigIsReady = 501;
-			/// <summary>
-			/// 502
-			/// </summary>
-			public const uint HideVideoConfRecents = 502;
-			/// <summary>
-			/// 503
-			/// </summary>
-			public const uint ShowCameraWhenNotInCall = 503;
-			/// <summary>
-			/// 504
-			/// </summary>
-			public const uint UseSourceEnabled = 504;
-			/// <summary>
-			/// 601
-			/// </summary>
-			public const uint SourceShareDisableJoinStart = 601;
-			/// <summary>
-			/// 621
-			/// </summary>
-			public const uint SourceIsEnabledJoinStart = 621;
-
-		}
-
-		public class UshortJoin
-		{
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint MasterVolumeLevel = 1;
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint VolumeSlidersJoinStart = 1;
-			/// <summary>
-			/// 61
-			/// </summary>
-			public const uint ShutdownPromptDuration = 61;
-			/// <summary>
-			/// 101
-			/// </summary>
-			public const uint NumberOfAuxFaders = 101;
-		}
-
-		public class StringJoin
-		{
-			/// <summary>
-			/// 1
-			/// </summary>
-			public const uint VolumeSliderNamesJoinStart = 1;
-			/// <summary>
-			/// 71
-			/// </summary>
-			public const uint SelectedSourceKey = 71;
-
-			/// <summary>
-			/// 241
-			/// </summary>
-			public const uint SpeedDialNameStartJoin = 241;
-
-			/// <summary>
-			/// 251
-			/// </summary>
-			public const uint SpeedDialNumberStartJoin = 251;
-			
-			/// <summary>
-			/// 501
-			/// </summary>
-			public const uint ConfigRoomName = 501;
-			/// <summary>
-			/// 502
-			/// </summary>
-			public const uint ConfigHelpMessage = 502;
-			/// <summary>
-			/// 503
-			/// </summary>
-			public const uint ConfigHelpNumber = 503;
-			/// <summary>
-			/// 504
-			/// </summary>
-			public const uint ConfigRoomPhoneNumber = 504;
-			/// <summary>
-			/// 505
-			/// </summary>
-			public const uint ConfigRoomURI = 505;
-			/// <summary>
-			/// 401
-			/// </summary>
-			public const uint UserCodeToSystem = 401;
-			/// <summary>
-			/// 402
-			/// </summary>
-			public const uint ServerUrl = 402;
-			/// <summary>
-			/// 512
-			/// </summary>
-			public const uint RoomSpeedDialNamesJoinStart = 512;
-			/// <summary>
-			/// 516
-			/// </summary>
-			public const uint RoomSpeedDialNumberssJoinStart = 516;
-			/// <summary>
-			/// 601
-			/// </summary>
-			public const uint SourceNameJoinStart = 601;
-			/// <summary>
-			/// 621
-			/// </summary>
-			public const uint SourceIconJoinStart = 621;
-			/// <summary>
-			/// 641
-			/// </summary>
-			public const uint SourceKeyJoinStart = 641;
-			/// <summary>
-			/// 661
-			/// </summary>
-			public const uint SourceTypeJoinStart = 661;
-			/// <summary>
-			/// 761
-			/// </summary>
-			public const uint CameraNearNameStart = 761;
-			/// <summary>
-			/// 770 - presence of this name on the input will cause the camera to be added
-			/// </summary>
-			public const uint CameraFarName = 770;
-		}
-
 		/// <summary>
 		/// Fires when config is ready to go
 		/// </summary>
@@ -223,6 +28,8 @@ namespace PepperDash.Essentials.Room.MobileControl
 
 		public ThreeSeriesTcpIpEthernetIntersystemCommunications EISC { get; private set; }
 
+        public MobileControlSIMPLRoomJoinMap JoinMap { get; private set; }
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -231,15 +38,15 @@ namespace PepperDash.Essentials.Room.MobileControl
 		public override string RoomName
 		{
 			get { 
-				var name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue;
+				var name = EISC.StringOutput[JoinMap.ConfigRoomName.JoinNumber].StringValue;
 				return string.IsNullOrEmpty(name) ? "Not Loaded" : name;
 			}
 		}
 
 		MobileControlDdvc01DeviceBridge SourceBridge;
 
-		Ddvc01AtcMessenger AtcMessenger;
-		Ddvc01VtcMessenger VtcMessenger;
+		SIMPLAtcMessenger AtcMessenger;
+		SIMPLVtcMessenger VtcMessenger;
 
 
 		/// <summary>
@@ -248,7 +55,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 		/// <param name="key"></param>
 		/// <param name="name"></param>
 		/// <param name="ipId"></param>
-		public MobileControlDdvc01RoomBridge(string key, string name, uint ipId)
+		public MobileControlSIMPLRoomBridge(string key, string name, uint ipId)
 			: base(key, name)
 		{
 			try
@@ -258,8 +65,13 @@ namespace PepperDash.Essentials.Room.MobileControl
 				if (reg != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
 					Debug.Console(0, this, "Cannot connect EISC at IPID {0}: \r{1}", ipId, reg);
 
+                JoinMap = new MobileControlSIMPLRoomJoinMap(1);
+
 				SourceBridge = new MobileControlDdvc01DeviceBridge(key + "-sourceBridge", "DDVC01 source bridge", EISC);
 				DeviceManager.AddDevice(SourceBridge);
+
+
+                
 			}
 			catch (Exception)
 			{
@@ -279,24 +91,33 @@ namespace PepperDash.Essentials.Room.MobileControl
 			SetupFeedbacks();
 
             var atcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			AtcMessenger = new Ddvc01AtcMessenger(atcKey, EISC, "/device/audioCodec");
+			AtcMessenger = new SIMPLAtcMessenger(atcKey, EISC, "/device/audioCodec");
 			AtcMessenger.RegisterWithAppServer(Parent);
 
             var vtcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			VtcMessenger = new Ddvc01VtcMessenger(vtcKey, EISC, "/device/videoCodec");
+			VtcMessenger = new SIMPLVtcMessenger(vtcKey, EISC, "/device/videoCodec");
 			VtcMessenger.RegisterWithAppServer(Parent);
 
 			EISC.SigChange += EISC_SigChange;
 			EISC.OnlineStatusChange += (o, a) =>
 			{
-				Debug.Console(1, this, "DDVC EISC online={0}. Config is ready={1}", a.DeviceOnLine, EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue);
-				if (a.DeviceOnLine && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue)
+				Debug.Console(1, this, "DDVC EISC online={0}. Config is ready={1}. Use Essentials Config={2}",
+                    a.DeviceOnLine, EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue, EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue);
+
+				if (a.DeviceOnLine && EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue)
 					LoadConfigValues();
+
+                if (a.DeviceOnLine && EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue)
+                    UseEssentialsConfig();
 			};
 			// load config if it's already there
-			if (EISC.IsOnline && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue) // || EISC.BooleanInput[BoolJoin.ConfigIsReady].BoolValue)
+			if (EISC.IsOnline && EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue) // || EISC.BooleanInput[JoinMap.ConfigIsReady].BoolValue)
 				LoadConfigValues();
 
+            if (EISC.IsOnline && EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue)
+            {
+                UseEssentialsConfig();
+            }
 
 			CrestronConsole.AddNewConsoleCommand(s =>
 			{
@@ -323,41 +144,60 @@ namespace PepperDash.Essentials.Room.MobileControl
 			return base.CustomActivate();
 		}
 
+        void UseEssentialsConfig()
+        {
+            ConfigIsLoaded = false;
+
+            SetupDeviceMessengers();
+
+            Debug.Console(0, this, "******* ESSENTIALS CONFIG: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
+
+            var handler = ConfigurationIsReady;
+            if (handler != null)
+            {
+                handler(this, new EventArgs());
+            }
+
+            ConfigIsLoaded = true;
+        }
 
 		/// <summary>
 		/// Setup the actions to take place on various incoming API calls
 		/// </summary>
 		void SetupFunctions()
 		{
-			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(BoolJoin.PromptForCode)));
-			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(BoolJoin.ClientJoined)));
+			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(JoinMap.PromptForCode.JoinNumber)));
+			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(JoinMap.ClientJoined.JoinNumber)));
 
 			Parent.AddAction(@"/room/room1/status", new Action(SendFullStatus));
 
 			Parent.AddAction(@"/room/room1/source", new Action<SourceSelectMessageContent>(c =>
 			{
-				EISC.SetString(StringJoin.SelectedSourceKey, c.SourceListItem);
-				EISC.PulseBool(BoolJoin.SourceHasChanged);
+				EISC.SetString(JoinMap.CurrentSourceKey.JoinNumber, c.SourceListItem);
+				EISC.PulseBool(JoinMap.SourceHasChanged.JoinNumber);
 			}));
 
 			Parent.AddAction(@"/room/room1/defaultsource", new Action(() => 
-				EISC.PulseBool(BoolJoin.ActivityShare)));
+				EISC.PulseBool(JoinMap.ActivityShare.JoinNumber)));
 			Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityPhoneCall)));
+				EISC.PulseBool(JoinMap.ActivityPhoneCall.JoinNumber)));
 			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityVideoCall)));
+				EISC.PulseBool(JoinMap.ActivityVideoCall.JoinNumber)));
 
 			Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u => 
-				EISC.SetUshort(UshortJoin.MasterVolumeLevel, u)));
+				EISC.SetUshort(JoinMap.MasterVolume.JoinNumber, u)));
 			Parent.AddAction(@"/room/room1/volumes/master/muteToggle", new Action(() => 
-				EISC.PulseBool(BoolJoin.MasterVolumeIsMuted)));
+				EISC.PulseBool(JoinMap.MasterVolume.JoinNumber)));
 			Parent.AddAction(@"/room/room1/volumes/master/privacyMuteToggle", new Action(() =>
-				EISC.PulseBool(BoolJoin.PrivacyMute)));
+				EISC.PulseBool(JoinMap.PrivacyMute.JoinNumber)));
 
 
 			// /xyzxyz/volumes/master/muteToggle ---> BoolInput[1]
 
-			for (uint i = 2; i <= 7; i++)
+            var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
+            var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
+
+            for (uint i = volumeStart; i <= volumeEnd; i++)
 			{
 				var index = i;
 				Parent.AddAction(string.Format(@"/room/room1/volumes/level-{0}/level", index), new Action<ushort>(u =>
@@ -367,13 +207,16 @@ namespace PepperDash.Essentials.Room.MobileControl
 			}
 
 			Parent.AddAction(@"/room/room1/shutdownStart", new Action(() =>
-				EISC.PulseBool(BoolJoin.ShutdownStart)));
+				EISC.PulseBool(JoinMap.ShutdownStart.JoinNumber)));
 			Parent.AddAction(@"/room/room1/shutdownEnd", new Action(() =>
-				EISC.PulseBool(BoolJoin.ShutdownEnd)));
+				EISC.PulseBool(JoinMap.ShutdownEnd.JoinNumber)));
 			Parent.AddAction(@"/room/room1/shutdownCancel", new Action(() =>
-				EISC.PulseBool(BoolJoin.ShutdownCancel)));
+				EISC.PulseBool(JoinMap.ShutdownCancel.JoinNumber)));
 		}
 
+
+
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -398,21 +241,21 @@ namespace PepperDash.Essentials.Room.MobileControl
 		void SetupFeedbacks()
 		{
 			// Power 
-			EISC.SetBoolSigAction(BoolJoin.RoomIsOn, b =>
+			EISC.SetBoolSigAction(JoinMap.RoomIsOn.JoinNumber, b =>
 				PostStatusMessage(new
 					{
 						isOn = b
 					}));
 
 			// Source change things
-			EISC.SetSigTrueAction(BoolJoin.SourceHasChanged, () =>
+			EISC.SetSigTrueAction(JoinMap.SourceHasChanged.JoinNumber, () =>
 				PostStatusMessage(new
 					{
-						selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue
+						selectedSourceKey = EISC.StringOutput[JoinMap.CurrentSourceKey.JoinNumber].StringValue
 					}));
 
 			// Volume things
-			EISC.SetUShortSigAction(UshortJoin.MasterVolumeLevel, u =>
+			EISC.SetUShortSigAction(JoinMap.MasterVolume.JoinNumber, u =>
                 PostStatusMessage(new
                 {
                     volumes = new
@@ -427,7 +270,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 			// map MasterVolumeIsMuted join -> status/volumes/master/muted
 			// 
 
-			EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b =>
+			EISC.SetBoolSigAction(JoinMap.MasterVolume.JoinNumber, b =>
                 PostStatusMessage(new
                 {
                     volumes = new
@@ -438,7 +281,7 @@ namespace PepperDash.Essentials.Room.MobileControl
                         }
                     }
                 }));
-			EISC.SetBoolSigAction(BoolJoin.PrivacyMute, b => 
+			EISC.SetBoolSigAction(JoinMap.PrivacyMute.JoinNumber, b => 
 				PostStatusMessage(new
 				{
 					volumes = new 
@@ -450,7 +293,10 @@ namespace PepperDash.Essentials.Room.MobileControl
 					}
 				}));
 
-			for (uint i = 2; i <= 7; i++)
+            var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
+            var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
+
+            for (uint i = volumeStart; i <= volumeEnd; i++)
 			{
 				var index = i; // local scope for lambdas
 				EISC.SetUShortSigAction(index, u => // start at join 2
@@ -481,7 +327,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 				});
 			}
 
-			EISC.SetUShortSigAction(UshortJoin.NumberOfAuxFaders, u => 
+			EISC.SetUShortSigAction(JoinMap.NumberOfAuxFaders.JoinNumber, u => 
 				PostStatusMessage(new {
 					volumes = new {
 						numberOfAuxFaders = u,
@@ -489,30 +335,30 @@ namespace PepperDash.Essentials.Room.MobileControl
 				}));
 
 			// shutdown things
-			EISC.SetSigTrueAction(BoolJoin.ShutdownCancel, new Action(() =>
+			EISC.SetSigTrueAction(JoinMap.ShutdownCancel.JoinNumber, new Action(() =>
 				PostMessage("/room/shutdown/", new
 				{
 					state = "wasCancelled"
 				})));
-			EISC.SetSigTrueAction(BoolJoin.ShutdownEnd, new Action(() =>
+			EISC.SetSigTrueAction(JoinMap.ShutdownEnd.JoinNumber, new Action(() =>
 				PostMessage("/room/shutdown/", new
 				{
 					state = "hasFinished"
 				})));
-			EISC.SetSigTrueAction(BoolJoin.ShutdownStart, new Action(() =>
+			EISC.SetSigTrueAction(JoinMap.ShutdownStart.JoinNumber, new Action(() =>
 				PostMessage("/room/shutdown/", new
 				{
 					state = "hasStarted",
-					duration = EISC.UShortOutput[UshortJoin.ShutdownPromptDuration].UShortValue
+					duration = EISC.UShortOutput[JoinMap.ShutdownPromptDuration.JoinNumber].UShortValue
 				})));
 
 			// Config things
-			EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
+			EISC.SetSigTrueAction(JoinMap.ConfigIsReady.JoinNumber, LoadConfigValues);
 
 			// Activity modes
-			EISC.SetSigTrueAction(BoolJoin.ActivityShare, () => UpdateActivity(1));
-			EISC.SetSigTrueAction(BoolJoin.ActivityPhoneCall, () => UpdateActivity(2));
-			EISC.SetSigTrueAction(BoolJoin.ActivityVideoCall, () => UpdateActivity(3));
+			EISC.SetSigTrueAction(JoinMap.ActivityShare.JoinNumber, () => UpdateActivity(1));
+			EISC.SetSigTrueAction(JoinMap.ActivityPhoneCall.JoinNumber, () => UpdateActivity(2));
+			EISC.SetSigTrueAction(JoinMap.ActivityVideoCall.JoinNumber, () => UpdateActivity(3));
 		}
 
 
@@ -556,7 +402,7 @@ namespace PepperDash.Essentials.Room.MobileControl
                 Debug.Console(0, this, "Replacing Room[0] in config");
                 co.Rooms[0] = rm;
             }
-			rm.Name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue;
+			rm.Name = EISC.StringOutput[JoinMap.ConfigRoomName.JoinNumber].StringValue;
 			rm.Key = "room1";
 			rm.Type = "ddvc01";
 
@@ -567,13 +413,13 @@ namespace PepperDash.Essentials.Room.MobileControl
 				rmProps = JsonConvert.DeserializeObject<DDVC01RoomPropertiesConfig>(rm.Properties.ToString());
 
 			rmProps.Help = new EssentialsHelpPropertiesConfig();
-			rmProps.Help.CallButtonText = EISC.StringOutput[StringJoin.ConfigHelpNumber].StringValue;
-			rmProps.Help.Message = EISC.StringOutput[StringJoin.ConfigHelpMessage].StringValue;
+			rmProps.Help.CallButtonText = EISC.StringOutput[JoinMap.ConfigHelpNumber.JoinNumber].StringValue;
+			rmProps.Help.Message = EISC.StringOutput[JoinMap.ConfigHelpMessage.JoinNumber].StringValue;
 
 			rmProps.Environment = new EssentialsEnvironmentPropertiesConfig(); // enabled defaults to false
 
-			rmProps.RoomPhoneNumber = EISC.StringOutput[StringJoin.ConfigRoomPhoneNumber].StringValue;
-			rmProps.RoomURI = EISC.StringOutput[StringJoin.ConfigRoomURI].StringValue;
+			rmProps.RoomPhoneNumber = EISC.StringOutput[JoinMap.ConfigRoomPhoneNumber.JoinNumber].StringValue;
+			rmProps.RoomURI = EISC.StringOutput[JoinMap.ConfigRoomURI.JoinNumber].StringValue;
 			rmProps.SpeedDials = new List<DDVC01SpeedDial>();
 
 			// This MAY need a check 
@@ -581,7 +427,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 			rmProps.VideoCodecKey = "videoCodec";
 
 			// volume control names
-			var volCount = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
+			var volCount = EISC.UShortOutput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
 
             //// use Volumes object or?
             //rmProps.VolumeSliderNames = new List<string>();
@@ -626,18 +472,18 @@ namespace PepperDash.Essentials.Room.MobileControl
 			// add sources...
 			for (uint i = 0; i <= 19; i++)
 			{
-				var name = EISC.StringOutput[StringJoin.SourceNameJoinStart + i].StringValue;
-				if (EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue
-					&& !EISC.BooleanOutput[BoolJoin.SourceIsEnabledJoinStart + i].BoolValue)
+				var name = EISC.StringOutput[JoinMap.SourceNameJoinStart.JoinNumber + i].StringValue;
+				if (EISC.BooleanOutput[JoinMap.UseSourceEnabled.JoinNumber].BoolValue
+					&& !EISC.BooleanOutput[JoinMap.SourceIsEnabledJoinStart.JoinNumber + i].BoolValue)
 				{
 					continue;
 				}		
-				else if(!EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue && string.IsNullOrEmpty(name))
+				else if(!EISC.BooleanOutput[JoinMap.UseSourceEnabled.JoinNumber].BoolValue && string.IsNullOrEmpty(name))
 					break;
-				var icon = EISC.StringOutput[StringJoin.SourceIconJoinStart + i].StringValue;
-				var key = EISC.StringOutput[StringJoin.SourceKeyJoinStart + i].StringValue;
-				var type = EISC.StringOutput[StringJoin.SourceTypeJoinStart + i].StringValue;
-				var disableShare = EISC.BooleanOutput[BoolJoin.SourceShareDisableJoinStart + i].BoolValue;
+				var icon = EISC.StringOutput[JoinMap.SourceIconJoinStart.JoinNumber + i].StringValue;
+				var key = EISC.StringOutput[JoinMap.SourceKeyJoinStart.JoinNumber + i].StringValue;
+				var type = EISC.StringOutput[JoinMap.SourceTypeJoinStart.JoinNumber + i].StringValue;
+				var disableShare = EISC.BooleanOutput[JoinMap.SourceShareDisableJoinStart.JoinNumber + i].BoolValue;
 
 				Debug.Console(0, this, "Adding source {0} '{1}'", key, name);
 				var newSLI = new SourceListItem{
@@ -679,14 +525,14 @@ namespace PepperDash.Essentials.Room.MobileControl
 				var acFavs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
 				for (uint i = 0; i < 4; i++)
 				{
-					if (!EISC.GetBool(BoolJoin.SpeedDialVisibleStartJoin + i))
+					if (!EISC.GetBool(JoinMap.SpeedDialVisibleStartJoin.JoinNumber + i))
 					{
 						break;
 					}
 					acFavs.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem()
 					{
-						Name = EISC.GetString(StringJoin.SpeedDialNameStartJoin + i),
-						Number = EISC.GetString(StringJoin.SpeedDialNumberStartJoin + i),
+						Name = EISC.GetString(JoinMap.SpeedDialNameStartJoin.JoinNumber + i),
+						Number = EISC.GetString(JoinMap.SpeedDialNumberStartJoin.JoinNumber + i),
 						Type = PepperDash.Essentials.Devices.Common.Codec.eCodecCallType.Audio
 					});
 				}
@@ -718,7 +564,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 				var camsProps = new List<object>();
 				for (uint i = 0; i < 9; i++)
 				{
-					var name = EISC.GetString(i + StringJoin.CameraNearNameStart);
+					var name = EISC.GetString(i + JoinMap.CameraNearNameStart.JoinNumber);
 					if (!string.IsNullOrEmpty(name))
 					{
 						camsProps.Add(new
@@ -728,7 +574,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 						});
 					}
 				}
-				var farName = EISC.GetString(StringJoin.CameraFarName);
+				var farName = EISC.GetString(JoinMap.CameraFarName.JoinNumber);
 				if (!string.IsNullOrEmpty(farName))
 				{
 					camsProps.Add(new
@@ -755,6 +601,8 @@ namespace PepperDash.Essentials.Room.MobileControl
 				co.Devices.Add(conf);
 			}
 
+            SetupDeviceMessengers();
+
 			Debug.Console(0, this, "******* CONFIG FROM DDVC: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
 
 			var handler = ConfigurationIsReady;
@@ -766,6 +614,67 @@ namespace PepperDash.Essentials.Room.MobileControl
 			ConfigIsLoaded = true;
 		}
 
+        /// <summary>
+        /// Iterates device config and adds messengers as neede for each device type
+        /// </summary>
+        void SetupDeviceMessengers()
+        {
+            try
+            {
+                foreach (var device in ConfigReader.ConfigObject.Devices)
+                {
+                    if (device.Group.Equals("simplmessenger"))
+                    {
+                        var props = JsonConvert.DeserializeObject<SimplMessengerPropertiesConfig>(device.Properties.ToString());
+
+                        var messengerKey = string.Format("device-{0}-{1}", this.Key, Parent.Key);
+
+                        if (DeviceManager.GetDeviceForKey(messengerKey) != null)
+                        {
+                            Debug.Console(2, this, "Messenger with key: {0} already exists. Skipping...", messengerKey);
+                            continue;
+                        }
+
+                        var dev = ConfigReader.ConfigObject.GetDeviceForKey(props.DeviceKey);
+
+                        if (dev == null)
+                        {
+                            Debug.Console(1, this, "Unable to find device config for key: '{0}'", props.DeviceKey);
+                            continue;
+                        }
+
+                        var type = device.Type.ToLower();
+                        MessengerBase messenger = null;
+
+                        if (type.Equals("simplcameramessenger"))
+                        {
+                            Debug.Console(2, this, "Adding SIMPLCameraMessenger for: '{0}'", props.DeviceKey);
+                            messenger = new SIMPLCameraMessenger(messengerKey, EISC, "/device/" + props.DeviceKey, props.JoinStart);
+                        }
+                        else if (type.Equals("simplroutemessenger"))
+                        {
+                            Debug.Console(2, this, "Adding SIMPLRouteMessenger for: '{0}'", props.DeviceKey);
+                            messenger = new SIMPLRouteMessenger(messengerKey, EISC, "/device/" + props.DeviceKey, props.JoinStart);
+                        }
+
+                        if (messenger != null)
+                        {
+                            DeviceManager.AddDevice(messenger);
+                            messenger.RegisterWithAppServer(Parent);
+                        }
+                        else
+                        {
+                            Debug.Console(2, this, "Unable to add messenger for device: '{0}' of type: '{1}'", props.DeviceKey, type);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error Setting up Device Managers: {0}", e);
+            }
+        }
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -773,7 +682,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 		{
 			if (ConfigIsLoaded)
 			{
-                var count = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
+                var count = EISC.UShortOutput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
 
                 Debug.Console(1, this, "The Fader Count is : {0}", count);
 
@@ -781,7 +690,11 @@ namespace PepperDash.Essentials.Room.MobileControl
 
                 // Create auxFaders
 				var auxFaderDict = new Dictionary<string, Volume>();
-				for (uint i = 2; i <= count; i++)
+
+                var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
+                var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
+
+                for (uint i = volumeStart; i <= count; i++)
 				{
 					auxFaderDict.Add("level-" + i,
 						new Volume("level-" + i,
@@ -795,22 +708,22 @@ namespace PepperDash.Essentials.Room.MobileControl
                 var volumes = new Volumes();
 
                 volumes.Master = new Volume("master", 
-                                EISC.UShortOutput[UshortJoin.MasterVolumeLevel].UShortValue,
-                                EISC.BooleanOutput[BoolJoin.MasterVolumeIsMuted].BoolValue,
-                  				EISC.StringOutput[1].StringValue,
+                                EISC.UShortOutput[JoinMap.MasterVolume.JoinNumber].UShortValue,
+                                EISC.BooleanOutput[JoinMap.MasterVolume.JoinNumber].BoolValue,
+                  				EISC.StringOutput[JoinMap.MasterVolume.JoinNumber].StringValue,
 				                true,
 				                "something.png");
 				volumes.Master.HasPrivacyMute = true;
-				volumes.Master.PrivacyMuted = EISC.BooleanOutput[BoolJoin.PrivacyMute].BoolValue;
+				volumes.Master.PrivacyMuted = EISC.BooleanOutput[JoinMap.PrivacyMute.JoinNumber].BoolValue;
 
                 volumes.AuxFaders = auxFaderDict;
-				volumes.NumberOfAuxFaders = EISC.UShortInput[UshortJoin.NumberOfAuxFaders].UShortValue;
+				volumes.NumberOfAuxFaders = EISC.UShortInput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
 
                 PostStatusMessage(new
                     {
 						activityMode = GetActivityMode(),
-                        isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue,
-                        selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue,
+                        isOn = EISC.BooleanOutput[JoinMap.RoomIsOn.JoinNumber].BoolValue,
+                        selectedSourceKey = EISC.StringOutput[JoinMap.CurrentSourceKey.JoinNumber].StringValue,
                         volumes = volumes
                     });			
 			}
@@ -829,9 +742,9 @@ namespace PepperDash.Essentials.Room.MobileControl
 		/// <returns></returns>
 		int GetActivityMode()
 		{
-			if (EISC.BooleanOutput[BoolJoin.ActivityPhoneCall].BoolValue) return 2;
-			else if (EISC.BooleanOutput[BoolJoin.ActivityShare].BoolValue) return 1;
-			else if (EISC.BooleanOutput[BoolJoin.ActivityVideoCall].BoolValue) return 3;
+			if (EISC.BooleanOutput[JoinMap.ActivityPhoneCall.JoinNumber].BoolValue) return 2;
+			else if (EISC.BooleanOutput[JoinMap.ActivityShare.JoinNumber].BoolValue) return 1;
+			else if (EISC.BooleanOutput[JoinMap.ActivityVideoCall.JoinNumber].BoolValue) return 3;
 			return 0;
 		}
 
@@ -873,12 +786,15 @@ namespace PepperDash.Essentials.Room.MobileControl
 			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);
+            if (uo != null)
+            {
+                if (uo is Action<bool>)
+                    (uo as Action<bool>)(args.Sig.BoolValue);
+                else if (uo is Action<ushort>)
+                    (uo as Action<ushort>)(args.Sig.UShortValue);
+                else if (uo is Action<string>)
+                    (uo as Action<string>)(args.Sig.StringValue);
+            }
 		}
 
 		/// <summary>
@@ -905,8 +821,8 @@ namespace PepperDash.Essentials.Room.MobileControl
 		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;
+			EISC.StringInput[JoinMap.UserCodeToSystem.JoinNumber].StringValue = UserCode;
+			EISC.StringInput[JoinMap.ServerUrl.JoinNumber].StringValue = Parent.Config.ClientAppUrl;
 		}
 	}
 }

PepperDashEssentials/AppServer/SIMPLJoinMaps/MobileControlSIMPLRoomJoinMap.cs

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

PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLAtcJoinMap.cs

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

PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLVtcJoinMap.cs

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

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
 		{
             AirMediaControllerJoinMap joinMap = new AirMediaControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<AirMediaControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/AppleTvBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             AppleTvJoinMap joinMap = new AppleTvJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if(!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<AppleTvJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -20,6 +20,46 @@ using PepperDash.Essentials.DM;
 
 namespace PepperDash.Essentials.Bridges
 {
+    /// <summary>
+    /// Helper methods for bridges
+    /// </summary>
+    public static class BridgeHelper
+    {
+        public static void PrintJoinMap(string command)
+        {
+            string bridgeKey = "";
+            string deviceKey = "";
+
+            var targets = command.Split(' ');
+
+            bridgeKey = targets[0].Trim();
+
+            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApi;
+
+            if (bridge == null)
+            {
+                Debug.Console(0, "Unable to find bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                deviceKey = targets[1].Trim();
+
+                if (!string.IsNullOrEmpty(deviceKey))
+                {
+                    bridge.PrintJoinMapForDevice(deviceKey);
+                    return;
+                }
+            }
+            else
+            {
+                bridge.PrintJoinMaps();
+            }
+        }
+    }
+
+
     /// <summary>
     /// Base class for all bridge class variants
     /// </summary>
@@ -45,7 +85,6 @@ namespace PepperDash.Essentials.Bridges
         {
 
         }
-
     }
 
     /// <summary>
@@ -55,11 +94,15 @@ namespace PepperDash.Essentials.Bridges
     {
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
+        protected Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
+
         public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
 
         public EiscApi(DeviceConfig dc) :
             base(dc.Key)
         {
+            JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
+
             PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
             Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
@@ -78,11 +121,19 @@ namespace PepperDash.Essentials.Bridges
 
                     if (device != null)
                     {
+                        Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
+
+
                         if (device is IBridge)      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
                         {
                             (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
+                        else if (device is IBridgeAdvanced)
+                        {
+                            Debug.Console(2, this, "'{0}' is IBridgeAdvanced", device.Key);
+                            (device as IBridgeAdvanced).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                        }
                         else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
                         {
                             (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
@@ -95,19 +146,21 @@ namespace PepperDash.Essentials.Bridges
                         }
                         else if (device is CameraBase)
                         {
-                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                             continue;
                         }
-						else if (device is PepperDash.Essentials.Core.DisplayBase)
-						{
-							(device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-                        else if (device is DmChassisController) {
+                        else if (device is PepperDash.Essentials.Core.DisplayBase)
+                        {
+                            (device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is DmChassisController)
+                        {
                             (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-                        else if (device is DmBladeChassisController) {
+                        else if (device is DmBladeChassisController)
+                        {
                             (device as DmBladeChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
@@ -136,6 +189,11 @@ namespace PepperDash.Essentials.Bridges
                             (device as GenericRelayDevice).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
+                        else if (device is IRSetTopBoxBase)
+                        {
+                            (device as IRSetTopBoxBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
                         else if (device is IDigitalInput)
                         {
                             (device as IDigitalInput).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
@@ -166,6 +224,16 @@ namespace PepperDash.Essentials.Bridges
                             (device as PepperDash.Essentials.Devices.Common.Occupancy.GlsOccupancySensorBaseController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
+                        else if (device is StatusSignController)
+                        {
+                            (device as StatusSignController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is C2nRthsController)
+                        {
+                            (device as C2nRthsController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
                     }
                 }
 
@@ -173,6 +241,55 @@ namespace PepperDash.Essentials.Bridges
             });
         }
 
+        /// <summary>
+        /// Adds a join map
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <param name="joinMap"></param>
+        public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
+        {
+            if (!JoinMaps.ContainsKey(deviceKey))
+            {
+                JoinMaps.Add(deviceKey, joinMap);
+            }
+            else
+            {
+                Debug.Console(2, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
+            }
+        }
+
+        /// <summary>
+        /// Prints all the join maps on this bridge
+        /// </summary>
+        public void PrintJoinMaps()
+        {
+            Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
+
+            foreach (var joinMap in JoinMaps)
+            {
+                Debug.Console(0, "Join map for device '{0}':", joinMap.Key);
+                joinMap.Value.PrintJoinMapInfo();
+            }
+        }
+
+        /// <summary>
+        /// Prints the join map for a device by key
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        public void PrintJoinMapForDevice(string deviceKey)
+        {
+            var joinMap = JoinMaps[deviceKey];
+
+            if (joinMap == null)
+            {
+                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                return;
+            }
+
+            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, this.Key); 
+            joinMap.PrintJoinMapInfo();
+        }
+
         /// <summary>
         /// Used for debugging to trigger an action based on a join number and type
         /// </summary>
@@ -269,10 +386,10 @@ namespace PepperDash.Essentials.Bridges
         public EssentialsControlPropertiesConfig Control { get; set; }
 
         [JsonProperty("devices")]
-        public List<ApiDevice> Devices { get; set; }
+        public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
 
-        public class ApiDevice
+        public class ApiDevicePropertiesConfig
         {
             [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }

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.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

@@ -15,29 +15,31 @@ namespace PepperDash.Essentials.Bridges
 {
     public static class CameraControllerApiExtensions
     {
-
-        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge)
         {
-            CameraControllerJoinMap joinMap = new CameraControllerJoinMap();
+            CameraControllerJoinMap joinMap = new CameraControllerJoinMap(joinStart);
+            
+            // Adds the join map to the bridge
+            bridge.AddJoinMap(cameraDevice.Key, joinMap);
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
 
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<CameraControllerJoinMap>(joinMapSerialized);
-
-            joinMap.OffsetJoinNumbers(joinStart);
+            if (customJoins != null)
+            {
+                joinMap.SetCustomJoinData(customJoins);
+            }
 
             Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
             Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
 
             var commMonitor = cameraDevice as ICommunicationMonitor;
-            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
 
             var ptzCamera = cameraDevice as IHasCameraPtzControl;
 
             if (ptzCamera != null)
             {
-                trilist.SetBoolSigAction(joinMap.Left, (b) =>
+                trilist.SetBoolSigAction(joinMap.PanLeft.JoinNumber, (b) =>
                     {
                         if (b)
                         {
@@ -48,7 +50,7 @@ namespace PepperDash.Essentials.Bridges
                             ptzCamera.PanStop();
                         }
                     });
-                trilist.SetBoolSigAction(joinMap.Right, (b) =>
+                trilist.SetBoolSigAction(joinMap.PanRight.JoinNumber, (b) =>
                 {
                     if (b)
                     {
@@ -60,7 +62,7 @@ namespace PepperDash.Essentials.Bridges
                     }
                 });
 
-                trilist.SetBoolSigAction(joinMap.Up, (b) =>
+                trilist.SetBoolSigAction(joinMap.TiltUp.JoinNumber, (b) =>
                 {
                     if (b)
                     {
@@ -71,7 +73,7 @@ namespace PepperDash.Essentials.Bridges
                         ptzCamera.TiltStop();
                     }
                 });
-                trilist.SetBoolSigAction(joinMap.Down, (b) =>
+                trilist.SetBoolSigAction(joinMap.TiltDown.JoinNumber, (b) =>
                 {
                     if (b)
                     {
@@ -83,7 +85,7 @@ namespace PepperDash.Essentials.Bridges
                     }
                 });
 
-                trilist.SetBoolSigAction(joinMap.ZoomIn, (b) =>
+                trilist.SetBoolSigAction(joinMap.ZoomIn.JoinNumber, (b) =>
                 {
                     if (b)
                     {
@@ -95,7 +97,7 @@ namespace PepperDash.Essentials.Bridges
                     }
                 });
 
-                trilist.SetBoolSigAction(joinMap.ZoomOut, (b) =>
+                trilist.SetBoolSigAction(joinMap.ZoomOut.JoinNumber, (b) =>
                 {
                     if (b)
                     {
@@ -108,27 +110,57 @@ namespace PepperDash.Essentials.Bridges
                 });
             }
 
-            if (cameraDevice.GetType().Name.ToString().ToLower() == "cameravisca")
+            if (cameraDevice is IPower)
             {
-                var viscaCamera = cameraDevice as PepperDash.Essentials.Devices.Common.Cameras.CameraVisca;
-                trilist.SetSigTrueAction(joinMap.PowerOn, () => viscaCamera.PowerOn());
-                trilist.SetSigTrueAction(joinMap.PowerOff, () => viscaCamera.PowerOff());
+                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.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
-                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
+            if (cameraDevice is ICommunicationMonitor)
+            {
+                var monitoredCamera = cameraDevice as ICommunicationMonitor;
+                monitoredCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+            }
 
-                viscaCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-                for (int i = 0; i < joinMap.NumberOfPresets; i++)
+            if (cameraDevice is IHasCameraPresets)
+            {
+                // Set the preset lables when they change
+                var presetsCamera = cameraDevice as IHasCameraPresets;
+                presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>((o, a) =>
+                {
+                    for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
+                    {
+                        int tempNum = i - 1;
+
+                        string label = "" ;
+
+                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
+
+                        if (preset != null)
+                            label = preset.Description;
+
+                        trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
+                    }
+                });
+                
+                for (int i = 0; i < joinMap.NumberOfPresets.JoinNumber; i++)
                 {
                     int tempNum = i;
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallOffset + tempNum), () =>
+
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallStart.JoinNumber + tempNum), () =>
                         {
-                            viscaCamera.RecallPreset(tempNum);
+                            presetsCamera.PresetSelect(tempNum);
+                        });
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveStart.JoinNumber + tempNum), () =>
+                        {
+                            var label = trilist.GetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum));
+
+                            presetsCamera.PresetStore(tempNum, label);
                         });
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveOffset + tempNum), () =>
-                    {
-                        viscaCamera.SavePreset(tempNum);
-                    });
                 }
             }
         }

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DigitalLoggerJoinMap joinMap = new DigitalLoggerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DigitalLoggerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Bridges
 
             DisplayControllerJoinMap joinMap = new DisplayControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
             
             if(!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges {
         public static void LinkToApi(this DmBladeChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey) {
             DmBladeChassisControllerJoinMap joinMap = new DmBladeChassisControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmBladeChassisControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

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

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmRmcControllerJoinMap joinMap = new DmRmcControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmRmcControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmTxControllerJoinMap joinMap = new DmTxControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmTxControllerJoinMap>(joinMapSerialized);
@@ -57,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];
 
@@ -71,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];
@@ -103,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)

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmpsAudioOutputControllerJoinMap joinMap = new DmpsAudioOutputControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmpsAudioOutputControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmpsRoutingControllerJoinMap joinMap = new DmpsRoutingControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/GenericLightingBridge.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges
         {
             GenericLightingJoinMap joinMap = new GenericLightingJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             GenericRelayControllerJoinMap joinMap = new GenericRelayControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

@@ -1,110 +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.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.GetJoinMapForDevice(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]);
-
-            // 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]);
-
-            // 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]);
-
-            }
-            #endregion
-        }
-    }
+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.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

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Bridges
         {
             HdMdxxxCEControllerJoinMap joinMap = new HdMdxxxCEControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<HdMdxxxCEControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges
         {
             IBasicCommunicationJoinMap joinMap = new IBasicCommunicationJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/IBridge.cs

@@ -7,8 +7,20 @@ 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);
     }
+
+    /// <summary>
+    /// Defines a device that uses JoinMapBaseAdvanced for its join map
+    /// </summary>
+    public interface IBridgeAdvanced
+    {
+        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge);
+    }
 }

PepperDashEssentials/Bridges/IDigitalInputBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             IDigitalInputJoinMap joinMap = new IDigitalInputJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);

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

PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -0,0 +1,43 @@
+using System.Linq;
+using Crestron.SimplSharp.Reflection;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.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

@@ -8,54 +8,57 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
-    public class CameraControllerJoinMap : JoinMapBase
+    /// <summary>
+    /// Join map for CameraBase devices
+    /// </summary>
+    public class CameraControllerJoinMap : JoinMapBaseAdvanced
     {
-        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; }
+        [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 });
 
-        public CameraControllerJoinMap()
+        [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))
         {
-            // Digital
-            IsOnline = 9;
-            PowerOff = 8;
-            PowerOn = 7;
-            Up = 1;
-            Down = 2;
-            Left = 3;
-            Right = 4;
-            ZoomIn = 5;
-            ZoomOut = 6;
-            PresetRecallOffset = 10;
-            PresetSaveOffset = 30;
-            NumberOfPresets = 5;
-            // Analog
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            IsOnline = IsOnline + joinOffset;
-            PowerOff = PowerOff + joinOffset;
-            PowerOn = PowerOn + joinOffset;
-            Up = Up + joinOffset;
-            Down = Down + joinOffset;
-            Left = Left + joinOffset;
-            Right = Right + joinOffset;
-            ZoomIn = ZoomIn + joinOffset;
-            ZoomOut = ZoomOut + joinOffset;
-            PresetRecallOffset = PresetRecallOffset + joinOffset;
-            PresetSaveOffset = PresetSaveOffset + joinOffset;
         }
     }
 }

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -38,6 +38,10 @@ namespace PepperDash.Essentials.Bridges
         /// 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
@@ -101,6 +105,7 @@ namespace PepperDash.Essentials.Bridges
             InputEndpointOnline = 500; //501-699
             OutputEndpointOnline = 700; //701-899
             TxAdvancedIsPresent = 1000; //1001-1199
+            OutputDisabledByHdcp = 1200; //1201-1399
 
             //Analog
             OutputVideo = 100; //101-299
@@ -139,6 +144,8 @@ namespace PepperDash.Essentials.Bridges
             OutputEndpointOnline = OutputEndpointOnline + joinOffset;
             HdcpSupportState = HdcpSupportState + joinOffset;
             HdcpSupportCapability = HdcpSupportCapability + joinOffset;
+            OutputDisabledByHdcp = OutputDisabledByHdcp + joinOffset;
+            TxAdvancedIsPresent = TxAdvancedIsPresent + joinOffset;
         }
     }
 }

PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -18,6 +18,10 @@ namespace PepperDash.Essentials.Bridges
         /// High when video sync is detected
         /// </summary>
         public uint VideoSyncStatus { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public uint FreeRunEnabled { get; set; }
         #endregion
 
         #region Analogs
@@ -41,6 +45,16 @@ namespace PepperDash.Essentials.Bridges
         /// 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
@@ -56,6 +70,7 @@ namespace PepperDash.Essentials.Bridges
             // Digital
             IsOnline = 1;
             VideoSyncStatus = 2;
+            FreeRunEnabled = 3;
             // Serial
             CurrentInputResolution = 1;
             // Analog
@@ -64,6 +79,8 @@ namespace PepperDash.Essentials.Bridges
             HdcpSupportCapability = 3;
             Port1HdcpState = 4;
             Port2HdcpState = 5;
+            VgaBrightness = 6;
+            VgaContrast = 7;
         }
 
         public override void OffsetJoinNumbers(uint joinStart)
@@ -72,12 +89,15 @@ namespace PepperDash.Essentials.Bridges
 
             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/GlsOccupancySensorBaseJoinMap.cs

@@ -1,219 +1,238 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public class 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 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
-
-        public GlsOccupancySensorBaseJoinMap()
-        {
-            IsOnline = 1;
-            ForceOccupied = 2;
-            ForceVacant = 3;
-            EnableRawStates = 4;
-            RoomOccupiedFeedback = 2;
-            GraceOccupancyDetectedFeedback = 3;
-            RoomVacantFeedback = 4;
-            RawOccupancyFeedback = 5;
-            EnableLedFlash = 11;
-            DisableLedFlash = 12;
-            EnableShortTimeout = 13;
-            DisableShortTimeout = 14;
-            OrWhenVacated = 15;
-            AndWhenVacated = 16;
-            EnableUsA = 17;
-            DisableUsA = 18;
-            EnableUsB = 19;
-            DisableUsB = 20;
-            EnablePir = 21;
-            DisablePir = 22;
-            DisablePir = 23;
-            IncrementUsInOccupiedState = 24;
-            DecrementUsInOccupiedState = 25;
-            IncrementUsInVacantState = 26;
-            DecrementUsInVacantState = 27;
-            IncrementPirInOccupiedState = 28;
-            DecrementPirInOccupiedState = 29;
-            IncrementPirInVacantState = 30;
-            DecrementPirInVacantState = 31;
-
-            Timeout = 1;
-            TimeoutLocalFeedback = 2;
-            InternalPhotoSensorValue = 3;
-            ExternalPhotoSensorValue = 4;
-            UsSensitivityInOccupiedState = 5;
-            UsSensitivityInVacantState = 6;
-            PirSensitivityInOccupiedState = 7;
-            PirSensitivityInVacantState = 8;           
-        }
-
-        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; 
-            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; 
-            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;
-        }
-    }    
-         
-}        
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class 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/SetTopBoxControllerJoinMap.cs

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

PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
@@ -14,11 +9,21 @@ namespace PepperDash.Essentials.Bridges
         /// </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
@@ -87,6 +92,68 @@ namespace PepperDash.Essentials.Bridges
         /// 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()
@@ -98,6 +165,10 @@ namespace PepperDash.Essentials.Bridges
             SnmpAppVersion = 3;
             BACnetAppVersion = 4;
             ControllerVersion = 5;
+            SerialNumber = 6;
+            Model = 7;
+            Uptime = 8;
+            LastBoot = 9;
 
 
             ProgramStartJoin = 10;
@@ -115,6 +186,23 @@ namespace PepperDash.Essentials.Bridges
             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)
@@ -131,6 +219,7 @@ namespace PepperDash.Essentials.Bridges
 
             // 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.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,9 +1,4 @@
-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;
@@ -17,9 +12,9 @@ namespace PepperDash.Essentials.Bridges
     {
         public static void LinkToApi(this SystemMonitorController systemMonitorController, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            SystemMonitorJoinMap joinMap = new SystemMonitorJoinMap();
+            var joinMap = new SystemMonitorJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if(!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<SystemMonitorJoinMap>(joinMapSerialized);
@@ -30,36 +25,81 @@ namespace PepperDash.Essentials.Bridges
             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)
             {
                 var programNumber = p.Value.Program.Number;
 
-                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;
             }

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

@@ -1,101 +0,0 @@
-using System;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices;
-//using PepperDash.Essentials.Devices.Dm;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials
-{
-	public class DmFactory
-	{
-		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");
-				// Catch all 200 series TX
-				var devprops = devToken["properties"];
-				var ipId = Convert.ToUInt32(devprops.Value<string>("ipId"), 16);
-				var parent = devprops.Value<string>("parent");
-				if (parent == null)
-					parent = "controlSystem";
-
-				if (devType.StartsWith("DmTx2", StringComparison.OrdinalIgnoreCase))
-				{
-					DmTx201C tx;
-					if (parent.Equals("controlSystem", StringComparison.OrdinalIgnoreCase))
-					{
-						tx = new DmTx201C(ipId, Global.ControlSystem);
-						//dev = new DmTx201SBasicController(devKey, devName, tx);
-					}
-					
-				}
-				else if (devType.StartsWith("DmRmc", StringComparison.OrdinalIgnoreCase))
-				{
-					DmRmc100C rmc;
-					if (parent.Equals("controlSystem", StringComparison.OrdinalIgnoreCase))
-					{
-						rmc = new DmRmc100C(ipId, Global.ControlSystem);
-						//dev = new DmRmcBaseController(devKey, devName, rmc);
-					}
-				}
-				else
-					FactoryHelper.HandleUnknownType(devToken, devType);
-			}
-			catch (Exception e)
-			{
-				FactoryHelper.HandleDeviceCreationError(devToken, e);
-			}
-			return dev;
-		}
-
-
-		public static Device CreateChassis(JToken devToken)
-		{
-			Device dev = null;
-			try
-			{
-				var devType = devToken.Value<string>("type");
-				var devKey = devToken.Value<string>("key");
-				var devName = devToken.Value<string>("name");
-				// Catch all 200 series TX
-				var devprops = devToken["properties"];
-				var ipId = Convert.ToUInt32(devprops.Value<string>("ipId"), 16);
-				var parent = devprops.Value<string>("parent");
-				if (parent == null)
-					parent = "controlSystem";
-
-				if (devType.Equals("dmmd8x8", StringComparison.OrdinalIgnoreCase))
-				{
-					var dm = new DmMd8x8(ipId, Global.ControlSystem);
-					//dev = new DmChassisController(devKey, devName, dm);
-				}
-				else if (devType.Equals("dmmd16x16", StringComparison.OrdinalIgnoreCase))
-				{
-					var dm = new DmMd16x16(ipId, Global.ControlSystem);
-					//dev = new DmChassisController(devKey, devName, dm);
-				}
-				else if (devType.Equals("dmmd32x32", StringComparison.OrdinalIgnoreCase))
-				{
-					var dm = new DmMd32x32(ipId, Global.ControlSystem);
-					//dev = new DmChassisController(devKey, devName, dm);
-				}
-			}
-			catch (Exception e)
-			{
-				FactoryHelper.HandleDeviceCreationError(devToken, e);
-			}
-			return dev;
-		}
-	}
-}

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

@@ -25,7 +25,6 @@ namespace PepperDash.Essentials
     {
         HttpLogoServer LogoServer;
 
-        List<object> FactoryObjects = new List<object>();
 
         public ControlSystem()
             : base()
@@ -36,7 +35,7 @@ namespace PepperDash.Essentials
         }
 
         /// <summary>
-        /// Git 'er goin'
+        /// Entry point for the program
         /// </summary>
         public override void InitializeSystem()
         {
@@ -48,7 +47,12 @@ namespace PepperDash.Essentials
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
-            // CrestronConsole.AddNewConsoleCommand(S => { ConfigWriter.WriteConfigFile(null); }, "writeconfig", "writes the current config to a file", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(PluginLoader.ReportAssemblyVersions, "reportversions", "Reports the versions of the loaded assemblies", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
+
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "CONSOLE MESSAGE: {0}", s);
@@ -80,10 +84,12 @@ namespace PepperDash.Essentials
                 GoWithLoad();
         }
 
+
+
         /// <summary>
         /// 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()
         {
@@ -95,20 +101,22 @@ namespace PepperDash.Essentials
 
                 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();
 
-                if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows OS
+                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", versionString);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", Global.AssemblyVersion);
 
                     // Check if User/ProgramX exists
-                    if (Directory.Exists(directoryPrefix + dirSeparator + "User"
+                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
                         Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
@@ -133,7 +141,7 @@ namespace PepperDash.Essentials
                 }
                 else   // Handles Linux OS (Virtual Control)
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on Virtual Control Server", versionString);
+                    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;
@@ -148,7 +156,7 @@ namespace PepperDash.Essentials
         }
 
         /// <summary>
-        /// Do it, yo
+        /// Begins the process of loading resources including plugins and configuration data
         /// </summary>
         public void GoWithLoad()
         {
@@ -158,11 +166,13 @@ namespace PepperDash.Essentials
 
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
 
+                PluginLoader.AddProgramAssemblies();
+
                 var filesReady = SetupFilesystem();
                 if (filesReady)
                 {
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Checking for plugins");
-                    LoadPlugins();
+                    PluginLoader.LoadPlugins();
 
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
                     if (!ConfigReader.LoadConfig2())
@@ -175,23 +185,21 @@ namespace PepperDash.Essentials
                 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" +
-                        "------------------------------------------------");
+                        @"----------------------------------------------
+                        ------------------------------------------------
+                        ------------------------------------------------
+                        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);
-
-
             }
 
             // Notify the OS that the program intitialization has completed
@@ -199,83 +207,7 @@ namespace PepperDash.Essentials
 
         }
 
-        /// <summary>
-        /// Initial simple implementation.  Reads user/programN/plugins folder and 
-        /// use
-        /// </summary>
-        void LoadPlugins()
-        {
-            var dir = Global.FilePathPrefix + "plugins";
-            if (Directory.Exists(dir))
-            {
-                // TODO Clear out or create localPlugins folder (maybe in program slot folder)
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for factory plugins");
-                var di = new DirectoryInfo(dir);
-                var zFiles = di.GetFiles("*.cplz");
-                foreach (var fi in zFiles)
-                {
-                    Debug.Console(0, "Found cplz: {0}. Unzipping into plugins directory", fi.Name);
-                    var result = CrestronZIP.Unzip(fi.FullName, di.FullName);
-                    Debug.Console(0, "UnZip Result: {0}", result.ToString());
-                    fi.Delete();
-                }
-                var files = di.GetFiles("*.dll");
-                Dictionary<string, Assembly> assyList = new Dictionary<string, Assembly>();
-                foreach (FileInfo fi in files)
-                {
-                    // TODO COPY plugin to loadedPlugins folder 
-                    // TODO LOAD that loadedPlugins dll file
-                    try
-                    {
-                        var assy = Assembly.LoadFrom(fi.FullName);
-                        var ver = assy.GetName().Version;
-                        var verStr = string.Format("{0}.{1}.{2}.{3}", ver.Major, ver.Minor, ver.Build, ver.Revision);
-                        assyList.Add(fi.FullName, assy);
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded plugin file '{0}', version {1}", fi.FullName, verStr);
-                    }
-                    catch
-                    {
-                        Debug.Console(2, "Assembly {0} is not a custom assembly", fi.FullName);
-                        continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                    }
-                }
-                foreach (var assy in assyList)
-                {
-                    // iteratate this assembly's classes, looking for "LoadPlugin()" methods
-                    try
-                    {
-                        var types = assy.Value.GetTypes();
-                        foreach (var type in types)
-                        {
-                            try
-                            {
-                                var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
-                                var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
-                                if (loadPlugin != null)
-                                {
-                                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding type {0}", assy.Key, type.FullName);
-                                    loadPlugin.Invoke(null, null);
-                                }
-                            }
-                            catch
-                            {
-                                Debug.Console(2, "Load Plugin not found. {0} is not a plugin assembly", assy.Value.FullName);
-                                continue;
-                            }
-
-                        }
-                    }
-                    catch
-                    {
-                        Debug.Console(2, "Assembly {0} is not a custom assembly. Types cannot be loaded.", assy.Value.FullName);
-                        continue;
-                    }
-                }
-                // plugin dll will be loaded.  Any classes in plugin should have a static constructor
-                // that registers that class with the Core.DeviceFactory
-            }
-        }
+       
 
         /// <summary>
         /// Verifies filesystem is set up. IR, SGD, and programX folders
@@ -303,18 +235,6 @@ namespace PepperDash.Essentials
 			return configExists;
 		}
 
-		///// <summary>
-		///// 
-		///// </summary>
-		///// <param name="s"></param>
-		//public void EnablePortalSync(string s)
-		//{
-		//    if (s.ToLower() == "enable")
-		//    {
-		//        CrestronConsole.ConsoleCommandResponse("Portal Sync features enabled");
-		//    }
-		//}
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -370,12 +290,13 @@ namespace PepperDash.Essentials
         /// </summary>
         public void LoadDevices()
         {
+            // Instantiate the Device Factories
+            new CoreDeviceFactory();
+
+
             // 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"));
 
@@ -407,11 +328,30 @@ namespace PepperDash.Essentials
 
                             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;
                     }
 

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"
+                    }
+                }
+            }
+        ]
+    }
+}

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

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

PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json

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

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

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/DevicePageControllerBase.cs

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/LargeTouchpanelControllerBase.cs

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/PageControllerLaptop.cs

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/PageControllerLargeDvd.cs

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

PepperDashEssentials/FOR REFERENCE UI/PageControllers/PageControllerLargeSetTopBoxGeneric.cs

@@ -1,139 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-
-//using PepperDash.Essentials.Core.Presets;
-
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-
-//namespace PepperDash.Essentials
-//{
-
-//    public class PageControllerLargeSetTopBoxGeneric : DevicePageControllerBase
-//    {
-//        // To-DO: Add properties for component subpage names. DpadPos1, DpadPos2...
-//        // Derived classes can then insert special subpages for variations on given
-//        // device types.  Like DirecTV vs Comcast
-
-//        public uint DpadSmartObjectId { get; set; }
-//        public uint NumberPadSmartObjectId { get; set; }
-//        public uint PresetsSmartObjectId { get; set; }
-//        public uint Position5TabsId { get; set; }
-
-//        ISetTopBoxControls Device;
-//        DevicePresetsView PresetsView;
-
-
-//        bool ShowPosition5Tabs;
-//        uint CurrentVisiblePosition5Item = 1;
-//        Dictionary<uint, uint> Position5SubpageJoins = new Dictionary<uint, uint>
-//        {
-//            { 1, 10053 },
-//            { 2, 10054 }
-//        };
-
-//        public PageControllerLargeSetTopBoxGeneric(BasicTriListWithSmartObject tl, ISetTopBoxControls device)
-//            : base(tl)
-//        {
-//            Device = device;
-//            DpadSmartObjectId = 10011;
-//            NumberPadSmartObjectId = 10014;
-//            PresetsSmartObjectId = 10012;
-//            Position5TabsId = 10081;
-
-//            bool dpad = device is IDPad;
-//            bool preset = device.HasPresets;
-//            bool dvr = device.HasDvr;
-//            bool numbers = device is INumericKeypad;
-//            uint[] joins = null;
-
-//            if (dpad && !preset && !dvr && !numbers) joins = new uint[] { 10031, 10091 };
-//            else if (!dpad && preset && !dvr && !numbers) joins = new uint[] { 10032, 10091 };
-//            else if (!dpad && !preset && dvr && !numbers) joins = new uint[] { 10033, 10091 };
-//            else if (!dpad && !preset && !dvr && numbers) joins = new uint[] { 10034, 10091 };
-
-//            else if (dpad && preset && !dvr && !numbers) joins = new uint[] { 10042, 10021, 10092 };
-//            else if (dpad && !preset && dvr && !numbers) joins = new uint[] { 10043, 10021, 10092 };
-//            else if (dpad && !preset && !dvr && numbers) joins = new uint[] { 10044, 10021, 10092 };
-//            else if (!dpad && preset && dvr && !numbers) joins = new uint[] { 10043, 10022, 10092 };
-//            else if (!dpad && preset && !dvr && numbers) joins = new uint[] { 10044, 10022, 10092 };
-//            else if (!dpad && !preset && dvr && numbers) joins = new uint[] { 10044, 10023, 10092 };
-
-//            else if (dpad && preset && dvr && !numbers) joins = new uint[] { 10053, 10032, 10011, 10093 };
-//            else if (dpad && preset && !dvr && numbers) joins = new uint[] { 10054, 10032, 10011, 10093 };
-//            else if (dpad && !preset && dvr && numbers) joins = new uint[] { 10054, 10033, 10011, 10093 };
-//            else if (!dpad && preset && dvr && numbers) joins = new uint[] { 10054, 10033, 10012, 10093 };
-
-//            else if (dpad && preset && dvr && numbers)
-//            {
-//                joins = new uint[] { 10081, 10032, 10011, 10093 }; // special case
-//                ShowPosition5Tabs = true;
-//            }
-//            // Project the joins into corresponding sigs.
-//            FixedObjectSigs = joins.Select(u => TriList.BooleanInput[u]).ToList();
-
-//            // Build presets
-//            if (device.HasPresets)
-//            {
-//                PresetsView = new DevicePresetsView(tl, device.PresetsModel);
-//            }
-//        }
-
-//        protected override void CustomSetVisible(bool state)
-//        {
-//            if (ShowPosition5Tabs)
-//            {
-//                // Show selected tab
-//                TriList.BooleanInput[Position5SubpageJoins[CurrentVisiblePosition5Item]].BoolValue = state;
-
-//                var tabSo = TriList.SmartObjects[Position5TabsId];
-//                if (state) // Link up the tab object
-//                {
-//                    tabSo.BooleanOutput["Tab Button 1 Press"].UserObject = new Action<bool>(b => ShowTab(1));
-//                    tabSo.BooleanOutput["Tab Button 2 Press"].UserObject = new Action<bool>(b => ShowTab(2));
-//                }
-//                else // Disco tab object
-//                {
-//                    tabSo.BooleanOutput["Tab Button 1 Press"].UserObject = null;
-//                    tabSo.BooleanOutput["Tab Button 2 Press"].UserObject = null;
-//                }
-//            }
-
-//            // Hook up smart objects if applicable
-//#warning hook these up
-//            //if (Device is IHasCueActionList)
-//            //{
-//            //    var uos = (Device as IHasCueActionList).CueActionList;
-//            //    SmartObjectHelper.LinkDpadWithUserObjects(TriList, DpadSmartObjectId, uos, state);
-//            //    SmartObjectHelper.LinkNumpadWithUserObjects(TriList, NumberPadSmartObjectId,
-//            //        uos, CommonBoolCue.Dash, CommonBoolCue.Last, state);
-//            //}
-
-
-//            // Link, unlink presets
-//            if (Device.HasPresets && state)
-//                PresetsView.Attach();
-//            else if (Device.HasPresets && !state)
-//                PresetsView.Detach();
-//        }
-
-//        void ShowTab(uint number)
-//        {
-//            // Ignore re-presses
-//            if (CurrentVisiblePosition5Item == number) return;
-//            // Swap subpage
-//            var bi = TriList.BooleanInput;
-//            if (CurrentVisiblePosition5Item > 0)
-//                bi[Position5SubpageJoins[CurrentVisiblePosition5Item]].BoolValue = false;
-//            CurrentVisiblePosition5Item = number;
-//            bi[Position5SubpageJoins[CurrentVisiblePosition5Item]].BoolValue = true;
-
-//            // Show feedback on buttons
-//        }
-//    }
-//}

PepperDashEssentials/FOR REFERENCE UI/Panels/REMOVE UiCue.cs

@@ -1,43 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public class UiCue
-//    {
-//        public static readonly Cue VisibleSystemInit = Cue.BoolCue("VisibleSystemInit", 15001);
-//        public static readonly Cue VisibleSplash = Cue.BoolCue("VisibleSplash", 15002);
-//        public static readonly Cue PressSplash = Cue.BoolCue("PressSplash", 15003);
-//        public static readonly Cue PressRoomOn = Cue.BoolCue("PressRoomOn", 15006);
-//        public static readonly Cue PressRoomOff = Cue.BoolCue("PressRoomOff", 15007);
-//        public static readonly Cue PressRoomOffWithConfirm = Cue.BoolCue("PressRoomOffWithConfirm", 15008);
-//        public static readonly Cue VisibleCommonHeader = Cue.BoolCue("PressPowerOffConfirm", 15011);
-//        public static readonly Cue VisibleCommonFooter = Cue.BoolCue("VisibleCommonFooter", 15012);
-//        public static readonly Cue PressHelp = Cue.BoolCue("PressHelp", 15013);
-//        public static readonly Cue PressSettings = Cue.BoolCue("PressSettings", 15014);
-
-//        public static readonly Cue ShowDate = Cue.BoolCue("PressSettings", 15015);
-//        public static readonly Cue ShowTime = Cue.BoolCue("PressSettings", 15016);
-//        public static readonly Cue ShowLicensed = Cue.BoolCue("PressSettings", 15017);
-//        public static readonly Cue ShowUnLicensed = Cue.BoolCue("PressSettings", 15018);
-
-//        public static readonly Cue PressModePresentationShare = Cue.BoolCue("PressModePresentationShare", 15101);
-//        public static readonly Cue PressModeVideoConf = Cue.BoolCue("PressModeVideoConf", 15102);
-//        public static readonly Cue PressModeAudioConf = Cue.BoolCue("PressModeAudioConf", 15103);
-
-//        public static readonly Cue VisiblePresentationSourceList = Cue.BoolCue("VisiblePresentationSourceList", 15111);
-//        public static readonly Cue VisibleSystemIsOff = Cue.BoolCue("VisibleSystemIsOff", 15112);
-
-//        public static readonly Cue VisibleAudioConfPopover = Cue.BoolCue("VisibleAudioConfPopover", 15201);
-
-//        public static readonly Cue VisibleVideoConfPopover = Cue.BoolCue("VisibleVideoConfPopover", 15251);
-
-//        public static readonly Cue TextRoomName = Cue.BoolCue("TextRoomName", 4001);
-//        public static readonly Cue TextPresentationShareButton = Cue.BoolCue("TextPresentationShareButton", 4011);
-
-//        public static readonly Cue SplashMessage = Cue.StringCue("SplashMessage", 2101);
-//    }
-//}

PepperDashEssentials/FOR REFERENCE UI/Panels/SmartGraphicsTouchpanelControllerBase.cs

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

PepperDashEssentials/FOR REFERENCE UI/SRL/SourceListSubpageReferenceList.cs

@@ -1,164 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using Crestron.SimplSharpPro.UI;
-
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-
-//namespace PepperDash.Essentials
-//{
-
-//    //*****************************************************************************
-//    /// <summary>
-//    /// Wrapper class for subpage reference list.  Contains helpful methods to get at the various signal groupings
-//    /// and to get individual signals using an index and a join.
-//    /// </summary>
-//    public class SourceListSubpageReferenceList : SubpageReferenceList
-//    {
-//        public const uint SmartObjectJoin = 3801;
-
-//        Action<uint> SourceSelectCallback;
-
-//        EssentialsRoom CurrentRoom;
-
-//        public SourceListSubpageReferenceList(BasicTriListWithSmartObject tl, 
-//            Action<uint> sourceSelectCallback)
-//            : base(tl, SmartObjectJoin, 3, 1, 3)
-//        {
-//            SourceSelectCallback = sourceSelectCallback;
-//        }
-
-//        void SetSourceList(Dictionary<uint, SourceListItem> dict)
-//        {
-//            // Iterate all positions, including ones missing from the dict.
-//            var max = dict.Keys.Max();
-//            for (uint i = 1; i <= max; i++)
-//            {
-//                // Add the source if it's in the dict
-//                if (dict.ContainsKey(i))
-//                {
-//                    Items.Add(new SourceListSubpageReferenceListItem(i, dict[i], this, SourceSelectCallback));
-//                    // Plug the callback function into the buttons
-//                }
-//                // Blank the line
-//                else
-//                    Items.Add(new SourceListSubpageReferenceListItem(i, null, 
-//                        this, SourceSelectCallback));
-//            }
-//            Count = (ushort)max;
-//        }
-
-//        /// <summary>
-//        /// Links the SRL to the Room's PresentationSourceChange event for updating of the UI
-//        /// </summary>
-//        /// <param name="room"></param>
-//        public void AttachToRoom(EssentialsRoom room)
-//        {
-//            CurrentRoom = room;
-//            SetSourceList(room.Sources);
-//            CurrentRoom.PresentationSourceChange -= CurrentRoom_PresentationSourceChange;
-//            CurrentRoom.PresentationSourceChange += CurrentRoom_PresentationSourceChange;
-//            SetPresentationSourceFb(CurrentRoom.CurrentPresentationSource);
-//        }
-
-//        /// <summary>
-//        /// Disconnects the SRL from a Room's PresentationSourceChange
-//        /// </summary>
-//        public void DetachFromCurrentRoom()
-//        {
-//            ClearPresentationSourceFb(CurrentRoom.CurrentPresentationSource);
-//            if(CurrentRoom != null)
-//                CurrentRoom.PresentationSourceChange -= CurrentRoom_PresentationSourceChange;
-//            CurrentRoom = null;
-//        }
-
-//        // Handler to route source changes into list feedback
-//        void CurrentRoom_PresentationSourceChange(object sender, EssentialsRoomSourceChangeEventArgs args)
-//        {
-//            Debug.Console(2, "SRL received source change");
-//            ClearPresentationSourceFb(args.OldSource);
-//            SetPresentationSourceFb(args.NewSource);
-//        }
-
-//        void ClearPresentationSourceFb(IPresentationSource source)
-//        {
-//            if (source == null) return;
-//            var oldSourceItem = (SourceListSubpageReferenceListItem)Items.FirstOrDefault(
-//                i => ((SourceListSubpageReferenceListItem)i).SourceDevice == source);
-//            if (oldSourceItem != null)
-//                oldSourceItem.ClearFeedback();
-//        }
-
-//        void SetPresentationSourceFb(SourceListItem source)
-//        {
-//            if (source == null) return;
-//            // Now set the new source to light up
-//            var newSourceItem = (SourceListSubpageReferenceListItem)Items.FirstOrDefault(
-//                i => ((SourceListSubpageReferenceListItem)i).SourceDevice == source);
-//            if (newSourceItem != null)
-//                newSourceItem.SetFeedback();
-//        }
-//    }
-
-//    public class SourceListSubpageReferenceListItem : SubpageReferenceListItem
-//    {
-//        public readonly IPresentationSource SourceDevice;
-
-//        public const uint ButtonPressJoin = 1;
-//        public const uint SelectedFeedbackJoin = 2;
-//        public const uint ButtonTextJoin = 1;
-//        public const uint IconNameJoin = 2;
-
-//        public SourceListSubpageReferenceListItem(uint index, SourceListItem srcDeviceItem, 
-//            SubpageReferenceList owner, Action<uint> sourceSelectCallback)
-//            : base(index, owner)
-//        {
-//            if (srcDeviceItem == null) throw new ArgumentNullException("srcDeviceItem");
-//            if (owner == null) throw new ArgumentNullException("owner");
-//            if (sourceSelectCallback == null) throw new ArgumentNullException("sourceSelectCallback");
-
-
-//            SourceDevice = srcDeviceItem;
-//            var nameSig = owner.StringInputSig(index, ButtonTextJoin);
-//            // Should be able to see if there is not enough buttons right here
-//            if (nameSig == null)
-//            {
-//                Debug.Console(0, "ERROR: Item {0} does not exist on source list SRL", index);
-//                return;
-//            }
-//            nameSig.StringValue = srcDeviceItem.Name;
-//            owner.StringInputSig(index, IconNameJoin).StringValue = srcDeviceItem.Icon;
-
-//            // Assign a source selection action to the appropriate button's UserObject - on release
-//            owner.GetBoolFeedbackSig(index, ButtonPressJoin).UserObject = new Action<bool>(b => 
-//                { if (!b) sourceSelectCallback(index); });
-			
-//            // hook up the video icon
-//            var videoDev = srcDeviceItem as IAttachVideoStatus;
-//            if (videoDev != null)
-//            {
-//                var status = videoDev.GetVideoStatuses();
-//                if (status != null)
-//                {
-//                    Debug.Console(1, "Linking {0} video status to SRL", videoDev.Key);
-//                    videoDev.GetVideoStatuses().VideoSyncFeedback.LinkInputSig(owner.BoolInputSig(index, 3));
-//                }
-//            }
-//        }
-
-//        public void SetFeedback()
-//        {
-//            Owner.BoolInputSig(Index, SelectedFeedbackJoin).BoolValue = true;
-//        }
-
-//        public void ClearFeedback()
-//        {
-//            Owner.BoolInputSig(Index, SelectedFeedbackJoin).BoolValue = false;
-//        }
-//    }
-//}

PepperDashEssentials/Factory/DeviceFactory.cs

@@ -69,7 +69,7 @@ namespace PepperDash.Essentials
 			{
 				var comm = CommFactory.GetControlPropertiesConfig(dc);
 
-				var bridge = new PepperDash.Essentials.Room.MobileControl.MobileControlDdvc01RoomBridge(key, name, comm.IpIdInt);
+				var bridge = new PepperDash.Essentials.Room.MobileControl.MobileControlSIMPLRoomBridge(key, name, comm.IpIdInt);
 				bridge.AddPreActivationAction(() =>
 				{
 					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -186,7 +186,7 @@ namespace PepperDash.Essentials.Fusion
 
 
             FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff"));
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
             // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
  
 
@@ -342,7 +342,7 @@ namespace PepperDash.Essentials.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff"); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
         }
     }

PepperDashEssentials/HttpApiHandler.cs

@@ -1,266 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharp.CrestronIO;
-//using Crestron.SimplSharp.Net.Http;
-
-//using Newtonsoft.Json;
-//using Newtonsoft.Json.Linq;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Core.Http;
-//using PepperDash.Core;
-
-//namespace PepperDash.Essentials
-//{
-//    public class EssentialsHttpApiHandler
-//    {
-//        string ConfigPath;
-//        string PresetsPathPrefix;
-//        EssentialsHttpServer Server;
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        /// <param name="server">HTTP server to attach to</param>
-//        /// <param name="configPath">The full path to configuration file</param>
-//        /// <param name="presetsListPath">The folder prefix for the presets path, eq "\HTML\presets\"</param>
-//        public EssentialsHttpApiHandler(EssentialsHttpServer server, string configPath, string presetsPathPrefix)
-//        {
-//            if (server == null) throw new ArgumentNullException("server");
-//            Server = server;
-//            ConfigPath = configPath;
-//            PresetsPathPrefix = presetsPathPrefix;
-//            server.ApiRequest += Server_ApiRequest;
-//        }
-
-
-//        void Server_ApiRequest(object sender, Crestron.SimplSharp.Net.Http.OnHttpRequestArgs args)
-//        {
-//            try
-//            {
-//                var path = args.Request.Path.ToLower();
-
-//                if (path == "/api/config")
-//                    HandleApiConfig(args);
-//                else if (path.StartsWith("/api/presetslist/"))
-//                    HandleApiPresetsList(args);
-//                else if (path == "/api/presetslists")
-//                    HandleApiGetPresetsLists(args.Request, args.Response);
-//                else
-//                {
-//                    args.Response.Code = 404;
-//                    return;
-//                }
-//                args.Response.Header.SetHeaderValue("Access-Control-Allow-Origin", "*");
-//                args.Response.Header.SetHeaderValue("Access-Control-Allow-Methods", "GET, POST, PATCH, PUT, DELETE, OPTIONS");
-//            }
-//            catch (Exception e)
-//            {
-//                Debug.Console(1, "Uncaught HTTP server error: \n{0}", e);
-//                args.Response.Code = 500;
-//            }
-//        }
-
-//        /// <summary>
-//        /// GET will return the running configuration.  POST will attempt to take in a new config
-//        /// and restart the program.
-//        /// </summary>
-//        void HandleApiConfig(OnHttpRequestArgs args)
-//        {
-//            var request = args.Request;
-//            if (request.Header.RequestType == "GET")
-//            {
-//                if (File.Exists(ConfigPath))
-//                {
-//                    Debug.Console(2, "Sending config:{0}", ConfigPath);
-//                    args.Response.Header.ContentType = EssentialsHttpServer.GetContentType(new FileInfo(ConfigPath).Extension);
-//                    args.Response.ContentStream = new FileStream(ConfigPath, FileMode.Open, FileAccess.Read);
-//                }
-//            }
-//            else if (request.Header.RequestType == "POST")
-//            {
-//                Debug.Console(2, "Post type: '{0}'", request.Header.ContentType);
-				
-//                // Make sure we're receiving at least good json
-//                Debug.Console(1, "Receving new config");
-//                if (GetContentStringJson(args) == null)
-//                    return;
-
-//                //---------------------------- try to move these into common method
-//                // Move current file aside
-//                var bakPath = ConfigPath + ".bak";
-//                if (File.Exists(bakPath))
-//                    File.Delete(bakPath);
-//                File.Move(ConfigPath, bakPath);
-
-//                // Write the file
-//                using (FileStream fs = File.Open(ConfigPath, FileMode.OpenOrCreate))
-//                using (StreamWriter sw = new StreamWriter(fs))
-//                {
-//                    try
-//                    {
-//                        sw.Write(args.Request.ContentString);
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        string err = string.Format("Error writing received config file:\r{0}", e);
-//                        CrestronConsole.PrintLine(err);
-//                        ErrorLog.Warn(err);
-//                        // Put file back
-//                        File.Move(ConfigPath + ".bak", ConfigPath);
-//                        args.Response.Code = 500;
-//                        return;
-//                    }
-//                }
-
-//                // If client says "yeah, restart" and has a good token
-//                // Restart program
-//                string consoleResponse = null;
-//                var restart = CrestronConsole.SendControlSystemCommand("progreset -p:" +
-//                    InitialParametersClass.ApplicationNumber, ref consoleResponse);
-//                if (!restart) Debug.Console(0, "CAN'T DO THAT YO: {0}", consoleResponse);
-//            }
-//        }
-
-//        void HandleApiPresetsList(OnHttpRequestArgs args)
-//        {
-//            var listPath = PresetsPathPrefix + args.Request.Path.Remove(0, 17);
-//            Debug.Console(2, "Checking for preset list '{0}'", listPath);
-
-//            if (args.Request.Header.RequestType == "GET")
-//            {
-//                if (File.Exists(listPath))
-//                {
-//                    Debug.Console(2, "Sending presets file:{0}", listPath);
-//                    args.Response.Header.ContentType = EssentialsHttpServer.GetContentType(new FileInfo(listPath).Extension);
-//                    args.Response.ContentStream = new FileStream(listPath, FileMode.Open, FileAccess.Read);
-//                }
-//            }
-//            else if (args.Request.Header.RequestType == "POST")
-//            {
-//                // Make sure we're receiving at least good json
-//                Debug.Console(1, "Receving new presets");
-//                if (GetContentStringJson(args) == null)
-//                    return;
-
-//                //---------------------------- try to move these into common method
-//                // Move current file aside
-//                var bakPath = listPath + ".new";
-//                Debug.Console(2, "Moving presets file to {0}", bakPath);
-//                if(File.Exists(bakPath))
-//                    File.Delete(bakPath);
-//                File.Move(listPath, bakPath);
-
-//                Debug.Console(2, "Writing new file");
-//                // Write the file
-//                using (FileStream fs = File.OpenWrite(listPath))
-//                using (StreamWriter sw = new StreamWriter(fs))
-//                {
-//                    try
-//                    {
-//                        Debug.Console(2, "Writing {1}, {0} bytes", args.Request.ContentString.Length, listPath);
-//                        sw.Write(args.Request.ContentString);
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        string err = string.Format("Error writing received presets file:\r{0}", e);
-//                        CrestronConsole.PrintLine(err);
-//                        ErrorLog.Warn(err);
-//                        // Put file back
-//                        File.Move(listPath + ".bak", listPath);
-//                        args.Response.Code = 500;
-//                        return;
-//                    }
-//                }
-//            }
-//        }
-
-
-//        void HandleApiGetPresetsLists(HttpServerRequest request, HttpServerResponse response)
-//        {
-//            if (request.Header.RequestType != "GET")
-//            {
-//                response.Code = 404; // This should be a 405 with an allow header
-//                return;
-//            }
-
-//            if (Directory.Exists(PresetsPathPrefix))
-//            {
-//                //CrestronConsole.PrintLine("Parsing presets directory");
-//                List<string> files = Directory.GetFiles(PresetsPathPrefix, "*.json")
-//                    .ToList().Select(f => Path.GetFileName(f)).ToList();
-//                if (files.Count > 0)
-//                    files.Sort();
-//                var json = JsonConvert.SerializeObject(files);
-//                response.Header.ContentType = "application/json";
-//                response.ContentString = json;
-//            }
-
-//                        //    //CrestronConsole.PrintLine("Found {0} files", files.Count);
-//                        //    JObject jo = new JObject();
-//                        //    JArray ja = new JArray();
-						
-//                        //    foreach (var filename in files)
-//                        //    {
-//                        //        try
-//                        //        {
-//                        //            using (StreamReader sr = new StreamReader(filename))
-//                        //            {
-//                        //                JObject tempJo = JObject.Parse(sr.ReadToEnd());
-//                        //                if (tempJo.Value<string>("content").Equals("presetsList"))
-//                        //                {
-//                        //                    var jItem = new JObject(); // make a new object
-//                        //                    jItem.Add("Name", tempJo["name"]);
-//                        //                    jItem.Add("File", filename);
-//                        //                    jItem.Add("Url", Uri.EscapeUriString(new Uri(
-//                        //                        filename.Replace("\\html", "")
-//                        //                        .Replace("\\HTML", "")
-//                        //                        .Replace('\\', '/'), UriKind.Relative).ToString()));
-//                        //                    ja.Add(jItem); // add to array
-//                        //                }
-//                        //                else
-//                        //                    CrestronConsole.PrintLine("Cannot use presets file '{0}'", filename);
-//                        //            }
-//                        //        }
-//                        //        catch
-//                        //        {
-//                        //            // ignore failures - maybe delete them
-//                        //            CrestronConsole.PrintLine("Unable to read presets file '{0}'", filename);
-//                        //        }
-//                        //    }
-//                        //    jo.Add("PresetChannelLists", ja);
-//                        //    //CrestronConsole.PrintLine(jo.ToString());
-//                        //    response.Header.ContentType = "application/json";
-//                        //    response.ContentString = jo.ToString();
-//                        //}
-//                        //else
-//                        //    CrestronConsole.PrintLine("No presets files in directory");
-//        }
-
-//        /// <summary>
-//        /// Simply does what it says
-//        /// </summary>
-//        JObject GetContentStringJson(OnHttpRequestArgs args)
-//        {
-//            //var content = args.Request.ContentString;
-//            //Debug.Console(1, "{0}", content);
-
-//            try
-//            {
-//                // just see if it parses properly
-//                return JObject.Parse(args.Request.ContentString);
-//            }
-//            catch (Exception e)
-//            {
-//                string err = string.Format("JSON Error reading config file:\r{0}", e);
-//                CrestronConsole.PrintLine(err);
-//                ErrorLog.Warn(err);
-//                args.Response.Code = 400; // Bad request
-//                return null;
-//            }
-//        }
-//    }
-//}

PepperDashEssentials/PepperDashEssentials.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{1BED5BA9-88C4-4365-9362-6F4B128071D3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials</RootNamespace>
+    <RootNamespace>PepperDashEssentials</RootNamespace>
     <AssemblyName>PepperDashEssentials</AssemblyName>
     <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92230};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PlatformFamilyName>WindowsCE</PlatformFamilyName>
@@ -108,20 +108,31 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AppServer\Messengers\CameraBaseMessenger.cs" />
     <Compile Include="AppServer\Messengers\ConfigMessenger.cs" />
-    <Compile Include="AppServer\Messengers\Ddvc01AtcMessenger.cs" />
+    <Compile Include="AppServer\Messengers\SIMPLAtcMessenger.cs" />
     <Compile Include="AppServer\Messengers\AudioCodecBaseMessenger.cs" />
-    <Compile Include="AppServer\Messengers\Ddvc01VtcMessenger.cs" />
+    <Compile Include="AppServer\Messengers\SIMPLVtcMessenger.cs" />
+    <Compile Include="AppServer\Messengers\IRunRouteActionMessenger.cs" />
     <Compile Include="AppServer\Messengers\MessengerBase.cs" />
+    <Compile Include="AppServer\Messengers\SIMPLCameraMessenger.cs" />
+    <Compile Include="AppServer\Messengers\SimplMessengerPropertiesConfig.cs" />
+    <Compile Include="AppServer\Messengers\SIMPLRouteMessenger.cs" />
     <Compile Include="AppServer\Messengers\SystemMonitorMessenger.cs" />
     <Compile Include="AppServer\Messengers\VideoCodecBaseMessenger.cs" />
+    <Compile Include="AppServer\SIMPLJoinMaps\SIMPLVtcJoinMap.cs" />
+    <Compile Include="AppServer\SIMPLJoinMaps\SIMPLAtcJoinMap.cs" />
+    <Compile Include="AppServer\SIMPLJoinMaps\MobileControlSIMPLRoomJoinMap.cs" />
     <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
     <Compile Include="Bridges\AppleTvBridge.cs" />
     <Compile Include="Bridges\BridgeBase.cs" />
     <Compile Include="Bridges\BridgeFactory.cs" />
+    <Compile Include="Bridges\C2nRthsControllerBridge.cs" />
     <Compile Include="Bridges\CameraControllerBridge.cs" />
     <Compile Include="Bridges\AirMediaControllerBridge.cs" />
     <Compile Include="Bridges\DmBladeChassisControllerBridge.cs" />
+    <Compile Include="Bridges\IRSetTopBoxBaseBridge.cs" />
+    <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
     <Compile Include="Bridges\DmpsAudioOutputControllerBridge.cs" />
     <Compile Include="Bridges\DmpsRoutingControllerBridge.cs" />
@@ -153,31 +164,16 @@
     <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
+    <Compile Include="Bridges\StatusSignControllerBridge.cs" />
     <Compile Include="Bridges\SystemMonitorBridge.cs" />
-    <Compile Include="Configuration ORIGINAL\Builders\TPConfig.cs" />
-    <Compile Include="Configuration ORIGINAL\Configuration.cs" />
-    <Compile Include="Configuration ORIGINAL\ConfigurationHelpers.cs" />
-    <Compile Include="Configuration ORIGINAL\ConfigTieLine.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\CommFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\RemoteFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\DeviceMonitorFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\DmFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\TouchpanelFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\PcFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\REMOVE DiscPlayerFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\MAYBE SetTopBoxFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\DisplayFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\FactoryHelper.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Devices\Amplifier.cs" />
-    <Compile Include="Devices\DiscPlayer\OppoExtendedBdp.cs" />
-    <Compile Include="Devices\NUMERIC AppleTV.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Factory\UiDeviceFactory.cs" />
     <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="REMOVE EssentialsApp.cs" />
-    <Compile Include="HttpApiHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
@@ -190,7 +186,7 @@
     <Compile Include="AppServer\MobileControlDdvc01DeviceBridge.cs" />
     <Compile Include="AppServer\Interfaces.cs" />
     <Compile Include="AppServer\RoomBridges\MobileControlBridgeBase.cs" />
-    <Compile Include="AppServer\RoomBridges\MobileControlDdvc01RoomBridge.cs" />
+    <Compile Include="AppServer\RoomBridges\MobileControlSIMPLRoomBridge.cs" />
     <Compile Include="AppServer\RoomBridges\MobileControlEssentialsHuddleSpaceRoomBridge.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IChannelExtensions.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IColorExtensions.cs" />
@@ -206,14 +202,7 @@
     <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
     <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
     <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
-    <Compile Include="Room\Types\EssentialsPresentationRoom.cs" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
-    <Compile Include="FOR REFERENCE UI\PageControllers\DevicePageControllerBase.cs" />
-    <Compile Include="FOR REFERENCE UI\PageControllers\PageControllerLaptop.cs" />
-    <Compile Include="FOR REFERENCE UI\PageControllers\PageControllerLargeDvd.cs" />
-    <Compile Include="FOR REFERENCE UI\PageControllers\PageControllerLargeSetTopBoxGeneric.cs" />
-    <Compile Include="FOR REFERENCE UI\PageControllers\LargeTouchpanelControllerBase.cs" />
-    <Compile Include="FOR REFERENCE UI\Panels\SmartGraphicsTouchpanelControllerBase.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />
@@ -243,12 +232,22 @@
     <Compile Include="AppServer\MobileControlSystemController.cs" />
     <Compile Include="UI\DualDisplaySourceSRLController.cs" />
     <Compile Include="UI\SubpageReferenceListActivityItem.cs" />
-    <Compile Include="FOR REFERENCE UI\Panels\REMOVE UiCue.cs" />
-    <Compile Include="FOR REFERENCE UI\SRL\SourceListSubpageReferenceList.cs" />
     <Compile Include="Room\Types\EssentialsHuddleSpaceRoom.cs" />
     <Compile Include="UI\EssentialsTouchpanelController.cs" />
     <Compile Include="UI\SubpageReferenceListSourceItem.cs" />
     <None Include="app.config" />
+    <EmbeddedResource Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <None Include="Properties\ControlSystem.cfg" />
     <EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -270,9 +269,6 @@
       <Name>Essentials Devices Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="FOR REFERENCE UI\OTHER\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

PepperDashEssentials/PluginLoading/PluginLoading.cs

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

PepperDashEssentials/Properties/AssemblyInfo.cs

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

PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1

@@ -1,13 +1,23 @@
 function Update-SourceVersion
 {
     Param ([string]$Version)
-    $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’;
+    $fullVersion = $Version
+    $baseVersion = [regex]::Match($Version, "(\d+.\d+.\d+).*").captures.groups[1].value
+    $NewAssemblyVersion = ‘AssemblyVersion("‘ + $baseVersion + ‘.*")’
+    echo "AssemblyVersion = $NewAssemblyVersion"
+    $NewAssemblyInformationalVersion = ‘AssemblyInformationalVersion("‘ + $Version + ‘")’
+    echo "AssemblyInformationalVersion = $NewAssemblyInformationalVersion"
+
     foreach ($o in $input)
-    {
+   {
         Write-output $o.FullName
         $TmpFile = $o.FullName + “.tmp”
         get-content $o.FullName |
-        %{$_ -replace ‘AssemblyVersion\("(\d+\.\d+\.\d+)\.\*"\)’, $NewVersion  }  > $TmpFile
+        %{
+           $_ -replace ‘AssemblyVersion\(".*"\)’, $NewAssemblyVersion} |
+        %{
+           $_ -replace ‘AssemblyInformationalVersion\(".*"\)’, $NewAssemblyInformationalVersion
+         }  > $TmpFile 
         move-item $TmpFile $o.FullName -force
     }
 }
@@ -21,9 +31,10 @@ function Update-AllAssemblyInfoFiles ( $version )
 }
 
 # validate arguments
-$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$");
+$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "\d+\.\d+\.\d+.*");
 if ($r.Success)
 {
+    echo "Updating Assembly Version to $args ...";
     Update-AllAssemblyInfoFiles $args[0];
 }
 else

PepperDashEssentials/REMOVE EssentialsApp.cs

@@ -1,69 +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 Crestron.SimplSharpPro.DM;
-//using Crestron.SimplSharpPro.DM.Cards;
-//using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Core.Devices;
-////using PepperDash.Essentials.Core.Devices.Dm;
-
-//using PepperDash.Essentials.Displays;
-
-////using PepperDash.Essentials.Core.Http;
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials
-//{
-//    public class EssentialsApp
-//    {
-//        public string ConfigPath { get; set; }
-
-//        public Dictionary<string, Room> Rooms { get; private set; }
-
-//        //EssentialsHttpApiHandler ApiHandler; // MOVE ???????????????????
-
-//        public EssentialsApp(CrestronControlSystem cs)
-//        {
-//            // Use a fake license manager for now
-//            Global.LicenseManager = PepperDash.Essentials.License.MockEssentialsLicenseManager.Manager;
-			
-			
-//            // ---------------------------------- Make this configurable
-//            //var server = Global.HttpConfigServer;
-//            //server.Start(8081, "HttpConfigServer");
-//            //ConfigPath = string.Format(@"\NVRAM\Program{0}\EssentialsConfiguration.json",
-//            //    InitialParametersClass.ApplicationNumber);
-//            //ApiHandler = new EssentialsHttpApiHandler(server, ConfigPath, @"\HTML\presets\lists\");
-
-//            Debug.Console(0, "\r\r--------------------CONFIG BEGIN--------------------\r");
-//            Configuration.Initialize(cs);
-//            Configuration.ReadConfiguration(ConfigPath);
-//            Debug.Console(0, "\r--------------------CONFIG END----------------------\r\r");
-//        }
-//    }
-
-//    public class ResponseToken
-//    {
-//        public string Token { get; private set; }
-//        public DateTime Expires { get; private set; }
-//        public bool IsExpired { get { return Expires < DateTime.Now; } }
-
-//        public ResponseToken(int timeoutMinutes)
-//        {
-//            Expires = DateTime.Now.AddMinutes(timeoutMinutes);
-//            Token = Guid.NewGuid().ToString();
-//        }
-//    }
-//}