update version for PepperDashCore to match the correct version

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/rfi_request.md

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

.github/scripts/GenerateVersionNumber-2.0.0.ps1

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

.github/scripts/ZipBuildOutput.ps1

@@ -8,7 +8,6 @@ $destination = "$($Env:GITHUB_HOME)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
-$exclusions += "Newtonsoft.Compact.Json.dll"
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
 Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {

.github/workflows/docker.yml

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

.github/workflows/essentialsplugins-betabuilds.yml

@@ -1,271 +0,0 @@
-name: 2.0.0 Branch Build Using Docker
-
-on:
-  push:
-    branches:
-      - feature/*
-      - hotfix/*
-      - release/*
-      - dev*
-
-env:
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Debug
-  # Defaults to master as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project:
-    runs-on: windows-2019
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          $latestVersions = $(git tag --merged origin/main)
-          $latestVersion = [version]"0.0.0"
-          Foreach ($version in $latestVersions) {
-            Write-Host $version
-            try {
-              if (([version]$version) -ge $latestVersion) {
-                $latestVersion = $version
-                Write-Host "Setting latest version to: $latestVersion"
-              }
-            }
-            catch {
-              Write-Host "Unable to convert $($version). Skipping"
-              continue;
-            }
-          }
-
-          $newVersion = [version]$latestVersion
-          $phase = ""
-          $newVersionString = ""
-          switch -regex ($Env:GITHUB_REF) {
-            '^refs\/heads\/main*.' {
-              $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, $newVersion.Build
-            }
-            '^refs\/heads\/feature\/*.' {
-              $phase = 'alpha'
-              $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/release\/*.' {
-              $splitRef = $Env:GITHUB_REF -split "/"
-              $version = [version]($splitRef[-1] -replace "v", "")
-              $phase = 'rc'
-              $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $version.Major, $version.Minor, $version.Build, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/dev*.' {
-              $phase = 'beta'
-              $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/hotfix\/*.' {
-              $phase = 'hotfix'
-              $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
-            }
-          }      
-          echo "VERSION=$newVersionString" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          function Update-SourceVersion {
-          Param ([string]$Version)
-          #$fullVersion = $Version
-          $baseVersion = [regex]::Match($Version, "(\d+.\d+.\d+).*").captures.groups[1].value
-          $NewAssemblyVersion = 'AssemblyVersion("' + $baseVersion + '.*")'
-          Write-Output "AssemblyVersion = $NewAssemblyVersion"
-          $NewAssemblyInformationalVersion = 'AssemblyInformationalVersion("' + $Version + '")'
-          Write-Output "AssemblyInformationalVersion = $NewAssemblyInformationalVersion"
-          foreach ($o in $input) {
-              Write-output $o.FullName
-              $TmpFile = $o.FullName + ".tmp"
-              get-content $o.FullName |
-              ForEach-Object {
-                  $_ -replace 'AssemblyVersion\(".*"\)', $NewAssemblyVersion } |
-              ForEach-Object {
-                  $_ -replace 'AssemblyInformationalVersion\(".*"\)', $NewAssemblyInformationalVersion
-              }  > $TmpFile 
-              move-item $TmpFile $o.FullName -force
-            }
-          }
-          function Update-AllAssemblyInfoFiles ( $version ) {
-              foreach ($file in "AssemblyInfo.cs", "AssemblyInfo.vb" ) {
-                  get-childitem -Path $Env:GITHUB_WORKSPACE -recurse | Where-Object { $_.Name -eq $file } | Update-SourceVersion $version ;
-              }
-          }
-          # validate arguments
-          $r = [System.Text.RegularExpressions.Regex]::Match($Env:VERSION, "\d+\.\d+\.\d+.*");
-          if ($r.Success) {
-              Write-Output "Updating Assembly Version to $Env:VERSION ...";
-              Update-AllAssemblyInfoFiles $Env:VERSION;
-          }
-          else {
-              Write-Output " ";
-              Write-Output "Error: Input version $Env:VERSION does not match x.y.z format!"
-              Write-Output " ";
-              Write-Output "Unable to apply version to AssemblyInfo.cs files";
-          }
-      - name: restore Nuget Packages
-        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
-      # Set the SOLUTION_PATH
-      - name: Get SLN Path
-        shell: powershell
-        run: |
-          $solution_path = Get-ChildItem *.sln -recurse 
-          $solution_path = $solution_path.FullName
-          $solution_path = $solution_path -replace "(?:[^\\]*\\){4}", ""
-          Write-Output $solution_path
-          echo "SOLUTION_PATH=$($solution_path)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        # Set the SOLUTION_FILE
-      - name: Get SLN File
-        shell: powershell
-        run: |
-          $solution_file = Get-ChildItem .\*.sln -recurse -Path "$($Env:GITHUB_WORKSPACE)" 
-          echo "SOLUTION_FILE=$($solution_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Login to Docker
-      - name: Login to Docker
-        uses: azure/docker-login@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      # Build the solutions in the docker image
-      - name: Build Solution
-        shell: powershell
-        run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_PATH)"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
-      # Zip up the output files as needed
-      - name: Zip Build Output
-        shell: powershell
-        run: |
-          $destination = "$($Env:GITHUB_HOME)\output"
-          New-Item -ItemType Directory -Force -Path ($destination)
-          Get-ChildItem ($destination)
-          $exclusions = "packages"
-          # Trying to get any .json schema files (not currently working)
-          # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
-            $allowed = $true;
-            # Exclude any files in submodules
-            foreach ($exclude in $exclusions) {
-              if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) {
-                $allowed = $false;
-                break;
-              }
-            }
-            if ($allowed) {
-              Write-Host "allowing $($_)"
-              $_;
-            }
-          } | Copy-Item -Destination ($destination) -Force
-          Write-Host "Getting matching files..."
-          # Get any files from the output folder that match the following extensions
-          Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { 
-            # Replace the extensions with dll and xml and create an array 
-            $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
-            Write-Host "Filenames:"
-            Write-Host $filenames
-            if ($filenames.length -gt 0) {
-              # Attempt to get the files and return them to the output directory
-              Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
-            }
-          }
-          Get-ChildItem -Path $destination\*.cplz | Rename-Item -NewName { "$($_.BaseName)-$($Env:VERSION)$($_.Extension)" }
-          Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
-          Write-Host "Output Contents post Zip"
-          Get-ChildItem -Path $destination
-      # Write the version to a file to be consumed by the push jobs
-      - name: Write Version
-        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
-      # Upload output files
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: Build
-          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-      # Upload the Version file as an artifact
-      - name: Upload version.txt
-        uses: actions/upload-artifact@v1
-        with:
-          name: Version
-          path: ${{env.GITHUB_HOME}}\output\version.txt
-      # Create the release on the source repo
-      - name: Create Release
-        id: create_release
-        uses: fleskesvor/create-release@feature/support-target-commitish
-        with:
-          tag_name: ${{ env.VERSION  }}
-          release_name: ${{ env.VERSION }}
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload the build package to the release
-      - name: Upload Release Package
-        id: upload_release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Push_Nuget_Package:
-    needs: Build_Project
-    runs-on: windows-latest
-    steps:
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      - name: Get nuget File
-        shell: powershell
-        run: |
-          $nuspec_file = Get-ChildItem *.nuspec -recurse 
-          echo "NUSPEC_FILE=$($nuspec_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      - name: Add nuget.exe
-        uses: nuget/setup-nuget@v1
-      - name: Add Github Packages source
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-      # Pushes to nuget, not needed unless publishing publicly
-      - name: Add nuget.org API Key
-        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
-      - name: Create nuget package
-        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ env.VERSION }}
-      - name: Publish nuget package to Github registry
-        run: nuget push **/*.nupkg -source github
-      # Pushes to nuget, not needed unless publishing publicly >> this pushes package to nuget.org
-      - name: Publish nuget package to nuget.org
-        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json

.github/workflows/essentialsplugins-releasebuilds.yml

@@ -1,219 +0,0 @@
-name: 2.0.0 Main Build using Docker
-
-on:
-  release:
-    types:
-      - released
-    branches:
-      - main
-
-env:
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Release
-  # Defaults to master as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project:
-    runs-on: windows-2019
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        env:
-          TAG_NAME: ${{ github.event.release.tag_name }}
-        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          function Update-SourceVersion {
-          Param ([string]$Version)
-          #$fullVersion = $Version
-          $baseVersion = [regex]::Match($Version, "(\d+.\d+.\d+).*").captures.groups[1].value
-          $NewAssemblyVersion = 'AssemblyVersion("' + $baseVersion + '.*")'
-          Write-Output "AssemblyVersion = $NewAssemblyVersion"
-          $NewAssemblyInformationalVersion = 'AssemblyInformationalVersion("' + $Version + '")'
-          Write-Output "AssemblyInformationalVersion = $NewAssemblyInformationalVersion"
-          foreach ($o in $input) {
-              Write-output $o.FullName
-              $TmpFile = $o.FullName + ".tmp"
-              get-content $o.FullName |
-              ForEach-Object {
-                  $_ -replace 'AssemblyVersion\(".*"\)', $NewAssemblyVersion } |
-              ForEach-Object {
-                  $_ -replace 'AssemblyInformationalVersion\(".*"\)', $NewAssemblyInformationalVersion
-              }  > $TmpFile 
-              move-item $TmpFile $o.FullName -force
-            }
-          }
-          function Update-AllAssemblyInfoFiles ( $version ) {
-              foreach ($file in "AssemblyInfo.cs", "AssemblyInfo.vb" ) {
-                  get-childitem -Path $Env:GITHUB_WORKSPACE -recurse | Where-Object { $_.Name -eq $file } | Update-SourceVersion $version ;
-              }
-          }
-          # validate arguments
-          $r = [System.Text.RegularExpressions.Regex]::Match($Env:VERSION, "\d+\.\d+\.\d+.*");
-          if ($r.Success) {
-              Write-Output "Updating Assembly Version to $Env:VERSION ...";
-              Update-AllAssemblyInfoFiles $Env:VERSION;
-          }
-          else {
-              Write-Output " ";
-              Write-Output "Error: Input version $Env:VERSION does not match x.y.z format!"
-              Write-Output " ";
-              Write-Output "Unable to apply version to AssemblyInfo.cs files";
-          }
-      - name: restore Nuget Packages
-        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
-      # Set the SOLUTION_PATH
-      - name: Get SLN Path
-        shell: powershell
-        run: |
-          $solution_path = Get-ChildItem *.sln -recurse 
-          $solution_path = $solution_path.FullName
-          $solution_path = $solution_path -replace "(?:[^\\]*\\){4}", ""
-          Write-Output $solution_path
-          echo "SOLUTION_PATH=$($solution_path)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        # Set the SOLUTION_FILE
-      - name: Get SLN File
-        shell: powershell
-        run: |
-          $solution_file = Get-ChildItem .\*.sln -recurse -Path "$($Env:GITHUB_WORKSPACE)" 
-          echo "SOLUTION_FILE=$($solution_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Login to Docker
-      - name: Login to Docker
-        uses: azure/docker-login@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      # Build the solutions in the docker image
-      - name: Build Solution
-        shell: powershell
-        run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_PATH)"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
-      # Zip up the output files as needed
-      - name: Zip Build Output
-        shell: powershell
-        run: |
-          $destination = "$($Env:GITHUB_HOME)\output"
-          New-Item -ItemType Directory -Force -Path ($destination)
-          Get-ChildItem ($destination)
-          $exclusions = "packages"
-          # Trying to get any .json schema files (not currently working)
-          # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
-            $allowed = $true;
-            # Exclude any files in submodules
-            foreach ($exclude in $exclusions) {
-              if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) {
-                $allowed = $false;
-                break;
-              }
-            }
-            if ($allowed) {
-              Write-Host "allowing $($_)"
-              $_;
-            }
-          } | Copy-Item -Destination ($destination) -Force
-          Write-Host "Getting matching files..."
-          # Get any files from the output folder that match the following extensions
-          Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { 
-            # Replace the extensions with dll and xml and create an array 
-            $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
-            Write-Host "Filenames:"
-            Write-Host $filenames
-            if ($filenames.length -gt 0) {
-              # Attempt to get the files and return them to the output directory
-              Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
-            }
-          }
-          Get-ChildItem -Path $destination\*.cplz | Rename-Item -NewName { "$($_.BaseName)-$($Env:VERSION)$($_.Extension)" }
-          Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
-          Write-Host "Output Contents post Zip"
-          Get-ChildItem -Path $destination
-      # Write the version to a file to be consumed by the push jobs
-      - name: Write Version
-        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
-      # Upload output files
-      - name: Upload Build Output
-        uses: actions/upload-artifact@v1
-        with:
-          name: Build
-          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-      # Upload the Version file as an artifact
-      - name: Upload version.txt
-        uses: actions/upload-artifact@v1
-        with:
-          name: Version
-          path: ${{env.GITHUB_HOME}}\output\version.txt
-      # Upload the build package to the release
-      - name: Upload Release Package
-        id: upload_release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Push_Nuget_Package:
-    needs: Build_Project
-    runs-on: windows-latest
-    steps:
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      - name: Get nuget File
-        shell: powershell
-        run: |
-          $nuspec_file = Get-ChildItem *.nuspec -recurse 
-          echo "NUSPEC_FILE=$($nuspec_file.BaseName)"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      - name: Add nuget.exe
-        uses: nuget/setup-nuget@v1
-      - name: Add Github Packages source
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-      # Pushes to nuget, not needed unless publishing publicly
-      - name: Add nuget.org API Key
-        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
-      - name: Create nuget package
-        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ env.VERSION }}
-      - name: Publish nuget package to Github registry
-        run: nuget push **/*.nupkg -source github
-      # Pushes to nuget, not needed unless publishing publicly >> this pushes package to nuget.org
-      - name: Publish nuget package to nuget.org
-        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json

.github/workflows/main.yml

@@ -0,0 +1,281 @@
+name: main Build using Docker
+
+on:
+  release:
+    types:
+      - created
+    branches:
+      - main
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Release
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
+jobs:
+  Build_Project:
+    runs-on: windows-latest
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      # And any submodules
+      #- name: Checkout submodules
+      #  shell: bash
+      #  run: |
+      #    git config --global url."https://github.com/".insteadOf "git@github.com:"
+      #    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+      #    git submodule sync --recursive
+      #    git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
+      # 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 }}
+      # Login to Docker
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      # Build the solutions in the docker image
+      - name: Build Solution
+        shell: powershell
+        run: |
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+      # Zip up the output files as needed
+      - name: Zip Build Output
+        shell: powershell
+        run: ./.github/scripts/ZipBuildOutput.ps1
+        # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
+      # Upload the build output as an artifact
+      - name: Upload Build Output
+        uses: actions/upload-artifact@v1
+        with:
+          name: Build
+          path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
+      # Upload the build package to the release
+      - name: Upload Release Package
+        id: upload_release
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Checkout main branch
+        run: git checkout main
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: git push -u origin main --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is main or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout main branch
+      - name: Create new branch
+        run: git checkout main
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: git push -u origin main --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

.gitignore

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

.gitmodules

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

PepperDashEssentials.sln

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

PepperDashEssentials/Bridges/BridgeFactory.cs

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

PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs

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

PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

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

PepperDashEssentials/Bridges/CameraControllerBridge.cs

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

PepperDashEssentials/Bridges/DspControllerBridge.cs

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

PepperDashEssentials/Bridges/EssentialComms.cs

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

PepperDashEssentials/Bridges/EssentialDM.cs

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

PepperDashEssentials/Bridges/EssentialDsp.cs

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

PepperDashEssentials/Bridges/EssentialTVOne.cs

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

PepperDashEssentials/Bridges/GenericLightingBridge.cs

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

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

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

PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

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

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -70,14 +70,6 @@ namespace PepperDash.Essentials.Bridges
         /// Range reports the highest supported HDCP state level for the corresponding input card
         /// </summary>
         public uint HdcpSupportCapability { get; set; }
-        /// <summary>
-        /// DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback
-        /// </summary>
-        public uint InputStreamCardStatus { get; set; }
-        /// <summary>
-        /// DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback
-        /// </summary>
-        public uint OutputStreamCardStatus { get; set; }
 #endregion
 
 #region Serials
@@ -123,8 +115,6 @@ namespace PepperDash.Essentials.Bridges
             InputUsb = 700; //701-899
             HdcpSupportState = 1000; //1001-1199
             HdcpSupportCapability = 1200; //1201-1399
-            InputStreamCardStatus = 1500; //1501-1532
-            OutputStreamCardStatus = 1600; //1601-1632
 
 
             //Serial
@@ -155,8 +145,6 @@ namespace PepperDash.Essentials.Bridges
             OutputEndpointOnline = OutputEndpointOnline + joinOffset;
             HdcpSupportState = HdcpSupportState + joinOffset;
             HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-            InputStreamCardStatus = InputStreamCardStatus + joinOffset;
-            OutputStreamCardStatus = OutputStreamCardStatus + joinOffset;
             OutputDisabledByHdcp = OutputDisabledByHdcp + joinOffset;
             TxAdvancedIsPresent = TxAdvancedIsPresent + joinOffset;
         }

PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -38,12 +38,12 @@ namespace PepperDash.Essentials.Bridges
         /// Reports the EDID serial number value
         /// </summary>
         public uint EdidSerialNumber { get; set; }
-        #endregion
-
-        #region Analogs
-        public uint AudioVideoSource { get; set; }
-        #endregion
-
+        #endregion
+
+        #region Analogs
+        public uint AudioVideoSource { get; set; }
+        #endregion
+
         public DmRmcControllerJoinMap()
         {
             // Digital
@@ -56,7 +56,7 @@ namespace PepperDash.Essentials.Bridges
             EdidPrefferedTiming = 4;
             EdidSerialNumber = 5;
 
-            //Analog
+            //Analog
             AudioVideoSource = 1;
         }
 
@@ -69,7 +69,7 @@ namespace PepperDash.Essentials.Bridges
             EdidManufacturer = EdidManufacturer + joinOffset;
             EdidName = EdidName + joinOffset;
             EdidPrefferedTiming = EdidPrefferedTiming + joinOffset;
-            EdidSerialNumber = EdidSerialNumber + joinOffset;
+            EdidSerialNumber = EdidSerialNumber + joinOffset;
             AudioVideoSource = AudioVideoSource + joinOffset;
         }
     }

PepperDashEssentials/Bridges/StatusSignControllerBridge.cs

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

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

@@ -88,7 +88,7 @@
             {
                 "name": "Wireless Video",
                 "key": "wePresent-1",
-                "type": "genericSource",
+                "type": "wePresent",
                 "group": "genericSource",
                 "uid": 9,
                 "properties": {

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

@@ -114,7 +114,7 @@
             {
                 "name": "Wireless Video",
                 "key": "wePresent-1",
-                "type": "genericSource",
+                "type": "wePresent",
                 "properties": {},
                 "group": "genericSource",
                 "uid": 3

PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json

@@ -225,14 +225,6 @@
             "2": "Output 2",
             "3": "Output 3",
             "4": "Output 4"
-          },
-          "inputSlotSupportsHdcp2":{
-            "1": "false",
-            "2": "false",
-            "3": "false",
-            "4": "false",
-            "5": "false",
-            "6": "false"
           }
         }
       },

PepperDashEssentials/Factory/DeviceFactory.cs

@@ -1,47 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharp.Reflection;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials
-{
-    /// <summary>
-    /// Responsible for loading all of the device types for this library
-    /// </summary>
-    public class DeviceFactory
-    {
-
-        public DeviceFactory()
-        {
-            var assy = Assembly.GetExecutingAssembly();
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
-            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-
-            if (types != null)
-            {
-                foreach (var type in types)
-                {
-                    try
-                    {
-                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                        factory.LoadTypeFactories();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
-                    }
-                }
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharp.Reflection;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials
+{
+    /// <summary>
+    /// Responsible for loading all of the device types for this library
+    /// </summary>
+    public class DeviceFactory
+    {
+
+        public DeviceFactory()
+        {
+            var assy = Assembly.GetExecutingAssembly();
+            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
+
+            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
+
+            if (types != null)
+            {
+                foreach (var type in types)
+                {
+                    try
+                    {
+                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                        factory.LoadTypeFactories();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
+                    }
+                }
+            }
+        }
+    }
+}

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -1,23 +1,23 @@
-using System;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using System;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.Fusion;
 
 
-using PepperDash.Core;
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Fusion;
-
+using PepperDash.Essentials.Core.Fusion;
+
 namespace PepperDash.Essentials.Fusion
 {
     public class EssentialsHuddleVtc1FusionController : EssentialsHuddleSpaceFusionSystemControllerBase
     {
         BooleanSigData CodecIsInCall;
 
-        public EssentialsHuddleVtc1FusionController(IEssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
-            : base(room, ipId, joinMapKey)
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
+            : base(room, ipId)
         {
 
         }
@@ -37,7 +37,7 @@ namespace PepperDash.Essentials.Fusion
         {
             try
             {
-                var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
                 if (codec == null)
                 {
@@ -55,25 +55,25 @@ namespace PepperDash.Essentials.Fusion
                 // Map FusionRoom Attributes:
 
                 // Codec volume
-                var codecVolume = FusionRoom.CreateOffsetUshortSig(JoinMap.VolumeFader1.JoinNumber, JoinMap.VolumeFader1.AttributeName, eSigIoMask.InputOutputSig);
+                var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
                 codecVolume.OutputSig.UserObject = new Action<ushort>(b => (codec as IBasicVolumeWithFeedback).SetVolume(b));
                 (codec as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(codecVolume.InputSig);
 
                 // In Call Status
-                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecInCall.JoinNumber, JoinMap.VcCodecInCall.AttributeName, eSigIoMask.InputSigOnly);
+                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
                 codec.CallStatusChange += new EventHandler<PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
                 
                 // Online status
                 if (codec is ICommunicationMonitor)
                 {
                     var c = codec as ICommunicationMonitor;
-                    var codecOnline = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecOnline.JoinNumber, JoinMap.VcCodecOnline.AttributeName, eSigIoMask.InputSigOnly);
+                    var codecOnline = FusionRoom.CreateOffsetBoolSig(122, "Online - VC 1", eSigIoMask.InputSigOnly);
                     codecOnline.InputSig.BoolValue = c.CommunicationMonitor.Status == MonitorStatus.IsOk;
                     c.CommunicationMonitor.StatusChange += (o, a) =>
                         {
                             codecOnline.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
                         };
-                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, JoinMap.VcCodecOnline.AttributeName);
+                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, "Online - VC 1");
                 }
 
                 // Codec IP Address
@@ -101,10 +101,10 @@ namespace PepperDash.Essentials.Fusion
 
                 if (codecHasIpInfo)
                 {
-                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpAddress.JoinNumber, JoinMap.VcCodecIpAddress.AttributeName, eSigIoMask.InputSigOnly);
+                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
                     codecIpAddressSig.InputSig.StringValue = codecIpAddress;
 
-                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpPort.JoinNumber, JoinMap.VcCodecIpPort.AttributeName, eSigIoMask.InputSigOnly);
+                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
                     codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
                 }
 
@@ -123,7 +123,7 @@ namespace PepperDash.Essentials.Fusion
                     FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
                 }
 
-                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Codec", tempAsset.InstanceId);
+                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
                 codecAsset.PowerOn.OutputSig.UserObject = codecPowerOnAction;
                 codecAsset.PowerOff.OutputSig.UserObject = codecPowerOffAction;
                 codec.StandbyIsOnFeedback.LinkComplementInputSig(codecAsset.PowerOn.InputSig);
@@ -141,7 +141,7 @@ namespace PepperDash.Essentials.Fusion
 
         void codec_CallStatusChange(object sender, PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs e)
         {
-            var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
             CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
         }
@@ -150,7 +150,7 @@ namespace PepperDash.Essentials.Fusion
 
         protected override void CreateSymbolAndBasicSigs(uint ipId)
         {
-            Debug.Console(0, this, "Creating Fusion Room symbol with GUID: {0} and IP-ID {1:X2}", RoomGuid, ipId);
+            Debug.Console(1, this, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
 
             FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
             FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();
@@ -166,19 +166,20 @@ namespace PepperDash.Essentials.Fusion
 
             CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAdHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
 
             // Room to fusion room
             Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
 
             // Moved to 
-            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(JoinMap.Display1CurrentSourceName.JoinNumber, JoinMap.Display1CurrentSourceName.AttributeName, eSigIoMask.InputSigOnly);
+            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as IEssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
+            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as IEssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
  
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
@@ -187,7 +188,7 @@ namespace PepperDash.Essentials.Fusion
         protected override void SetUpSources()
         {
             // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as IEssentialsHuddleVtc1Room).SourceListKey);
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
             if (dict != null)
             {
                 // NEW PROCESS:
@@ -196,9 +197,9 @@ namespace PepperDash.Essentials.Fusion
                 uint i = 1;
                 foreach (var kvp in setTopBoxes)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > JoinMap.Display1SetTopBoxSourceStart.JoinSpan) // We only have five spots
+                    if (i > 5) // We only have five spots
                         break;
                 }
 
@@ -206,7 +207,7 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in discPlayers)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 5) // We only have five spots
                         break;
@@ -216,9 +217,9 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in laptops)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + i, JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > JoinMap.Display1LaptopSourceStart.JoinSpan) // We only have ten spots???
+                    if (i > 10) // We only have ten spots???
                         break;
                 }
 
@@ -238,7 +239,7 @@ namespace PepperDash.Essentials.Fusion
             else
             {
                 Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as IEssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
             }
         }
 
@@ -259,7 +260,7 @@ namespace PepperDash.Essentials.Fusion
                     display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
                 }
 
-                var defaultDisplay = (Room as IEssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -272,17 +273,14 @@ namespace PepperDash.Essentials.Fusion
                 // Display to fusion room sigs
                 FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
                 FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
-
-                var defaultDisplayTwoWay = defaultDisplay as IHasPowerControlWithFeedback;
-                if (defaultDisplayTwoWay != null)
-                {
-                    defaultDisplayTwoWay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-                }
-
+                defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
                 if (defaultDisplay is IDisplayUsage)
                     (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
 
-                MapDisplayToRoomJoins(1, JoinMap.Display1Start.JoinNumber, defaultDisplay);
+
+
+                MapDisplayToRoomJoins(1, 158, defaultDisplay);
+
 
                 var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
 
@@ -304,18 +302,8 @@ namespace PepperDash.Essentials.Fusion
                 var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
                 dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
                 dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
-
-
-                var defaultTwoWayDisplay = defaultDisplay as IHasPowerControlWithFeedback;
-                if (defaultTwoWayDisplay != null)
-                {
-                    defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-                    if (defaultDisplay is IDisplayUsage)
-                        (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-
-                    defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
-                }
-
+                defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+                // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
                 // Use extension methods
                 dispAsset.TrySetMakeModel(defaultDisplay);
                 dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
@@ -327,31 +315,26 @@ namespace PepperDash.Essentials.Fusion
 
         }
 
-        protected override void MapDisplayToRoomJoins(int displayIndex, uint joinOffset, DisplayBase display)
+        protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
         {
             string displayName = string.Format("Display {0} - ", displayIndex);
 
 
-            if (display == (Room as IEssentialsHuddleVtc1Room).DefaultDisplay)
+            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
             {
                 // Power on
                 var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
                 defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });
+                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
 
                 // Power Off
                 var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off", eSigIoMask.InputOutputSig);
                 defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOff(); }); ;
-
-                var displayTwoWay = display as IHasPowerControlWithFeedback;
-                if (displayTwoWay != null)
-                {
-                    displayTwoWay.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-                    displayTwoWay.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-                }
+                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
         }
     }

PepperDashEssentials/PepperDashEssentials.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{1BED5BA9-88C4-4365-9362-6F4B128071D3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials</RootNamespace>
-    <AssemblyName>PepperDash.Essentials</AssemblyName>
+    <RootNamespace>PepperDashEssentials</RootNamespace>
+    <AssemblyName>PepperDashEssentials</AssemblyName>
     <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92230};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PlatformFamilyName>WindowsCE</PlatformFamilyName>
     <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
@@ -71,9 +71,13 @@
       <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+    </Reference>
+    <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\essentials-framework\Essentials DM\Essentials_DM\bin\PepperDash_Essentials_DM.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -133,31 +137,24 @@
     <Compile Include="Devices\Amplifier.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="Fusion\EssentialsTechRoomFusionSystemController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\SimplRoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
-    <Compile Include="Room\Config\EssentialsTechRoomConfig.cs" />
     <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
-    <Compile Include="Room\Types\EssentialsCombinedHuddleVtc1Room.cs" />
     <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
     <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
     <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
-    <Compile Include="Room\Types\EssentialsTechRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleSpaceRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleVtc1Room.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />
     <Compile Include="UIDrivers\Essentials\EssentialsHeaderDriver.cs" />
     <Compile Include="UIDrivers\JoinedSigInterlock.cs" />
-    <Compile Include="UIDrivers\ScreenSaverController.cs" />
     <Compile Include="UIDrivers\SigInterlock.cs" />
     <Compile Include="UIDrivers\EssentialsHuddleVTC\EssentialsHuddlePresentationUiDriver.cs" />
     <Compile Include="UIDrivers\EssentialsHuddle\EssentialsHuddleTechPageDriver.cs" />
@@ -209,18 +206,14 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj">
+    <ProjectReference Include="..\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
       <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
       <Name>PepperDash_Essentials_Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj">
+    <ProjectReference Include="..\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj">
       <Project>{892B761C-E479-44CE-BD74-243E9214AF13}</Project>
       <Name>Essentials Devices Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PepperDash.Essentials.Devices.DM\PepperDash.Essentials.Devices.Dm.csproj">
-      <Project>{9199CE8A-0C9F-4952-8672-3EED798B284F}</Project>
-      <Name>PepperDash_Essentials_DM</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>

PepperDashEssentials/Properties/ControlSystem.cfg

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ControlSystem>
-  <Name>Test RMC3</Name>
-  <Address>auto 192.168.1.40;username crestron</Address>
-  <ProgramSlot>Program01</ProgramSlot>
-  <Storage>Internal Flash</Storage>
+<?xml version="1.0" encoding="utf-8"?>
+<ControlSystem>
+  <Name>192.168.10.1</Name>
+  <Address>auto 192.168.10.1</Address>
+  <ProgramSlot>Program01</ProgramSlot>
+  <Storage>Internal Flash</Storage>
 </ControlSystem>

PepperDashEssentials/Room/Config/DDVC01RoomPropertiesConfig.cs

@@ -8,19 +8,19 @@ using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Room.Config
 {
-	public class SimplRoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
+	public class DDVC01RoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
 	{
 		[JsonProperty("roomPhoneNumber")]
 		public string RoomPhoneNumber { get; set; }
 		[JsonProperty("roomURI")]
 		public string RoomURI { get; set; }
 		[JsonProperty("speedDials")]
-		public List<SimplSpeedDial> SpeedDials { get; set; }
+		public List<DDVC01SpeedDial> SpeedDials { get; set; }
 		[JsonProperty("volumeSliderNames")]
 		public List<string> VolumeSliderNames { get; set; }
 	}
 
-	public class SimplSpeedDial
+	public class DDVC01SpeedDial
 	{
 		[JsonProperty("name")]
 		public string Name { get; set; }

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -1,393 +1,311 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Room.Config
-{
-	public class EssentialsRoomConfigHelper
-	{
-		/// <summary>
-		/// Returns a room object from this config data
-		/// </summary>
-		/// <returns></returns>
-		public static Device GetRoomObject(DeviceConfig roomConfig)
-		{
-			var typeName = roomConfig.Type.ToLower();
-
-			if (typeName == "huddle")
-			{
-                return new EssentialsHuddleSpaceRoom(roomConfig);
-			}
-		    if (typeName == "huddlevtc1")
-		    {
-		        return new EssentialsHuddleVtc1Room(roomConfig);
-		    }
-		    if (typeName == "ddvc01bridge")
-		    {
-		        return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
-		    }
-		    if (typeName == "dualdisplay")
-		    {
-		        return new EssentialsDualDisplayRoom(roomConfig);
-		    }
-            if (typeName == "combinedhuddlevtc1")
-            {
-                return new EssentialsCombinedHuddleVtc1Room(roomConfig);
-            }
-
-		    return typeName != "techroom" ? null : new EssentialsTechRoom(roomConfig);
-		}
-
-        /// <summary>
-        /// Gets and operating, standalone emergegncy object that can be plugged into a room.
-        /// Returns null if there is no emergency defined
-        /// </summary>
-        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, IEssentialsRoom room)
-        {
-            // This emergency 
-            var emergency = props.Emergency;
-            if (emergency != null)
-            {
-                //switch on emergency type here.  Right now only contact and shutdown
-                var e = new EssentialsRoomEmergencyContactClosure(room.Key + "-emergency", props.Emergency, room);
-                DeviceManager.AddDevice(e);
-            }
-            return null;
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="props"></param>
-		/// <param name="room"></param>
-		/// <returns></returns>
-		public static Core.Privacy.MicrophonePrivacyController GetMicrophonePrivacy(
-			EssentialsRoomPropertiesConfig props, IPrivacy room)
-		{
-			var microphonePrivacy = props.MicrophonePrivacy;
-			if (microphonePrivacy == null)
-			{
-				Debug.Console(0, "Cannot create microphone privacy with null properties");
-				return null;
-			}
-			// Get the MicrophonePrivacy device from the device manager
-			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as
-				Core.Privacy.MicrophonePrivacyController);
-			// Set this room as the IPrivacy device
-			if (mP == null)
-			{
-				Debug.Console(0, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
-				return null;
-			}
-			mP.SetPrivacyDevice(room);
-
-			var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
-
-			if (behaviour == null)
-			{
-				Debug.Console(0, "WARNING: No behaviour defined for MicrophonePrivacyController");
-				return null;
-			}
-			if (behaviour == "trackroomstate")
-			{
-				// Tie LED enable to room power state
-                var essRoom = room as IEssentialsRoom;
-                essRoom.OnFeedback.OutputChange += (o, a) =>
-				{
-                    if (essRoom.OnFeedback.BoolValue)
-						mP.EnableLeds = true;
-					else
-						mP.EnableLeds = false;
-				};
-
-                mP.EnableLeds = essRoom.OnFeedback.BoolValue;
-			}
-			else if (behaviour == "trackcallstate")
-			{
-				// Tie LED enable to room power state
-                var inCallRoom = room as IHasInCallFeedback;
-                inCallRoom.InCallFeedback.OutputChange += (o, a) =>
-				{
-                    if (inCallRoom.InCallFeedback.BoolValue)
-						mP.EnableLeds = true;
-					else
-						mP.EnableLeds = false;
-				};
-
-                mP.EnableLeds = inCallRoom.InCallFeedback.BoolValue;
-			}
-
-			return mP;
-		}
-	
-	}
-
-    /// <summary>
-    /// 
-    /// </summary>
-	public class EssentialsRoomPropertiesConfig
-	{
-		[JsonProperty("addresses")]
-		public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
-
-		[JsonProperty("description")]
-		public string Description { get; set; }
-
-		[JsonProperty("emergency")]
-		public EssentialsRoomEmergencyConfig Emergency { get; set; }
-
-		[JsonProperty("help")]
-		public EssentialsHelpPropertiesConfig Help { get; set; }
-
-		[JsonProperty("helpMessage")]
-		public string HelpMessage { get; set; }
-
-        /// <summary>
-        /// Read this value to get the help message.  It checks for the old and new config format.
-        /// </summary>
-        public string HelpMessageForDisplay
-        {
-            get
-            {
-                if(Help != null && !string.IsNullOrEmpty(Help.Message))
-                {
-                    return Help.Message;
-                }
-                else
-                {
-                    return HelpMessage; 
-                }
-            }
-        }
-
-		[JsonProperty("environment")]
-		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
-
-		[JsonProperty("logo")]
-		public EssentialsLogoPropertiesConfig LogoLight { get; set; }
-
-        [JsonProperty("logoDark")]
-        public EssentialsLogoPropertiesConfig LogoDark { get; set; }
-	
-		[JsonProperty("microphonePrivacy")]
-		public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
-
-		[JsonProperty("occupancy")]
-		public EssentialsRoomOccSensorConfig Occupancy { get; set; }
-
-		[JsonProperty("oneButtonMeeting")]
-		public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
-
-		[JsonProperty("shutdownVacancySeconds")]
-		public int ShutdownVacancySeconds { get; set; }
-
-		[JsonProperty("shutdownPromptSeconds")]
-		public int ShutdownPromptSeconds { get; set; }
-
-		[JsonProperty("tech")]
-		public EssentialsRoomTechConfig Tech { get; set; }
-
-		[JsonProperty("volumes")]
-		public EssentialsRoomVolumesConfig Volumes { get; set; }
-
-        [JsonProperty("fusion")]
-        public EssentialsRoomFusionConfig Fusion { get; set; }
-
-		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
-		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
-
-        /// <summary>
-        /// Indicates if this room represents a combination of other rooms
-        /// </summary>
-        [JsonProperty("isRoomCombinationScenario")]
-        public bool IsRoomCombinationScenario { get; set; }
-
-        public EssentialsRoomPropertiesConfig()
-        {
-            LogoLight = new EssentialsLogoPropertiesConfig();
-            LogoDark = new EssentialsLogoPropertiesConfig();
-        }
-	}
-
-    public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
-    {
-        [JsonProperty("defaultAudioKey")]
-        public string DefaultAudioKey { get; set; }
-        [JsonProperty("sourceListKey")]
-        public string SourceListKey { get; set; }
-        [JsonProperty("destinationListKey")]
-        public string DestinationListKey { get; set; }
-        [JsonProperty("defaultSourceItem")]
-        public string DefaultSourceItem { get; set; }
-        /// <summary>
-        /// Indicates if the room supports advanced sharing
-        /// </summary>
-        [JsonProperty("supportsAdvancedSharing")]
-        public bool SupportsAdvancedSharing { get; set; }
-        /// <summary>
-        /// Indicates if non-tech users can change the share mode
-        /// </summary>
-        [JsonProperty("userCanChangeShareMode")]
-        public bool UserCanChangeShareMode { get; set; }
-    }
-
-    public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
-    {
-        [JsonProperty("videoCodecKey")]
-        public string VideoCodecKey { get; set; }
-        [JsonProperty("audioCodecKey")]
-        public string AudioCodecKey { get; set; }
-    }
-
-	public class EssentialsEnvironmentPropertiesConfig
-	{
-		public bool Enabled { get; set; }
-
-        [JsonProperty("deviceKeys")]
-        public List<string> DeviceKeys { get; set; }
-
-        public EssentialsEnvironmentPropertiesConfig()
-        {
-            DeviceKeys = new List<string>();
-        }
-
-	}
-
-    public class EssentialsRoomFusionConfig
-    {
-        public uint IpIdInt
-        {
-            get
-            {
-                try 
-                {
-                    return Convert.ToUInt32(IpId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to convert IP ID: {0} to hex.  Error:\n{1}", IpId));
-                }
-          
-            }
-        }
-
-        [JsonProperty("ipId")]
-        public string IpId { get; set; }
-
-        [JsonProperty("joinMapKey")]
-        public string JoinMapKey { get; set; }
-
-    }
-
-    public class EssentialsRoomMicrophonePrivacyConfig
-    {
-		[JsonProperty("deviceKey")]
-		public string DeviceKey { get; set; }
-
-		[JsonProperty("behaviour")]
-		public string Behaviour { get; set; }
-    }
-
-    /// <summary>
-    /// Properties for the help text box
-    /// </summary>
-    public class EssentialsHelpPropertiesConfig
-    {
-		[JsonProperty("message")]
-		public string Message { get; set; }
-
-		[JsonProperty("showCallButton")]
-		public bool ShowCallButton { get; set; }
-        
-		/// <summary>
-        /// Defaults to "Call Help Desk"
-        /// </summary>
-		[JsonProperty("callButtonText")]
-		public string CallButtonText { get; set; }
-
-        public EssentialsHelpPropertiesConfig()
-        {
-            CallButtonText = "Call Help Desk";
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class EssentialsOneButtonMeetingPropertiesConfig
-    {
-		[JsonProperty("enable")]
-		public bool Enable { get; set; }
-    }
-
-    public class EssentialsRoomAddressPropertiesConfig
-    {
-		[JsonProperty("phoneNumber")]
-		public string PhoneNumber { get; set; }
-
-		[JsonProperty("sipAddress")]
-		public string SipAddress { get; set; }
-    }
-
-
-    /// <summary>
-    /// Properties for the room's logo on panels
-    /// </summary>
-    public class EssentialsLogoPropertiesConfig
-    {
-		[JsonProperty("type")]
-		public string Type { get; set; }
-
-		[JsonProperty("url")]
-		public string Url { get; set; }
-        /// <summary>
-        /// Gets either the custom URL, a local-to-processor URL, or null if it's a default logo
-        /// </summary>
-        public string GetLogoUrlLight()
-        {
-            if (Type == "url")
-                return Url;
-            if (Type == "system")
-                return string.Format("http://{0}:8080/logo.png", 
-                    CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
-            return null;
-        }
-
-        public string GetLogoUrlDark()
-        {
-            if (Type == "url")
-                return Url;
-            if (Type == "system")
-                return string.Format("http://{0}:8080/logo-dark.png",
-                    CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
-            return null;
-        }
-    }
-
-    /// <summary>
-    /// Represents occupancy sensor(s) setup for a room
-    /// </summary>
-    public class EssentialsRoomOccSensorConfig
-    {
-		[JsonProperty("deviceKey")]
-		public string DeviceKey { get; set; }
-
-		[JsonProperty("timeoutMinutes")]
-		public int TimeoutMinutes { get; set; }
-    }
-
-	public class EssentialsRoomTechConfig
-	{
-		[JsonProperty("password")]
-		public string Password { get; set; }
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Room.Config
+{
+	public class EssentialsRoomConfigHelper
+	{
+		/// <summary>
+		/// Returns a room object from this config data
+		/// </summary>
+		/// <returns></returns>
+		public static Device GetRoomObject(DeviceConfig roomConfig)
+		{
+			var typeName = roomConfig.Type.ToLower();
+			if (typeName == "huddle")
+			{
+                var huddle = new EssentialsHuddleSpaceRoom(roomConfig);
+
+                return huddle;
+			}
+            else if (typeName == "huddlevtc1")
+            {
+                var rm = new EssentialsHuddleVtc1Room(roomConfig);
+                
+                return rm;
+            }
+			else if (typeName == "ddvc01Bridge")
+			{
+				return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
+			}
+            else if (typeName == "dualdisplay")
+            {
+                var rm = new EssentialsDualDisplayRoom(roomConfig);
+
+                return rm;
+            }
+
+            return null;
+		}
+
+        /// <summary>
+        /// Gets and operating, standalone emergegncy object that can be plugged into a room.
+        /// Returns null if there is no emergency defined
+        /// </summary>
+        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, EssentialsRoomBase room)
+        {
+            // This emergency 
+            var emergency = props.Emergency;
+            if (emergency != null)
+            {
+                //switch on emergency type here.  Right now only contact and shutdown
+                var e = new EssentialsRoomEmergencyContactClosure(room.Key + "-emergency", props.Emergency, room);
+                DeviceManager.AddDevice(e);
+            }
+            return null;
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="props"></param>
+		/// <param name="room"></param>
+		/// <returns></returns>
+		public static Core.Privacy.MicrophonePrivacyController GetMicrophonePrivacy(
+			EssentialsRoomPropertiesConfig props, IPrivacy room)
+		{
+			var microphonePrivacy = props.MicrophonePrivacy;
+			if (microphonePrivacy == null)
+			{
+				Debug.Console(0, "Cannot create microphone privacy with null properties");
+				return null;
+			}
+			// Get the MicrophonePrivacy device from the device manager
+			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as
+				Core.Privacy.MicrophonePrivacyController);
+			// Set this room as the IPrivacy device
+			if (mP == null)
+			{
+				Debug.Console(0, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
+				return null;
+			}
+			mP.SetPrivacyDevice(room);
+
+			var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
+
+			if (behaviour == null)
+			{
+				Debug.Console(0, "WARNING: No behaviour defined for MicrophonePrivacyController");
+				return null;
+			}
+			if (behaviour == "trackroomstate")
+			{
+				// Tie LED enable to room power state
+                var essRoom = room as EssentialsRoomBase;
+                essRoom.OnFeedback.OutputChange += (o, a) =>
+				{
+                    if (essRoom.OnFeedback.BoolValue)
+						mP.EnableLeds = true;
+					else
+						mP.EnableLeds = false;
+				};
+
+                mP.EnableLeds = essRoom.OnFeedback.BoolValue;
+			}
+			else if (behaviour == "trackcallstate")
+			{
+				// Tie LED enable to room power state
+                var inCallRoom = room as IHasInCallFeedback;
+                inCallRoom.InCallFeedback.OutputChange += (o, a) =>
+				{
+                    if (inCallRoom.InCallFeedback.BoolValue)
+						mP.EnableLeds = true;
+					else
+						mP.EnableLeds = false;
+				};
+
+                mP.EnableLeds = inCallRoom.InCallFeedback.BoolValue;
+			}
+
+			return mP;
+		}
+	
+	}
+
+    /// <summary>
+    /// 
+    /// </summary>
+	public class EssentialsRoomPropertiesConfig
+	{
+		[JsonProperty("addresses")]
+		public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
+
+		[JsonProperty("description")]
+		public string Description { get; set; }
+
+		[JsonProperty("emergency")]
+		public EssentialsRoomEmergencyConfig Emergency { get; set; }
+
+		[JsonProperty("help")]
+		public EssentialsHelpPropertiesConfig Help { get; set; }
+
+		[JsonProperty("helpMessage")]
+		public string HelpMessage { get; set; }
+
+		[JsonProperty("environment")]
+		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
+
+		[JsonProperty("logo")]
+		public EssentialsLogoPropertiesConfig Logo { get; set; }
+	
+		[JsonProperty("microphonePrivacy")]
+		public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
+
+		[JsonProperty("occupancy")]
+		public EssentialsRoomOccSensorConfig Occupancy { get; set; }
+
+		[JsonProperty("oneButtonMeeting")]
+		public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
+
+		[JsonProperty("shutdownVacancySeconds")]
+		public int ShutdownVacancySeconds { get; set; }
+
+		[JsonProperty("shutdownPromptSeconds")]
+		public int ShutdownPromptSeconds { get; set; }
+
+		[JsonProperty("tech")]
+		public EssentialsRoomTechConfig Tech { get; set; }
+
+		[JsonProperty("volumes")]
+		public EssentialsRoomVolumesConfig Volumes { get; set; }
+
+		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
+		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
+	}
+
+    public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
+    {
+        [JsonProperty("defaultAudioKey")]
+        public string DefaultAudioKey { get; set; }
+        [JsonProperty("sourceListKey")]
+        public string SourceListKey { get; set; }
+        [JsonProperty("defaultSourceItem")]
+        public string DefaultSourceItem { get; set; }
+
+    }
+
+    public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
+    {
+        [JsonProperty("videoCodecKey")]
+        public string VideoCodecKey { get; set; }
+        [JsonProperty("audioCodecKey")]
+        public string AudioCodecKey { get; set; }
+    }
+
+	public class EssentialsEnvironmentPropertiesConfig
+	{
+		public bool Enabled { get; set; }
+
+        [JsonProperty("deviceKeys")]
+        public List<string> DeviceKeys { get; set; }
+
+        public EssentialsEnvironmentPropertiesConfig()
+        {
+            DeviceKeys = new List<string>();
+        }
+
+	}
+
+    public class EssentialsRoomMicrophonePrivacyConfig
+    {
+		[JsonProperty("deviceKey")]
+		public string DeviceKey { get; set; }
+
+		[JsonProperty("behaviour")]
+		public string Behaviour { get; set; }
+    }
+
+    /// <summary>
+    /// Properties for the help text box
+    /// </summary>
+    public class EssentialsHelpPropertiesConfig
+    {
+		[JsonProperty("message")]
+		public string Message { get; set; }
+
+		[JsonProperty("showCallButton")]
+		public bool ShowCallButton { get; set; }
+        
+		/// <summary>
+        /// Defaults to "Call Help Desk"
+        /// </summary>
+		[JsonProperty("callButtonText")]
+		public string CallButtonText { get; set; }
+
+        public EssentialsHelpPropertiesConfig()
+        {
+            CallButtonText = "Call Help Desk";
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsOneButtonMeetingPropertiesConfig
+    {
+		[JsonProperty("enable")]
+		public bool Enable { get; set; }
+    }
+
+    public class EssentialsRoomAddressPropertiesConfig
+    {
+		[JsonProperty("phoneNumber")]
+		public string PhoneNumber { get; set; }
+
+		[JsonProperty("sipAddress")]
+		public string SipAddress { get; set; }
+    }
+
+
+    /// <summary>
+    /// Properties for the room's logo on panels
+    /// </summary>
+    public class EssentialsLogoPropertiesConfig
+    {
+		[JsonProperty("type")]
+		public string Type { get; set; }
+
+		[JsonProperty("url")]
+		public string Url { get; set; }
+        /// <summary>
+        /// Gets either the custom URL, a local-to-processor URL, or null if it's a default logo
+        /// </summary>
+        public string GetUrl()
+        {
+            if (Type == "url")
+                return Url;
+            if (Type == "system")
+                return string.Format("http://{0}:8080/logo.png", 
+                    CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Represents occupancy sensor(s) setup for a room
+    /// </summary>
+    public class EssentialsRoomOccSensorConfig
+    {
+		[JsonProperty("deviceKey")]
+		public string DeviceKey { get; set; }
+
+		[JsonProperty("timeoutMinutes")]
+		public int TimeoutMinutes { get; set; }
+    }
+
+	public class EssentialsRoomTechConfig
+	{
+		[JsonProperty("password")]
+		public string Password { get; set; }
+	}
 }

PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs

@@ -17,11 +17,11 @@ namespace PepperDash.Essentials.Room
 
     public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase
     {
-        IEssentialsRoom Room;
+        EssentialsRoomBase Room;
         string Behavior;
         bool TriggerOnClose;
 
-        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, IEssentialsRoom room) :
+        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, EssentialsRoomBase room) :
             base(key)
         {
             Room = room;

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -207,7 +207,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -215,7 +215,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
         {
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
@@ -274,45 +274,28 @@ namespace PepperDash.Essentials
 
             CallTypeFeedback = new IntFeedback(() => 0);
 
-            SetSourceListKey();
+            SourceListKey = "default";
             EnablePowerOnToLastSource = true;
         }
 
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
-            }
-
-        }
-
         void InitializeDisplay(DisplayBase disp)
         {
             if (disp != null)
             {
                 // Link power, warming, cooling to display
-                var dispTwoWay = disp as IHasPowerControlWithFeedback;
-                if (dispTwoWay != null)
-                {
-                    dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
+                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
+                    {
+                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
                         {
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                            {
-                                if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                    disp.CurrentSourceInfo = null;
-                                OnFeedback.FireUpdate();
-                            }
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                            {
-                                SetDefaultLevels();
-                            }
-                        };
-                }
+                            if (!disp.PowerIsOnFeedback.BoolValue)
+                                disp.CurrentSourceInfo = null;
+                            OnFeedback.FireUpdate();
+                        }
+                        if (disp.PowerIsOnFeedback.BoolValue)
+                        {
+                            SetDefaultLevels();
+                        }
+                    };
 
                 disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
                 {
@@ -344,8 +327,8 @@ namespace PepperDash.Essentials
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
                     IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
-            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
+            this.LogoUrl = PropertiesConfig.Logo.GetUrl();
+            this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 
@@ -595,8 +578,8 @@ namespace PepperDash.Essentials
 
 
 
-                if (dest is IHasPowerControl)
-                    (dest as IHasPowerControl).PowerOff();
+                if (dest is IPower)
+                    (dest as IPower).PowerOff();
             }
             else
             {
@@ -645,9 +628,9 @@ namespace PepperDash.Essentials
         public static void AllRoomsOff()
         {
             var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsHuddleSpaceRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+                d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
             foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as IEssentialsHuddleSpaceRoom).SourceListKey);
+                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as EssentialsHuddleSpaceRoom).SourceListKey);
         }
 
         #region IPrivacy Members