updates XML comments for bool & string feedbacks

* refactored ProgramInfo routine to not send console commands for unregistered or stopped programs and inverted some if statements

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

.gitignore

@@ -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/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/Bridges/BridgeBase.cs

@@ -136,6 +136,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 +171,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;
+                        }
                     }
                 }
 

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.GetJoinMapForDevice(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/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.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]);
+                
+                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/DmTxControllerBridge.cs

@@ -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/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.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]);
+            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/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.GetJoinMapForDevice(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/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 = 60;
+
+            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.GetJoinMapForDevice(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,7 +12,7 @@ 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);
 
@@ -30,36 +25,79 @@ 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]);
+            }
+        }
+
+        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/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/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

@@ -97,9 +97,11 @@ namespace PepperDash.Essentials
 
                 directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
 
-                var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                var fullVersion = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
 
-                Global.SetAssemblyVersion(string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build));
+                AssemblyInformationalVersionAttribute fullVersionAtt = fullVersion[0] as AssemblyInformationalVersionAttribute;
+
+                Global.SetAssemblyVersion(fullVersionAtt.InformationalVersion);
 
                 if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                 {
@@ -426,11 +428,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/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/PepperDashEssentials.csproj

@@ -119,9 +119,12 @@
     <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,20 +156,11 @@
     <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\DisplayFactory.cs" />
-    <Compile Include="Configuration ORIGINAL\Factories\FactoryHelper.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Devices\Amplifier.cs" />
     <Compile Include="ControlSystem.cs" />
@@ -201,7 +195,6 @@
     <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="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
@@ -236,6 +229,18 @@
     <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>

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/References/PepperDashEssentialsBase.cplz/PepperDashEssentialsBase.config

@@ -1,16 +0,0 @@
-<ProgramInfo>
-  <RequiredInfo>
-    <FriendlyName>PepperDashEssentials</FriendlyName>
-    <SystemName>PepperDashEssentialsBase</SystemName>
-    <EntryPoint>PepperDashEssentialsBase</EntryPoint>
-    <MinFirmwareVersion>1.009.0029</MinFirmwareVersion>
-    <ProgramTool>SIMPL# Plugin</ProgramTool>
-    <DesignToolId>5</DesignToolId>
-    <ProgramToolId>5</ProgramToolId>
-    <ArchiveName />
-  </RequiredInfo>
-  <OptionalInfo>
-    <CompiledOn>1/8/2016 3:03:22 PM</CompiledOn>
-    <CompilerRev>1.0.0.27100</CompilerRev>
-  </OptionalInfo>
-</ProgramInfo>

PepperDashEssentials/References/PepperDashEssentialsBase.cplz/manifest.info

@@ -1,18 +0,0 @@
-MainAssembly=PepperDashEssentialsBase.dll:5d68a993ab03b4b88d0f95478188a439
-MainAssemblyMinFirmwareVersion=1.009.0029
-ü
-DependencySource=Crestron.SimplSharpPro.DeviceSupport.dll:caae4b4259aaf619059f0ae34473bfd2
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.DeviceSupport.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.DeviceSupport.dll:caae4b4259aaf619059f0ae34473bfd2
-ü
-DependencySource=Crestron.SimplSharpPro.DM.dll:bdf5acfa80cc3bb87f21deb891128b1d
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.DM.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.DM.dll:bdf5acfa80cc3bb87f21deb891128b1d
-ü
-DependencySource=Crestron.SimplSharpPro.EthernetCommunications.dll:36e663497195140ee6f1b4ebc53f5ea7
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.EthernetCommunications.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.EthernetCommunications.dll:36e663497195140ee6f1b4ebc53f5ea7
-ü
-DependencySource=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
-DependencyPath=PepperDashEssentialsBase.cplz:Crestron.SimplSharpPro.UI.dll
-DependencyMainAssembly=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e

PepperDashEssentials/Room/Types/EssentialsPresentationRoom.cs

@@ -1,437 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Room.Config;
-
-//namespace PepperDash.Essentials
-//{
-//    public class EssentialsPresentationRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange
-//    {
-//        public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-//        public event SourceInfoChangeHandler CurrentSingleSourceChange;
-//        public event SourceInfoChangeHandler CurrentDisplay1SourceChange;
-//        public event SourceInfoChangeHandler CurrentDisplay2SourceChange;
-
-//        protected override Func<bool> OnFeedbackFunc { get {
-//            return () => (CurrentSingleSourceInfo != null 
-//                && CurrentSingleSourceInfo.Type != eSourceListItemType.Off)
-//                || (Display1SourceInfo != null 
-//                && Display1SourceInfo.Type != eSourceListItemType.Off)
-//                || (Display2SourceInfo != null
-//                && Display2SourceInfo.Type != eSourceListItemType.Off); } }
-
-//        protected override Func<bool> IsWarmingFeedbackFunc { get { return () =>false;; } }
-//        protected override Func<bool> IsCoolingFeedbackFunc { get { return () => false; } }
-
-//        public EssentialsPresentationRoomPropertiesConfig Config { get; private set; }
-
-//        public Dictionary<uint, IRoutingSinkNoSwitching> Displays { get; private set; }
-
-//        public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; }
-//        public IBasicVolumeControls DefaultVolumeControls { get; private set; }C:\Working Directories\PD\essentials\PepperDashEssentials\Room\Types\EssentialsPresentationRoom.cs
-
-//        /// <summary>
-//        /// The config name of the source list
-//        /// </summary>
-//        public string SourceListKey { get; set; }
-
-//        /// <summary>
-//        /// If room is off, enables power on to last source. Default true
-//        /// </summary>
-//        public bool EnablePowerOnToLastSource { get; set; }
-//        string LastSourceKey;
-
-//        public enum eVideoRoutingMode
-//        {
-//            SelectSourceSelectDisplay, SourceToAllDisplays
-//        }
-
-//        public eVideoRoutingMode VideoRoutingMode { get; set; }
-
-//        public enum eAudioRoutingMode
-//        {
-//            AudioFollowsLastVideo, SelectAudioFromDisplay
-//        }
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public IBasicVolumeControls CurrentVolumeControls 
-//        {
-//            get { return _CurrentAudioDevice;  }
-//            set
-//            {
-//                if (value == _CurrentAudioDevice) return;
-
-//                var oldDev = _CurrentAudioDevice;
-//                // derigister this room from the device, if it can
-//                if (oldDev is IInUseTracking)
-//                    (oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
-//                var handler = CurrentVolumeDeviceChange;
-//                if (handler != null)
-//                    CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
-//                _CurrentAudioDevice = value;
-//                if (handler != null)
-//                    CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
-//                // register this room with new device, if it can
-//                if (_CurrentAudioDevice is IInUseTracking)
-//                    (_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
-//            }
-//        }
-//        IBasicVolumeControls _CurrentAudioDevice;
-
-//        /// <summary>
-//        /// The SourceListItem last run - containing names and icons. The complex setter is 
-//        /// to add/remove this room to the source's InUseTracking, if it is capable
-//        /// </summary>
-//        public SourceListItem CurrentSingleSourceInfo
-//        {
-//            get { return _CurrentSingleSourceInfo; }
-//            private set
-//            {
-//                if (value == _CurrentSingleSourceInfo) return;
-
-//                var handler = CurrentSingleSourceChange;
-//                // remove from in-use tracker, if so equipped
-//                if(_CurrentSingleSourceInfo != null && _CurrentSingleSourceInfo.SourceDevice is IInUseTracking)
-//                    (_CurrentSingleSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-//                if (handler != null)
-//                    handler(this, _CurrentSingleSourceInfo, ChangeType.WillChange);
-
-//                _CurrentSingleSourceInfo = value;
-
-//                // add to in-use tracking
-//                if (_CurrentSingleSourceInfo != null && _CurrentSingleSourceInfo.SourceDevice is IInUseTracking)
-//                    (_CurrentSingleSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-//                if (handler != null)
-//                    handler(this, _CurrentSingleSourceInfo, ChangeType.DidChange);
-//            }
-//        }
-//        SourceListItem _CurrentSingleSourceInfo;
-
-//        public SourceListItem Display1SourceInfo
-//        {
-//            get { return _Display1SourceInfo; }
-//            set
-//            {
-//                if (value == _Display1SourceInfo) return;
-
-//                var handler = CurrentDisplay1SourceChange;
-//                if (handler != null)
-//                    handler(this, _Display1SourceInfo, ChangeType.WillChange);
-
-//                _Display1SourceInfo = value;
-
-//                if (handler != null)
-//                    handler(this, _Display1SourceInfo, ChangeType.DidChange);
-//            }
-//        }
-//        SourceListItem _Display1SourceInfo;
-
-//        public SourceListItem Display2SourceInfo
-//        {
-//            get { return _Display2SourceInfo; }
-//            set
-//            {
-//                if (value == _Display2SourceInfo) return;
-
-//                var handler = CurrentDisplay2SourceChange;
-//                if (handler != null)
-//                    handler(this, _Display2SourceInfo, ChangeType.WillChange);
-
-//                _Display2SourceInfo = value;
-
-//                if (handler != null)
-//                    handler(this, _Display2SourceInfo, ChangeType.DidChange);
-//            }
-//        }
-//        SourceListItem _Display2SourceInfo;
-
-//        /// <summary>
-//        /// If an audio dialer is available for this room
-//        /// </summary>
-//        public bool HasAudioDialer { get { return false; } }
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        /// <param name="key"></param>
-//        /// <param name="name"></param>
-//        public EssentialsPresentationRoom(string key, string name,
-//            Dictionary<uint, IRoutingSinkNoSwitching> displays,
-//            IBasicVolumeWithFeedback defaultVolume, EssentialsPresentationRoomPropertiesConfig config)
-//            : base(key, name)
-//        {
-//            Config = config;
-//            Displays = displays;
-
-//            DefaultVolumeControls = defaultVolume;
-//            CurrentVolumeControls = defaultVolume;
-
-//            //DefaultAudioDevice = defaultAudio;
-//            //if (defaultAudio is IBasicVolumeControls)
-//            //    DefaultVolumeControls = defaultAudio as IBasicVolumeControls;
-//            //else if (defaultAudio is IHasVolumeDevice)
-//            //    DefaultVolumeControls = (defaultAudio as IHasVolumeDevice).VolumeDevice;
-
-			
-//            SourceListKey = "default";
-//            EnablePowerOnToLastSource = true;
-//        }
-
-//        /// <summary>
-//        /// Run the same source to all destinations
-//        /// </summary>
-//        /// <param name="sourceItem"></param>
-//        public void RouteSourceToAllDestinations(SourceListItem sourceItem)
-//        {
-//            if (Config.Volumes.Master != null)
-//            {
-//                var audioDev = DeviceManager.GetDeviceForKey(Config.Volumes.Master.DeviceKey);
-//                if (audioDev is IBasicVolumeWithFeedback)
-//                {
-
-//                }
-//            }
-
-//            foreach (var display in Displays.Values)
-//            {
-//                if (sourceItem != null)
-//                    DoVideoRoute(sourceItem.SourceKey, display.Key);
-//                else
-//                    DoVideoRoute("$off", display.Key);
-//            }
-//            Display1SourceInfo = sourceItem;
-//            Display2SourceInfo = sourceItem;
-//            CurrentSingleSourceInfo = sourceItem;
-//            OnFeedback.FireUpdate();
-//        }
-
-//        public void SourceToDisplay1(SourceListItem sourceItem)
-//        {
-//            DoVideoRoute(sourceItem.SourceKey, Displays[1].Key);
-//            Display1SourceInfo = sourceItem;
-//            OnFeedback.FireUpdate();
-//        }
-
-//        public void SourceToDisplay2(SourceListItem sourceItem)
-//        {
-//            DoVideoRoute(sourceItem.SourceKey, Displays[2].Key);
-//            Display2SourceInfo = sourceItem;
-//            OnFeedback.FireUpdate();
-//        }
-
-
-//        /// <summary>
-//        /// Basic source -> destination routing
-//        /// </summary>
-//        void DoVideoRoute(string sourceKey, string destinationKey)
-//        {
-//            new CTimer(o =>
-//                {
-//                    var dest = DeviceManager.GetDeviceForKey(destinationKey) as IRoutingSinkNoSwitching;
-//                    if (dest == null)
-//                    {
-//                        Debug.Console(1, this, "Cannot route. Destination '{0}' not found", destinationKey);
-//                        return;
-//                    }
-//                    // off is special case
-//                    if (sourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-//                    {
-//                        dest.ReleaseRoute();
-//                        if (dest is IPower)
-//                            (dest as IPower).PowerOff();
-//                        return;
-//                    }
-
-//                    var source = DeviceManager.GetDeviceForKey(sourceKey) as IRoutingOutputs;
-//                    if (source == null)
-//                    {
-//                        Debug.Console(1, this, "Cannot route. Source '{0}' not found", sourceKey);
-//                        return;
-//                    }
-//                    dest.ReleaseAndMakeRoute(source, eRoutingSignalType.Video);
-//                }, 0);
-//        }
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        protected override void EndShutdown()
-//        {
-//            RunRouteAction("roomoff");
-//        }
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        /// <param name="routeKey"></param>
-//        public void RunRouteAction(string routeKey)
-//        {
-//            RunRouteAction(routeKey, null);
-//        }
-
-//        /// <summary>
-//        /// Gets a source from config list SourceListKey and dynamically build and executes the
-//        /// route or commands
-//        /// </summary>
-//        /// <param name="name"></param>
-//        public void RunRouteAction(string routeKey, Action successCallback)
-//        {
-//            // Run this on a separate thread
-//            new CTimer(o =>
-//                {
-//                    Debug.Console(1, this, "Run room action '{0}'", routeKey);
-//                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
-//                    if(dict == null)
-//                    {
-//                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
-//                        return;
-//                    }
-
-//                    // Try to get the list item by it's string key
-//                    if (!dict.ContainsKey(routeKey))
-//                    {
-//                        Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'", 
-//                            routeKey, SourceListKey);
-//                        return;
-//                    }
-
-//                    var item = dict[routeKey];
-//                    //Debug.Console(2, this, "Action {0} has {1} steps",
-//                    //    item.SourceKey, item.RouteList.Count);
-
-//                    // Let's run it
-//                    if (routeKey.ToLower() != "roomoff")
-//                        LastSourceKey = routeKey;
-
-//                    foreach (var route in item.RouteList)
-//                    {
-//                        // if there is a $defaultAll on route, run two separate
-//                        if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
-//                        {
-//                            var tempAudio = new SourceRouteListItem
-//                            {
-//                                DestinationKey = "$defaultDisplay",
-//                                SourceKey = route.SourceKey,
-//                                Type = eRoutingSignalType.Video
-//                            };
-//                            DoRoute(tempAudio);
-
-//                            var tempVideo = new SourceRouteListItem
-//                            {
-//                                DestinationKey = "$defaultAudio",
-//                                SourceKey = route.SourceKey,
-//                                Type = eRoutingSignalType.Audio
-//                            };
-//                            DoRoute(tempVideo);
-//                            continue;
-//                        }
-//                        else
-//                            DoRoute(route);
-//                    }
-
-//                    // Set volume control on room, using default if non provided
-//                    IBasicVolumeControls volDev = null;
-//                    // Handle special cases for volume control
-//                    if (string.IsNullOrEmpty(item.VolumeControlKey) 
-//                        || item.VolumeControlKey.Equals("$defaultAudio", StringComparison.OrdinalIgnoreCase))
-//                        volDev = DefaultVolumeControls;
-//                    //else if (item.VolumeControlKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-//                    //    volDev = DefaultDisplay as IBasicVolumeControls;
-//                    // Or a specific device, probably rarely used.
-//                    else
-//                    {
-//                        var dev = DeviceManager.GetDeviceForKey(item.VolumeControlKey);
-//                        if (dev is IBasicVolumeControls)
-//                            volDev = dev as IBasicVolumeControls;
-//                        else if (dev is IHasVolumeDevice)
-//                            volDev = (dev as IHasVolumeDevice).VolumeDevice;
-//                    }
-//                    CurrentVolumeControls = volDev;
-
-//                    // store the name and UI info for routes
-//                    if (item.SourceKey != null)
-//                        CurrentSingleSourceInfo = item;
-//                    // And finally, set the "control".  This will trigger event
-//                    //CurrentControlDevice = DeviceManager.GetDeviceForKey(item.SourceKey) as Device;
-
-//                    OnFeedback.FireUpdate();
-
-//                    // report back when done
-//                    if (successCallback != null)
-//                        successCallback();
-//                }, 0); // end of CTimer
-//        }
-
-//        /// <summary>
-//        /// Will power the room on with the last-used source
-//        /// </summary>
-//        public void PowerOnToDefaultOrLastSource()
-//        {
-//            if (!EnablePowerOnToLastSource || LastSourceKey == null)
-//                return;
-//            RunRouteAction(LastSourceKey);
-//        }
-
-//        /// <summary>
-//        /// Does what it says
-//        /// </summary>
-//        public override void SetDefaultLevels()
-//        {
-//            Debug.Console(0, this, "SetDefaultLevels not implemented");
-//        }
-
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        /// <param name="route"></param>
-//        /// <returns></returns>
-//        bool DoRoute(SourceRouteListItem route)
-//        {
-//            IRoutingSinkNoSwitching dest = null;
-
-//            if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-//                dest = DefaultAudioDevice;
-//            //else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
-//            //    dest = DefaultDisplay;
-//            else
-//                dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
-
-//            if (dest == null)
-//            {
-//                Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-//                return false;
-//            }
-
-//            if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-//            {
-//                dest.ReleaseRoute();
-//                if (dest is IPower)
-//                    (dest as IPower).PowerOff();
-//            }
-//            else
-//            {
-//                var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-//                if (source == null)
-//                {
-//                    Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-//                    return false;
-//                }
-//                dest.ReleaseAndMakeRoute(source, route.Type);
-//            }
-//            return true;
-//        }
-
-//        public override void RoomVacatedForTimeoutPeriod(object o)
-//        {
-//            //Implement this
-//        }
-
-//    }
-//}

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -106,12 +106,18 @@ namespace PepperDash.Essentials
                 Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Registration failed. Continuing, but panel may not function: {0}", Panel.RegistrationFailureReason);
 
             // Give up cleanly if SGD is not present.
-            var sgdName = Global.FilePathPrefix
-                + Global.DirectorySeparator + "sgd" + Global.DirectorySeparator + props.SgdFile;
+            var sgdName = Global.FilePathPrefix + "sgd" + Global.DirectorySeparator + props.SgdFile;
             if (!File.Exists(sgdName))
             {
-                Debug.Console(0, this, "ERROR: Smart object file '{0}' not present. Exiting TSW load", sgdName);
-                return;
+                Debug.Console(0, this, "Smart object file '{0}' not present in User folder. Looking for embedded file", sgdName);
+
+                sgdName = Global.ApplicationDirectoryPathPrefix + Global.DirectorySeparator + "SGD" + Global.DirectorySeparator + props.SgdFile;
+
+                if (!File.Exists(sgdName))
+                {
+                    Debug.Console(0, this, "Unable to find SGD file '{0}' in User sgd or application SGD folder. Exiting touchpanel load.", sgdName);
+                    return;
+                }
             }
 
             Panel.LoadSmartObjects(sgdName);

README.md

@@ -1,7 +1,12 @@
 
-# PepperDash Essentials Framework
+# PepperDash Essentials Framework (c) 2020
+
+## License
+Provided under MIT license
 
 ## Overview
+PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs.
+
 Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.
 
 ## Minimum Requirements
@@ -9,36 +14,31 @@ Essentials Framework is a collection of C# / Simpl# Pro libraries that can be ut
 - To edit and compile the source, Microsoft Visual Studio 2008 Professional with SP1 is required.
 - Crestron's Simpl# Plugin is also required (must be obtained from Crestron).
 
+## Dependencies
+
+The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required.  It is referenced as a submodule and will be automatically checked out when cloning this repo if set to recurse submodules.  This allows different builds of the PepperDash.Core library to be referenced by checking out the desired submodule commit.
+
 ## Utilization
 Essentials was originally conceptualized as a standalone application for running control system logic entirely in Simpl# Pro. It is primarily designed around accomplishing this goal, but during development, it became obvious that it could easily be leveraged to also serve as a partner application to one or more SIMPL Windows programs.
 
 Utilization of Essentials Framework falls into the following categories:
 
-1. Standalone Control System Application for controlling one or more rooms
+1. Standalone Control System Application for controlling one or more rooms. See [Standalone Use](https://github.com/PepperDash/Essentials/wiki/Standalone-Use#standalone-application)
 
-2. Partner Application to a SIMPL Windows program. This allows for several useful advantages
+2. Partner Application to a SIMPL Windows program. This allows for several useful advantages. See [SIMPL Windows Bridging](https://github.com/PepperDash/Essentials/wiki/SIMPL-Bridging#simpl-windows-bridging)
 
-- Dynamic device instantiation. Devices can be defined in configuration and instantiated at runtime and then "bridged" to a SIMPL Windows program via EISC.
+- Dynamic device instantiation. Devices can be defined in configuration and instantiated at runtime and then bridged to a SIMPL Windows program via EISC.
 
-- Advanced logic. Some logic operations that cannot be affectively accomplished in SIMPL Windows (ex. JSON/XML serialization/deserialization, database operations, etc.) can be done in the Simpl# Pro environment and the necessary input and output "bridged" to a SIMPL Windows program via EISC.
+- Advanced logic. Some logic operations that cannot be affectively accomplished in SIMPL Windows (ex. JSON/XML serialization/deserialization, database operations, etc.) can be done in the Simpl# Pro environment and the necessary input and output bridged to a SIMPL Windows program via EISC.
 
 3. Hybrid Application that may contain elements of both standalone control and SIMPL partner application integration.
-- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications.  The device can be defined in an Essentials application, interacted with in that application and also "bridged" to one or more SIMPL Windows applications.
+- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications.  The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
 
  ## Documentation
- For detailed documentation, follow this [LINK]() to the Wiki.
+ For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
 ## How-To (Getting Started)
-To help understand Essentials Framework, we recommend starting with the current [Example Build]() and loading it to a Crestron 3-Series processor.
 
-1. First, load the PepperDashEssentials.cpz to the processor in program slot 1 and start the program.
-2. On first boot, the Essentials Application will build the necessary configuration folder structure in the User/Program1/ path.
-3. Load the ExampleEssentialsConfigurationFile.json to the User/Program1/ folder.
-4. Reset the program via console (progreset -p:1).  The program will load the example configuration file.
-5. Launch the EssentialsExampleXpanel.vtz project.  You can interact with the program (which uses simulated device logic to emulate a real commercial huddle room with presentation, audio and video calling capabilities).
-6. Via console, you can run the (**devlist:1**) command to get some insight into what has been loaded from the configuration file into the system .  This will print the basic device information in the form of ["key"] "Name".  The "key" value is what we can use to interact with each device uniquely.
-7. Run the command (**devprops:1 display-1**).  This will print the real-time property values of the device with key "display-1".
-8. Run the command (**devmethods:1 display-1**).  This will print the public methods available for the device with key "display-1".
-9. Run the command (**devjson:1 {"deviceKey":"display-1","methodName":"PowerOn", "params": []}**).  This will call the method PowerOn() on the device with key "display-1".
+See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
 
 

devjson commands.json

@@ -40,4 +40,5 @@ devjson:1 {"deviceKey":"commBridge", "methodName":"ExecuteJoinAction", "params":
 
 devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [ "I'M GETTING TIRED OF THIS" ]}
 
-devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []}
+devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []} 
+

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

@@ -7,7 +7,7 @@ using Crestron.SimplSharp.Net.Http;
 using PepperDash.Core;
 using PepperDash.Core.DebugThings;
 
-namespace PepperDash.Essentials.Devices.Common
+namespace PepperDash.Essentials.Core
 {
 	public class GenericHttpClient : Device, IBasicCommunication
 	{
@@ -23,7 +23,6 @@ namespace PepperDash.Essentials.Devices.Common
 			
 		}
 
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -53,6 +52,7 @@ namespace PepperDash.Essentials.Devices.Common
 			Client.Dispatch(request);
 			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
+
 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
 		{
 			if (error == HTTP_CALLBACK_ERROR.COMPLETED)

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

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/StatusSign/StatusSignController.cs

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -1,156 +1,169 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// A bridge class to cover the basic features of GenericBase hardware
-	/// </summary>
-	public class CrestronGenericBaseDevice : Device, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
-	{
-		public virtual GenericBase Hardware { get; protected set; }
-
-        /// <summary>
-        /// Returns a list containing the Outputs that we want to expose.
-        /// </summary>
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; }
-
-		public BoolFeedback IsOnline { get; private set; }
-		public BoolFeedback IsRegistered { get; private set; }
-		public StringFeedback IpConnectionsText { get; private set; }
-
-		/// <summary>
-		/// Used by implementing classes to prevent registration with Crestron TLDM. For
-		/// devices like RMCs and TXs attached to a chassis.
-		/// </summary>
-		public bool PreventRegistration { get; protected set; }
-
-		public CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
-			: base(key, name)
-		{
-            Feedbacks = new FeedbackCollection<Feedback>();
-
-			Hardware = hardware;
-			IsOnline = new BoolFeedback("IsOnlineFeedback", () => Hardware.IsOnline);
-			IsRegistered = new BoolFeedback("IsRegistered", () => Hardware.Registered);
-			IpConnectionsText = new StringFeedback("IpConnectionsText", () => 
-				string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray()));
-
-            AddToFeedbackList(IsOnline, IsRegistered, IpConnectionsText);
-
-			CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
-		}
-
-		/// <summary>
-		/// Make sure that overriding classes call this!
-		/// Registers the Crestron device, connects up to the base events, starts communication monitor
-		/// </summary>
-		public override bool CustomActivate()
-		{
-            Debug.Console(0, this, "Activating");
-			if (!PreventRegistration)
-			{
-                //Debug.Console(1, this, "  Does not require registration. Skipping");
-
-				var response = Hardware.RegisterWithLogging(Key);
-				if (response != eDeviceRegistrationUnRegistrationResponse.Success)
-				{
-					//Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-					return false;
-				}
-			}
-
-            Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
-            CommunicationMonitor.Start();    
-
-			return true;
-		}
-
-		/// <summary>
-		/// This disconnects events and unregisters the base hardware device.
-		/// </summary>
-		/// <returns></returns>
-		public override bool Deactivate()
-		{
-			CommunicationMonitor.Stop();
-			Hardware.OnlineStatusChange -= Hardware_OnlineStatusChange;
-
-			return Hardware.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
-		}
-	
-        /// <summary>
-        /// Adds feedback(s) to the list
-        /// </summary>
-        /// <param name="newFbs"></param>
-        public void AddToFeedbackList(params Feedback[] newFbs)
-        {
-            foreach (var f in newFbs)
-            {
-                if (f != null)
-                {
-                    if (!Feedbacks.Contains(f))
-                    {
-                        Feedbacks.Add(f);
-                    }
-                }
-            }
-        }
-
-		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-		{
-            if (args.DeviceOnLine)
-            {
-                foreach (var feedback in Feedbacks)
-                {
-                    if (feedback != null)
-                        feedback.FireUpdate();
-                }
-            }
-		}
-
-		#region IStatusMonitor Members
-
-		public StatusMonitorBase CommunicationMonitor { get; private set; }
-		#endregion
-
-        #region IUsageTracking Members
-
-        public UsageTracking UsageTracker { get; set; }
-
-        #endregion
-	}
-
-	//***********************************************************************************
-	public class CrestronGenericBaseDeviceEventIds
-	{
-		public const uint IsOnline = 1;
-		public const uint IpConnectionsText =2;
-	}
-
-	/// <summary>
-	/// Adds logging to Register() failure
-	/// </summary>
-	public static class GenericBaseExtensions
-	{
-		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
-		{
-			var result = device.Register();
-			var level = result == eDeviceRegistrationUnRegistrationResponse.Success ?
-				Debug.ErrorLogLevel.Notice : Debug.ErrorLogLevel.Error;
-			Debug.Console(0, level, "Register device result: '{0}', type '{1}', result {2}", key, device, result);
-			//if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-			//{
-			//    Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
-			//}
-			return result;
-		}
-
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// A bridge class to cover the basic features of GenericBase hardware
+	/// </summary>
+	public class CrestronGenericBaseDevice : Device, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
+	{
+		public virtual GenericBase Hardware { get; protected set; }
+
+        /// <summary>
+        /// Returns a list containing the Outputs that we want to expose.
+        /// </summary>
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; }
+
+		public BoolFeedback IsOnline { get; private set; }
+		public BoolFeedback IsRegistered { get; private set; }
+		public StringFeedback IpConnectionsText { get; private set; }
+
+		/// <summary>
+		/// Used by implementing classes to prevent registration with Crestron TLDM. For
+		/// devices like RMCs and TXs attached to a chassis.
+		/// </summary>
+		public bool PreventRegistration { get; protected set; }
+
+        public CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
+            : base(key, name)
+        {
+            Feedbacks = new FeedbackCollection<Feedback>();
+
+            Hardware = hardware;
+            IsOnline = new BoolFeedback("IsOnlineFeedback", () => Hardware.IsOnline);
+            IsRegistered = new BoolFeedback("IsRegistered", () => Hardware.Registered);
+            IpConnectionsText = new StringFeedback("IpConnectionsText", () =>
+            {
+                if (Hardware.ConnectedIpList != null)
+                    return string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray());
+                else
+                    return string.Empty;
+            });
+            AddToFeedbackList(IsOnline, IpConnectionsText);
+
+            CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
+        }
+
+		/// <summary>
+		/// Make sure that overriding classes call this!
+		/// Registers the Crestron device, connects up to the base events, starts communication monitor
+		/// </summary>
+		public override bool CustomActivate()
+		{
+            Debug.Console(0, this, "Activating");
+			if (!PreventRegistration)
+			{
+                //Debug.Console(1, this, "  Does not require registration. Skipping");
+
+				var response = Hardware.RegisterWithLogging(Key);
+				if (response != eDeviceRegistrationUnRegistrationResponse.Success)
+				{
+					//Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+					return false;
+				}
+
+                IsRegistered.FireUpdate();
+			}
+
+            foreach (var f in Feedbacks)
+            {
+                f.FireUpdate();
+            }
+
+            Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
+            CommunicationMonitor.Start();    
+
+			return true;
+		}
+
+		/// <summary>
+		/// This disconnects events and unregisters the base hardware device.
+		/// </summary>
+		/// <returns></returns>
+		public override bool Deactivate()
+		{
+			CommunicationMonitor.Stop();
+			Hardware.OnlineStatusChange -= Hardware_OnlineStatusChange;
+
+			var success = Hardware.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
+
+            IsRegistered.FireUpdate();
+
+            return success;
+		}
+	
+        /// <summary>
+        /// Adds feedback(s) to the list
+        /// </summary>
+        /// <param name="newFbs"></param>
+        public void AddToFeedbackList(params Feedback[] newFbs)
+        {
+            foreach (var f in newFbs)
+            {
+                if (f != null)
+                {
+                    if (!Feedbacks.Contains(f))
+                    {
+                        Feedbacks.Add(f);
+                    }
+                }
+            }
+        }
+
+		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+		{
+            Debug.Console(2, this, "OnlineStatusChange Event.  Online = {0}", args.DeviceOnLine);
+            foreach (var feedback in Feedbacks)
+            {
+                if (feedback != null)
+                    feedback.FireUpdate();
+            }         
+		}
+
+		#region IStatusMonitor Members
+
+		public StatusMonitorBase CommunicationMonitor { get; private set; }
+		#endregion
+
+        #region IUsageTracking Members
+
+        public UsageTracking UsageTracker { get; set; }
+
+        #endregion
+	}
+
+	//***********************************************************************************
+	public class CrestronGenericBaseDeviceEventIds
+	{
+		public const uint IsOnline = 1;
+		public const uint IpConnectionsText =2;
+	}
+
+	/// <summary>
+	/// Adds logging to Register() failure
+	/// </summary>
+	public static class GenericBaseExtensions
+	{
+		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
+		{
+			var result = device.Register();
+			var level = result == eDeviceRegistrationUnRegistrationResponse.Success ?
+				Debug.ErrorLogLevel.Notice : Debug.ErrorLogLevel.Error;
+			Debug.Console(0, level, "Register device result: '{0}', type '{1}', result {2}", key, device, result);
+			//if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+			//{
+			//    Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
+			//}
+			return result;
+		}
+
+	}
 }

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

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public static class DeviceFeedbackExtensions
+    {
+        /// <summary>
+        /// Attempts to get and return a feedback property from a device by name.
+        /// If unsuccessful, returns null.
+        /// </summary>
+        /// <param name="device"></param>
+        /// <param name="propertyName"></param>
+        /// <returns></returns>
+        public static Feedback GetFeedbackProperty(this Device device, string propertyName)
+        {
+            var feedback = DeviceJsonApi.GetPropertyByName(device.Key, propertyName) as Feedback;
+
+            if (feedback != null)
+            {
+                return feedback;
+            }
+
+            return null;
+        }
+    }
+}

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

@@ -59,7 +59,7 @@ namespace PepperDash.Essentials.Core
 		}
 
 		/// <summary>
-		/// 
+		/// Gets the properties on a device
 		/// </summary>
 		/// <param name="key"></param>
 		/// <returns></returns>
@@ -75,8 +75,34 @@ namespace PepperDash.Essentials.Core
 			return JsonConvert.SerializeObject(props, Formatting.Indented);
 		}
 
+        /// <summary>
+        /// Gets a property from a device path by name
+        /// </summary>
+        /// <param name="deviceObjectPath"></param>
+        /// <param name="propertyName"></param>
+        /// <returns></returns>
+        public static object GetPropertyByName(string deviceObjectPath, string propertyName)
+        {
+            var obj = FindObjectOnPath(deviceObjectPath);
+            if(obj == null)
+                return "{ \"error\":\"No Device\"}";
+
+            CType t = obj.GetType();
+
+            var prop = t.GetProperty(propertyName);
+            if (prop != null)
+            {
+                return prop;
+            }
+            else
+            {
+                Debug.Console(1, "Unable to find Property: {0} on Device with path: {1}", propertyName, deviceObjectPath);
+                return null;
+            }
+        }
+
 		/// <summary>
-		/// 
+		/// Gets the methods on a device
 		/// </summary>
 		/// <param name="key"></param>
 		/// <returns></returns>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -4,10 +4,12 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-
+using Crestron.SimplSharpPro.GeneralIO;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Touchpanels;
 
 namespace PepperDash.Essentials.Core
 {
@@ -46,26 +48,41 @@ namespace PepperDash.Essentials.Core
 
             var typeName = dc.Type.ToLower();
 
-			// Check "core" types first
+
+            // Check for types that have been added by plugin dlls. 
+            if (FactoryMethods.ContainsKey(typeName))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from plugin", dc.Type);
+                return FactoryMethods[typeName](dc);
+            }
+
+			// Check "core" types 
             if (typeName == "genericcomm")
             {
                 Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
                 return new GenericComm(dc);
             }
-            else if (typeName == "ceniodigin104")
+            if (typeName == "ceniodigin104")
             {
                 var control = CommFactory.GetControlPropertiesConfig(dc);
                 var ipid = control.IpIdInt;
 
                 return new CenIoDigIn104Controller(key, name, new Crestron.SimplSharpPro.GeneralIO.CenIoDi104(ipid, Global.ControlSystem));
             }
+		    if (typeName == "statussign")
+		    {
+		        var control = CommFactory.GetControlPropertiesConfig(dc);
+		        var cresnetId = control.CresnetIdInt;
 
-			// then check for types that have been added by plugin dlls. 
-			if (FactoryMethods.ContainsKey(typeName))
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from plugin", dc.Type);
-				return FactoryMethods[typeName](dc);
-			}
+                return  new StatusSignController(key, name, new StatusSign(cresnetId, Global.ControlSystem));
+		    }
+		    if (typeName == "c2nrths")
+		    {
+		        var control = CommFactory.GetControlPropertiesConfig(dc);
+		        var cresnetId = control.CresnetIdInt;
+
+		        return new C2nRthsController(key, name, new C2nRths(cresnetId, Global.ControlSystem));
+		    }
 
             return null;
         }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolFeedback.cs

@@ -32,18 +32,36 @@ namespace PepperDash.Essentials.Core
         List<BoolInputSig> LinkedInputSigs = new List<BoolInputSig>();
         List<BoolInputSig> LinkedComplementInputSigs = new List<BoolInputSig>();
 
+        List<Crestron.SimplSharpPro.DeviceSupport.Feedback> LinkedCrestronFeedbacks = new List<Crestron.SimplSharpPro.DeviceSupport.Feedback>();
+
+        /// <summary>
+        /// Creates the feedback with the Func as described.
+        /// </summary>
+        /// <remarks>
+        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
+        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
+        /// </remarks>
+        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public BoolFeedback(Func<bool> valueFunc)
             : this(null, valueFunc)
         {
         }
 
+        /// <summary>
+        /// Creates the feedback with the Func as described.
+        /// </summary>
+        /// <remarks>
+        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
+        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
+        /// </remarks>
+        /// <param name="key">Key to find this Feedback</param>
+        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public BoolFeedback(string key, Func<bool> valueFunc)
             : base(key)
         {
             ValueFunc = valueFunc;
         }
 
-
         public override void FireUpdate()
         {
             bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();
@@ -56,28 +74,63 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        /// <summary>
+        /// Links an input sig
+        /// </summary>
+        /// <param name="sig"></param>
         public void LinkInputSig(BoolInputSig sig)
         {
             LinkedInputSigs.Add(sig);
             UpdateSig(sig);
         }
 
+        /// <summary>
+        /// Unlinks an inputs sig
+        /// </summary>
+        /// <param name="sig"></param>
         public void UnlinkInputSig(BoolInputSig sig)
         {
             LinkedInputSigs.Remove(sig);
         }
 
+        /// <summary>
+        /// Links an input sig to the complement value
+        /// </summary>
+        /// <param name="sig"></param>
         public void LinkComplementInputSig(BoolInputSig sig)
         {
             LinkedComplementInputSigs.Add(sig);
             UpdateComplementSig(sig);
         }
 
+        /// <summary>
+        /// Unlinks an input sig to the complement value
+        /// </summary>
+        /// <param name="sig"></param>
         public void UnlinkComplementInputSig(BoolInputSig sig)
         {
             LinkedComplementInputSigs.Remove(sig);
         }
 
+        /// <summary>
+        /// Links a Crestron Feedback object
+        /// </summary>
+        /// <param name="feedback"></param>
+        public void LinkCrestronFeedback(Crestron.SimplSharpPro.DeviceSupport.Feedback feedback)
+        {
+            LinkedCrestronFeedbacks.Add(feedback);
+            UpdateCrestronFeedback(feedback);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="feedback"></param>
+        public void UnlinkCrestronFeedback(Crestron.SimplSharpPro.DeviceSupport.Feedback feedback)
+        {
+            LinkedCrestronFeedbacks.Remove(feedback);
+        }
+
         public override string ToString()
         {
             return (InTestMode ? "TEST -- " : "") + BoolValue.ToString();
@@ -103,6 +156,11 @@ namespace PepperDash.Essentials.Core
         {
             sig.BoolValue = !_BoolValue;
         }
+
+        void UpdateCrestronFeedback(Crestron.SimplSharpPro.DeviceSupport.Feedback feedback)
+        {
+            feedback.State = _BoolValue;
+        }
     }
 
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntFeedback.cs

@@ -23,11 +23,28 @@ namespace PepperDash.Essentials.Core
         Func<int> ValueFunc;
         List<UShortInputSig> LinkedInputSigs = new List<UShortInputSig>();
 
+        /// <summary>
+        /// Creates the feedback with the Func as described.
+        /// </summary>
+        /// <remarks>
+        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
+        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
+        /// </remarks>
+        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public IntFeedback(Func<int> valueFunc)
             : this(null, valueFunc)
         {
         }
 
+        /// <summary>
+        /// Creates the feedback with the Func as described.
+        /// </summary>
+        /// <remarks>
+        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
+        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
+        /// </remarks>
+        /// <param name="key">Key to find this Feedback</param>
+        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public IntFeedback(string key, Func<int> valueFunc)
             : base(key)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringFeedback.cs

@@ -7,6 +7,7 @@ using Crestron.SimplSharpPro;
 
 namespace PepperDash.Essentials.Core
 {
+
     public class StringFeedback : Feedback
     {
         public override string StringValue { get { return _StringValue; } } // ValueFunc.Invoke(); } }
@@ -18,16 +19,33 @@ namespace PepperDash.Essentials.Core
         public string TestValue { get; private set; }
 
         /// <summary>
-        /// Evalutated on FireUpdate
+        /// Evaluated on FireUpdate
         /// </summary>
         public Func<string> ValueFunc { get; private set; }
         List<StringInputSig> LinkedInputSigs = new List<StringInputSig>();
 
+        /// <summary>
+        /// Creates the feedback with the Func as described.
+        /// </summary>
+        /// <remarks>
+        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
+        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
+        /// </remarks>
+        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public StringFeedback(Func<string> valueFunc)
             : this(null, valueFunc)
         {
         }
 
+        /// <summary>
+        /// Creates the feedback with the Func as described.
+        /// </summary>
+        /// <remarks>
+        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
+        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
+        /// </remarks>
+        /// <param name="key">Key to find this Feedback</param>
+        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public StringFeedback(string key, Func<string> valueFunc)
             : base(key)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -439,7 +439,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         void GetTouchpanelInfo()
         {
-            // TODO Get IP and Project Name from TP
+            // TODO: Get IP and Project Name from TP
         }
 
         protected void FusionRoom_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)

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

@@ -26,6 +26,17 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public static string FilePathPrefix { get; private set; }
 
+        /// <summary>
+        /// The file path prefix to the applciation directory
+        /// </summary>
+        public static string ApplicationDirectoryPathPrefix 
+        {
+            get
+            {
+                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
+            }
+        }
+
         /// <summary>
         /// Returns the directory separator character based on the running OS
         /// </summary>

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

@@ -31,7 +31,9 @@ namespace PepperDash.Essentials.Core
         }
     }
 
-
+    /// <summary>
+    /// Base class for join maps
+    /// </summary>
     public abstract class JoinMapBase
     {
         /// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/SystemMonitorController.cs

@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.Diagnostics;
-
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -19,18 +14,32 @@ namespace PepperDash.Essentials.Core.Monitoring
     /// </summary>
     public class SystemMonitorController : Device
     {
+        private const long UptimePollTime = 300000;
+        private CTimer _uptimePollTimer;
+
+        private string _uptime;
+        private string _lastStart;
+
         public event EventHandler<EventArgs> SystemMonitorPropertiesChanged;
 
         public Dictionary<uint, ProgramStatusFeedbacks> ProgramStatusFeedbackCollection;
+        public Dictionary<short, EthernetStatusFeedbacks> EthernetStatusFeedbackCollection;
 
-        public IntFeedback TimeZoneFeedback { get; set; }
-        public StringFeedback TimeZoneTextFeedback { get; set; }
+        public IntFeedback TimeZoneFeedback { get; protected set; }
+        public StringFeedback TimeZoneTextFeedback { get; protected set; }
+
+        public StringFeedback IoControllerVersionFeedback { get; protected set; }
+        public StringFeedback SnmpVersionFeedback { get; protected set; }
+        public StringFeedback BaCnetAppVersionFeedback { get; protected set; }
+        public StringFeedback ControllerVersionFeedback { get; protected set; }
+
+        //new feedbacks. Issue #50
+        public StringFeedback SerialNumberFeedback { get; protected set; }
+        public StringFeedback ModelFeedback { get; set; }
+
+        public StringFeedback UptimeFeedback { get; set; }
+        public StringFeedback LastStartFeedback { get; set; }
 
-        public StringFeedback IOControllerVersionFeedback { get; set; }
-        public StringFeedback SnmpVersionFeedback { get; set; }
-        public StringFeedback BACnetAppVersionFeedback { get; set; }
-        public StringFeedback ControllerVersionFeedback { get; set; }
-        
         public SystemMonitorController(string key)
             : base(key)
         {
@@ -38,21 +47,18 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
 
-            //CrestronConsole.AddNewConsoleCommand(RefreshSystemMonitorData, "RefreshSystemMonitor", "Refreshes System Monitor Feedbacks", ConsoleAccessLevelEnum.AccessOperator);
+            TimeZoneFeedback = new IntFeedback(() => SystemMonitor.TimeZoneInformation.TimeZoneNumber);
+            TimeZoneTextFeedback = new StringFeedback(() => SystemMonitor.TimeZoneInformation.TimeZoneName);
 
-            TimeZoneFeedback = new IntFeedback(new Func<int>( () => SystemMonitor.TimeZoneInformation.TimeZoneNumber));
-            TimeZoneTextFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.TimeZoneInformation.TimeZoneName));
+            IoControllerVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.IOPVersion);
+            SnmpVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.SNMPVersion);
+            BaCnetAppVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.BACNetVersion);
+            ControllerVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.ControlSystemVersion);
 
-            IOControllerVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.IOPVersion));
-            SnmpVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.SNMPVersion));
-            BACnetAppVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.BACNetVersion));
-            ControllerVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.ControlSystemVersion));
-
-            //var status = string.Format("System Monitor Status: \r TimeZone: {0}\rTimeZoneText: {1}\rIOControllerVersion: {2}\rSnmpAppVersionFeedback: {3}\rBACnetAppVersionFeedback: {4}\rControllerVersionFeedback: {5}",
-            //    SystemMonitor.TimeZoneInformation.TimeZoneNumber, SystemMonitor.TimeZoneInformation.TimeZoneName, SystemMonitor.VersionInformation.IOPVersion, SystemMonitor.VersionInformation.SNMPVersion,
-            //    SystemMonitor.VersionInformation.BACNetVersion, SystemMonitor.VersionInformation.ControlSystemVersion);
-                
-            //Debug.Console(1, this, status);
+            SerialNumberFeedback = new StringFeedback(() => CrestronEnvironment.SystemInfo.SerialNumber);
+            ModelFeedback = new StringFeedback(() => InitialParametersClass.ControllerPromptName);
+            UptimeFeedback = new StringFeedback(() => _uptime);
+            LastStartFeedback = new StringFeedback(()=> _lastStart);
 
             ProgramStatusFeedbackCollection = new Dictionary<uint, ProgramStatusFeedbacks>();
 
@@ -62,43 +68,129 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramStatusFeedbackCollection.Add(prog.Number, program);
             }
 
-            SystemMonitor.ProgramChange += new ProgramStateChangeEventHandler(SystemMonitor_ProgramChange);
-            SystemMonitor.TimeZoneInformation.TimeZoneChange += new TimeZoneChangeEventHandler(TimeZoneInformation_TimeZoneChange);
+            CreateEthernetStatusFeedbacks();
+            UpdateEthernetStatusFeeedbacks();
+
+            _uptimePollTimer = new CTimer(PollUptime,null,0, UptimePollTime);
+
+            SystemMonitor.ProgramChange += SystemMonitor_ProgramChange;
+            SystemMonitor.TimeZoneInformation.TimeZoneChange += TimeZoneInformation_TimeZoneChange;
+            CrestronEnvironment.EthernetEventHandler += CrestronEnvironmentOnEthernetEventHandler;
+            CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironmentOnProgramStatusEventHandler;
+        }
+
+        private void CrestronEnvironmentOnProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType != eProgramStatusEventType.Stopping) return;
+
+            _uptimePollTimer.Stop();
+            _uptimePollTimer.Dispose();
+            _uptimePollTimer = null;
+        }
+
+        private void PollUptime(object obj)
+        {
+            var consoleResponse = string.Empty;
+
+            CrestronConsole.SendControlSystemCommand("uptime", ref consoleResponse);
+
+            ParseUptime(consoleResponse);
+
+            UptimeFeedback.FireUpdate();
+            LastStartFeedback.FireUpdate();
+        }
+
+        private void ParseUptime(string response)
+        {
+            var splitString = response.Trim().Split('\r', '\n');
+
+            var lastStartRaw = splitString[2];
+            var lastStartIndex = lastStartRaw.IndexOf(':');
+
+            _lastStart = lastStartRaw.Substring(lastStartIndex + 1).Trim();
+
+            var uptimeRaw = splitString[0];
+
+            var forIndex = uptimeRaw.IndexOf("for", StringComparison.Ordinal);
+
+            //4 => "for " to get what's on the right
+            _uptime = uptimeRaw.Substring(forIndex + 4);
+        }
+
+        private void CrestronEnvironmentOnEthernetEventHandler(EthernetEventArgs ethernetEventArgs)
+        {
+            if (ethernetEventArgs.EthernetEventType != eEthernetEventType.LinkUp) return;
+
+            foreach (var fb in EthernetStatusFeedbackCollection)
+            {
+                fb.Value.UpdateEthernetStatus();
+            }
+        }
+
+        private void CreateEthernetStatusFeedbacks()
+        {
+            EthernetStatusFeedbackCollection = new Dictionary<short, EthernetStatusFeedbacks>();
+
+            for (short i = 0; i < InitialParametersClass.NumberOfEthernetInterfaces; i++)
+            {
+                var ethernetInterface = new EthernetStatusFeedbacks(i);
+                EthernetStatusFeedbackCollection.Add(i, ethernetInterface);
+            }
+        }
+
+        private void UpdateEthernetStatusFeeedbacks()
+        {
+            foreach (var iface in EthernetStatusFeedbackCollection)
+            {
+                iface.Value.CurrentIpAddressFeedback.FireUpdate();
+                iface.Value.CurrentSubnetMaskFeedback.FireUpdate();
+                iface.Value.CurrentDefaultGatewayFeedback.FireUpdate();
+                iface.Value.StaticIpAddressFeedback.FireUpdate();
+                iface.Value.StaticSubnetMaskFeedback.FireUpdate();
+                iface.Value.StaticDefaultGatewayFeedback.FireUpdate();
+                iface.Value.HostNameFeedback.FireUpdate();
+                iface.Value.DnsServerFeedback.FireUpdate();
+                iface.Value.DomainFeedback.FireUpdate();
+                iface.Value.DhcpStatusFeedback.FireUpdate();
+                iface.Value.MacAddressFeedback.FireUpdate();
+            }
         }
 
         /// <summary>
         /// Gets data in separate thread
         /// </summary>
-        /// <param name="command"></param>
-        void RefreshSystemMonitorData(string command)
+        private void RefreshSystemMonitorData()
         {
             // this takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke((o) =>
-                {
-                    TimeZoneFeedback.FireUpdate();
-                    TimeZoneTextFeedback.FireUpdate();
-                    IOControllerVersionFeedback.FireUpdate();
-                    SnmpVersionFeedback.FireUpdate();
-                    BACnetAppVersionFeedback.FireUpdate();
-                    ControllerVersionFeedback.FireUpdate();
-
-                    OnSystemMonitorPropertiesChanged();
-                }
-            );
+            CrestronInvoke.BeginInvoke(UpdateFeedback);
         }
 
-        void OnSystemMonitorPropertiesChanged()
+        private void UpdateFeedback(object o)
+        {
+            TimeZoneFeedback.FireUpdate();
+            TimeZoneTextFeedback.FireUpdate();
+            IoControllerVersionFeedback.FireUpdate();
+            SnmpVersionFeedback.FireUpdate();
+            BaCnetAppVersionFeedback.FireUpdate();
+            ControllerVersionFeedback.FireUpdate();
+            SerialNumberFeedback.FireUpdate();
+            ModelFeedback.FireUpdate();
+
+            OnSystemMonitorPropertiesChanged();
+        }
+
+        private void OnSystemMonitorPropertiesChanged()
         {
             var handler = SystemMonitorPropertiesChanged;
             if (handler != null)
             {
-                handler(this, new EventArgs());   
+                handler(this, new EventArgs());
             }
         }
 
         public override bool CustomActivate()
         {
-            RefreshSystemMonitorData(null);
+            RefreshSystemMonitorData();
 
             return base.CustomActivate();
         }
@@ -114,46 +206,41 @@ namespace PepperDash.Essentials.Core.Monitoring
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="args"></param>
-        void SystemMonitor_ProgramChange(Program sender, ProgramEventArgs args)
+        private void SystemMonitor_ProgramChange(Program sender, ProgramEventArgs args)
         {
             Debug.Console(2, this, "Program Change Detected for slot: {0}", sender.Number);
             Debug.Console(2, this, "Event Type: {0}", args.EventType);
 
             var program = ProgramStatusFeedbackCollection[sender.Number];
 
-            if (args.EventType == eProgramChangeEventType.OperatingState)
+            switch (args.EventType)
             {
-                program.ProgramStartedFeedback.FireUpdate();
-                program.ProgramStoppedFeedback.FireUpdate();
-
-                program.ProgramInfo.OperatingState = args.OperatingState;
-
-				//program.GetProgramInfo();
-
-				if (args.OperatingState == eProgramOperatingState.Start)
-					program.GetProgramInfo();
-				else
-				{
-					program.AggregatedProgramInfoFeedback.FireUpdate();
-					program.OnProgramInfoChanged();
-				}
+                case eProgramChangeEventType.OperatingState:
+                    program.ProgramStartedFeedback.FireUpdate();
+                    program.ProgramStoppedFeedback.FireUpdate();
+                    program.ProgramInfo.OperatingState = args.OperatingState;
+                    if (args.OperatingState == eProgramOperatingState.Start)
+                        program.GetProgramInfo();
+                    else
+                    {
+                        program.AggregatedProgramInfoFeedback.FireUpdate();
+                        program.OnProgramInfoChanged();
+                    }
+                    break;
+                case eProgramChangeEventType.RegistrationState:
+                    program.ProgramRegisteredFeedback.FireUpdate();
+                    program.ProgramUnregisteredFeedback.FireUpdate();
+                    program.ProgramInfo.RegistrationState = args.RegistrationState;
+                    program.GetProgramInfo();
+                    break;
             }
-            else if (args.EventType == eProgramChangeEventType.RegistrationState)
-            {
-                program.ProgramRegisteredFeedback.FireUpdate();
-                program.ProgramUnregisteredFeedback.FireUpdate();
-
-                program.ProgramInfo.RegistrationState = args.RegistrationState;
-
-                program.GetProgramInfo();
-            }         
         }
 
         /// <summary>
         /// Responds to time zone changes and updates the appropriate feedbacks
         /// </summary>
         /// <param name="args"></param>
-        void TimeZoneInformation_TimeZoneChange(TimeZoneEventArgs args)
+        private void TimeZoneInformation_TimeZoneChange(TimeZoneEventArgs args)
         {
             Debug.Console(2, this, "Time Zone Change Detected.");
             TimeZoneFeedback.FireUpdate();
@@ -162,6 +249,98 @@ namespace PepperDash.Essentials.Core.Monitoring
             OnSystemMonitorPropertiesChanged();
         }
 
+        public class EthernetStatusFeedbacks
+        {
+            public StringFeedback HostNameFeedback { get; protected set; }
+            public StringFeedback DnsServerFeedback { get; protected set; }
+            public StringFeedback DomainFeedback { get; protected set; }
+            public StringFeedback MacAddressFeedback { get; protected set; }
+            public StringFeedback DhcpStatusFeedback { get; protected set; }
+
+            public StringFeedback CurrentIpAddressFeedback { get; protected set; }
+            public StringFeedback CurrentSubnetMaskFeedback { get; protected set; }
+            public StringFeedback CurrentDefaultGatewayFeedback { get; protected set; }
+            
+            public StringFeedback StaticIpAddressFeedback { get; protected set; }
+            public StringFeedback StaticSubnetMaskFeedback { get; protected set; }
+            public StringFeedback StaticDefaultGatewayFeedback { get; protected set; }
+
+            public EthernetStatusFeedbacks(short adapterIndex)
+            {
+                HostNameFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, adapterIndex));
+
+                CurrentIpAddressFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex));
+                CurrentDefaultGatewayFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex));
+                CurrentSubnetMaskFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex));
+                StaticIpAddressFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex));
+                StaticDefaultGatewayFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex));
+                StaticSubnetMaskFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex));
+                DomainFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, adapterIndex));
+                DnsServerFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, adapterIndex));
+                MacAddressFeedback =
+                    new StringFeedback(
+                        () =>
+                            CrestronEthernetHelper.GetEthernetParameter(
+                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, adapterIndex));
+
+                DhcpStatusFeedback = new StringFeedback(
+                    () =>
+                        CrestronEthernetHelper.GetEthernetParameter(
+                            CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, adapterIndex));
+            }
+
+            public void UpdateEthernetStatus()
+            {
+                HostNameFeedback.FireUpdate();
+                CurrentIpAddressFeedback.FireUpdate();
+                CurrentSubnetMaskFeedback.FireUpdate();
+                CurrentDefaultGatewayFeedback.FireUpdate();
+                StaticIpAddressFeedback.FireUpdate();
+                StaticSubnetMaskFeedback.FireUpdate();
+                StaticDefaultGatewayFeedback.FireUpdate();
+                DomainFeedback.FireUpdate();
+                DnsServerFeedback.FireUpdate();
+                MacAddressFeedback.FireUpdate();
+                DhcpStatusFeedback.FireUpdate();
+            }
+        }
+
 
         public class ProgramStatusFeedbacks
         {
@@ -192,17 +371,19 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramInfo.OperatingState = Program.OperatingState;
                 ProgramInfo.RegistrationState = Program.RegistrationState;
 
-                ProgramStartedFeedback = new BoolFeedback(new Func<bool>( () => Program.OperatingState == eProgramOperatingState.Start));
-                ProgramStoppedFeedback = new BoolFeedback(new Func<bool>( () => Program.OperatingState == eProgramOperatingState.Stop));
-                ProgramRegisteredFeedback = new BoolFeedback(new Func<bool>( () => Program.RegistrationState == eProgramRegistrationState.Register));
-                ProgramUnregisteredFeedback = new BoolFeedback(new Func<bool>( () => Program.RegistrationState == eProgramRegistrationState.Unregister));
+                ProgramStartedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Start);
+                ProgramStoppedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Stop);
+                ProgramRegisteredFeedback =
+                    new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Register);
+                ProgramUnregisteredFeedback =
+                    new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Unregister);
 
-                ProgramNameFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.ProgramFile));
-                ProgramCompileTimeFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.CompileTime));
-                CrestronDataBaseVersionFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.CrestronDB));
-                EnvironmentVersionFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.Environment));
+                ProgramNameFeedback = new StringFeedback(() => ProgramInfo.ProgramFile);
+                ProgramCompileTimeFeedback = new StringFeedback(() => ProgramInfo.CompileTime);
+                CrestronDataBaseVersionFeedback = new StringFeedback(() => ProgramInfo.CrestronDb);
+                EnvironmentVersionFeedback = new StringFeedback(() => ProgramInfo.Environment);
 
-                AggregatedProgramInfoFeedback = new StringFeedback(new Func<string>(() => JsonConvert.SerializeObject(ProgramInfo)));
+                AggregatedProgramInfoFeedback = new StringFeedback(() => JsonConvert.SerializeObject(ProgramInfo));
 
                 GetProgramInfo();
             }
@@ -212,74 +393,99 @@ namespace PepperDash.Essentials.Core.Monitoring
             /// </summary>
             public void GetProgramInfo()
             {
-                CrestronInvoke.BeginInvoke((o) =>
+                CrestronInvoke.BeginInvoke(GetProgramInfo);
+            }
+
+            private void GetProgramInfo(object o)
+            {
+                Debug.Console(2, "Attempting to get program info for slot: {0}", Program.Number);
+
+                string response = null;
+
+                if (Program.RegistrationState == eProgramRegistrationState.Unregister || Program.OperatingState == eProgramOperatingState.Stop)
                 {
-                    Debug.Console(2, "Attempting to get program info for slot: {0}", Program.Number);
+                    Debug.Console(2, "Program {0} not registered. Setting default values for program information.",
+                        Program.Number);
 
-                    string response = null;
-
-                    var success = CrestronConsole.SendControlSystemCommand(string.Format("progcomments:{0}", Program.Number), ref response);
-
-                    if (success)
+                    ProgramInfo = new ProgramInfo(Program.Number)
                     {
-                        //Debug.Console(2, "Progcomments Response: \r{0}", response);
+                        OperatingState = Program.OperatingState,
+                        RegistrationState = Program.RegistrationState
+                    };
 
-                        if (!response.ToLower().Contains("bad or incomplete"))
-                        {
-                            // Shared properteis
-                            ProgramInfo.ProgramFile = ParseConsoleData(response, "Program File", ": ", "\n");
-                            ProgramInfo.CompilerRevision = ParseConsoleData(response, "Compiler Rev", ": ", "\n");
-                            ProgramInfo.CompileTime = ParseConsoleData(response, "Compiled On", ": ", "\n");
-                            ProgramInfo.Include4Dat = ParseConsoleData(response, "Include4.dat", ": ", "\n");
+                    return;
+                }
 
+                var success = CrestronConsole.SendControlSystemCommand(
+                    string.Format("progcomments:{0}", Program.Number), ref response);
 
+                if (!success)
+                {
+                    Debug.Console(2, "Progcomments Attempt Unsuccessful for slot: {0}", Program.Number);
+                    UpdateFeedbacks();
+                    return;
+                }
 
-                            if (ProgramInfo.ProgramFile.Contains(".dll"))
-                            {
-                                // SSP Program
-                                ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ": ", "\n");
-                                ProgramInfo.ApplicationName = ParseConsoleData(response, "Application Name", ": ", "\n");
-                                ProgramInfo.ProgramTool = ParseConsoleData(response, "Program Tool", ": ", "\n");
-                                ProgramInfo.MinFirmwareVersion = ParseConsoleData(response, "Min Firmware Version", ": ", "\n");
-                                ProgramInfo.PlugInVersion = ParseConsoleData(response, "PlugInVersion", ": ", "\n");
-                            }
-                            else if (ProgramInfo.ProgramFile.Contains(".smw"))
-                            {
-                                // SIMPL Windows Program
-                                ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ":", "\n");
-                                ProgramInfo.SystemName = ParseConsoleData(response, "System Name", ": ", "\n");
-                                ProgramInfo.CrestronDB = ParseConsoleData(response, "CrestronDB", ": ", "\n");
-                                ProgramInfo.Environment = ParseConsoleData(response, "Source Env", ": ", "\n");
-                                ProgramInfo.Programmer = ParseConsoleData(response, "Programmer", ": ", "\n");
+                if (response.ToLower().Contains("bad or incomplete"))
+                {
+                    Debug.Console(2,
+                        "Program in slot {0} not running.  Setting default ProgramInfo for slot: {0}",
+                        Program.Number);
 
-                            }
-                            //Debug.Console(2, "ProgramInfo: \r{0}", JsonConvert.SerializeObject(ProgramInfo));
-                        }
-                        else
-                        {
-                            Debug.Console(2, "Bad or incomplete console command response.  Initializing ProgramInfo for slot: {0}", Program.Number);
-
-                            // Assume no valid program info.  Constructing a new object will wipe all properties
-                            ProgramInfo = new ProgramInfo(Program.Number);
-
-                            ProgramInfo.OperatingState = Program.OperatingState;
-                            ProgramInfo.RegistrationState = Program.RegistrationState;
-                        }
-                    }
-                    else
+                    // Assume no valid program info.  Constructing a new object will wipe all properties
+                    ProgramInfo = new ProgramInfo(Program.Number)
                     {
-                        Debug.Console(2, "Progcomments Attempt Unsuccessful for slot: {0}", Program.Number);
-                    }
+                        OperatingState = Program.OperatingState,
+                        RegistrationState = Program.RegistrationState
+                    };
 
-                    ProgramNameFeedback.FireUpdate();
-                    ProgramCompileTimeFeedback.FireUpdate();
-                    CrestronDataBaseVersionFeedback.FireUpdate();
-                    EnvironmentVersionFeedback.FireUpdate();
+                    UpdateFeedbacks();
 
-                    AggregatedProgramInfoFeedback.FireUpdate();
+                    return;
+                }
 
-                    OnProgramInfoChanged();
-                });
+
+                // Shared properteis
+                ProgramInfo.ProgramFile = ParseConsoleData(response, "Program File", ": ", "\n");
+                ProgramInfo.CompilerRevision = ParseConsoleData(response, "Compiler Rev", ": ", "\n");
+                ProgramInfo.CompileTime = ParseConsoleData(response, "Compiled On", ": ", "\n");
+                ProgramInfo.Include4Dat = ParseConsoleData(response, "Include4.dat", ": ", "\n");
+
+
+                if (ProgramInfo.ProgramFile.Contains(".dll"))
+                {
+                    // SSP Program
+                    ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ": ", "\n");
+                    ProgramInfo.ApplicationName = ParseConsoleData(response, "Application Name", ": ", "\n");
+                    ProgramInfo.ProgramTool = ParseConsoleData(response, "Program Tool", ": ", "\n");
+                    ProgramInfo.MinFirmwareVersion = ParseConsoleData(response, "Min Firmware Version", ": ",
+                        "\n");
+                    ProgramInfo.PlugInVersion = ParseConsoleData(response, "PlugInVersion", ": ", "\n");
+                }
+                else if (ProgramInfo.ProgramFile.Contains(".smw"))
+                {
+                    // SIMPL Windows Program
+                    ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ":", "\n");
+                    ProgramInfo.SystemName = ParseConsoleData(response, "System Name", ": ", "\n");
+                    ProgramInfo.CrestronDb = ParseConsoleData(response, "CrestronDB", ": ", "\n");
+                    ProgramInfo.Environment = ParseConsoleData(response, "Source Env", ": ", "\n");
+                    ProgramInfo.Programmer = ParseConsoleData(response, "Programmer", ": ", "\n");
+                }
+                Debug.Console(2, "Program info for slot {0} successfully updated", Program.Number);
+
+                UpdateFeedbacks();
+            }
+
+            private void UpdateFeedbacks()
+            {
+                ProgramNameFeedback.FireUpdate();
+                ProgramCompileTimeFeedback.FireUpdate();
+                CrestronDataBaseVersionFeedback.FireUpdate();
+                EnvironmentVersionFeedback.FireUpdate();
+
+                AggregatedProgramInfoFeedback.FireUpdate();
+
+                OnProgramInfoChanged();
             }
 
             public void OnProgramInfoChanged()
@@ -294,30 +500,28 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             private string ParseConsoleData(string data, string line, string startString, string endString)
             {
-                string outputData = "";
+                var outputData = "";
 
-                if (data.Length > 0)
+                if (data.Length <= 0) return outputData;
+
+                try
                 {
-                    try
-                    {
-
-                        //Debug.Console(2, "ParseConsoleData Data: {0}, Line {1}, startStirng {2}, endString {3}", data, line, startString, endString);
-                        var linePosition = data.IndexOf(line);
-                        var startPosition = data.IndexOf(startString, linePosition) + startString.Length;
-                        var endPosition = data.IndexOf(endString, startPosition);
-                        outputData = data.Substring(startPosition, endPosition - startPosition).Trim();
-                        //Debug.Console(2, "ParseConsoleData Return: {0}", outputData);
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(1, "Error Parsing Console Data:\r{0}", e);
-                    }
+                    //Debug.Console(2, "ParseConsoleData Data: {0}, Line {1}, startStirng {2}, endString {3}", data, line, startString, endString);
+                    var linePosition = data.IndexOf(line, StringComparison.Ordinal);
+                    var startPosition = data.IndexOf(startString, linePosition, StringComparison.Ordinal) +
+                                        startString.Length;
+                    var endPosition = data.IndexOf(endString, startPosition, StringComparison.Ordinal);
+                    outputData = data.Substring(startPosition, endPosition - startPosition).Trim();
+                    //Debug.Console(2, "ParseConsoleData Return: {0}", outputData);
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(1, "Error Parsing Console Data:\r{0}", e);
                 }
 
                 return outputData;
             }
         }
-
     }
 
     /// <summary>
@@ -330,32 +534,39 @@ namespace PepperDash.Essentials.Core.Monitoring
         [JsonProperty("programNumber")]
         public uint ProgramNumber { get; private set; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonConverter(typeof (StringEnumConverter))]
         [JsonProperty("operatingState")]
         public eProgramOperatingState OperatingState { get; set; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonConverter(typeof (StringEnumConverter))]
         [JsonProperty("registrationState")]
         public eProgramRegistrationState RegistrationState { get; set; }
 
         [JsonProperty("programFile")]
         public string ProgramFile { get; set; }
+
         [JsonProperty("friendlyName")]
         public string FriendlyName { get; set; }
+
         [JsonProperty("compilerRevision")]
         public string CompilerRevision { get; set; }
+
         [JsonProperty("compileTime")]
         public string CompileTime { get; set; }
+
         [JsonProperty("include4Dat")]
         public string Include4Dat { get; set; }
 
         // SIMPL Windows properties
         [JsonProperty("systemName")]
         public string SystemName { get; set; }
+
         [JsonProperty("crestronDb")]
-        public string CrestronDB { get; set; }
+        public string CrestronDb { get; set; }
+
         [JsonProperty("environment")]
         public string Environment { get; set; }
+
         [JsonProperty("programmer")]
         public string Programmer { get; set; }
 
@@ -363,10 +574,13 @@ namespace PepperDash.Essentials.Core.Monitoring
         // SSP Properties
         [JsonProperty("applicationName")]
         public string ApplicationName { get; set; }
+
         [JsonProperty("programTool")]
         public string ProgramTool { get; set; }
+
         [JsonProperty("minFirmwareVersion")]
         public string MinFirmwareVersion { get; set; }
+
         [JsonProperty("plugInVersion")]
         public string PlugInVersion { get; set; }
 
@@ -381,7 +595,7 @@ namespace PepperDash.Essentials.Core.Monitoring
             Include4Dat = "";
 
             SystemName = "";
-            CrestronDB = "";
+            CrestronDb = "";
             Environment = "";
             Programmer = "";
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -64,7 +64,7 @@
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -113,11 +113,13 @@
   <ItemGroup>
     <Compile Include="Config\Comm and IR\CecPortController.cs" />
     <Compile Include="Config\Comm and IR\GenericComm.cs" />
+    <Compile Include="Config\Comm and IR\GenericHttpClient.cs" />
     <Compile Include="Config\Essentials\ConfigUpdater.cs" />
     <Compile Include="Config\Essentials\ConfigReader.cs" />
     <Compile Include="Config\Essentials\ConfigWriter.cs" />
     <Compile Include="Config\Essentials\EssentialsConfig.cs" />
     <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
+    <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
     <Compile Include="Crestron IO\Inputs\CenIoDigIn104Controller.cs" />
     <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
@@ -125,9 +127,11 @@
     <Compile Include="Crestron IO\IOPortConfig.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
+    <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
+    <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
@@ -233,6 +237,7 @@
     <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="Touchpanels\Interfaces.cs" />
     <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
+    <Compile Include="Touchpanels\Mpc3Touchpanel.cs" />
     <Compile Include="Touchpanels\TriListExtensions.cs" />
     <Compile Include="UI PageManagers\BlurayPageManager.cs" />
     <Compile Include="UI PageManagers\SetTopBoxThreePanelPageManager.cs" />

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

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

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

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs

@@ -1,7 +1,11 @@
 using System.Reflection;
+using Crestron.SimplSharp.Reflection;
+
+[assembly: System.Reflection.AssemblyTitle("PepperDashEssentialsBase")]
+[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")]
 
-[assembly: AssemblyTitle("PepperDashEssentialsBase")]
-[assembly: AssemblyCompany("PepperDash Technology Corp")]
-[assembly: AssemblyProduct("PepperDashEssentialsBase")]
-[assembly: AssemblyCopyright("Copyright © Ppperdash 2019")]
-[assembly: AssemblyVersion("1.4.0.*")]

essentials-framework/Essentials Core/PepperDashEssentialsBase/References/SSMonoIOLibrary.clz/SSMonoIOLibrary.config

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/References/SSMonoIOLibrary.clz/manifest.info

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/References/SSMonoProTaskLibrary.cplz/SSMonoProTaskLibrary.config

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/References/SSMonoProTaskLibrary.cplz/manifest.info

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Timers/CountdownTimer.cs

@@ -1,134 +1,149 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public class SecondsCountdownTimer: IKeyed
-    {
-        public event EventHandler<EventArgs> HasStarted;
-        public event EventHandler<EventArgs> HasFinished;
-        public event EventHandler<EventArgs> WasCancelled;
-
-        public string Key { get; private set; }
-
-        public BoolFeedback IsRunningFeedback { get; private set; }
-        bool _IsRunning;
-
-        public IntFeedback PercentFeedback { get; private set; }
-        public StringFeedback TimeRemainingFeedback { get; private set; }
-
-        public bool CountsDown { get; set; }
-        public int SecondsToCount { get; set; }
-        
-        public DateTime StartTime { get; private set; }
-        public DateTime FinishTime { get; private set; }
- 
-        CTimer SecondTimer;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        public SecondsCountdownTimer(string key)
-        {
-            Key = key;
-            IsRunningFeedback = new BoolFeedback(() => _IsRunning);
-
-            TimeRemainingFeedback = new StringFeedback(() =>
-                {
-                    // Need to handle up and down here.
-
-                    if (StartTime == null || FinishTime == null)
-                        return "";
-                    var timeSpan = FinishTime - DateTime.Now;
-                    return Math.Round(timeSpan.TotalSeconds).ToString();
-                });
-
-            PercentFeedback = new IntFeedback(() =>
-            {
-                if (StartTime == null || FinishTime == null)
-                    return 0;
-                double percent = (FinishTime - DateTime.Now).TotalSeconds
-                    / (FinishTime - StartTime).TotalSeconds 
-                    * 100;
-                return (int)percent;
-            });
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void Start()
-        {
-            if (_IsRunning)
-                return;
-            StartTime = DateTime.Now;
-            FinishTime = StartTime + TimeSpan.FromSeconds(SecondsToCount);
-
-            if (SecondTimer != null)
-                SecondTimer.Stop();
-            SecondTimer = new CTimer(SecondElapsedTimerCallback, null, 0, 1000);
-            _IsRunning = true;
-            IsRunningFeedback.FireUpdate();
-
-            var handler = HasStarted;
-            if (handler != null)
-                handler(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void Reset()
-        {
-            _IsRunning = false;
-            Start();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void Cancel()
-        {
-            StopHelper();
-            
-            var handler = WasCancelled;
-            if (handler != null)
-                handler(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// Called upon expiration, or calling this will force timer to finish.
-        /// </summary>
-        public void Finish()
-        {
-            StopHelper();
-
-            var handler = HasFinished;
-            if (handler != null)
-                handler(this, new EventArgs());
-        }
-
-        void StopHelper()
-        {
-            if (SecondTimer != null)
-                SecondTimer.Stop();
-            _IsRunning = false;
-            IsRunningFeedback.FireUpdate(); 
-        }
-
-        void SecondElapsedTimerCallback(object o)
-        {
-            PercentFeedback.FireUpdate();
-            TimeRemainingFeedback.FireUpdate();
-
-            if (DateTime.Now >= FinishTime)
-                Finish();
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public class SecondsCountdownTimer: IKeyed
+    {
+        public event EventHandler<EventArgs> HasStarted;
+        public event EventHandler<EventArgs> HasFinished;
+        public event EventHandler<EventArgs> WasCancelled;
+
+        public string Key { get; private set; }
+
+        public BoolFeedback IsRunningFeedback { get; private set; }
+        bool _IsRunning;
+
+        public IntFeedback PercentFeedback { get; private set; }
+        public StringFeedback TimeRemainingFeedback { get; private set; }
+
+        public bool CountsDown { get; set; }
+
+        /// <summary>
+        /// The number of seconds to countdown
+        /// </summary>
+        public int SecondsToCount { get; set; }
+        
+        public DateTime StartTime { get; private set; }
+        public DateTime FinishTime { get; private set; }
+ 
+        CTimer SecondTimer;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        public SecondsCountdownTimer(string key)
+        {
+            Key = key;
+            IsRunningFeedback = new BoolFeedback(() => _IsRunning);
+
+            TimeRemainingFeedback = new StringFeedback(() =>
+                {
+                    // Need to handle up and down here.
+
+                    if (StartTime == null || FinishTime == null)
+                        return "";
+                    var timeSpan = FinishTime - DateTime.Now;
+
+                    if (timeSpan.TotalSeconds < 60)
+                    {
+                        return Math.Round(timeSpan.TotalSeconds).ToString();
+                    }
+                    else
+                    {
+                        Debug.Console(2, this, "timeSpan.Minutes == {0}, timeSpan.Seconds == {1}", timeSpan.Minutes, timeSpan.Seconds);
+                        return String.Format("{0:D2}:{1:D2}",
+                            timeSpan.Minutes,
+                            timeSpan.Seconds);
+                    }
+                });
+
+            PercentFeedback = new IntFeedback(() =>
+            {
+                if (StartTime == null || FinishTime == null)
+                    return 0;
+                double percent = (FinishTime - DateTime.Now).TotalSeconds
+                    / (FinishTime - StartTime).TotalSeconds 
+                    * 100;
+                return (int)percent;
+            });
+        }
+
+        /// <summary>
+        /// Starts the Timer
+        /// </summary>
+        public void Start()
+        {
+            if (_IsRunning)
+                return;
+            StartTime = DateTime.Now;
+            FinishTime = StartTime + TimeSpan.FromSeconds(SecondsToCount);
+
+            if (SecondTimer != null)
+                SecondTimer.Stop();
+            SecondTimer = new CTimer(SecondElapsedTimerCallback, null, 0, 1000);
+            _IsRunning = true;
+            IsRunningFeedback.FireUpdate();
+
+            var handler = HasStarted;
+            if (handler != null)
+                handler(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Restarts the timer
+        /// </summary>
+        public void Reset()
+        {
+            _IsRunning = false;
+            Start();
+        }
+
+        /// <summary>
+        /// Cancels the timer (without triggering it to finish)
+        /// </summary>
+        public void Cancel()
+        {
+            StopHelper();
+            
+            var handler = WasCancelled;
+            if (handler != null)
+                handler(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Called upon expiration, or calling this will force timer to finish.
+        /// </summary>
+        public void Finish()
+        {
+            StopHelper();
+
+            var handler = HasFinished;
+            if (handler != null)
+                handler(this, new EventArgs());
+        }
+
+        void StopHelper()
+        {
+            if (SecondTimer != null)
+                SecondTimer.Stop();
+            _IsRunning = false;
+            IsRunningFeedback.FireUpdate(); 
+        }
+
+        void SecondElapsedTimerCallback(object o)
+        {
+            PercentFeedback.FireUpdate();
+            TimeRemainingFeedback.FireUpdate();
+
+            if (DateTime.Now >= FinishTime)
+                Finish();
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core.Touchpanels
+{
+    /// <summary>
+    /// A wrapper class for the touchpanel portion of an MPC3 class process to allow for configurable
+    /// behavior of the keybad buttons
+    /// </summary>
+    public class Mpc3TouchpanelController : Device
+    {
+        MPC3Basic _Touchpanel;
+
+        Dictionary<string, KeypadButton> _Buttons;
+
+        public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
+            : base(key, name)
+        {
+            _Touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
+            _Buttons = buttons;
+
+            _Touchpanel.ButtonStateChange += new Crestron.SimplSharpPro.DeviceSupport.ButtonEventHandler(_Touchpanel_ButtonStateChange);
+
+
+            AddPostActivationAction(() =>
+                {
+                    // Link up the button feedbacks to the specified BoolFeedbacks
+                    foreach (var button in _Buttons)
+                    {
+                        var feedbackConfig = button.Value.Feedback;
+                        var device = DeviceManager.GetDeviceForKey(feedbackConfig.DeviceKey) as Device;
+                        if (device != null)
+                        {
+                            var bKey = button.Key.ToLower();
+
+                            var feedback = device.GetFeedbackProperty(feedbackConfig.BoolFeedbackName);
+
+                            var bFeedback = feedback as BoolFeedback;
+                            var iFeedback = feedback as IntFeedback;
+                            if (bFeedback != null)
+                            {
+
+                                if (bKey == "power")
+                                {
+                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackPower);
+                                    continue;
+                                }
+                                else if (bKey == "mute")
+                                {
+                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackMute);
+                                    continue;
+                                }
+
+                                // Link to the Crestron Feedback corresponding to the button number
+                                bFeedback.LinkCrestronFeedback(_Touchpanel.Feedbacks[UInt16.Parse(button.Key)]);
+                            }
+                            else if (iFeedback != null)
+                            {
+                                if (bKey == "volumefeedback")
+                                {
+                                    var volFeedback = feedback as IntFeedback;
+                                    // TODO: Figure out how to subsribe to a volume IntFeedback and link it to the voluem
+                                    volFeedback.LinkInputSig(_Touchpanel.VolumeBargraph);
+                                }
+                            }
+                            else
+                            {
+                                Debug.Console(1, this, "Unable to get BoolFeedback with name: {0} from device: {1}", feedbackConfig.BoolFeedbackName, device.Key);
+                            }
+                        }
+                        else
+                        {
+                            Debug.Console(1, this, "Unable to get device with key: {0}", feedbackConfig.DeviceKey);
+                        }
+                    }
+                });
+        }
+
+        void _Touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
+        {
+            Debug.Console(1, this, "Button {0} ({1}), {2}", args.Button.Number, args.Button.Name, args.NewButtonState);
+            var type = args.NewButtonState.ToString();
+
+            if (_Buttons.ContainsKey(args.Button.Number.ToString()))
+            {
+                Press(args.Button.Number.ToString(), type);
+            }
+            else if(_Buttons.ContainsKey(args.Button.Name.ToString()))
+            {
+                Press(args.Button.Name.ToString(), type);
+            }
+        }
+
+        /// <summary>
+        /// Runs the function associated with this button/type. One of the following strings:
+        /// Pressed, Released, Tapped, DoubleTapped, Held, HeldReleased    
+        /// </summary>
+        /// <param name="number"></param>
+        /// <param name="type"></param>
+        public void Press(string number, string type)
+        {
+            // TODO: In future, consider modifying this to generate actions at device activation time
+            //       to prevent the need to dynamically call the method via reflection on each button press
+            if (!_Buttons.ContainsKey(number)) { return; }
+            var but = _Buttons[number];
+            if (but.EventTypes.ContainsKey(type))
+            {
+                foreach (var a in but.EventTypes[type]) { DeviceJsonApi.DoDeviceAction(a); }
+            }
+        }
+
+
+    }
+
+    /// <summary>
+    /// Represents the configuration of a keybad buggon
+    /// </summary>
+    public class KeypadButton
+    {
+        public Dictionary<string, DeviceActionWrapper[]> EventTypes { get; set; }
+        public KeypadButtonFeedback Feedback { get; set; }
+
+        public KeypadButton()
+        {
+            EventTypes = new Dictionary<string, DeviceActionWrapper[]>();
+            Feedback = new KeypadButtonFeedback();
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class KeypadButtonFeedback
+    {
+        public string DeviceKey { get; set; }
+        public string BoolFeedbackName { get; set; }
+    }
+}

essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs

@@ -44,7 +44,10 @@ namespace PepperDash.Essentials.DM.AirMedia
 
             DeviceConfig = dc;
 
-            PropertiesConfig = props;
+            PropertiesConfig = props;
+
+            InputPorts = new RoutingPortCollection<RoutingInputPort>();
+            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
 
             InputPorts.Add(new RoutingInputPort(DmPortName.Osd, eRoutingSignalType.Audio | eRoutingSignalType.Video,
                 eRoutingPortConnectionType.None, new Action(SelectPinPointUxLandingPage), this));