fix(essentials): Updates to resolve oddities with ZoomRoom directory browsing and dialing

Hotfix/zoom camera fixes

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,9 @@ 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

@@ -0,0 +1,27 @@
+---
+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/workflows/docker.yml

@@ -45,7 +45,6 @@ jobs:
       - name: Update AssemblyInfo.cs
         shell: powershell
         run: |
-          Write-Output ${{ env.VERSION }}
           ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
       - name: restore Nuget Packages
         run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
@@ -79,16 +78,9 @@ jobs:
         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  }}
@@ -98,7 +90,6 @@ jobs:
           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:
@@ -151,160 +142,3 @@ jobs:
         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"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          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"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      # Checkout/Create the branch
-      - name: Create new branch
-        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
-      # Download the build output into the repo
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Check directory
-        run: Get-ChildItem ./
-      # Unzip the build package file
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Check directory again
-        run: Get-ChildItem ./
-        # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      # Commits the build output to the branch and tags it with the version
-      - name: Commit build output and tag the commit
-        shell: powershell
-        run: |
-          git config user.email "actions@pepperdash.com"
-          git config user.name "GitHub Actions"
-          git add .
-          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
-          Write-Host "Commit: $commit"
-          git commit -m $commit
-          git tag $($Env:VERSION)
-      # Push the commit
-      - name: Push to Builds Repo
-        shell: powershell
-        run: |
-          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
-          Write-Host "Branch: $branch"
-          git push -u origin $($branch) --force
-      # Push the tags
-      - name: Push tags
-        run: git push --tags origin
-      - name: Check Directory
-        run: Get-ChildItem ./

.github/workflows/main.yml

@@ -31,12 +31,11 @@ jobs:
         shell: powershell
         env:
           TAG_NAME: ${{ github.event.release.tag_name }}
-        run: echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        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: |
-          Write-Output ${{ env.VERSION }}
           ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
       - name: restore Nuget Packages
         run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
@@ -124,148 +123,3 @@ jobs:
         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"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          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"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          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

@@ -388,3 +388,4 @@ MigrationBackup/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
+essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -70,6 +70,14 @@ 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
@@ -115,6 +123,8 @@ 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
@@ -145,6 +155,8 @@ 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/ControlSystem.cs

@@ -12,11 +12,11 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Fusion;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM;
 using PepperDash.Essentials.Fusion;
 using PepperDash.Essentials.Room.Config;
-//using PepperDash.Essentials.Room.MobileControl;
 
 using Newtonsoft.Json;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
@@ -36,6 +36,7 @@ namespace PepperDash.Essentials
             Thread.MaxNumberOfUserThreads = 400;
             Global.ControlSystem = this;
             DeviceManager.Initialize(this);
+            SecretsManager.Initialize();
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
         }
 
@@ -53,7 +54,7 @@ namespace PepperDash.Essentials
 
             if (Debug.DoNotLoadOnNextBoot)
             {
-                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                CrestronConsole.AddNewConsoleCommand(s => CrestronInvoke.BeginInvoke((o) => GoWithLoad()), "go", "Loads configuration file",
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
@@ -71,7 +72,7 @@ namespace PepperDash.Essentials
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}\r", tl);
+                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -85,8 +86,8 @@ namespace PepperDash.Essentials
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
-                CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
+                CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r\n" +
-                    "System URL:   {0}\r" +
+                    "System URL:   {0}\r\n" +
                     "Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
             }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -130,29 +131,46 @@ namespace PepperDash.Essentials
 
                 if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", Global.AssemblyVersion);
+                    string userFolder;
+                    string nvramFolder;
+                    bool is4series = false;
+
+                    if (eCrestronSeries.Series4 == (Global.ProcessorSeries & eCrestronSeries.Series4)) // Handle 4-series
+                    {
+                        is4series = true;
+                        // Set path to user/
+                        userFolder = "user";
+                        nvramFolder = "nvram";
+                    }
+                    else
+                    {
+                        userFolder = "User";
+                        nvramFolder = "Nvram";
+                    }
+
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, is4series ? "4-series" : "3-series");
 
                     // Check if User/ProgramX exists
-                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
+                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + userFolder
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        Debug.Console(0, @"{0}/program{1} directory found", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + "User"
+                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // Check if Nvram/Programx exists
-                    else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
+                    else if (Directory.Exists(directoryPrefix + dirSeparator + nvramFolder
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        Debug.Console(0, @"{0}/program{1} directory found", nvramFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
+                        filePathPrefix = directoryPrefix + dirSeparator + nvramFolder
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // If neither exists, set path to User/ProgramX
                     else
                     {
-                        Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
+                        Debug.Console(0, @"No previous directory found.  Using {0}/program{1}", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + "User"
+                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                 }
@@ -290,33 +308,14 @@ namespace PepperDash.Essentials
 
 			DeviceManager.ActivateAll();
 
-		    var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl;
+		    var mobileControl = GetMobileControlDevice();
 
 		    if (mobileControl == null) return;
 
             mobileControl.LinkSystemMonitorToAppServer();
-		    //LinkSystemMonitorToAppServer();
+		    
 		}
 
-        //void LinkSystemMonitorToAppServer()
-        //{
-        //    var sysMon = DeviceManager.GetDeviceForKey("systemMonitor") as PepperDash.Essentials.Core.Monitoring.SystemMonitorController;
-
-        //    var appServer = DeviceManager.GetDeviceForKey("appServer") as MobileControlSystemController;
-
-
-        //    if (sysMon != null && appServer != null)
-        //    {
-        //        var key = sysMon.Key + "-" + appServer.Key;
-        //        var messenger = new PepperDash.Essentials.AppServer.Messengers.SystemMonitorMessenger
-        //            (key, sysMon, "/device/systemMonitor");
-
-        //        messenger.RegisterWithAppServer(appServer);
-
-        //        DeviceManager.AddDevice(messenger);
-        //    }
-        //}
-
         /// <summary>
         /// Reads all devices from config and adds them to DeviceManager
         /// </summary>
@@ -342,7 +341,12 @@ namespace PepperDash.Essentials
                     // Skip this to prevent unnecessary warnings
                     if (devConf.Key == "processor")
                     {
-                        if (devConf.Type.ToLower() != Global.ControlSystem.ControllerPrompt.ToLower())
+                        var prompt = Global.ControlSystem.ControllerPrompt;
+
+                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) &&
+                                        String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase);
+
+                        if (!typeMatch)
                             Debug.Console(0,
                                 "WARNING: Config file defines processor type as '{0}' but actual processor is '{1}'!  Some ports may not be available",
                                 devConf.Type.ToUpper(), Global.ControlSystem.ControllerPrompt.ToUpper());
@@ -394,19 +398,14 @@ namespace PepperDash.Essentials
                     if (newDev == null)
                         newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
 
-                    //
-                    //if (newDev == null)
-                    //    newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
-                    //
-
 					if (newDev != null)
 						DeviceManager.AddDevice(newDev);
 					else
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
                 }
             }
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
@@ -453,39 +452,62 @@ namespace PepperDash.Essentials
 
             foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
             {
-                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
+                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as IEssentialsRoom;
                 if (room != null)
                 {
-                    if (room is EssentialsHuddleSpaceRoom)
+                    // default IPID
+                    uint fusionIpId = 0xf1;
+
+                    // default to no join map key
+                    string fusionJoinMapKey = string.Empty;
+
+                    if (room.Config.Properties["fusion"] != null)
+                    {
+                        Debug.Console(2, "Custom Fusion config found. Using custom values");
+
+                        var fusionConfig = room.Config.Properties["fusion"].ToObject<EssentialsRoomFusionConfig>();
+
+                        if (fusionConfig != null)
+                        {
+                            fusionIpId = fusionConfig.IpIdInt;
+                            fusionJoinMapKey = fusionConfig.JoinMapKey;
+                        }
+                    }
+
+                    if (room is IEssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
+                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, fusionIpId, fusionJoinMapKey));
 
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
-                        // Mobile Control bridge
-                        //var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
-                        //AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-                        //DeviceManager.AddDevice(bridge);
 
-                        CreateMobileControlBridge(room);
+                        CreateMobileControlBridge(room as EssentialsRoomBase);
                     }
-                    else if (room is EssentialsHuddleVtc1Room)
+                    else if (room is IEssentialsHuddleVtc1Room)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
+                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
-                        // Mobile Control bridge
-                        //var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room);
-                        //AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-                        //DeviceManager.AddDevice(bridge);
 
-                        CreateMobileControlBridge(room);
+                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                    }
+                    else if (room is EssentialsTechRoom)
+                    {
+                        DeviceManager.AddDevice(room);
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                            "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion");
+                        DeviceManager.AddDevice(new EssentialsTechRoomFusionSystemController((EssentialsTechRoom)room, fusionIpId, fusionJoinMapKey));
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
+
+                        CreateMobileControlBridge(room as EssentialsRoomBase);
                     }
                     else
                     {
@@ -504,40 +526,55 @@ namespace PepperDash.Essentials
 
         private static void CreateMobileControlBridge(EssentialsRoomBase room)
         {
-            var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl;
+            var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            mobileControl.CreateMobileControlRoomBridge(room);
+            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }
 
-        /// <summary>
+        private static IMobileControl GetMobileControlDevice()
-        /// Helps add the post activation steps that link bridges to main controller
+        {
-        /// </summary>
+            var mobileControlList = DeviceManager.AllDevices.OfType<IMobileControl>().ToList();
-        /// <param name="bridge"></param>
+
-        //void AddBridgePostActivationHelper(MobileControlBridgeBase bridge)
+            if (mobileControlList.Count > 1)
-        //{
+            {
-        //    bridge.AddPostActivationAction(() =>
+                Debug.Console(0, Debug.ErrorLogLevel.Warning,
-        //    {
+                    "Multiple instances of Mobile Control Server found.");
-        //        var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;
+
-        //        if (parent == null)
+                return null;
-        //        {
+            }
-        //            Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
+
-        //            return;
+            if (mobileControlList.Count > 0)
-        //        }
+            {
-        //        Debug.Console(0, bridge, "Linking to parent controller");
+                return mobileControlList[0];
-        //        bridge.AddParent(parent);
+            }
-        //        parent.AddBridge(bridge);
+
-        //    });
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control not enabled for this system");
-        //}
+            return null;
+        }
 
         /// <summary>
         /// Fires up a logo server if not already running
         /// </summary>
         void LoadLogoServer()
         {
+            if (ConfigReader.ConfigObject.Rooms == null)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured. Bypassing Logo server startup.");
+                return;
+            }
+
+            if (
+                !ConfigReader.ConfigObject.Rooms.Any(
+                    CheckRoomConfig))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured to use system Logo server. Bypassing Logo server startup");
+                return;
+            }
+
             try
             {
                 LogoServer = new HttpLogoServer(8080, Global.DirectorySeparator + "html" + Global.DirectorySeparator + "logo");
@@ -547,5 +584,38 @@ namespace PepperDash.Essentials
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
             }
         }
+
+        private bool CheckRoomConfig(DeviceConfig c)
+        {
+            string logoDark = null;
+            string logoLight = null;
+            string logo = null;
+
+            try
+            {
+                if (c.Properties["logoDark"] != null)
+                {
+                    logoDark = c.Properties["logoDark"].Value<string>("type");
+                }
+
+                if (c.Properties["logoLight"] != null)
+                {
+                    logoLight = c.Properties["logoLight"].Value<string>("type");
+                }
+
+                if (c.Properties["logo"] != null)
+                {
+                    logo = c.Properties["logo"].Value<string>("type");
+                }
+
+                return ((logoDark != null && logoDark == "system") ||
+                        (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
+            }
+            catch
+            {
+                Debug.Console(1, Debug.ErrorLogLevel.Notice, "Unable to find logo information in any room config");
+                return false;
+            }
+        }
     }
 }

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -16,8 +16,8 @@ namespace PepperDash.Essentials.Fusion
     {
         BooleanSigData CodecIsInCall;
 
-        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
+        public EssentialsHuddleVtc1FusionController(IEssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
-            : base(room, ipId)
+            : base(room, ipId, joinMapKey)
         {
 
         }
@@ -37,7 +37,7 @@ namespace PepperDash.Essentials.Fusion
         {
             try
             {
-                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
+                var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
 
                 if (codec == null)
                 {
@@ -55,25 +55,25 @@ namespace PepperDash.Essentials.Fusion
                 // Map FusionRoom Attributes:
 
                 // Codec volume
-                var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
+                var codecVolume = FusionRoom.CreateOffsetUshortSig(JoinMap.VolumeFader1.JoinNumber, JoinMap.VolumeFader1.AttributeName, 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(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
+                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecInCall.JoinNumber, JoinMap.VcCodecInCall.AttributeName, 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(122, "Online - VC 1", eSigIoMask.InputSigOnly);
+                    var codecOnline = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecOnline.JoinNumber, JoinMap.VcCodecOnline.AttributeName, 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, "Online - VC 1");
+                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, JoinMap.VcCodecOnline.AttributeName);
                 }
 
                 // Codec IP Address
@@ -101,10 +101,10 @@ namespace PepperDash.Essentials.Fusion
 
                 if (codecHasIpInfo)
                 {
-                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
+                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpAddress.JoinNumber, JoinMap.VcCodecIpAddress.AttributeName, eSigIoMask.InputSigOnly);
                     codecIpAddressSig.InputSig.StringValue = codecIpAddress;
 
-                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
+                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpPort.JoinNumber, JoinMap.VcCodecIpPort.AttributeName, 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, "Display", tempAsset.InstanceId);
+                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Codec", 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 EssentialsHuddleVtc1Room).VideoCodec;
+            var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
 
             CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
         }
@@ -166,20 +166,19 @@ 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(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(CreateAdHocMeeting, "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(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
+            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(JoinMap.Display1CurrentSourceName.JoinNumber, JoinMap.Display1CurrentSourceName.AttributeName, eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
+            (Room as IEssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as IEssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
-            // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
  
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
@@ -188,7 +187,7 @@ namespace PepperDash.Essentials.Fusion
         protected override void SetUpSources()
         {
             // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as IEssentialsHuddleVtc1Room).SourceListKey);
             if (dict != null)
             {
                 // NEW PROCESS:
@@ -197,9 +196,9 @@ namespace PepperDash.Essentials.Fusion
                 uint i = 1;
                 foreach (var kvp in setTopBoxes)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 5) // We only have five spots
+                    if (i > JoinMap.Display1SetTopBoxSourceStart.JoinSpan) // We only have five spots
                         break;
                 }
 
@@ -207,7 +206,7 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in discPlayers)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 5) // We only have five spots
                         break;
@@ -217,9 +216,9 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in laptops)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + i, JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 10) // We only have ten spots???
+                    if (i > JoinMap.Display1LaptopSourceStart.JoinSpan) // We only have ten spots???
                         break;
                 }
 
@@ -239,7 +238,7 @@ namespace PepperDash.Essentials.Fusion
             else
             {
                 Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+                    (Room as IEssentialsHuddleVtc1Room).SourceListKey, Room.Key);
             }
         }
 
@@ -260,7 +259,7 @@ namespace PepperDash.Essentials.Fusion
                     display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
                 }
 
-                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                var defaultDisplay = (Room as IEssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -273,14 +272,17 @@ namespace PepperDash.Essentials.Fusion
                 // Display to fusion room sigs
                 FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
                 FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
-                defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
+
+                var defaultDisplayTwoWay = defaultDisplay as IHasPowerControlWithFeedback;
+                if (defaultDisplayTwoWay != null)
+                {
+                    defaultDisplayTwoWay.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));
 
@@ -302,8 +304,18 @@ 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;
-                defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+
-                // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
+
+                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);
+                }
+
                 // Use extension methods
                 dispAsset.TrySetMakeModel(defaultDisplay);
                 dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
@@ -315,26 +327,31 @@ namespace PepperDash.Essentials.Fusion
 
         }
 
-        protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
+        protected override void MapDisplayToRoomJoins(int displayIndex, uint joinOffset, DisplayBase display)
         {
             string displayName = string.Format("Display {0} - ", displayIndex);
 
 
-            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
+            if (display == (Room as IEssentialsHuddleVtc1Room).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(); }); ;
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+                var displayTwoWay = display as IHasPowerControlWithFeedback;
+                if (displayTwoWay != null)
+                {
+                    displayTwoWay.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+                    displayTwoWay.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 EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
         }
     }

PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Fusion;
+
+namespace PepperDash.Essentials.Fusion
+{
+    public class EssentialsTechRoomFusionSystemController : EssentialsHuddleSpaceFusionSystemControllerBase
+    {
+        public EssentialsTechRoomFusionSystemController(EssentialsTechRoom room, uint ipId, string joinMapKey)
+            : base(room, ipId, joinMapKey)
+        {
+
+        }
+
+        protected override void SetUpDisplay()
+        {
+            try
+            {
+
+                var displays = (Room as EssentialsTechRoom).Displays;
+
+                Debug.Console(1, this, "Setting up Static Assets for {0} Displays", displays.Count);
+
+                foreach (var display in displays.Values.Cast<DisplayBase>())
+                {
+                    var disp = display; // Local scope variable
+
+                    Debug.Console(2, this, "Setting up Static Asset for {0}", disp.Key);
+
+                    disp.UsageTracker = new UsageTracking(disp) { UsageIsTracked = true };
+                    disp.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
+
+                    var dispPowerOnAction = new Action<bool>(b =>
+                    {
+                        if (!b)
+                        {
+                            disp.PowerOn();
+                        }
+                    });
+                    var dispPowerOffAction = new Action<bool>(b =>
+                    {
+                        if (!b)
+                        {
+                            disp.PowerOff();
+                        }
+                    });
+
+                    var deviceConfig = ConfigReader.ConfigObject.GetDeviceForKey(disp.Key);
+
+                    FusionAsset tempAsset;
+
+                    if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+                    {
+                        // Used existing asset
+                        tempAsset = FusionStaticAssets[deviceConfig.Uid];
+                    }
+                    else
+                    {
+                        // Create a new asset
+                        tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom),
+                            disp.Name, "Display", "");
+                        FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
+                    }
+
+                    var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
+                        tempAsset.InstanceId);
+
+                    if (dispAsset != null)
+                    {
+                        dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
+                        dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
+
+                        // Use extension methods
+                        dispAsset.TrySetMakeModel(disp);
+                        dispAsset.TryLinkAssetErrorToCommunication(disp);
+                    }
+
+                    var defaultTwoWayDisplay = disp as IHasPowerControlWithFeedback;
+                    if (defaultTwoWayDisplay != null)
+                    {
+                        defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
+                        if (disp is IDisplayUsage)
+                        {
+                            (disp as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
+                        }
+
+                        if(dispAsset != null)
+                            defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+                    }
+
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error setting up displays in Fusion: {0}", e);
+            }
+        }
+    }
+}

PepperDashEssentials/PepperDashEssentials.csproj

@@ -71,7 +71,7 @@
       <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
@@ -133,19 +133,23 @@
     <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\DDVC01RoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\SimplRoomPropertiesConfig.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\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\IEssentialsHuddleSpaceRoom.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -22,37 +22,32 @@ namespace PepperDash.Essentials.Room.Config
 		public static Device GetRoomObject(DeviceConfig roomConfig)
 		{
 			var typeName = roomConfig.Type.ToLower();
+
 			if (typeName == "huddle")
 			{
-                var huddle = new EssentialsHuddleSpaceRoom(roomConfig);
+                return new EssentialsHuddleSpaceRoom(roomConfig);
-
-                return huddle;
 			}
-            else if (typeName == "huddlevtc1")
+		    if (typeName == "huddlevtc1")
-            {
+		    {
-                var rm = new EssentialsHuddleVtc1Room(roomConfig);
+		        return new EssentialsHuddleVtc1Room(roomConfig);
-                
+		    }
-                return rm;
+		    if (typeName == "ddvc01bridge")
-            }
+		    {
-			else if (typeName == "ddvc01Bridge")
+		        return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
-			{
+		    }
-				return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
+		    if (typeName == "dualdisplay")
-			}
+		    {
-            else if (typeName == "dualdisplay")
+		        return new EssentialsDualDisplayRoom(roomConfig);
-            {
+		    }
-                var rm = new EssentialsDualDisplayRoom(roomConfig);
 
-                return rm;
+		    return typeName != "techroom" ? null : new EssentialsTechRoom(roomConfig);
-            }
-
-            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)
+        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, IEssentialsRoom room)
         {
             // This emergency 
             var emergency = props.Emergency;
@@ -101,7 +96,7 @@ namespace PepperDash.Essentials.Room.Config
 			if (behaviour == "trackroomstate")
 			{
 				// Tie LED enable to room power state
-                var essRoom = room as EssentialsRoomBase;
+                var essRoom = room as IEssentialsRoom;
                 essRoom.OnFeedback.OutputChange += (o, a) =>
 				{
                     if (essRoom.OnFeedback.BoolValue)
@@ -182,6 +177,9 @@ namespace PepperDash.Essentials.Room.Config
 		[JsonProperty("volumes")]
 		public EssentialsRoomVolumesConfig Volumes { get; set; }
 
+        [JsonProperty("fusion")]
+        public EssentialsRoomFusionConfig Fusion { get; set; }
+
 		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
@@ -198,9 +196,20 @@ namespace PepperDash.Essentials.Room.Config
         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
@@ -225,6 +234,32 @@ namespace PepperDash.Essentials.Room.Config
 
 	}
 
+    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")]

PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs

@@ -0,0 +1,72 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    public class EssentialsTechRoomConfig
+    {
+        /// <summary>
+        /// The key of the dummy device used to enable routing
+        /// </summary>
+        [JsonProperty("dummySourceKey")]
+        public string DummySourceKey { get; set; }
+
+        /// <summary>
+        /// The keys of the displays assigned to this room
+        /// </summary>
+        [JsonProperty("displays")]
+        public List<string> Displays { get; set; }
+        
+        /// <summary>
+        /// The keys of the tuners assinged to this room
+        /// </summary>
+        [JsonProperty("tuners")]
+        public List<string> Tuners { get; set; }
+
+        /// <summary>
+        /// PIN to access the room as a normal user
+        /// </summary>
+        [JsonProperty("userPin")]
+        public string UserPin { get; set; }
+
+        /// <summary>
+        /// PIN to access the room as a tech user
+        /// </summary>
+        [JsonProperty("techPin")]
+        public string TechPin { get; set; }
+
+        /// <summary>
+        /// Name of the presets file.  Path prefix is assumed to be /html/presets/lists/
+        /// </summary>
+        [JsonProperty("presetsFileName")]
+        public string PresetsFileName { get; set; }
+
+        [JsonProperty("scheduledEvents")]
+        public List<ScheduledEventConfig> ScheduledEvents { get; set; }
+
+        /// <summary>
+        /// Indicates that the room is the primary when true
+        /// </summary>
+        [JsonProperty("isPrimary")]
+        public bool IsPrimary { get; set; }
+
+        /// <summary>
+        /// Indicates which tuners should mirror preset recall when two rooms are configured in a primary->secondary scenario
+        /// </summary>
+        [JsonProperty("mirroredTuners")]
+        public Dictionary<uint, string> MirroredTuners { get; set; }
+
+        /// <summary>
+        /// Indicates the room 
+        /// </summary>
+        [JsonProperty("isTvPresetsProvider")] 
+        public bool IsTvPresetsProvider;
+
+        public EssentialsTechRoomConfig()
+        {
+            Displays = new List<string>();
+            Tuners = new List<string>();
+            ScheduledEvents = new List<ScheduledEventConfig>();
+        }
+    }
+}

PepperDashEssentials/Room/Config/SimplRoomPropertiesConfig.cs

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

PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs

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

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -274,28 +274,45 @@ namespace PepperDash.Essentials
 
             CallTypeFeedback = new IntFeedback(() => 0);
 
-            SourceListKey = "default";
+            SetSourceListKey();
             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
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
+                var dispTwoWay = disp as IHasPowerControlWithFeedback;
-                    {
+                if (dispTwoWay != null)
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                {
+                    dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
                         {
-                            if (!disp.PowerIsOnFeedback.BoolValue)
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                                disp.CurrentSourceInfo = null;
+                            {
-                            OnFeedback.FireUpdate();
+                                if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                        }
+                                    disp.CurrentSourceInfo = null;
-                        if (disp.PowerIsOnFeedback.BoolValue)
+                                OnFeedback.FireUpdate();
-                        {
+                            }
-                            SetDefaultLevels();
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                        }
+                            {
-                    };
+                                SetDefaultLevels();
+                            }
+                        };
+                }
 
                 disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
                 {
@@ -329,7 +346,6 @@ namespace PepperDash.Essentials
 
             this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
             this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-            this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 
@@ -579,8 +595,8 @@ namespace PepperDash.Essentials
 
 
 
-                if (dest is IPower)
+                if (dest is IHasPowerControl)
-                    (dest as IPower).PowerOff();
+                    (dest as IHasPowerControl).PowerOff();
             }
             else
             {
@@ -629,9 +645,9 @@ namespace PepperDash.Essentials
         public static void AllRoomsOff()
         {
             var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+                d is IEssentialsHuddleSpaceRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
             foreach (var room in allRooms)
-                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as EssentialsHuddleSpaceRoom).SourceListKey);
+                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as IEssentialsHuddleSpaceRoom).SourceListKey);
         }
 
         #region IPrivacy Members

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -13,7 +13,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay
+    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IEssentialsHuddleSpaceRoom
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
@@ -176,15 +176,19 @@ namespace PepperDash.Essentials
             if (disp != null)
             {
                 // Link power, warming, cooling to display
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
+                 var dispTwoWay = disp as IHasPowerControlWithFeedback;
-                    {
+                 if (dispTwoWay != null)
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                 {
-                        {
+                     dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
-                            if (!disp.PowerIsOnFeedback.BoolValue)
+                         {
-                                CurrentSourceInfo = null;
+                             if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                            OnFeedback.FireUpdate();
+                             {
-                        }
+                                 if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                    };
+                                     CurrentSourceInfo = null;
+                                 OnFeedback.FireUpdate();
+                             }
+                         };
+                 }
 
                 disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
                 { 
@@ -197,11 +201,25 @@ namespace PepperDash.Essentials
                     IsCoolingDownFeedback.FireUpdate(); 
                 };
             }
+
+            SetSourceListKey();
           
-			SourceListKey = "default";
 			EnablePowerOnToLastSource = true;
    		}
 
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+        }
+
         protected override void CustomSetConfig(DeviceConfig config)
         {
             var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleRoomPropertiesConfig>(config.Properties.ToString());
@@ -252,7 +270,6 @@ namespace PepperDash.Essentials
 
             this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
             this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-            this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 
@@ -495,8 +512,8 @@ namespace PepperDash.Essentials
 			if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
 			{
 				dest.ReleaseRoute();
-				if (dest is IPower)
+                if (dest is IHasPowerControl)
-					(dest as IPower).PowerOff();
+                    (dest as IHasPowerControl).PowerOff();
 			}
 			else
 			{

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -13,13 +13,13 @@ using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
-using PepperDash_Essentials_Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
+    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IEssentialsHuddleVtc1Room
-        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
+    {
-	{
+        private bool _codecExternalSourceChange;
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
 
@@ -51,20 +51,6 @@ namespace PepperDash.Essentials
 
         //************************
 
-		public override string SourceListKey
-		{
-			get
-			{
-				return _SourceListKey;
-			}
-			set
-			{
-				_SourceListKey = value;
-				SetCodecExternalSources();
-				
-			}
-		}
-
         protected override Func<bool> OnFeedbackFunc
         {
             get
@@ -190,6 +176,14 @@ namespace PepperDash.Essentials
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
 				if (handler != null)
 					handler(_CurrentSourceInfo, ChangeType.DidChange);
+
+                var vc = VideoCodec as IHasExternalSourceSwitching;
+                if (vc != null && !_codecExternalSourceChange)
+                {
+                    vc.SetSelectedSource(CurrentSourceInfoKey);
+                }
+
+			    _codecExternalSourceChange = false;
 			}
 		}
 		SourceListItem _CurrentSourceInfo;
@@ -273,19 +267,23 @@ namespace PepperDash.Essentials
                 if (disp != null)
                 {
                     // Link power, warming, cooling to display
-                    disp.PowerIsOnFeedback.OutputChange += (o, a) =>
+                    var dispTwoWay = disp as IHasPowerControlWithFeedback;
-                        {
+                    if (dispTwoWay != null)
-                            if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                    {
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
                             {
-                                if (!disp.PowerIsOnFeedback.BoolValue)
+                                if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                                    CurrentSourceInfo = null;
+                                {
-                                OnFeedback.FireUpdate();
+                                    if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                            }
+                                        CurrentSourceInfo = null;
-                            if (disp.PowerIsOnFeedback.BoolValue)
+                                    OnFeedback.FireUpdate();
-                            {
+                                }
-                                SetDefaultLevels();
+                                if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                            }
+                                {
-                        };
+                                    SetDefaultLevels();
+                                }
+                            };
+                    }
 
                     disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
                     {
@@ -328,7 +326,8 @@ namespace PepperDash.Essentials
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
-                SourceListKey = "default";
+                SetSourceListKey();
+
                 EnablePowerOnToLastSource = true;
             }
             catch (Exception e)
@@ -337,6 +336,21 @@ namespace PepperDash.Essentials
             }
    		}
 
+
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+			SetCodecExternalSources();
+        }
+
         protected override void CustomSetConfig(DeviceConfig config)
         {
             var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
@@ -360,13 +374,14 @@ namespace PepperDash.Essentials
             this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
             this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
 
-            this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 			
             return base.CustomActivate();
         }
 
+        
+
         /// <summary>
         /// 
         /// </summary>
@@ -383,6 +398,8 @@ namespace PepperDash.Essentials
             Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Shutting down room");
 
             RunRouteAction("roomOff");
+            VideoCodec.StopSharing();
+            VideoCodec.StandbyActivate();
         }
 
         /// <summary>
@@ -406,6 +423,12 @@ namespace PepperDash.Essentials
             return true;
         }
 
+        public void RunRouteActionCodec(string routeKey, string sourceListKey)
+        {
+            _codecExternalSourceChange = true;
+            RunRouteAction(routeKey, sourceListKey);
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -431,7 +454,8 @@ namespace PepperDash.Essentials
             else
             {
                 Debug.Console(1, this, "sourceListKey present but not yet implemented");
-                throw new NotImplementedException();
+
+                RunRouteAction(routeKey, new Action(() => { }));
             }
         }
 
@@ -448,7 +472,11 @@ namespace PepperDash.Essentials
                 RunRouteAction(routeKey, successCallback);
             }
             else
-                throw new NotImplementedException();
+            {
+                Debug.Console(1, this, "sourceListKey present but not yet implemented");
+
+                RunRouteAction(routeKey, successCallback);
+            }
         }
 
 		/// <summary>
@@ -580,6 +608,28 @@ namespace PepperDash.Essentials
 
                     OnFeedback.FireUpdate();
 
+                    if (OnFeedback.BoolValue)
+                    {
+                        if (VideoCodec.UsageTracker.InUseTracker.InUseFeedback.BoolValue)
+                        {
+                            Debug.Console(1, this, "Video Codec in use, deactivating standby on codec");
+                            VideoCodec.StandbyDeactivate();
+                        }
+
+                        if (VideoCodec.StandbyIsOnFeedback.BoolValue)
+                        {
+                            VideoCodec.StandbyDeactivate();
+                        }
+                        else
+                        {
+                            Debug.Console(1, this, "Video codec not in standby. No need to wake.");
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Room OnFeedback state: {0}", OnFeedback.BoolValue);
+                    }
+
                     // report back when done
                     if (successCallback != null)
                         successCallback();
@@ -640,8 +690,9 @@ namespace PepperDash.Essentials
 			if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
 			{
 				dest.ReleaseRoute();
-				if (dest is IPower)
+                if (dest is IHasPowerControl)
-					(dest as IPower).PowerOff();
+                    (dest as IHasPowerControl).PowerOff();
+
 			}
 			else
 			{
@@ -686,44 +737,51 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public static void AllRoomsOff()
 		{
-			var allRooms = DeviceManager.AllDevices.Where(d => 
+			var allRooms = DeviceManager.AllDevices.Where(d =>
-				d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+                d is IEssentialsRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
 			foreach (var room in allRooms)
-				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
+                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
 		}
 
 
-		/// <summary>
+        /// <summary>
-		/// Setup the external sources for the Cisco Touch 10 devices that support IHasExternalSourceSwitch
+        /// Setup the external sources for the Cisco Touch 10 devices that support IHasExternalSourceSwitch
-		/// </summary>
+        /// </summary>
-		private void SetCodecExternalSources()
+        private void SetCodecExternalSources()
-		{
+        {
-			var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
+            var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
 
-			if (videoCodecWithExternalSwitching == null)
+            if (videoCodecWithExternalSwitching == null || !videoCodecWithExternalSwitching.ExternalSourceListEnabled)
-			{
+            {
-				return;
+                return;
-			}
+            }
 
-		    string codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
+            try
-		    videoCodecWithExternalSwitching.ClearExternalSources();
+            {
-		    videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
+                // Get the tie line that the external switcher is connected to
-		    var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
+                string codecInputConnectorName = ConfigReader.ConfigObject.TieLines.SingleOrDefault(
+                    x => x.DestinationKey == VideoCodec.Key && x.DestinationPort == videoCodecWithExternalSwitching.ExternalSourceInputPort).DestinationPort;
 
-		    foreach (var kvp in srcList)
+                videoCodecWithExternalSwitching.ClearExternalSources();
-		    {
+                videoCodecWithExternalSwitching.RunRouteAction = RunRouteActionCodec;
-		        var srcConfig = kvp.Value;
+                var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
-		        if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
+                foreach (var kvp in srcList)
-		        {
+                {
+                    var srcConfig = kvp.Value;
 
-		            videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
+                    if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
-		            videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
+                    {
-
+                        videoCodecWithExternalSwitching.AddExternalSource(codecInputConnectorName, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
-
+                        videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
-		        }
+                    }
-		    }
+                }
-		}
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error setting codec external sources: {0}", e);
+            }
+        }
 
         private void SetCodecBranding()
         {

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

@@ -0,0 +1,517 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Scheduler;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Presets;
+using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Room.Config;
+
+namespace PepperDash.Essentials
+{
+    public class EssentialsTechRoom : EssentialsRoomBase, ITvPresetsProvider, IBridgeAdvanced, IRunDirectRouteAction
+    {
+        private readonly EssentialsTechRoomConfig _config;
+        private readonly Dictionary<string, TwoWayDisplayBase> _displays;
+
+        private readonly DevicePresetsModel _tunerPresets;
+        private readonly Dictionary<string, IRSetTopBoxBase> _tuners;
+
+        private Dictionary<string, string> _currentPresets;
+        private ScheduledEventGroup _roomScheduledEventGroup;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected override Func<bool> IsWarmingFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    return _displays.All(kv => kv.Value.IsWarmingUpFeedback.BoolValue);
+                };
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        protected override Func<bool> IsCoolingFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    return _displays.All(kv => kv.Value.IsCoolingDownFeedback.BoolValue);
+                };
+            }
+        }
+
+        public EssentialsTechRoom(DeviceConfig config) : base(config)
+        {
+            _config = config.Properties.ToObject<EssentialsTechRoomConfig>();
+
+            _tunerPresets = new DevicePresetsModel(String.Format("{0}-presets", config.Key), _config.PresetsFileName);
+
+            _tunerPresets.SetFileName(_config.PresetsFileName);
+
+            _tunerPresets.PresetRecalled += TunerPresetsOnPresetRecalled;
+
+            _tuners = GetDevices<IRSetTopBoxBase>(_config.Tuners);
+            _displays = GetDevices<TwoWayDisplayBase>(_config.Displays);
+
+            RoomPowerIsOnFeedback = new BoolFeedback(() => RoomPowerIsOn);
+
+            SetUpTunerPresetsFeedback();
+
+            SubscribeToDisplayFeedbacks();
+
+            CreateOrUpdateScheduledEvents();
+        }
+
+        public Dictionary<string, StringFeedback> CurrentPresetsFeedbacks { get; private set; }
+
+        public Dictionary<string, IRSetTopBoxBase> Tuners
+        {
+            get { return _tuners; }
+        }
+
+        public Dictionary<string, TwoWayDisplayBase> Displays
+        {
+            get { return _displays; }
+        }
+
+        public BoolFeedback RoomPowerIsOnFeedback { get; private set; }
+
+        public bool RoomPowerIsOn
+        {
+            get { return _displays.All(kv => kv.Value.PowerIsOnFeedback.BoolValue); }
+        }
+
+        #region ITvPresetsProvider Members
+
+        public DevicePresetsModel TvPresets
+        {
+            get { return _tunerPresets; }
+        }
+
+        #endregion
+
+        private void TunerPresetsOnPresetRecalled(ISetTopBoxNumericKeypad device, string channel)
+        {
+            //Debug.Console(2, this, "TunerPresetsOnPresetRecalled");
+
+            if (!_currentPresets.ContainsKey(device.Key))
+            {
+                return;
+            }
+
+            //Debug.Console(2, this, "Tuner Key: {0} Channel: {1}", device.Key, channel);
+
+            _currentPresets[device.Key] = channel;
+
+            if (CurrentPresetsFeedbacks.ContainsKey(device.Key))
+            {
+                CurrentPresetsFeedbacks[device.Key].FireUpdate();
+            }
+        }
+
+        private void SetUpTunerPresetsFeedback()
+        {
+            _currentPresets = new Dictionary<string, string>();
+            CurrentPresetsFeedbacks = new Dictionary<string, StringFeedback>();
+
+            foreach (var setTopBox in _tuners)
+            {
+                var tuner = setTopBox.Value;
+                _currentPresets.Add(tuner.Key, String.Empty);
+                CurrentPresetsFeedbacks.Add(tuner.Key, new StringFeedback(() => _currentPresets[tuner.Key]));
+            }
+        }
+
+        private void SubscribeToDisplayFeedbacks()
+        {
+            foreach (var display in _displays)
+            {
+                display.Value.PowerIsOnFeedback.OutputChange +=
+                    (sender, args) =>
+                    {
+                        RoomPowerIsOnFeedback.InvokeFireUpdate();
+                        IsWarmingUpFeedback.InvokeFireUpdate();
+                        IsCoolingDownFeedback.InvokeFireUpdate();
+                    };
+            }
+        }
+
+        private void CreateOrUpdateScheduledEvents()
+        {
+            var eventsConfig = _config.ScheduledEvents;
+
+            GetOrCreateScheduleGroup();
+
+            foreach (var eventConfig in eventsConfig)
+            {
+                CreateOrUpdateSingleEvent(eventConfig);
+            }
+
+            _roomScheduledEventGroup.UserGroupCallBack += HandleScheduledEvent;
+        }
+
+        private void GetOrCreateScheduleGroup()
+        {
+            if (_roomScheduledEventGroup == null)
+            {
+                _roomScheduledEventGroup = Scheduler.GetEventGroup(Key) ?? new ScheduledEventGroup(Key);
+
+                Scheduler.AddEventGroup(_roomScheduledEventGroup);
+            }
+
+            _roomScheduledEventGroup.RetrieveAllEvents();
+        }
+
+        private void CreateOrUpdateSingleEvent(ScheduledEventConfig scheduledEvent)
+        {
+            if (!_roomScheduledEventGroup.ScheduledEvents.ContainsKey(scheduledEvent.Key))
+            {
+                SchedulerUtilities.CreateEventFromConfig(scheduledEvent, _roomScheduledEventGroup, HandleScheduledEvent);
+                return;
+            }
+
+            var roomEvent = _roomScheduledEventGroup.ScheduledEvents[scheduledEvent.Key];
+
+            //if (SchedulerUtilities.CheckEventTimeForMatch(roomEvent, DateTime.Parse(scheduledEvent.Time)) &&
+            //    SchedulerUtilities.CheckEventRecurrenceForMatch(roomEvent, scheduledEvent.Days))
+            //{
+            //    Debug.Console(1, this, "Existing event matches new event properties.  Nothing to update");
+            //    return;
+            //}
+
+            Debug.Console(1, this,
+                "Existing event does not match new config properties. Deleting existing event '{0}' and creating new event from configuration",
+                roomEvent.Name);
+
+            _roomScheduledEventGroup.DeleteEvent(roomEvent);
+
+            SchedulerUtilities.CreateEventFromConfig(scheduledEvent, _roomScheduledEventGroup, HandleScheduledEvent);
+        }
+
+        public void AddOrUpdateScheduledEvent(ScheduledEventConfig scheduledEvent)
+        {
+            //update config based on key of scheduleEvent
+            GetOrCreateScheduleGroup();
+            var existingEventIndex = _config.ScheduledEvents.FindIndex((e) => e.Key == scheduledEvent.Key);
+
+            if (existingEventIndex < 0)
+            {
+                _config.ScheduledEvents.Add(scheduledEvent);
+            }
+            else
+            {
+                _config.ScheduledEvents[existingEventIndex] = scheduledEvent;
+            }
+
+            //create or update event based on config
+            CreateOrUpdateSingleEvent(scheduledEvent);
+            //save config
+            Config.Properties = JToken.FromObject(_config);
+
+            CustomSetConfig(Config);
+            //Fire Event
+            OnScheduledEventUpdate();
+        }
+
+        public List<ScheduledEventConfig> GetScheduledEvents()
+        {
+            return _config.ScheduledEvents ?? new List<ScheduledEventConfig>();
+        }
+
+        private void OnScheduledEventUpdate()
+        {
+            var handler = ScheduledEventsChanged;
+
+            if (handler == null)
+            {
+                return;
+            }
+
+            handler(this, new ScheduledEventEventArgs {ScheduledEvents = _config.ScheduledEvents});
+        }
+
+        public event EventHandler<ScheduledEventEventArgs> ScheduledEventsChanged;
+
+        private void HandleScheduledEvent(ScheduledEvent schevent, ScheduledEventCommon.eCallbackReason type)
+        {
+            var eventConfig = _config.ScheduledEvents.FirstOrDefault(e => e.Key == schevent.Name);
+
+            if (eventConfig == null)
+            {
+                Debug.Console(1, this, "Event with name {0} not found", schevent.Name);
+                return;
+            }
+
+            Debug.Console(1, this, "Running actions for event {0}", schevent.Name);
+
+            if (eventConfig.Acknowledgeable)
+            {
+                schevent.Acknowledge();
+            }
+
+            CrestronInvoke.BeginInvoke((o) =>
+            {
+                Debug.Console(2, this, "There are {0} actions to execute for this event.", eventConfig.Actions.Count);
+
+                foreach (var a in eventConfig.Actions)
+                {
+                    Debug.Console(2, this, 
+@"Attempting to run action:
+DeviceKey: {0}
+MethodName: {1}
+Params: {2}"
+                    , a.DeviceKey, a.MethodName, a.Params);
+                    DeviceJsonApi.DoDeviceAction(a);
+                }
+            });
+        }
+
+
+        public void RoomPowerOn()
+        {
+            Debug.Console(2, this, "Room Powering On");
+
+            var dummySource = DeviceManager.GetDeviceForKey(_config.DummySourceKey) as IRoutingOutputs;
+
+            if (dummySource == null)
+            {
+                Debug.Console(1, this, "Unable to get source with key: {0}", _config.DummySourceKey);
+                return;
+            }
+
+            foreach (var display in _displays)
+            {
+                RunDirectRoute(dummySource, display.Value);
+            }
+        }
+
+        public void RoomPowerOff()
+        {
+            Debug.Console(2, this, "Room Powering Off");
+
+            foreach (var display in _displays)
+            {
+                display.Value.PowerOff();
+            }
+        }
+
+        private Dictionary<string, T> GetDevices<T>(ICollection<string> config) where T : IKeyed
+        {
+            try
+            {
+                var returnValue = DeviceManager.AllDevices.OfType<T>()
+                    .Where(d => config.Contains(d.Key))
+                    .ToDictionary(d => d.Key, d => d);
+
+                return returnValue;
+            }
+            catch
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error,
+                    "Error getting devices. Check Essentials Configuration");
+                return null;
+            }
+        }
+
+        #region Overrides of EssentialsRoomBase
+
+        protected override Func<bool> OnFeedbackFunc
+        {
+            get { return () => RoomPowerIsOn; }
+        }
+
+        protected override void EndShutdown()
+        {
+        }
+
+        public override void SetDefaultLevels()
+        {
+        }
+
+        public override void PowerOnToDefaultOrLastSource()
+        {
+        }
+
+        public override bool RunDefaultPresentRoute()
+        {
+            return false;
+        }
+
+        public override void RoomVacatedForTimeoutPeriod(object o)
+        {
+        }
+
+        #endregion
+
+        #region Implementation of IBridgeAdvanced
+
+        public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+
+            var joinMap = new EssentialsTechRoomJoinMap(joinStart);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!String.IsNullOrEmpty(joinMapSerialized))
+            {
+                joinMap = JsonConvert.DeserializeObject<EssentialsTechRoomJoinMap>(joinMapSerialized);
+            }
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            uint i;
+            if (_config.IsPrimary)
+            {
+                Debug.Console(1, this, "Linking Primary system Tuner Preset Mirroring");
+                if (_config.MirroredTuners != null && _config.MirroredTuners.Count > 0)
+                {
+                    foreach (var tuner in _config.MirroredTuners)
+                    {
+                        var f = CurrentPresetsFeedbacks[tuner.Value];
+
+                        if (f == null)
+                        {
+                            Debug.Console(1, this, "Unable to find feedback with key: {0}", tuner.Value);
+                            continue;
+                        }
+
+                        var join = joinMap.CurrentPreset.JoinNumber + tuner.Key;
+                        f.LinkInputSig(trilist.StringInput[(uint)(join)]);
+                        Debug.Console(1, this, "Linked Current Preset feedback for tuner: {0} to serial join: {1}", tuner.Value, join);
+                    }
+                }
+
+                //i = 0;
+                //foreach (var feedback in CurrentPresetsFeedbacks)
+                //{
+                //    feedback.Value.LinkInputSig(trilist.StringInput[(uint) (joinMap.CurrentPreset.JoinNumber + i)]);
+                //    i++;
+                //}
+
+                trilist.OnlineStatusChange += (device, args) =>
+                {
+                    if (!args.DeviceOnLine)
+                    {
+                        return;
+                    }
+
+                    foreach (var feedback in CurrentPresetsFeedbacks)
+                    {
+                        feedback.Value.FireUpdate();
+                    }
+                };
+
+                return;
+            }
+            else
+            {
+                Debug.Console(1, this, "Linking Secondary system Tuner Preset Mirroring");
+
+                if (_config.MirroredTuners != null && _config.MirroredTuners.Count > 0)
+                {
+                    foreach (var tuner in _config.MirroredTuners)
+                    {
+                        var t = _tuners[tuner.Value];
+
+                        if (t == null)
+                        {
+                            Debug.Console(1, this, "Unable to find tuner with key: {0}", tuner.Value);
+                            continue;
+                        }
+
+                        var join = joinMap.CurrentPreset.JoinNumber + tuner.Key;
+                        trilist.SetStringSigAction(join, s => _tunerPresets.Dial(s, t));
+                        Debug.Console(1, this, "Linked preset recall action for tuner: {0} to serial join: {1}", tuner.Value, join);
+                    }
+
+                    //foreach (var setTopBox in _tuners)
+                    //{
+                    //    var tuner = setTopBox;
+
+                    //    trilist.SetStringSigAction(joinMap.CurrentPreset.JoinNumber + i, s => _tunerPresets.Dial(s, tuner.Value));
+
+                    //}
+                }
+            }
+        }
+
+        #endregion
+
+        private class EssentialsTechRoomJoinMap : JoinMapBaseAdvanced
+        {
+            [JoinName("currentPreset")]
+            public JoinDataComplete CurrentPreset = new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 16},
+                new JoinMetadata {Description = "Current Tuner Preset", JoinType = eJoinType.Serial});
+
+            public EssentialsTechRoomJoinMap(uint joinStart) : base(joinStart, typeof(EssentialsTechRoomJoinMap))
+            {
+            }
+        }
+
+        #region IRunDirectRouteAction Members
+
+        private void RunDirectRoute(IRoutingOutputs source, IRoutingSink dest)
+        {
+             if (dest == null)
+            {
+                Debug.Console(1, this, "Cannot route, unknown destination '{0}'", dest.Key);
+                return;
+            }
+
+            if (source == null)
+            {
+                dest.ReleaseRoute();
+                if (dest is IHasPowerControl)
+                    (dest as IHasPowerControl).PowerOff();
+            }
+            else
+            {
+                dest.ReleaseAndMakeRoute(source, eRoutingSignalType.Video);
+            }
+        }
+
+        /// <summary>
+        /// Attempts to route directly between a source and destination
+        /// </summary>
+        /// <param name="sourceKey"></param>
+        /// <param name="destinationKey"></param>
+        public void RunDirectRoute(string sourceKey, string destinationKey)
+        {
+            IRoutingSink dest = null;
+
+            dest = DeviceManager.GetDeviceForKey(destinationKey) as IRoutingSink;
+
+            var source = DeviceManager.GetDeviceForKey(sourceKey) as IRoutingOutputs;
+
+            if (source == null || dest == null)
+            {
+                Debug.Console(1, this, "Cannot route unknown source or destination '{0}' to {1}", sourceKey, destinationKey);
+                return;
+            }
+            RunDirectRoute(source, dest);
+        }
+
+        #endregion
+    }
+
+    public class ScheduledEventEventArgs : EventArgs
+    {
+        public List<ScheduledEventConfig> ScheduledEvents;
+    }
+}

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.AudioCodec;
+
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials
+{
+    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay
+    {
+        bool ExcludeFromGlobalFunctions { get; }
+
+        void RunRouteAction(string routeKey);
+
+        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
+
+        IBasicVolumeControls CurrentVolumeControls { get; }
+
+        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+    }
+
+    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
+        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
+    {
+        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
+
+        void RunRouteAction(string routeKey);
+
+        IHasScheduleAwareness ScheduleSource { get; }
+
+        BoolFeedback InCallFeedback { get; }
+
+        BoolFeedback PrivacyModeIsOnFeedback { get; }
+
+        string DefaultCodecRouteString { get; }
+    }
+}

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -79,6 +79,16 @@ namespace PepperDash.Essentials
                     Panel = new Tsw1052(id, Global.ControlSystem);
                 else if (type == "tsw1060")
                     Panel = new Tsw1060(id, Global.ControlSystem);
+                else if (type == "tsw570")
+                    Panel = new Tsw570(id, Global.ControlSystem);
+                else if (type == "tsw770")
+                    Panel = new Tsw770(id, Global.ControlSystem);
+                else if (type == "ts770")
+                    Panel = new Ts770(id, Global.ControlSystem);
+                else if (type == "tsw1070")
+                    Panel = new Tsw1070(id, Global.ControlSystem);
+                else if (type == "ts1070")
+                    Panel = new Ts1070(id, Global.ControlSystem);
                 else
                 {
                     Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW controller with type '{0}'", type);
@@ -203,7 +213,7 @@ namespace PepperDash.Essentials
     {
         public EssentialsTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "xpanel" };
+            TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -222,7 +232,7 @@ namespace PepperDash.Essentials
 
                 // spin up different room drivers depending on room type
                 var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
-                if (room is EssentialsHuddleSpaceRoom)
+                if (room is IEssentialsHuddleSpaceRoom)
                 {
                     // Screen Saver Driver
                     mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
@@ -236,7 +246,7 @@ namespace PepperDash.Essentials
                     var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
                     avDriver.DefaultRoomKey = props.DefaultRoomKey;
                     mainDriver.AvDriver = avDriver;
-                    avDriver.CurrentRoom = room as EssentialsHuddleSpaceRoom;
+                    avDriver.CurrentRoom = room as IEssentialsHuddleSpaceRoom;
 
                     // Environment Driver
                     if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
@@ -270,7 +280,7 @@ namespace PepperDash.Essentials
                         tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
                     }
                 }
-                else if (room is EssentialsHuddleVtc1Room)
+                else if (room is IEssentialsHuddleVtc1Room)
                 {
                     Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
 
@@ -284,11 +294,11 @@ namespace PepperDash.Essentials
                     var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, props);
 
                     var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(panelController.Panel, avDriver,
-                        (room as EssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
+                        (room as IEssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
                     avDriver.SetVideoCodecDriver(codecDriver);
                     avDriver.DefaultRoomKey = props.DefaultRoomKey;
                     mainDriver.AvDriver = avDriver;
-                    avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room;
+                    avDriver.CurrentRoom = room as IEssentialsHuddleVtc1Room;
 
                     // Environment Driver
                     if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)

PepperDashEssentials/UI/HttpLogoServer.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.Net.Http;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials
 {
@@ -16,12 +13,12 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 
         /// </summary>
-        HttpServer Server;
+        readonly HttpServer _server;
 
         /// <summary>
         /// 
         /// </summary>
-        string FileDirectory;
+        readonly string _fileDirectory;
 
         /// <summary>
         /// 
@@ -45,18 +42,17 @@ namespace PepperDash.Essentials
                 //{ ".js", "application/javascript" },
                 //{ ".json", "application/json" },
                 //{ ".map", "application/x-navimap" },
-				{ ".pdf", "application.pdf" },
+				{ ".pdf", "application/pdf" },
 				{ ".png", "image/png" },
                 //{ ".txt", "text/plain" },
 			};
 
-            Server = new HttpServer();
+            _server = new HttpServer {Port = port};
-            Server.Port = port;
+            _fileDirectory = directory;
-            FileDirectory = directory;
+            _server.OnHttpRequest += Server_OnHttpRequest;
-            Server.OnHttpRequest += new OnHttpRequestHandler(Server_OnHttpRequest);
+            _server.Open();
-            Server.Open();
 
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
         }
 
         /// <summary>
@@ -67,27 +63,40 @@ namespace PepperDash.Essentials
             var path = args.Request.Path;
             Debug.Console(2, "HTTP Request with path: '{0}'", args.Request.Path);
 
-            if (File.Exists(FileDirectory + path))
+            try
             {
-                string filePath = path.Replace('/', '\\');
+                if (File.Exists(_fileDirectory + path))
-                string localPath = string.Format(@"{0}{1}", FileDirectory, filePath);
-
-                Debug.Console(2, "HTTP Logo Server attempting to find file: '{0}'", localPath);
-                if (File.Exists(localPath))
                 {
-                    args.Response.Header.ContentType = GetContentType(new FileInfo(localPath).Extension);
+                    var filePath = path.Replace('/', '\\');
-                    args.Response.ContentStream = new FileStream(localPath, FileMode.Open, FileAccess.Read);
+                    var localPath = string.Format(@"{0}{1}", _fileDirectory, filePath);
+
+                    Debug.Console(2, "HTTP Logo Server attempting to find file: '{0}'", localPath);
+                    if (File.Exists(localPath))
+                    {
+                        args.Response.Header.ContentType = GetContentType(new FileInfo(localPath).Extension);
+                        args.Response.ContentStream = new FileStream(localPath, FileMode.Open, FileAccess.Read);
+                    }
+                    else
+                    {
+                        Debug.Console(2, "HTTP Logo Server Cannot find file '{0}'", localPath);
+                        args.Response.ContentString = string.Format("Not found: '{0}'", filePath);
+                        args.Response.Code = 404;
+                    }
                 }
                 else
                 {
-                    Debug.Console(2, "HTTP Logo Server Cannot find file '{0}'", localPath);
+                    Debug.Console(2, "HTTP Logo Server: '{0}' does not exist", _fileDirectory + path);
-                    args.Response.ContentString = string.Format("Not found: '{0}'", filePath);
+                    args.Response.ContentString = string.Format("Not found: '{0}'", _fileDirectory + path);
                     args.Response.Code = 404;
                 }
             }
-            else
+            catch (Exception ex)
             {
-                Debug.Console(2, "HTTP Logo Server: '{0}' does not exist", FileDirectory + path);
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception getting file: {0}", ex.Message);
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Stack Trace: {0}", ex.StackTrace);
+
+                args.Response.Code = 400;
+                args.Response.ContentString = string.Format("invalid request");
             }
         }
 
@@ -97,7 +106,7 @@ namespace PepperDash.Essentials
         void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
         {
             if (programEventType == eProgramStatusEventType.Stopping)
-                Server.Close();
+                _server.Close();
         }
 
         /// <summary>
@@ -107,11 +116,7 @@ namespace PepperDash.Essentials
         /// <returns></returns>
         public static string GetContentType(string extension)
         {
-            string type;
+            var type = ExtensionContentTypes.ContainsKey(extension) ? ExtensionContentTypes[extension] : "text/plain";
-            if (ExtensionContentTypes.ContainsKey(extension))
-                type = ExtensionContentTypes[extension];
-            else
-                type = "text/plain";
             return type;
         }
     }

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -103,7 +103,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 1202
         /// </summary>
-        public const uint VCStagingInactivePopoverVisible = 1202;
+        public const uint VCStagingInactivePopoverWithRecentsVisible = 1202;
         /// <summary>
         /// 
         /// </summary>
@@ -121,6 +121,11 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCRecentsVisible = 1206;
 
+        /// <summary>
+        /// 1202
+        /// </summary>
+        public const uint VCStagingInactivePopoverWithoutRecentsVisible = 1207;
+
 		/// <summary>
 		/// 1208
 		/// </summary>
@@ -243,6 +248,10 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCCameraSelectBarWithoutModeVisible = 1261;
 
+        /// <summary>
+        /// 1262
+        /// </summary>
+        public const uint VCCameraAutoModeIsOnFb = 1262;
 
         /// <summary>
         /// 1271
@@ -743,10 +752,10 @@ namespace PepperDash.Essentials
         /// 15044 Close button for source modal overlay
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
-        /// <summary>
+        ///// <summary>
-        /// 15045 - Visibility for the bar containing call navigation button list
+        ///// 15045 - Visibility for the bar containing call navigation button list
-        /// </summary>
+        ///// </summary>
-        public const uint CallStagingBarVisible = 15045;
+        //public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>
@@ -764,6 +773,10 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public const uint NextMeetingModalVisible = 15049;
         /// <summary>
+        /// 15050
+        /// </summary>
+        public const uint NextMeetingNotificationRibbonVisible = 15050;
+        /// <summary>
         /// 15051
         /// </summary>
         public const uint Display1SelectPressAndFb = 15051;

PepperDashEssentials/UIDrivers/DualDisplayRouting.cs

@@ -146,18 +146,18 @@
 
 //        }
 
-//        void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentSourceInfoChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
 //        {
             
 //        }
 
-//        void CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = PendingSource.PreferredName;
 
 //        }
 
-//        void CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = PendingSource.PreferredName;
 //        }

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -52,7 +52,7 @@ namespace PepperDash.Essentials
             CaretInterlock = new JoinedSigInterlock(TriList);
         }
 
-        void SetUpGear(IAVDriver avDriver, EssentialsRoomBase currentRoom)
+        void SetUpGear(IAVDriver avDriver, IEssentialsRoom currentRoom)
         {
             // Gear
             TriList.SetString(UIStringJoin.HeaderButtonIcon5, "Gear");
@@ -105,7 +105,7 @@ namespace PepperDash.Essentials
             {
                 string message = null;
                 var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
-                    as EssentialsHuddleSpaceRoom;
+                    as IEssentialsHuddleSpaceRoom;
                 if (room != null)
                     message = room.PropertiesConfig.HelpMessage;
                 else
@@ -207,6 +207,7 @@ namespace PepperDash.Essentials
             //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
 
             // Set the call status text
+            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
             if (codec.ActiveCalls.Count > 0)
             {
                 if (codec.ActiveCalls.Count == 1)
@@ -221,7 +222,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleVtc1Room type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, EssentialsHuddleVtc1Room currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, IEssentialsHuddleVtc1Room currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 
@@ -283,7 +284,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleSpaceRoom type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, EssentialsHuddleSpaceRoom currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, IEssentialsHuddleSpaceRoom currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 

PepperDashEssentials/UIDrivers/Essentials/EssentialsPresentationPanelAvFunctionsDriver.cs

@@ -983,7 +983,7 @@
 //        /// <summary>
 //        /// Handles source change
 //        /// </summary>
-//        void _CurrentRoom_SourceInfoChange(EssentialsRoomBase room, 
+//        void _CurrentRoom_SourceInfoChange(IEssentialsRoom room, 
 //            SourceListItem info, ChangeType change)
 //        {
 //            if (change == ChangeType.WillChange)
@@ -995,7 +995,7 @@
 //        /// <summary>
 //        /// 
 //        /// </summary>
-//        void _CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+//        void _CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
 //        {
 //            if (type == ChangeType.DidChange)
 //            {
@@ -1021,7 +1021,7 @@
 //        /// <summary>
 //        /// 
 //        /// </summary>
-//        void _CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+//        void _CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
 //        {
 //            if (type == ChangeType.DidChange)
 //            {

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -78,7 +78,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// 
 		/// </summary>
-		public EssentialsHuddleSpaceRoom CurrentRoom
+		public IEssentialsHuddleSpaceRoom CurrentRoom
 		{
 			get { return _CurrentRoom; }
 			set
@@ -86,7 +86,7 @@ namespace PepperDash.Essentials
 				SetCurrentRoom(value);
 			}
 		}
-		EssentialsHuddleSpaceRoom _CurrentRoom;
+		IEssentialsHuddleSpaceRoom _CurrentRoom;
 
         /// <summary>
         /// 
@@ -305,9 +305,9 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.ShowPowerOffPress, EndMeetingPress);
 
 			TriList.SetSigFalseAction(UIBoolJoin.DisplayPowerTogglePress, () =>
-				{ 
+				{
-					if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IPower)
+                    if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IHasPowerControl)
-						(CurrentRoom.DefaultDisplay as IPower).PowerToggle();
+                        (CurrentRoom.DefaultDisplay as IHasPowerControl).PowerToggle();
 				});
 
 			base.Show();
@@ -498,7 +498,7 @@ namespace PepperDash.Essentials
             TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
             // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
-                CurrentRoom.RunDefaultPresentRoute();
+                (CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute();
         }
 
 
@@ -583,7 +583,7 @@ namespace PepperDash.Essentials
 		void UiSelectSource(string key)
 		{
 			// Run the route and when it calls back, show the source
-			CurrentRoom.RunRouteAction(key, new Action(() => { }));
+			CurrentRoom.RunRouteAction(key);
 		}
 
 		/// <summary>
@@ -745,7 +745,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        public void RefreshCurrentRoom(EssentialsHuddleSpaceRoom room)
+        public void RefreshCurrentRoom(IEssentialsHuddleSpaceRoom room)
         {
             if (_CurrentRoom != null)
             {
@@ -836,7 +836,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void SetCurrentRoom(EssentialsHuddleSpaceRoom room)
+		void SetCurrentRoom(IEssentialsHuddleSpaceRoom room)
 		{
 			if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -871,7 +871,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(EssentialsHuddleSpaceRoom room)
+        void UpdateMCJoins(IEssentialsHuddleSpaceRoom room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -984,8 +984,8 @@ namespace PepperDash.Essentials
 				(previousDev as IDvr).UnlinkButtons(TriList);
 			if (previousDev is INumericKeypad)
 				(previousDev as INumericKeypad).UnlinkButtons(TriList);
-			if (previousDev is IPower)
+            if (previousDev is IHasPowerControl)
-				(previousDev as IPower).UnlinkButtons(TriList);
+                (previousDev as IHasPowerControl).UnlinkButtons(TriList);
 			if (previousDev is ITransport)
 				(previousDev as ITransport).UnlinkButtons(TriList);
 			//if (previousDev is IRadio)
@@ -1044,8 +1044,8 @@ namespace PepperDash.Essentials
 				(dev as IDvr).LinkButtons(TriList);
 			if (dev is INumericKeypad)
 				(dev as INumericKeypad).LinkButtons(TriList);
-			if (dev is IPower)
+            if (dev is IHasPowerControl)
-				(dev as IPower).LinkButtons(TriList);
+                (dev as IHasPowerControl).LinkButtons(TriList);
 			if (dev is ITransport)
 				(dev as ITransport).LinkButtons(TriList);
 			//if (dev is IRadio)

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddleTechPageDriver.cs

@@ -1,326 +1,326 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-
+
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials;
+using PepperDash.Essentials;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.SmartObjects;
+using PepperDash.Essentials.Core.SmartObjects;
-using PepperDash.Essentials.Core.Touchpanels.Keyboards;
+using PepperDash.Essentials.Core.Touchpanels.Keyboards;
-using PepperDash.Essentials.Devices.Displays;
+using PepperDash.Essentials.Devices.Displays;
-using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Room.Config;
-
+
-namespace PepperDash.Essentials.UIDrivers
+namespace PepperDash.Essentials.UIDrivers
-{
+{
-    public class EssentialsHuddleTechPageDriver : PanelDriverBase
+    public class EssentialsHuddleTechPageDriver : PanelDriverBase
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        SmartObjectDynamicList MenuList;
+        SmartObjectDynamicList MenuList;
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        SubpageReferenceList StatusList;
+        SubpageReferenceList StatusList;
-        /// <summary>
+        /// <summary>
-        /// The list of display controls
+        /// The list of display controls
-        /// </summary>
+        /// </summary>
-        SubpageReferenceList DisplayList;
+        SubpageReferenceList DisplayList;
-        /// <summary>
+        /// <summary>
-        /// References lines in the list against device instances
+        /// References lines in the list against device instances
-        /// </summary>
+        /// </summary>
-        Dictionary<ICommunicationMonitor, uint> StatusListDeviceIndexes;
+        Dictionary<ICommunicationMonitor, uint> StatusListDeviceIndexes;
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        JoinedSigInterlock PagesInterlock;
+        JoinedSigInterlock PagesInterlock;
-
+
-        /// <summary>
+        /// <summary>
-        /// 1
+        /// 1
-        /// </summary>
+        /// </summary>
-        public const uint JoinText = 1;
+        public const uint JoinText = 1;
-
+
-        CTimer PinAuthorizedTimer;
+        CTimer PinAuthorizedTimer;
-
+
-		EssentialsRoomTechConfig Config;
+		EssentialsRoomTechConfig Config;
-
+
-        StringBuilder PinEntryBuilder = new StringBuilder(4);
+        StringBuilder PinEntryBuilder = new StringBuilder(4);
-
+
-        bool IsAuthorized;
+        bool IsAuthorized;
-
+
-        SmartObjectNumeric PinKeypad;
+        SmartObjectNumeric PinKeypad;
-
+
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        /// <param name="trilist"></param>
+        /// <param name="trilist"></param>
-        /// <param name="parent"></param>
+        /// <param name="parent"></param>
-        public EssentialsHuddleTechPageDriver(BasicTriListWithSmartObject trilist, EssentialsRoomTechConfig config)
+        public EssentialsHuddleTechPageDriver(BasicTriListWithSmartObject trilist, EssentialsRoomTechConfig config)
-            : base(trilist)
+            : base(trilist)
-        {
+        {
-			Config = config;
+			Config = config;
-
+
-            PagesInterlock = new JoinedSigInterlock(trilist);
+            PagesInterlock = new JoinedSigInterlock(trilist);
-            PagesInterlock.SetButDontShow(UIBoolJoin.TechSystemStatusVisible);
+            PagesInterlock.SetButDontShow(UIBoolJoin.TechSystemStatusVisible);
-
+
-            trilist.SetSigFalseAction(UIBoolJoin.TechExitButton, Hide);
+            trilist.SetSigFalseAction(UIBoolJoin.TechExitButton, Hide);
-
+
-            MenuList = new SmartObjectDynamicList(trilist.SmartObjects[UISmartObjectJoin.TechMenuList], 
+            MenuList = new SmartObjectDynamicList(trilist.SmartObjects[UISmartObjectJoin.TechMenuList], 
-                true, 3100);
+                true, 3100);
-
+
-            MenuList.SetFeedback(1, true); // initial fb
+            MenuList.SetFeedback(1, true); // initial fb
-			ushort count = 0;
+			ushort count = 0;
-
+
-            MenuList.SetItemMainText(1, "System Status");
+            MenuList.SetItemMainText(1, "System Status");
-            MenuList.SetItemButtonAction(1, b => { 
+            MenuList.SetItemButtonAction(1, b => { 
-                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechSystemStatusVisible); 
+                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechSystemStatusVisible); 
-                MenuList.SetFeedback(1, true);
+                MenuList.SetFeedback(1, true);
-            });
+            });
-
+
-            MenuList.SetItemMainText(2, "Display Controls");
+            MenuList.SetItemMainText(2, "Display Controls");
-            MenuList.SetItemButtonAction(2, b => { 
+            MenuList.SetItemButtonAction(2, b => { 
-                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechDisplayControlsVisible); 
+                if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechDisplayControlsVisible); 
-                MenuList.SetFeedback(2, true);
+                MenuList.SetFeedback(2, true);
-            });
+            });
-
+
-			count = 2;
+			count = 2;
-
+
-			// Don't show panel setup on iPad or xpanel
+			// Don't show panel setup on iPad or xpanel
-			if (TriList is Crestron.SimplSharpPro.DeviceSupport.TswFt5Button)
+			if (TriList is Crestron.SimplSharpPro.DeviceSupport.TswFt5Button)
-			{
+			{
-				count++;
+				count++;
-				MenuList.SetItemMainText(count, "Panel Setup");
+				MenuList.SetItemMainText(count, "Panel Setup");
-				MenuList.SetItemButtonAction(count, b =>
+				MenuList.SetItemButtonAction(count, b =>
-				{
+				{
-					if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechPanelSetupVisible);
+					if (b) PagesInterlock.ShowInterlocked(UIBoolJoin.TechPanelSetupVisible);
-					MenuList.SetFeedback(count, true);
+					MenuList.SetFeedback(count, true);
-				});
+				});
-			}
+			}
-
+
-            MenuList.Count = count;
+            MenuList.Count = count;
-            BuildStatusList();
+            BuildStatusList();
-            BuildDisplayList();
+            BuildDisplayList();
-            SetupPinModal();
+            SetupPinModal();
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        public override void Show()
+        public override void Show()
-        {
+        {
-            // divert to PIN if we need auth
+            // divert to PIN if we need auth
-            if (IsAuthorized)
+            if (IsAuthorized)
-            {
+            {
-                // Cancel the auth timer so we don't deauth after coming back in
+                // Cancel the auth timer so we don't deauth after coming back in
-                if (PinAuthorizedTimer != null)
+                if (PinAuthorizedTimer != null)
-                    PinAuthorizedTimer.Stop();
+                    PinAuthorizedTimer.Stop();
-
+
-                TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, true);
+                TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, true);
-                PagesInterlock.Show();
+                PagesInterlock.Show();
-                base.Show();
+                base.Show();
-            }
+            }
-            else
+            else
-            {
+            {
-                TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, true);
+                TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, true);
-            }
+            }
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        public override void Hide()
+        public override void Hide()
-        {
+        {
-            // Leave it authorized for 60 seconds.
+            // Leave it authorized for 60 seconds.
-            if (IsAuthorized)
+            if (IsAuthorized)
-                PinAuthorizedTimer = new CTimer(o => { 
+                PinAuthorizedTimer = new CTimer(o => { 
-                    IsAuthorized = false;
+                    IsAuthorized = false;
-                    PinAuthorizedTimer = null;
+                    PinAuthorizedTimer = null;
-                }, 60000);
+                }, 60000);
-            TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, false);
+            TriList.SetBool(UIBoolJoin.TechCommonItemsVisbible, false);
-            PagesInterlock.Hide();
+            PagesInterlock.Hide();
-            base.Hide();
+            base.Hide();
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Wire up the keypad and buttons
+        /// Wire up the keypad and buttons
-        /// </summary>
+        /// </summary>
-        void SetupPinModal()
+        void SetupPinModal()
-        {
+        {
-            TriList.SetSigFalseAction(UIBoolJoin.PinDialogCancelPress, CancelPinDialog);
+            TriList.SetSigFalseAction(UIBoolJoin.PinDialogCancelPress, CancelPinDialog);
-            PinKeypad = new SmartObjectNumeric(TriList.SmartObjects[UISmartObjectJoin.TechPinDialogKeypad], true);
+            PinKeypad = new SmartObjectNumeric(TriList.SmartObjects[UISmartObjectJoin.TechPinDialogKeypad], true);
-            PinKeypad.Digit0.UserObject = new Action<bool>(b => { if (b)DialPinDigit('0'); });
+            PinKeypad.Digit0.UserObject = new Action<bool>(b => { if (b)DialPinDigit('0'); });
-            PinKeypad.Digit1.UserObject = new Action<bool>(b => { if (b)DialPinDigit('1'); });
+            PinKeypad.Digit1.UserObject = new Action<bool>(b => { if (b)DialPinDigit('1'); });
-            PinKeypad.Digit2.UserObject = new Action<bool>(b => { if (b)DialPinDigit('2'); });
+            PinKeypad.Digit2.UserObject = new Action<bool>(b => { if (b)DialPinDigit('2'); });
-            PinKeypad.Digit3.UserObject = new Action<bool>(b => { if (b)DialPinDigit('3'); });
+            PinKeypad.Digit3.UserObject = new Action<bool>(b => { if (b)DialPinDigit('3'); });
-            PinKeypad.Digit4.UserObject = new Action<bool>(b => { if (b)DialPinDigit('4'); });
+            PinKeypad.Digit4.UserObject = new Action<bool>(b => { if (b)DialPinDigit('4'); });
-            PinKeypad.Digit5.UserObject = new Action<bool>(b => { if (b)DialPinDigit('5'); });
+            PinKeypad.Digit5.UserObject = new Action<bool>(b => { if (b)DialPinDigit('5'); });
-            PinKeypad.Digit6.UserObject = new Action<bool>(b => { if (b)DialPinDigit('6'); });
+            PinKeypad.Digit6.UserObject = new Action<bool>(b => { if (b)DialPinDigit('6'); });
-            PinKeypad.Digit7.UserObject = new Action<bool>(b => { if (b)DialPinDigit('7'); });
+            PinKeypad.Digit7.UserObject = new Action<bool>(b => { if (b)DialPinDigit('7'); });
-            PinKeypad.Digit8.UserObject = new Action<bool>(b => { if (b)DialPinDigit('8'); });
+            PinKeypad.Digit8.UserObject = new Action<bool>(b => { if (b)DialPinDigit('8'); });
-            PinKeypad.Digit9.UserObject = new Action<bool>(b => { if (b)DialPinDigit('9'); });
+            PinKeypad.Digit9.UserObject = new Action<bool>(b => { if (b)DialPinDigit('9'); });
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        /// <param name="d"></param>
+        /// <param name="d"></param>
-        void DialPinDigit(char d)
+        void DialPinDigit(char d)
-        {
+        {
-            PinEntryBuilder.Append(d);
+            PinEntryBuilder.Append(d);
-            var len = PinEntryBuilder.Length;
+            var len = PinEntryBuilder.Length;
-            SetPinDotsFeedback(len);
+            SetPinDotsFeedback(len);
-
+
-            // check it!
+            // check it!
-            if (len == 4)
+            if (len == 4)
-            {
+            {
-                if (Config.Password == PinEntryBuilder.ToString())
+                if (Config.Password == PinEntryBuilder.ToString())
-                {
+                {
-                    IsAuthorized = true;
+                    IsAuthorized = true;
-                    SetPinDotsFeedback(0);
+                    SetPinDotsFeedback(0);
-                    TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
+                    TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
-                    Show();
+                    Show();
-                }
+                }
-                else
+                else
-                {
+                {
-                    SetPinDotsFeedback(0);
+                    SetPinDotsFeedback(0);
-                    TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, true);
+                    TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, true);
-                    new CTimer(o => 
+                    new CTimer(o => 
-                        {
+                        {
-                            TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, false);
+                            TriList.SetBool(UIBoolJoin.PinDialogErrorVisible, false);
-                        }, 1500);
+                        }, 1500);
-                }
+                }
-
+
-                PinEntryBuilder.Remove(0, len); // clear it either way
+                PinEntryBuilder.Remove(0, len); // clear it either way
-            }
+            }
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Draws the dots as pin is entered
+        /// Draws the dots as pin is entered
-        /// </summary>
+        /// </summary>
-        /// <param name="len"></param>
+        /// <param name="len"></param>
-        void SetPinDotsFeedback(int len)
+        void SetPinDotsFeedback(int len)
-        {
+        {
-            TriList.SetBool(UIBoolJoin.PinDialogDot1, len >= 1);
+            TriList.SetBool(UIBoolJoin.PinDialogDot1, len >= 1);
-            TriList.SetBool(UIBoolJoin.PinDialogDot2, len >= 2);
+            TriList.SetBool(UIBoolJoin.PinDialogDot2, len >= 2);
-            TriList.SetBool(UIBoolJoin.PinDialogDot3, len >= 3);
+            TriList.SetBool(UIBoolJoin.PinDialogDot3, len >= 3);
-            TriList.SetBool(UIBoolJoin.PinDialogDot4, len == 4);
+            TriList.SetBool(UIBoolJoin.PinDialogDot4, len == 4);
-
+
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Does what it says
+        /// Does what it says
-        /// </summary>
+        /// </summary>
-        void CancelPinDialog()
+        void CancelPinDialog()
-        {
+        {
-            PinEntryBuilder.Remove(0, PinEntryBuilder.Length);
+            PinEntryBuilder.Remove(0, PinEntryBuilder.Length);
-            TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
+            TriList.SetBool(UIBoolJoin.PinDialog4DigitVisible, false);
-        }
+        }
-
+
-
+
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        void BuildStatusList()
+        void BuildStatusList()
-        {
+        {
-            StatusList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechStatusList, 3, 3, 3);
+            StatusList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechStatusList, 3, 3, 3);
-            StatusListDeviceIndexes = new Dictionary<ICommunicationMonitor, uint>();
+            StatusListDeviceIndexes = new Dictionary<ICommunicationMonitor, uint>();
-            uint i = 0;
+            uint i = 0;
-            foreach (var d in DeviceManager.AllDevices)
+            foreach (var d in DeviceManager.AllDevices)
-            {
+            {
-                // make sure it is both ICommunicationMonitor and a Device
+                // make sure it is both ICommunicationMonitor and a Device
-                var sd = d as ICommunicationMonitor;
+                var sd = d as ICommunicationMonitor;
-                if (sd == null)
+                if (sd == null)
-                    continue;
+                    continue;
-                var dd = sd as Device;
+                var dd = sd as Device;
-                if(dd == null)
+                if(dd == null)
-                    continue;
+                    continue;
-                i++;
+                i++;
-                StatusList.StringInputSig(i, 1).StringValue = dd.Name;
+                StatusList.StringInputSig(i, 1).StringValue = dd.Name;
-                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)sd.CommunicationMonitor.Status;
+                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)sd.CommunicationMonitor.Status;
-                StatusListDeviceIndexes.Add(sd, i);
+                StatusListDeviceIndexes.Add(sd, i);
-                sd.CommunicationMonitor.StatusChange += CommunicationMonitor_StatusChange ;
+                sd.CommunicationMonitor.StatusChange += CommunicationMonitor_StatusChange ;
-            }
+            }
-            StatusList.Count = (ushort)i;
+            StatusList.Count = (ushort)i;
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Builds the list of display controls
+        /// Builds the list of display controls
-        /// </summary>
+        /// </summary>
-        void BuildDisplayList()
+        void BuildDisplayList()
-        {
+        {
-            DisplayList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechDisplayControlsList, 10, 3, 3);
+            DisplayList = new SubpageReferenceList(TriList, UISmartObjectJoin.TechDisplayControlsList, 10, 3, 3);
-
+
-            var devKeys = ConfigReader.ConfigObject.Devices.Where(d =>
+            var devKeys = ConfigReader.ConfigObject.Devices.Where(d =>
-                d.Group.Equals("display", StringComparison.OrdinalIgnoreCase)
+                d.Group.Equals("display", StringComparison.OrdinalIgnoreCase)
-                || d.Group.Equals("projector", StringComparison.OrdinalIgnoreCase))
+                || d.Group.Equals("projector", StringComparison.OrdinalIgnoreCase))
-                .Select(dd => dd.Key);
+                .Select(dd => dd.Key);
-            var disps = DeviceManager.AllDevices.Where(d =>
+            var disps = DeviceManager.AllDevices.Where(d =>
-                devKeys.Contains(d.Key));
+                devKeys.Contains(d.Key));
-            ushort i = 0;
+            ushort i = 0;
-            foreach (var disp in disps)
+            foreach (var disp in disps)
-            {
+            {
-                var display = disp as DisplayBase;
+                var display = disp as DisplayBase;
-                if (display != null)
+                if (display != null)
-                {
+                {
-                    i++;
+                    i++;
-                    DisplayList.StringInputSig(i, 1).StringValue = display.Name;
+                    DisplayList.StringInputSig(i, 1).StringValue = display.Name;
-                    DisplayList.GetBoolFeedbackSig(i, 1).SetSigFalseAction(display.PowerOn);      
+                    DisplayList.GetBoolFeedbackSig(i, 1).SetSigFalseAction(display.PowerOn);      
-                    DisplayList.GetBoolFeedbackSig(i, 2).SetSigFalseAction(display.PowerOff);
+                    DisplayList.GetBoolFeedbackSig(i, 2).SetSigFalseAction(display.PowerOff);
-                    if (display is TwoWayDisplayBase)
+                    if (display is TwoWayDisplayBase)
-                    {
+                    {
-                        var powerOnSig = DisplayList.BoolInputSig(i, 1);
+                        var powerOnSig = DisplayList.BoolInputSig(i, 1);
-                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkInputSig(powerOnSig);
+                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkInputSig(powerOnSig);
-
+
-                        var powerOffSig = DisplayList.BoolInputSig(1, 2);
+                        var powerOffSig = DisplayList.BoolInputSig(1, 2);
-                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkComplementInputSig(powerOffSig);
+                        (display as TwoWayDisplayBase).PowerIsOnFeedback.LinkComplementInputSig(powerOffSig);
-                    } 
+                    } 
-                    DisplayList.GetBoolFeedbackSig(i, 3).SetSigFalseAction(() =>
+                    DisplayList.GetBoolFeedbackSig(i, 3).SetSigFalseAction(() =>
-                        { if (display is IInputHdmi1) (display as IInputHdmi1).InputHdmi1(); });
+                        { if (display is IInputHdmi1) (display as IInputHdmi1).InputHdmi1(); });
-                    DisplayList.GetBoolFeedbackSig(i, 4).SetSigFalseAction(() =>
+                    DisplayList.GetBoolFeedbackSig(i, 4).SetSigFalseAction(() =>
-                        { if (display is IInputHdmi2) (display as IInputHdmi2).InputHdmi2(); });
+                        { if (display is IInputHdmi2) (display as IInputHdmi2).InputHdmi2(); });
-                    DisplayList.GetBoolFeedbackSig(i, 5).SetSigFalseAction(() =>
+                    DisplayList.GetBoolFeedbackSig(i, 5).SetSigFalseAction(() =>
-                        { if (display is IInputHdmi3) (display as IInputHdmi3).InputHdmi3(); });
+                        { if (display is IInputHdmi3) (display as IInputHdmi3).InputHdmi3(); });
-                    //DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
+                    //DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
-                    //{ if (display is IInputHdmi4) (display as IInputHdmi4).InputHdmi4(); });
+                    //{ if (display is IInputHdmi4) (display as IInputHdmi4).InputHdmi4(); });
-                    DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
+                    DisplayList.GetBoolFeedbackSig(i, 6).SetSigFalseAction(() =>
-                        { if (display is IInputDisplayPort1) (display as IInputDisplayPort1).InputDisplayPort1(); });
+                        { if (display is IInputDisplayPort1) (display as IInputDisplayPort1).InputDisplayPort1(); });
-
+
-                
+                
-                    // Figure out some way to provide current input feedback
+                    // Figure out some way to provide current input feedback
-                    if (display is TwoWayDisplayBase)
+                    if (display is TwoWayDisplayBase)
-                    {
+                    {
-                        (display as TwoWayDisplayBase).CurrentInputFeedback.OutputChange += CurrentInputFeedback_OutputChange;
+                        (display as TwoWayDisplayBase).CurrentInputFeedback.OutputChange += CurrentInputFeedback_OutputChange;
-                    }
+                    }
-                }
+                }
-
+
-                
+                
-            }
+            }
-
+
-            DisplayList.Count = i;
+            DisplayList.Count = i;
-        }
+        }
-
+
-
+
-        void CurrentInputFeedback_OutputChange(object sender, EventArgs e)
+        void CurrentInputFeedback_OutputChange(object sender, EventArgs e)
-        {
+        {
-            
+            
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
+        void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
-        {
+        {
-            var c = sender as ICommunicationMonitor;
+            var c = sender as ICommunicationMonitor;
-            if (StatusListDeviceIndexes.ContainsKey(c))
+            if (c != null && StatusListDeviceIndexes.ContainsKey(c))
-            {
+            {
-                var i = StatusListDeviceIndexes[c];
+                var i = StatusListDeviceIndexes[c];
-                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;
+                StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;
-            }
+            }
-        }
+        }
-    }
+    }
 }

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -50,7 +50,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 
         /// </summary>
-        public EssentialsHuddleVtc1Room CurrentRoom
+        public IEssentialsHuddleVtc1Room CurrentRoom
         {
             get { return _CurrentRoom; }
             set
@@ -58,7 +58,7 @@ namespace PepperDash.Essentials
                 SetCurrentRoom(value);
             }
         }
-        EssentialsHuddleVtc1Room _CurrentRoom;
+        IEssentialsHuddleVtc1Room _CurrentRoom;
 
         /// <summary>
         /// For hitting feedbacks
@@ -173,10 +173,28 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
+
+        private UiDisplayMode _currentMode;
+
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
-        UiDisplayMode CurrentMode = UiDisplayMode.Start;
+        UiDisplayMode CurrentMode
+        {
+            get
+            {
+                return _currentMode;
+            }
+            set
+            {
+                if (value != _currentMode)
+                {
+                    _currentMode = value;
+
+                    SetActivityFooterFeedbacks();
+                }
+            }
+        }
 
 		CTimer NextMeetingTimer;
 
@@ -207,6 +225,7 @@ namespace PepperDash.Essentials
 
 			MeetingOrContactMethodModalSrl = new SubpageReferenceList(TriList, UISmartObjectJoin.MeetingListSRL, 3, 3, 5);
 
+            CurrentMode = UiDisplayMode.Start;
 
 			// buttons are added in SetCurrentRoom
 			//HeaderButtonsList = new SmartObjectHeaderButtonList(TriList.SmartObjects[UISmartObjectJoin.HeaderButtonList]);
@@ -319,8 +338,8 @@ namespace PepperDash.Essentials
 
             TriList.SetSigFalseAction(UIBoolJoin.DisplayPowerTogglePress, () =>
             {
-                if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IPower)
+                if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IHasPowerControl)
-                    (CurrentRoom.DefaultDisplay as IPower).PowerToggle();
+                    (CurrentRoom.DefaultDisplay as IHasPowerControl).PowerToggle();
             });
 
 			SetupNextMeetingTimer();
@@ -607,11 +626,21 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
+            if (CurrentRoom != null)
-                && CurrentRoom.ShutdownType == eShutdownType.None;
+            {
-            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
+                var startMode = CurrentMode == UiDisplayMode.Start;
-                && CurrentRoom.ShutdownType == eShutdownType.None;
+                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
-            EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
+                var callMode = CurrentMode == UiDisplayMode.Call;
+
+                TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
+                TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
+
+                CallButtonSig.BoolValue = callMode
+                    && CurrentRoom.ShutdownType == eShutdownType.None;
+                ShareButtonSig.BoolValue = presentationMode
+                    && CurrentRoom.ShutdownType == eShutdownType.None;
+                EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
+            }
         }
 
         /// <summary>
@@ -623,14 +652,13 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            TriList.SetBool(StartPageVisibleJoin, false);
+            //TriList.SetBool(StartPageVisibleJoin, false);
-            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
+            //TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-            TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+            //TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
                 CurrentSourcePageManager.Hide();
 			PowerOnFromCall();
             CurrentMode = UiDisplayMode.Call;
-            SetActivityFooterFeedbacks();
             VCDriver.Show();
         }
 
@@ -643,16 +671,13 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-            TriList.SetBool(StartPageVisibleJoin, false);
-            TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
-            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
             // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
             { 
 				if (!CurrentRoom.OnFeedback.BoolValue)
 				{
 					// If there's no default, show UI elements
-					if (!CurrentRoom.RunDefaultPresentRoute())
+					if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
 						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
 				}
             }
@@ -665,7 +690,6 @@ namespace PepperDash.Essentials
             }
             CurrentMode = UiDisplayMode.Presentation;
 			SetupSourceList();
-            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -707,6 +731,8 @@ namespace PepperDash.Essentials
 			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
+            CurrentMode = UiDisplayMode.Presentation;
+
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -743,7 +769,7 @@ namespace PepperDash.Essentials
         void UiSelectSource(string key)
         {
             // Run the route and when it calls back, show the source
-            CurrentRoom.RunRouteAction(key, new Action(() => { }));
+            CurrentRoom.RunRouteAction(key);
         }
 
         /// <summary>
@@ -894,7 +920,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        void RefreshCurrentRoom(EssentialsHuddleVtc1Room room)
+        void RefreshCurrentRoom(IEssentialsHuddleVtc1Room room)
         {
 
             if (_CurrentRoom != null)
@@ -969,7 +995,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void SetCurrentRoom(EssentialsHuddleVtc1Room room)
+        void SetCurrentRoom(IEssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -1004,7 +1030,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(EssentialsHuddleVtc1Room room)
+        void UpdateMCJoins(IEssentialsHuddleVtc1Room room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -1035,7 +1061,7 @@ namespace PepperDash.Essentials
 				if (CurrentRoom.CurrentSourceInfo != null &&  CurrentRoom.CurrentSourceInfo.DisableCodecSharing)
 				{
 					Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source");
-					CurrentRoom.RunRouteAction("codecOsd", CurrentRoom.SourceListKey);
+					CurrentRoom.RunRouteAction("codecOsd");
 				}
 			}
 
@@ -1218,9 +1244,8 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                SetActivityFooterFeedbacks();
+                //TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
+                //TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
 				// Clear this so that the pesky meeting warning can resurface every minute when off
 				LastMeetingDismissedId = null;
             }
@@ -1293,8 +1318,8 @@ namespace PepperDash.Essentials
                 (previousDev as IDvr).UnlinkButtons(TriList);
             if (previousDev is INumericKeypad)
                 (previousDev as INumericKeypad).UnlinkButtons(TriList);
-            if (previousDev is IPower)
+            if (previousDev is IHasPowerControl)
-                (previousDev as IPower).UnlinkButtons(TriList);
+                (previousDev as IHasPowerControl).UnlinkButtons(TriList);
             if (previousDev is ITransport)
                 (previousDev as ITransport).UnlinkButtons(TriList);
         }
@@ -1351,8 +1376,8 @@ namespace PepperDash.Essentials
                 (dev as IDvr).LinkButtons(TriList);
             if (dev is INumericKeypad)
                 (dev as INumericKeypad).LinkButtons(TriList);
-            if (dev is IPower)
+            if (dev is IHasPowerControl)
-                (dev as IPower).LinkButtons(TriList);
+                (dev as IHasPowerControl).LinkButtons(TriList);
             if (dev is ITransport)
                 (dev as ITransport).LinkButtons(TriList);
         }
@@ -1443,7 +1468,7 @@ namespace PepperDash.Essentials
     /// </summary>
     public interface IAVWithVCDriver : IAVDriver
     {
-        EssentialsHuddleVtc1Room CurrentRoom { get; }
+        IEssentialsHuddleVtc1Room CurrentRoom { get; }
 
         PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
         /// <summary>

PepperDashEssentials/UIDrivers/SmartObjectRoomsList.cs

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// Sets feedback for the given room
 		/// </summary>
-		public void SetFeedbackForRoom(EssentialsHuddleSpaceRoom room)
+		public void SetFeedbackForRoom(IEssentialsHuddleSpaceRoom room)
 		{
 			var itemToSet = Items.FirstOrDefault(i => i.Room == room);
 			if (itemToSet != null)
@@ -48,11 +48,11 @@ namespace PepperDash.Essentials
 
 	public class SmartObjectRoomsListItem
 	{
-		public EssentialsHuddleSpaceRoom Room { get; private set; }
+		public IEssentialsHuddleSpaceRoom Room { get; private set; }
 		SmartObjectRoomsList Parent;
 		public uint Index { get; private set; }
 
-		public SmartObjectRoomsListItem(EssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
+		public SmartObjectRoomsListItem(IEssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
 			Action<bool> buttonAction)
 		{
 			Room = room;

PepperDashEssentials/UIDrivers/SourceChangeArgs.cs

@@ -12,5 +12,5 @@ namespace PepperDash.Essentials
     ///// <summary>
     ///// The handler type for a Room's SourceInfoChange
     ///// </summary>
-    //public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
+    //public delegate void SourceInfoChangeHandler(IEssentialsRoom room, SourceListItem info, ChangeType type);
 }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -142,7 +142,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
 
                 StagingBarsInterlock = new JoinedSigInterlock(triList);
-                StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
+                if(Codec is IHasCallHistory)
+                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible);
+                else
+                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible);
 
                 StagingButtonsFeedbackInterlock = new JoinedSigInterlock(triList);
                 StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
@@ -351,10 +354,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
 			
 			uint stageJoin;
-			if (Codec.IsInCall)
+            if (Codec.IsInCall)
-				stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
+                stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
-			else
+            else
-				stageJoin = UIBoolJoin.VCStagingInactivePopoverVisible;
+            {
+                if (Codec is IHasCallHistory)
+                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible;
+                else
+                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible;
+            }
 			if (IsVisible)
 				StagingBarsInterlock.ShowInterlocked(stageJoin);
 			else
@@ -513,13 +521,18 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 var codecOffCameras = Codec as IHasCameraOff;
 
+                var supportsCameraOffMode = Codec.SupportsCameraOff;
+
                 var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-                if (codecAutoCameras != null)
+                var supportsAutoCameraMode = Codec.SupportsCameraAutoMode;
+
+                if (codecAutoCameras != null && supportsAutoCameraMode)
                 {
                     CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
                     codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
+                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCCameraAutoModeIsOnFb]);
                     //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
                     //() => codecAutoCameras.CameraAutoModeOn());
 
@@ -554,7 +567,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
                 //    () => ShowCameraManualMode());
 
-                if (codecOffCameras != null)
+                if (codecOffCameras != null && supportsCameraOffMode)
                 {
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
                     codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
@@ -769,12 +782,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if (camerasCodec != null && camerasCodec.SelectedCamera != null)
             {
-
+                Debug.Console(2, "Attempting to map camera actions to selected camera: '{0}'", camerasCodec.SelectedCamera.Key);
                 var dpad = CameraPtzPad;
 
                 var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
                 if (camera != null)
                 {
+
+                    Debug.Console(2, "Selected camera is IHasCameraPtzControl");
                     if (camerasCodec.SelectedCamera.CanTilt)
                     {
                         dpad.SigUp.SetBoolSigAction((b) =>
@@ -839,25 +854,46 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     }
 
                 }
+                else
+                {
+                    Debug.Console(2, "Selected Camera is not IHasCameraPtzControl.  No controls to map");
+                }
+            }
+            else
+            {
+                Debug.Console(2, "Codec does not have cameras of selected camera is null");
             }
         }
 
         // Determines if codec is in manual camera control mode and shows feedback
         void ShowCameraManualMode()
         {
+            Debug.Console(2, "ShowCameraManualMode");
+
             var inManualMode = true;
 
             var codecOffCameras = Codec as IHasCameraOff;
 
             var codecAutoCameras = Codec as IHasCameraAutoMode;
 
+            var supportsAutoCameras = codecAutoCameras != null && Codec.SupportsCameraAutoMode;
+
             if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
             {
                 inManualMode = false;
+
+                var codecCameraMute = Codec as IHasCameraMute;
+
+                if (codecCameraMute != null)
+                {
+                    codecCameraMute.CameraMuteOff();
+                    inManualMode = true;
+
+                }
             }
 
             // Clear auto mode
-            if (codecAutoCameras != null )
+            if (supportsAutoCameras)
             {
                 if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
                 {
@@ -1044,10 +1080,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            SetCurrentDirectoryToRoot();
+            if (codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+            {
+                SetCurrentDirectoryToRoot();
 
-            RefreshDirectory();
+                RefreshDirectory();
-            
+            }
         }
 
 		/// <summary>
@@ -1125,10 +1163,23 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             });
 
                         }
+                        else if (dc.ContactMethods.Count == 1)
+                        {
+                            var invitableContact = dc as IInvitableContact;
+
+                            if (invitableContact != null)
+                            {
+                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(invitableContact); });
+                            }
+                            else
+                            {
+                                // If only one contact method, just dial that method
+                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
+                            }
+                        }
                         else
                         {
-                            // If only one contact method, just dial that method
+                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
-							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
                         }
                     }
                     else    // is DirectoryFolder
@@ -1201,7 +1252,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 			var lc = Codec as IHasCodecLayouts;
 			if (lc != null)
 			{
-                TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
+
 				lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
 				lc.LocalLayoutFeedback.OutputChange += (o,a) => 
 				{
@@ -1214,14 +1265,24 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
 				if (cisco != null)
 				{
+                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 					// Cisco has min/max buttons that need special sauce
 					cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 					//cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 
 					TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle);
 				}
+
+                var zoomRoom = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom;
+                if (zoomRoom != null)
+                {
+                    TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = true;
+                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggle);
+                }
 				 
 			}
+
+            
 		}
 
 		/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs

@@ -78,7 +78,7 @@ namespace PepperDash.Essentials.Core.Bridges
     /// <summary>
     /// Bridge API using EISC
     /// </summary>
-    public class EiscApiAdvanced : BridgeApi
+    public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
     {
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
@@ -98,13 +98,35 @@ namespace PepperDash.Essentials.Core.Bridges
 
             Eisc.SigChange += Eisc_SigChange;
 
+            CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, Eisc, 120000, 300000);
+
             AddPostActivationAction(LinkDevices);
+            AddPostActivationAction(LinkRooms);
+            AddPostActivationAction(RegisterEisc);
+        }
+
+        public override bool CustomActivate()
+        {
+            CommunicationMonitor.Start();
+            return base.CustomActivate();
+        }
+
+        public override bool Deactivate()
+        {
+            CommunicationMonitor.Stop();
+            return base.Deactivate();
         }
 
         private void LinkDevices()
         {
             Debug.Console(1, this, "Linking Devices...");
 
+            if (PropertiesConfig.Devices == null)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No devices linked to this bridge");
+                return;
+            }
+
             foreach (var d in PropertiesConfig.Devices)
             {
                 var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
@@ -130,6 +152,14 @@ namespace PepperDash.Essentials.Core.Bridges
                     bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                 }
             }
+        }
+
+        private void RegisterEisc()
+        {
+            if (Eisc.Registered)
+            {
+                return;
+            }
 
             var registerResult = Eisc.Register();
 
@@ -142,6 +172,31 @@ namespace PepperDash.Essentials.Core.Bridges
             Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
         }
 
+        public void LinkRooms()
+        {
+            Debug.Console(1, this, "Linking Rooms...");
+
+            if (PropertiesConfig.Rooms == null)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No rooms linked to this bridge.");
+                return;
+            }
+
+            foreach (var room in PropertiesConfig.Rooms)
+            {
+                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+                if (rm == null)
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Notice,
+                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    continue;
+                }
+
+                rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
+            }
+        }
+
         /// <summary>
         /// Adds a join map
         /// </summary>
@@ -280,6 +335,12 @@ namespace PepperDash.Essentials.Core.Bridges
                 Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
             }
         }
+
+        #region Implementation of ICommunicationMonitor
+
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+        #endregion
     }
 
     public class EiscApiPropertiesConfig
@@ -290,6 +351,9 @@ namespace PepperDash.Essentials.Core.Bridges
         [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
+
 
         public class ApiDevicePropertiesConfig
         {
@@ -303,13 +367,25 @@ namespace PepperDash.Essentials.Core.Bridges
             public string JoinMapKey { get; set; }
         }
 
+        public class ApiRoomPropertiesConfig
+        {
+            [JsonProperty("roomKey")]
+            public string RoomKey { get; set; }
+
+            [JsonProperty("joinStart")]
+            public uint JoinStart { get; set; }
+
+            [JsonProperty("joinMapKey")]
+            public string JoinMapKey { get; set; }
+        }
+
     }
 
     public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -327,6 +403,16 @@ namespace PepperDash.Essentials.Core.Bridges
                         controlProperties.TcpSshProperties.Address, Global.ControlSystem);
                     return new EiscApiAdvanced(dc, eisc);
                 }
+                case "eiscapiadvancedserver":
+                {
+                    var eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                case "eiscapiadvancedclient":
+                {
+                    var eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
                 {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -47,7 +47,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <param name="joinStart">Join this join map will start at</param>
         /// <param name="type">Type of the child join map</param>
         public AppleTvJoinMap(uint joinStart, Type type) : base(joinStart, type)
-    {
+        {
-    }
+        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -76,6 +76,14 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
+        [JoinName("InputStreamCardState")]
+        public JoinDataComplete InputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1501, JoinSpan = 32 },
+            new JoinMetadata { Description = "DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("OutputStreamCardState")]
+        public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
+            new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -154,7 +154,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs

@@ -1,131 +1,274 @@
 using System;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
-	public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
+    public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
-	{
+    {
-		[JoinName("IsOnline")]
+        [JoinName("IsOnline")]
-		public JoinDataComplete IsOnline = new JoinDataComplete(
+        public JoinDataComplete IsOnline = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 1,
+                JoinNumber = 1,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Is Online",
+                Description = "Sensor Is Online",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
+                JoinType = eJoinType.Digital
-			});
+            });
 
-		[JoinName("Name")]
+        [JoinName("Name")]
-		public JoinDataComplete Name = new JoinDataComplete(
+        public JoinDataComplete Name = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 1,
+                JoinNumber = 1,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Name",
+                Description = "Sensor Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
+                JoinType = eJoinType.Serial
-			});
+            });
 
-		[JoinName("Enable")]
+        [JoinName("Enable")]
-		public JoinDataComplete Enable = new JoinDataComplete(
+        public JoinDataComplete Enable = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 2,
+                JoinNumber = 2,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Enable",
+                Description = "Sensor Enable",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
+                JoinType = eJoinType.Digital
-			});
+            });
 
-		[JoinName("PartitionSensed")]
+        [JoinName("PartitionSensed")]
-		public JoinDataComplete PartitionSensed = new JoinDataComplete(
+        public JoinDataComplete PartitionSensed = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 3,
+                JoinNumber = 3,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Partition Sensed",
+                Description = "Sensor Partition Sensed",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
+                JoinType = eJoinType.Digital
-			});
+            });
 
-		[JoinName("PartitionNotSensed")]
+        [JoinName("PartitionNotSensed")]
-		public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
+        public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 4,
+                JoinNumber = 4,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Partition Not Sensed",
+                Description = "Sensor Partition Not Sensed",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
+                JoinType = eJoinType.Digital
-			});
+            });
 
-		[JoinName("IncreaseSensitivity")]
+        [JoinName("IncreaseSensitivity")]
-		public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
+        public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 6,
+                JoinNumber = 6,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Increase Sensitivity",
+                Description = "Sensor Increase Sensitivity",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
+                JoinType = eJoinType.Digital
-			});
+            });
 
-		[JoinName("DecreaseSensitivity")]
+        [JoinName("DecreaseSensitivity")]
-		public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
+        public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 7,
+                JoinNumber = 7,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Decrease Sensitivity",
+                Description = "Sensor Decrease Sensitivity",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
+                JoinType = eJoinType.Digital
-			});
+            });
 
-		[JoinName("Sensitivity")]
+        [JoinName("Sensitivity")]
-		public JoinDataComplete Sensitivity = new JoinDataComplete(
+        public JoinDataComplete Sensitivity = new JoinDataComplete(
-			new JoinData
+            new JoinData
-			{
+            {
-				JoinNumber = 2,
+                JoinNumber = 2,
-				JoinSpan = 1
+                JoinSpan = 1
-			},
+            },
-			new JoinMetadata
+            new JoinMetadata
-			{
+            {
-				Description = "Sensor Sensitivity",
+                Description = "Sensor Sensitivity",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Analog
+                JoinType = eJoinType.Analog
-			});
+            });
 
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>
         /// <param name="joinStart">Join this join map will start at</param>
-		public GlsPartitionSensorJoinMap(uint joinStart)
+        public GlsPartitionSensorJoinMap(uint joinStart)
-			: this(joinStart, typeof (GlsPartitionSensorJoinMap))
+            : this(joinStart, typeof(GlsPartitionSensorJoinMap))
-		{
+        {
 
-		}
+        }
+
+        /// <summary>
+        /// Constructor to use when extending this Join map
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        /// <param name="type">Type of the child join map</param>
+        protected GlsPartitionSensorJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+
+        }
+    }
+}
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Obsolete("use PepperDash.Essentials.Core.Bridges.JoinMaps version")]
+	public class GlsPartitionSensorJoinMap:JoinMapBaseAdvanced
+	{
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Is Online",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("Enable")]
+        public JoinDataComplete Enable = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 2,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Enable",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PartitionSensed")]
+        public JoinDataComplete PartitionSensed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 3,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Partition Sensed",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PartitionNotSensed")]
+        public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 4,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Partition Not Sensed",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("IncreaseSensitivity")]
+        public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 6,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Increase Sensitivity",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("DecreaseSensitivity")]
+        public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 7,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Decrease Sensitivity",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("Sensitivity")]
+        public JoinDataComplete Sensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 2,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Sensitivity",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        /// <summary>
+        /// Constructor to use when instantiating this Join Map without inheriting from it
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        public GlsPartitionSensorJoinMap(uint joinStart)
+            : this(joinStart, typeof(GlsPartitionSensorJoinMap))
+        {
+
+        }
 
         /// <summary>
         /// Constructor to use when extending this Join map

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs

@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Join map for IRBlurayBase devices
+    /// </summary>
+    public class IRBlurayBaseJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("PowerOn")]
+        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("PowerOff")]
+        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("PowerToggle")]
+        public JoinDataComplete PowerToggle = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata { Description = "Power Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Up")]
+        public JoinDataComplete Up = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Down")]
+        public JoinDataComplete Down = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Left")]
+        public JoinDataComplete Left = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Right")]
+        public JoinDataComplete Right = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Select")]
+        public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata { Description = "Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Menu")]
+        public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
+            new JoinMetadata { Description = "Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Exit")]
+        public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
+            new JoinMetadata { Description = "Exit", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit0")]
+        public JoinDataComplete Digit0 = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 0", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit1")]
+        public JoinDataComplete Digit1 = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 1", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit2")]
+        public JoinDataComplete Digit2 = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 2", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit3")]
+        public JoinDataComplete Digit3 = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 3", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit4")]
+        public JoinDataComplete Digit4 = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 4", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit5")]
+        public JoinDataComplete Digit5 = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 5", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit6")]
+        public JoinDataComplete Digit6 = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 6", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit7")]
+        public JoinDataComplete Digit7 = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 7", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit8")]
+        public JoinDataComplete Digit8 = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 8", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit9")]
+        public JoinDataComplete Digit9 = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 9", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadClear")]
+        public JoinDataComplete KeypadClear = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Clear", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadEnter")]
+        public JoinDataComplete KeypadEnter = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Enter", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChannelUp")]
+        public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
+            new JoinMetadata { Description = "STB Channel Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChannelDown")]
+        public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
+            new JoinMetadata { Description = "STB Channel Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("LastChannel")]
+        public JoinDataComplete LastChannel = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
+            new JoinMetadata { Description = "Last Channel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Guide")]
+        public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
+            new JoinMetadata { Description = "Guide", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Info")]
+        public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
+            new JoinMetadata { Description = "Info", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Red")]
+        public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
+            new JoinMetadata { Description = "Red", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Green")]
+        public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
+            new JoinMetadata { Description = "Green", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Yellow")]
+        public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
+            new JoinMetadata { Description = "Yellow", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Blue")]
+        public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
+            new JoinMetadata { Description = "Blue", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+
+        [JoinName("Play")]
+        public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
+            new JoinMetadata { Description = "Play", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Pause")]
+        public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
+            new JoinMetadata { Description = "Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Stop")]
+        public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
+            new JoinMetadata { Description = "Stop", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("FFwd")]
+        public JoinDataComplete FFwd = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
+            new JoinMetadata { Description = "FFwd", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Rewind")]
+        public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
+            new JoinMetadata { Description = "Rewind", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChapPlus")]
+        public JoinDataComplete ChapPlus = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
+            new JoinMetadata { Description = "Chapter Plus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChapMinus")]
+        public JoinDataComplete ChapMinus = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
+            new JoinMetadata { Description = "Chapter Minus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Replay")]
+        public JoinDataComplete Replay = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
+            new JoinMetadata { Description = "Replay", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Record")]
+        public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+            new JoinMetadata { Description = "Record", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HasKeypadAccessoryButton1")]
+        public JoinDataComplete HasKeypadAccessoryButton1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+            new JoinMetadata { Description = "Has Keypad Accessory Button 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HasKeypadAccessoryButton2")]
+        public JoinDataComplete HasKeypadAccessoryButton2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
+            new JoinMetadata { Description = "Has Keypad Accessory Button 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadAccessoryButton1Press")]
+        public JoinDataComplete KeypadAccessoryButton1Press = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 2 },
+            new JoinMetadata { Description = "Keypad Accessory Button 1 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadAccessoryButton2Press")]
+        public JoinDataComplete KeypadAccessoryButton2Press = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 2 },
+            new JoinMetadata { Description = "Keypad Accessory Button 2 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadAccessoryButton1Label")]
+        public JoinDataComplete KeypadAccessoryButton1Label = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("KeypadAccessoryButton2Label")]
+        public JoinDataComplete KeypadAccessoryButton2Label = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+                /// <summary>
+        /// Constructor to use when instantiating this Join Map without inheriting from it
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        public IRBlurayBaseJoinMap(uint joinStart)
+            : this(joinStart, typeof(IRBlurayBaseJoinMap))
+        {
+        }
+
+        /// <summary>
+        /// Constructor to use when extending this Join map
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        /// <param name="type">Type of the child join map</param>
+        protected IRBlurayBaseJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs

@@ -1,10 +1,10 @@
 using System;
 
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges
-{
+{
-    public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
+    public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
-    {
+    {
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
@@ -236,5 +236,5 @@ namespace PepperDash.Essentials.Core.Bridges
             : base(joinStart, type)
         {
         }
-    }
+    }
 }

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

@@ -11,8 +11,10 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
-    public class CecPortController : Device, IBasicCommunication
+	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
     {
+		public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
         public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
         public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
@@ -23,6 +25,8 @@ namespace PepperDash.Essentials.Core
         public CecPortController(string key, Func<EssentialsControlPropertiesConfig, ICec> postActivationFunc,
             EssentialsControlPropertiesConfig config):base(key)
         {
+			StreamDebugging = new CommunicationStreamDebugging(key);
+
             AddPostActivationAction(() =>
             {
                 Port = postActivationFunc(config);
@@ -50,15 +54,21 @@ namespace PepperDash.Essentials.Core
 
         void OnDataReceived(string s)
         {
-            var bytesHandler = BytesReceived;
+			var bytesHandler = BytesReceived;
             if (bytesHandler != null)
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
-            if (textHandler != null)
+			if (textHandler != null)
-                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			{
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", s);
+				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			}
         }
 
         #region IBasicCommunication Members
@@ -67,6 +77,8 @@ namespace PepperDash.Essentials.Core
         {
             if (Port == null)
                 return;
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
             Port.StreamCec.Send.StringValue = text;
         }
 
@@ -75,6 +87,8 @@ namespace PepperDash.Essentials.Core
             if (Port == null)
                 return;
             var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             Port.StreamCec.Send.StringValue = text;
         }
 

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

@@ -56,6 +56,11 @@ namespace PepperDash.Essentials.Core
 
 	    private void RegisterAndConfigureComPort()
 	    {
+	        if (Port == null)
+	        {
+	            Debug.Console(0,this,Debug.ErrorLogLevel.Error, "Configured com Port for this device does not exist.");
+	            return;
+	        }
             if (Port.Parent is CrestronControlSystem)
             {
                 var result = Port.Register();
@@ -87,18 +92,20 @@ namespace PepperDash.Essentials.Core
 
         void OnDataReceived(string s)
         {
+
             var bytesHandler = BytesReceived;
             if (bytesHandler != null)
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
             if (textHandler != null)
             {
-                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    Debug.Console(0, this, "Recevied: '{0}'", s);
+					Debug.Console(0, this, "Received: '{0}'", s);
-
                 textHandler(this, new GenericCommMethodReceiveTextArgs(s));
             }
         }

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

@@ -104,7 +104,7 @@ namespace PepperDash.Essentials.Core
 			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
 			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
 				return dev.ComPorts[config.ControlPortNumber];
-			Debug.Console(0, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			Debug.Console(0,Debug.ErrorLogLevel.Notice, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
 			return null;
 		}
 

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

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core
 		{
 			Communication = comm;
 			PortGather = new CommunicationGather(Communication, '\x0d');
-			PortGather.LineReceived += this.Port_LineReceived;
+			//PortGather.LineReceived += this.Port_LineReceived;
 			CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
 			LineEnding = props.LineEnding;
 		}
@@ -47,13 +47,6 @@ namespace PepperDash.Essentials.Core
 			return true;
 		}
 
-		void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
-		{
-			if (Debug.Level == 2)
-				Debug.Console(2, this, "RX: '{0}'", 
-					ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
-		}
-
 		void SendLine(string s)
 		{
 			//if (Debug.Level == 2)

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

@@ -25,6 +25,7 @@ namespace PepperDash.Essentials.Core
         public GenericComm(DeviceConfig config)
             : base(config)
         {
+
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
 
             var commPort = CommFactory.CreateCommForDevice(config);
@@ -96,7 +97,6 @@ namespace PepperDash.Essentials.Core
             // this is a permanent event handler. This cannot be -= from event
             CommPort.TextReceived += (s, a) =>
             {
-                Debug.Console(2, this, "RX: {0}", a.Text);
                 trilist.SetString(joinMap.TextReceived.JoinNumber, a.Text);
             };
             trilist.SetStringSigAction(joinMap.SendText.JoinNumber, s => CommPort.SendText(s));

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

@@ -33,7 +33,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, path);
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 		public void SendText(string format, params object[] items)
 		{
@@ -41,7 +40,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 
 		public void SendTextNoResponse(string format, params object[] items)
@@ -50,7 +48,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
 			request.Url = new UrlParser(url);
 			Client.Dispatch(request);
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 
 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
@@ -63,10 +60,6 @@ namespace PepperDash.Essentials.Core
 				{
 					if (ResponseRecived != null)
 						ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
-
-					Debug.Console(2, this, "GenericHttpClient ResponseReceived");
-					Debug.Console(2, this, "RX:{0}", responseReceived.ContentString);
-					Debug.Console(2, this, "TX:{0}", (request as HttpClientRequest).Url.ToString());
 				}
 			}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/BasicConfig.cs

@@ -1,11 +1,8 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Newtonsoft.Json;
-using PepperDash.Core;
+
-using PepperDash.Essentials.Core;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -23,11 +20,24 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
 
-		[JsonProperty("tieLines")]
+        [JsonProperty("destinationLists")]
+        public Dictionary<string, Dictionary<string,DestinationListItem>> DestinationLists { get; set; }
+
+        [JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }
 
         [JsonProperty("joinMaps")]
-        public Dictionary<string, string> JoinMaps { get; set; }
+        public Dictionary<string, JObject> JoinMaps { get; set; }
+
+        public BasicConfig()
+        {
+            Info = new InfoConfig();
+            Devices = new List<DeviceConfig>();
+            SourceLists = new Dictionary<string, Dictionary<string, SourceListItem>>();
+            DestinationLists = new Dictionary<string, Dictionary<string, DestinationListItem>>();
+            TieLines = new List<TieLineConfig>();
+            JoinMaps = new Dictionary<string, JObject>();
+        }
 
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
@@ -40,6 +50,21 @@ namespace PepperDash.Essentials.Core.Config
 			return SourceLists[key];
 		}
 
+        /// <summary>
+        /// Retrieves a DestinationListItem based on the key
+        /// </summary>
+        /// <param name="key">key of the item to retrieve</param>
+        /// <returns>DestinationListItem if the key exists, null otherwise</returns>
+	    public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
+	    {
+	        if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
+	        {
+	            return null;
+	        }
+
+	        return DestinationLists[key];
+	    } 
+
         /// <summary>
         /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/DeviceConfig.cs

@@ -30,7 +30,19 @@ namespace PepperDash.Essentials.Core.Config
 
         [JsonProperty("properties")]
         [JsonConverter(typeof(DevicePropertiesConverter))]
-        public JToken Properties { get; set; }
+        public JToken Properties { get; set; }
+
+        public DeviceConfig(DeviceConfig dc)
+        {
+            Key = dc.Key;
+            Uid = dc.Uid;
+            Name = dc.Name;
+            Group = dc.Group;
+            Type = dc.Type;
+            Properties = JToken.FromObject(dc.Properties);
+        }
+
+        public DeviceConfig() {}
     }
 
     /// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs

@@ -1,195 +1,195 @@
-using System;
+using System;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Core.Config;
+using PepperDash.Core.Config;
-
+
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config
-{
+{
-	/// <summary>
+	/// <summary>
-	/// Loads the ConfigObject from the file
+	/// Loads the ConfigObject from the file
-	/// </summary>
+	/// </summary>
 	public class ConfigReader
 	{
 	    public const string LocalConfigPresent =
             @"
 ***************************************************
 ************* Using Local config file *************
-***************************************************";
+***************************************************";
-
+
-		public static EssentialsConfig ConfigObject { get; private set; }
+		public static EssentialsConfig ConfigObject { get; private set; }
-
+
-		public static bool LoadConfig2()
+		public static bool LoadConfig2()
-		{
+		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
-			try
+			try
-			{
+			{
-                // Check for local config file first
+                // Check for local config file first
-                var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
+                var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
-
+
-                bool localConfigFound = false;
+                bool localConfigFound = false;
-
+
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
-
+
-                // Check for local config directory first
+                // Check for local config directory first
-
+
-                var configFiles = GetConfigFiles(filePath);
+                var configFiles = GetConfigFiles(filePath);
-
+
-                if (configFiles != null)
+                if (configFiles != null)
-                {
+                {
-                    if (configFiles.Length > 1)
+                    if (configFiles.Length > 1)
-                    {
+                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                            "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
+                            "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
-                        return false;
+                        return false;
-                    }
+                    }
-                    if(configFiles.Length == 1)
+                    if(configFiles.Length == 1)
-                    {
+                    {
                         localConfigFound = true;
-                        
+                        
-                    }
+                    }
-                }
+                }
-                else
+                else
-                {
+                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                        "Local Configuration file not present.", filePath);
+                        "Local Configuration file not present.", filePath);
-
+
-                }
+                }
-
+
-                // Check for Portal Config
+                // Check for Portal Config
-                if(!localConfigFound)
+                if(!localConfigFound)
-                {
+                {
-                    filePath = Global.FilePathPrefix + Global.ConfigFileName;
+                    filePath = Global.FilePathPrefix + Global.ConfigFileName;
-
+
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
-
+
-                    configFiles = GetConfigFiles(filePath);
+                    configFiles = GetConfigFiles(filePath);
-
+
-                    if (configFiles != null)
+                    if (configFiles != null)
-                    {
+                    {
-                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
+                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
-
+
-                        if (configFiles.Length > 1)
+                        if (configFiles.Length > 1)
-                        {
+                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Error,
+                            Debug.Console(0, Debug.ErrorLogLevel.Error,
-                                "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
+                                "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
-                            return false;
+                            return false;
-                        }
+                        }
-                        else if (configFiles.Length == 1)
+                        else if (configFiles.Length == 1)
-                        {
+                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
-                            return false;
+                            return false;
-                        }
+                        }
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                            "ERROR: Portal Configuration file not present. Please load file and reset program.");
+                            "ERROR: Portal Configuration file not present. Please load file and reset program.");
-                        return false;
+                        return false;
-                    }
+                    }
-                }
+                }
-
+
-                // Get the actual file path
+                // Get the actual file path
                 filePath = configFiles[0].FullName;
 
                 // Generate debug statement if using a local file.
 			    if (localConfigFound)
 			    {
                     GetLocalFileMessage(filePath);
-			    }
+			    }
-
+
-                // Read the file
+                // Read the file
-                using (StreamReader fs = new StreamReader(filePath))
+                using (StreamReader fs = new StreamReader(filePath))
-                {
+                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
-
+
-                    if (localConfigFound)
+                    if (localConfigFound)
-                    {
+                    {
-                        ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
+                        ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
-
+
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
-
+
-                        return true;
+                        return true;
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        var doubleObj = JObject.Parse(fs.ReadToEnd());
+                        var doubleObj = JObject.Parse(fs.ReadToEnd());
-                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
+                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
-
+
-                        // Extract SystemUrl and TemplateUrl into final config output
+                        // Extract SystemUrl and TemplateUrl into final config output
-
+
-                        if (doubleObj["system_url"] != null)
+                        if (doubleObj["system_url"] != null)
-                        {
+                        {
-                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
+                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
-                        }
+                        }
-
+
-                        if (doubleObj["template_url"] != null)
+                        if (doubleObj["template_url"] != null)
-                        {
+                        {
-                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
+                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
-                        }
+                        }
-                    }
+                    }
-
+
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
-
+
-                    return true;
+                    return true;
-                }
+                }
-			}
+			}
-			catch (Exception e)
+			catch (Exception e)
-			{
+			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
-				return false;
+				return false;
-			}
+			}
-		}
+		}
-
+
-        /// <summary>
+        /// <summary>
-        /// Returns all the files from the directory specified.
+        /// Returns all the files from the directory specified.
-        /// </summary>
+        /// </summary>
-        /// <param name="filePath"></param>
+        /// <param name="filePath"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public static FileInfo[] GetConfigFiles(string filePath)
+        public static FileInfo[] GetConfigFiles(string filePath)
-        {
+        {
-            // Get the directory
+            // Get the directory
-            var dir = Path.GetDirectoryName(filePath);
+            var dir = Path.GetDirectoryName(filePath);
-
+
-            if (Directory.Exists(dir))
+            if (Directory.Exists(dir))
-            {
+            {
-                Debug.Console(1, "Searching in Directory '{0}'", dir);
+                Debug.Console(1, "Searching in Directory '{0}'", dir);
-                // Get the directory info
+                // Get the directory info
-                var dirInfo = new DirectoryInfo(dir);
+                var dirInfo = new DirectoryInfo(dir);
-
+
-                // Get the file name
+                // Get the file name
-                var fileName = Path.GetFileName(filePath);
+                var fileName = Path.GetFileName(filePath);
-                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
+                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
-
+
-                // Get the files that match from the directory
+                // Get the files that match from the directory
-                return dirInfo.GetFiles(fileName);
+                return dirInfo.GetFiles(fileName);
-            }
+            }
-            else
+            else
-            {
+            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                    "Directory not found: ", dir);
+                    "Directory not found: ", dir);
-
+
-                return null;
+                return null;
-            }
+            }
-        }
+        }
-
+
-		/// <summary>
+		/// <summary>
-		/// Returns the group for a given device key in config
+		/// Returns the group for a given device key in config
-		/// </summary>
+		/// </summary>
-		/// <param name="key"></param>
+		/// <param name="key"></param>
-		/// <returns></returns>
+		/// <returns></returns>
-        public static string GetGroupForDeviceKey(string key)
+        public static string GetGroupForDeviceKey(string key)
-        {
+        {
-            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-            return dev == null ? null : dev.Group;
+            return dev == null ? null : dev.Group;
         }
 
 	    private static void GetLocalFileMessage(string filePath)
@@ -248,7 +248,7 @@ namespace PepperDash.Essentials.Core.Config
 
             Debug.Console(2, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
             Debug.Console(0, newDebugString.ToString());
-	    }
+	    }
-
+
-	}
+	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigWriter.cs

@@ -1,162 +1,162 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
-using PepperDash.Core;
+using PepperDash.Core;
-
+
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Responsible for updating config at runtime, and writing the updates out to a local file
+    /// Responsible for updating config at runtime, and writing the updates out to a local file
-    /// </summary>
+    /// </summary>
-    public class ConfigWriter
+    public class ConfigWriter
-    {
+    {
-        public const string LocalConfigFolder = "LocalConfig";
+        public const string LocalConfigFolder = "LocalConfig";
-
+
-        public const long WriteTimeout = 30000;
+        public const long WriteTimeout = 30000;
-
+
         public static CTimer WriteTimer;
-		static CCriticalSection fileLock = new CCriticalSection();
+		static CCriticalSection fileLock = new CCriticalSection();
-
+
-        /// <summary>
+        /// <summary>
-        /// Updates the config properties of a device
+        /// Updates the config properties of a device
-        /// </summary>
+        /// </summary>
-        /// <param name="deviceKey"></param>
+        /// <param name="deviceKey"></param>
-        /// <param name="properties"></param>
+        /// <param name="properties"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
+        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
-        {
+        {
-            bool success = false;
+            bool success = false;
-
+
-            // Get the current device config
+            // Get the current device config
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
+            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
-
+
-            if (deviceConfig != null)
+            if (deviceConfig != null)
-            {
+            {
-                // Replace the current properties JToken with the new one passed into this method
+                // Replace the current properties JToken with the new one passed into this method
-                deviceConfig.Properties = properties;
+                deviceConfig.Properties = properties;
-
+
-                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
+                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
-
+
-                success = true;
+                success = true;
-            }
+            }
-
+
-            ResetTimer();
+            ResetTimer();
-
+
-            return success;
+            return success;
-        }
+        }
-
+
-        public static bool UpdateDeviceConfig(DeviceConfig config)
+        public static bool UpdateDeviceConfig(DeviceConfig config)
-        {
+        {
-            bool success = false;
+            bool success = false;
-
+
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(config.Key));
+            var deviceConfigIndex = ConfigReader.ConfigObject.Devices.FindIndex(d => d.Key.Equals(config.Key));
-
+
-            if (deviceConfig != null)
+            if (deviceConfigIndex >= 0)
-            {
+            {
-                deviceConfig = config;
+                ConfigReader.ConfigObject.Devices[deviceConfigIndex] = config;
-
+
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
-
+
-                success = true;
+                success = true;
-            }
+            }
-
+
-            ResetTimer();
+            ResetTimer();
-
+
-            return success;
+            return success;
-        }
+        }
-
+
-        public static bool UpdateRoomConfig(DeviceConfig config)
+        public static bool UpdateRoomConfig(DeviceConfig config)
-        {
+        {
-            bool success = false;
+            bool success = false;
-
+
-            var deviceConfig = ConfigReader.ConfigObject.Rooms.FirstOrDefault(d => d.Key.Equals(config.Key));
+			var roomConfigIndex = ConfigReader.ConfigObject.Rooms.FindIndex(d => d.Key.Equals(config.Key));
-
+
-            if (deviceConfig != null)
+			if (roomConfigIndex >= 0)
-            {
+            {
-                deviceConfig = config;
+                ConfigReader.ConfigObject.Rooms[roomConfigIndex] = config;
-
+
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+                Debug.Console(1, "Updated room of device: '{0}'", config.Key);
-
+
-                success = true;
+                success = true;
-            }
+            }
-
+
-            ResetTimer();
+            ResetTimer();
-
+
-            return success;
+            return success;
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Resets (or starts) the write timer
+        /// Resets (or starts) the write timer
-        /// </summary>
+        /// </summary>
-        static void ResetTimer()
+        static void ResetTimer()
-        {
+        {
-            if (WriteTimer == null)
+            if (WriteTimer == null)
-                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
+                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
-
+
-            WriteTimer.Reset(WriteTimeout);
+            WriteTimer.Reset(WriteTimeout);
-
+
-            Debug.Console(1, "Config File write timer has been reset.");
+            Debug.Console(1, "Config File write timer has been reset.");
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Writes the current config to a file in the LocalConfig subfolder
+        /// Writes the current config to a file in the LocalConfig subfolder
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        private static void WriteConfigFile(object o)
+        private static void WriteConfigFile(object o)
-        {
+        {
-            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
+            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
-
+
-            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
+            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
-
+
-            WriteFile(filePath, configData);
+            WriteFile(filePath, configData);
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Writes
+        /// Writes
-        /// </summary>
+        /// </summary>
-        /// <param name="filepath"></param>
+        /// <param name="filepath"></param>
-        /// <param name="o"></param>
+        /// <param name="o"></param>
-        public static void WriteFile(string filePath, string configData)
+        public static void WriteFile(string filePath, string configData)
-        {
+        {
-            if (WriteTimer != null)
+            if (WriteTimer != null)
-                WriteTimer.Stop();
+                WriteTimer.Stop();
-
+
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
-
+
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
-
+
-            try
+            try
-            {
+            {
-                if (fileLock.TryEnter())
+                if (fileLock.TryEnter())
-                {
+                {
-                    using (StreamWriter sw = new StreamWriter(filePath))
+                    using (StreamWriter sw = new StreamWriter(filePath))
-                    {
+                    {
-                        sw.Write(configData);
+                        sw.Write(configData);
-                        sw.Flush();
+                        sw.Flush();
-                    }
+                    }
-                }
+                }
-                else
+                else
-                {
+                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
-                }
+                }
-            }
+            }
-            catch (Exception e)
+            catch (Exception e)
-            {
+            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
-            }
+            }
-            finally
+            finally
-            {
+            {
-                if (fileLock != null && !fileLock.Disposed)
+                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
+                    fileLock.Leave();
-
+
-            }
+            }
-        }
+        }
-
+
-
+
-    }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/EssentialsConfig.cs

@@ -51,6 +51,13 @@ namespace PepperDash.Essentials.Core.Config
 
 		[JsonProperty("rooms")]
         public List<DeviceConfig> Rooms { get; set; }
+
+
+        public EssentialsConfig()
+            : base()
+        {
+            Rooms = new List<DeviceConfig>();
+        }
 	}
 		
 	/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/C2nIo/C2nIoController.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public class C2NIoController:CrestronGenericBaseDevice, IComPorts, IIROutputPorts, IRelayPorts
+    {
+        private C2nIo _device;
+
+        public C2NIoController(string key, Func<DeviceConfig, C2nIo> preActivationFunc, DeviceConfig config):base(key, config.Name)
+        {
+            AddPreActivationAction(() =>
+            {
+                _device = preActivationFunc(config);
+
+                RegisterCrestronGenericBase(_device);
+            });
+        }
+
+        #region Implementation of IComPorts
+
+        public CrestronCollection<ComPort> ComPorts
+        {
+            get { return _device.ComPorts; }
+        }
+
+        public int NumberOfComPorts
+        {
+            get { return _device.NumberOfComPorts; }
+        }
+
+        #endregion
+
+        #region Implementation of IIROutputPorts
+
+        public CrestronCollection<IROutputPort> IROutputPorts
+        {
+            get { return _device.IROutputPorts; }
+        }
+
+        public int NumberOfIROutputPorts
+        {
+            get { return _device.NumberOfIROutputPorts; }
+        }
+
+        #endregion
+
+        #region Implementation of IRelayPorts
+
+        public CrestronCollection<Relay> RelayPorts
+        {
+            get { return _device.RelayPorts; }
+        }
+
+        public int NumberOfRelayPorts
+        {
+            get { return _device.NumberOfRelayPorts; }
+        }
+
+        #endregion
+    }
+
+    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2nRthsController>
+    {
+        public C2NIoControllerFactory()
+        {
+            TypeNames = new List<string>() { "c2nio" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new C2N-IO Device");
+
+            return new C2NIoController(dc.Key, GetC2NIoDevice, dc);
+        }
+
+        static C2nIo GetC2NIoDevice(DeviceConfig dc)
+        {
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+            var cresnetId = control.CresnetIdInt;
+            var branchId = control.ControlPortNumber;
+            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+
+            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
+                return new C2nIo(cresnetId, Global.ControlSystem);
+            }
+            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
+
+            if (cresnetBridge != null)
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
+                return new C2nIo(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+            }
+            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+            return null;
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs

@@ -1,38 +1,39 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Config;
-
+
-
+
-namespace PepperDash.Essentials.Core.CrestronIO
+namespace PepperDash.Essentials.Core.CrestronIO
 {
     [Description("Wrapper class for Digital Input")]
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
+    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
-    {
+    {
-        public DigitalInput InputPort { get; private set; }
+        public DigitalInput InputPort { get; private set; }
-
+
-        public BoolFeedback InputStateFeedback { get; private set; }
+        public BoolFeedback InputStateFeedback { get; private set; }
-
+
-        Func<bool> InputStateFeedbackFunc
+        Func<bool> InputStateFeedbackFunc
-        {
+        {
-            get
+            get
-            {
+            {
-                return () => InputPort.State;
+                return () => InputPort.State;
-            }
+            }
-        }
+        }
 
 
         public GenericDigitalInputDevice(string key, string name, Func<IOPortConfig, DigitalInput> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
         {
+            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
@@ -40,15 +41,15 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
                 InputPort.Register();
 
-                InputPort.StateChange += InputPort_StateChange;
+                InputPort.StateChange += InputPort_StateChange;
 
             });
         }
 
         #region Events
 
-        void InputPort_StateChange(DigitalInput digitalInput, DigitalInputEventArgs args)
+        void InputPort_StateChange(DigitalInput digitalInput, DigitalInputEventArgs args)
-        {
+        {
             InputStateFeedback.FireUpdate();
         }
 
@@ -81,7 +82,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             if (ioPortDevice == null)
             {
-                Debug.Console(0, "GetDigitalInput: Device '0' is not a valid IRelayPorts Device", dc.PortDeviceKey);
+                Debug.Console(0, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
@@ -99,13 +100,13 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Bridge Linking
 
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            var joinMap = new IDigitalInputJoinMap(joinStart);
+            var joinMap = new IDigitalInputJoinMap(joinStart);
-
+
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
+
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -115,19 +116,19 @@ namespace PepperDash.Essentials.Core.CrestronIO
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
+            }
-
+
-            try
+            try
-            {
+            {
-                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
+
-                // Link feedback for input state
+                // Link feedback for input state
-                InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
+                InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
-            }
+            }
-            catch (Exception e)
+            catch (Exception e)
-            {
+            {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.Console(1, this, "Error: {0}", e);
+                Debug.Console(1, this, "Error: {0}", e);
             }
         }
 
@@ -144,7 +145,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new Generic Relay Device");
+                Debug.Console(1, "Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 
@@ -158,7 +159,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #endregion
 
-    }
+    }
-
+
-
+
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs

@@ -4,15 +4,21 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
+
+
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsDevice, IDigitalInput
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
     {
         public Versiport InputPort { get; private set; }
 
@@ -26,17 +32,29 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
         }
 
-        public GenericVersiportDigitalInputDevice(string key, Versiport inputPort, IOPortConfig props):
+        public GenericVersiportDigitalInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
-            base(key)
+            base(key, name)
         {
             InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
-            InputPort = inputPort;
-            InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
-            if (props.DisablePullUpResistor)
-                InputPort.DisablePullUpResistor = true;
-            InputPort.VersiportChange += new VersiportEventHandler(InputPort_VersiportChange);
 
-            Debug.Console(1, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", props.PortNumber, InputPort.DisablePullUpResistor);
+            AddPostActivationAction(() =>
+            {
+                InputPort = postActivationFunc(config);
+
+                InputPort.Register();
+
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
+                if (config.DisablePullUpResistor)
+                    InputPort.DisablePullUpResistor = true;
+
+                InputPort.VersiportChange += InputPort_VersiportChange;
+
+
+
+                Debug.Console(1, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+
+            });
+
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
@@ -46,5 +64,105 @@ namespace PepperDash.Essentials.Core.CrestronIO
             if(args.Event == eVersiportEvent.DigitalInChange)
                 InputStateFeedback.FireUpdate();
         }
+
+
+        #region Bridge Linking
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new IDigitalInputJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            }
+
+            try
+            {
+                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+                // Link feedback for input state
+                InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.Console(1, this, "Error: {0}", e);
+            }
+        }
+
+        #endregion
+
+
+        public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
+        {
+         
+            IIOPorts ioPortDevice;
+
+            if (dc.PortDeviceKey.Equals("processor"))
+            {
+                if (!Global.ControlSystem.SupportsVersiport)
+                {
+                    Debug.Console(0, "GetVersiportDigitalInput: Processor does not support Versiports");
+                    return null;
+                }
+                ioPortDevice = Global.ControlSystem;
+            }
+            else
+            {
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.Console(0, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.Console(0, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                return null;
+            }
+
+            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
+            {
+                Debug.Console(0, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+            }
+
+            return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
+        }
+    }
+
+
+    public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
+    {
+        public GenericVersiportDigitalInputDeviceFactory()
+        {
+            TypeNames = new List<string>() { "versiportinput" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+
+            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
+
+            if (props == null) return null;
+
+            var portDevice = new GenericVersiportDigitalInputDevice(dc.Key, dc.Name, GenericVersiportDigitalInputDevice.GetVersiportDigitalInput, props);
+
+            return portDevice;
+        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -1,25 +1,25 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Config;
-
+
-namespace PepperDash.Essentials.Core.CrestronIO
+namespace PepperDash.Essentials.Core.CrestronIO
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Represents a generic device controlled by relays
+    /// Represents a generic device controlled by relays
     /// </summary>
     [Description("Wrapper class for a Relay")]
-    public class GenericRelayDevice : EssentialsBridgeableDevice, ISwitchedOutput
+    public class GenericRelayDevice : EssentialsBridgeableDevice, ISwitchedOutput
-    {
+    {
-        public Relay RelayOutput { get; private set; }
+        public Relay RelayOutput { get; private set; }
-
+
         public BoolFeedback OutputIsOnFeedback { get; private set; }
 
         //Maintained for compatibility with PepperDash.Essentials.Core.Devices.CrestronProcessor
@@ -94,11 +94,11 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Events
 
-        void RelayOutput_StateChange(Relay relay, RelayEventArgs args)
+        void RelayOutput_StateChange(Relay relay, RelayEventArgs args)
-        {
+        {
             OutputIsOnFeedback.FireUpdate();
-        }
+        }
-
+
         #endregion
 
         #region Methods
@@ -119,33 +119,33 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 OpenRelay();
             else
                 CloseRelay();
-        }
+        }
 
         #endregion
-
+
-        #region ISwitchedOutput Members
+        #region ISwitchedOutput Members
-
+
-        void ISwitchedOutput.On()
+        void ISwitchedOutput.On()
-        {
+        {
-            CloseRelay();
+            CloseRelay();
-        }
+        }
-
+
-        void ISwitchedOutput.Off()
+        void ISwitchedOutput.Off()
-        {
+        {
-            OpenRelay();
+            OpenRelay();
-        }
+        }
-
+
         #endregion
 
         #region Bridge Linking
 
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            var joinMap = new GenericRelayControllerJoinMap(joinStart);
+            var joinMap = new GenericRelayControllerJoinMap(joinStart);
-
+
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
+
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -155,26 +155,26 @@ namespace PepperDash.Essentials.Core.CrestronIO
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
+            }
-
+
-            if (RelayOutput == null)
+            if (RelayOutput == null)
-            {
+            {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Relay is null", Key);
+                Debug.Console(1, this, "Unable to link device '{0}'.  Relay is null", Key);
-                return;
+                return;
-            }
+            }
-
+
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
+
-            trilist.SetBoolSigAction(joinMap.Relay.JoinNumber, b =>
+            trilist.SetBoolSigAction(joinMap.Relay.JoinNumber, b =>
-            {
+            {
-                if (b)
+                if (b)
-                    CloseRelay();
+                    CloseRelay();
-                else
+                else
-                    OpenRelay();
+                    OpenRelay();
-            });
+            });
-
+
-            // feedback for relay state
+            // feedback for relay state
-
+
             OutputIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Relay.JoinNumber]);
         }
 
@@ -202,54 +202,54 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 return portDevice;
 
 
-                /*
+                /*
-                if (props.PortDeviceKey == "processor")
+                if (props.PortDeviceKey == "processor")
-                    portDevice = Global.ControlSystem as IRelayPorts;
+                    portDevice = Global.ControlSystem as IRelayPorts;
-                else
+                else
-                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
+                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
-
+
-                if (portDevice == null)
+                if (portDevice == null)
-                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
+                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
-                else
+                else
-                {
+                {
-                    var cs = (portDevice as CrestronControlSystem);
+                    var cs = (portDevice as CrestronControlSystem);
-
+
-                    if (cs != null)
+                    if (cs != null)
-                    {
+                    {
-                        // The relay is on a control system processor
+                        // The relay is on a control system processor
-                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
+                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
-                        {
+                        {
-                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
+                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
-                            return null;
+                            return null;
-                        }
+                        }
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        // The relay is on another device type
+                        // The relay is on another device type
-
+
-                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
+                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
-                        {
+                        {
-                            Debug.Console(0, "Port Device: {0} does not have enough relays");
+                            Debug.Console(0, "Port Device: {0} does not have enough relays");
-                            return null;
+                            return null;
-                        }
+                        }
-                    }
+                    }
-
+
-                    Relay relay = portDevice.RelayPorts[props.PortNumber];
+                    Relay relay = portDevice.RelayPorts[props.PortNumber];
-
+
-                    if (!relay.Registered)
+                    if (!relay.Registered)
-                    {
+                    {
-                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
+                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
-                            return new GenericRelayDevice(key, relay);
+                            return new GenericRelayDevice(key, relay);
-                        else
+                        else
-                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
+                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        return new GenericRelayDevice(key, relay);
+                        return new GenericRelayDevice(key, relay);
-                    }
+                    }
-
+
-                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
+                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
-                }
+                }
                 */
 
             }
@@ -258,7 +258,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #endregion
 
 
-    }
+    }
-
+
-
+
 }

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

@@ -130,6 +130,12 @@ namespace PepperDash.Essentials.Core
 		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
 		{
             Debug.Console(2, this, "OnlineStatusChange Event.  Online = {0}", args.DeviceOnLine);
+
+            if (!Hardware.Registered)
+            {
+                return;  // protects in cases where device has been unregistered and feedbacks would attempt to access null sigs.
+            }
+
             foreach (var feedback in Feedbacks)
             {
                 if (feedback != null)

essentials-framework/Essentials Core/PepperDashEssentialsBase/Device Info/DeviceInfo.cs

@@ -0,0 +1,11 @@
+namespace PepperDash.Essentials.Core.DeviceInfo
+{
+    public class DeviceInfo
+    {
+        public string HostName { get; set; } 
+        public string IpAddress { get; set; }
+        public string MacAddress { get; set; }
+        public string SerialNumber { get; set; }
+        public string FirmwareVersion { get; set; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Device Info/DeviceInfoEventArgs.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace PepperDash.Essentials.Core.DeviceInfo
+{
+    public class DeviceInfoEventArgs:EventArgs
+    {
+        public DeviceInfo DeviceInfo { get; set; }
+
+        public DeviceInfoEventArgs()
+        {
+            
+        }
+
+        public DeviceInfoEventArgs(DeviceInfo devInfo)
+        {
+            DeviceInfo = devInfo;
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Device Info/IDeviceInfoProvider.cs

@@ -0,0 +1,16 @@
+using System;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.DeviceInfo
+{
+    public interface IDeviceInfoProvider:IKeyed
+    {
+        DeviceInfo DeviceInfo { get; }
+
+        event DeviceInfoChangeHandler DeviceInfoChanged;
+
+        void UpdateDeviceInfo();
+    }
+
+    public delegate void DeviceInfoChangeHandler(IKeyed device, DeviceInfoEventArgs args);
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IDiscPlayerControls.cs

@@ -6,7 +6,7 @@ using PepperDash.Essentials.Core.SmartObjects;
 namespace PepperDash.Essentials.Core
 {
 
-	public interface IDiscPlayerControls : IColor, IDPad, INumericKeypad, IPower, ITransport, IUiDisplayInfo
+    public interface IDiscPlayerControls : IColor, IDPad, INumericKeypad, IHasPowerControl, ITransport, IUiDisplayInfo
 	{
 	}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasBranding.cs

@@ -1,8 +1,20 @@
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+using System;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface IHasBranding
     {
         bool BrandingEnabled { get; }
         void InitializeBranding(string roomKey);
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface IHasBranding
+    {
+        bool BrandingEnabled { get; }
+        void InitializeBranding(string roomKey);
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasPhoneDialing.cs

@@ -1,6 +1,7 @@
-using PepperDash.Essentials.Core;
+using System;
+using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface IHasPhoneDialing
     {
@@ -11,4 +12,18 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         void EndPhoneCall();
         void SendDtmfToPhone(string digit);
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface IHasPhoneDialing
+    {
+        BoolFeedback PhoneOffHookFeedback { get; }
+        StringFeedback CallerIdNameFeedback { get; }
+        StringFeedback CallerIdNumberFeedback { get; }
+        void DialPhoneCall(string number);
+        void EndPhoneCall();
+        void SendDtmfToPhone(string digit);
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageDefinition.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface ILanguageDefinition
     {
@@ -15,4 +15,21 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         List<LanguageLabel> DestinationGroupNames { get; set; }
         List<LanguageLabel> RoomNames { get; set; } 
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface ILanguageDefinition
+    {
+        string LocaleName { get; set; }
+        string FriendlyName { get; set; }
+        bool Enable { get; set; }
+        List<LanguageLabel> UiLabels { get; set; }
+        List<LanguageLabel> Sources { get; set; }
+        List<LanguageLabel> Destinations { get; set; }
+        List<LanguageLabel> SourceGroupNames { get; set; }
+        List<LanguageLabel> DestinationGroupNames { get; set; }
+        List<LanguageLabel> RoomNames { get; set; }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ILanguageProvider.cs

@@ -1,9 +1,21 @@
 using System;
-using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+   
+    public interface ILanguageProvider
+    {
+        ILanguageDefinition CurrentLanguage { get; set; }
+
+        event EventHandler CurrentLanguageChanged;
+    }
+
+}
 
 namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
-        public interface ILanguageProvider
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface ILanguageProvider
     {
         ILanguageDefinition CurrentLanguage { get; set; }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -8,11 +8,9 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(EssentialsRoomBase room);
+        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
-
-
     }
 
     /// <summary>
@@ -22,10 +20,16 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     {
         event EventHandler<EventArgs> UserCodeChanged;
 
+        event EventHandler<EventArgs> UserPromptedForCode;
+
+        event EventHandler<EventArgs> ClientJoined;
+
         string UserCode { get; }
 
         string QrCodeUrl { get; }
 
+        string QrCodeChecksum { get; }
+
         string McServerUrl { get; }
 
         string RoomName { get; }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/INumeric.cs

@@ -1,5 +1,5 @@
 using Crestron.SimplSharpPro.DeviceSupport;
-
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
@@ -8,7 +8,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// 
 	/// </summary>
-	public interface INumericKeypad
+	public interface INumericKeypad:IKeyed
 	{
 		void Digit0(bool pressRelease);
 		void Digit1(bool pressRelease);

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IPower.cs

@@ -14,35 +14,64 @@ using PepperDash.Essentials.Core.SmartObjects;
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
-	/// 
+	/// Defines the ability to power a device on and off
 	/// </summary>
+    [Obsolete("Will be replaced by IHasPowerControlWithFeedback")]
 	public interface IPower
 	{
 		void PowerOn();
 		void PowerOff();
 		void PowerToggle();
-		BoolFeedback PowerIsOnFeedback { get; }
+        BoolFeedback PowerIsOnFeedback { get; }
 	}
 
+    /// <summary>
+    /// Adds feedback for current power state
+    /// </summary>
+    public interface IHasPowerControlWithFeedback : IHasPowerControl
+    {
+        BoolFeedback PowerIsOnFeedback { get; }
+    }
+
+    /// <summary>
+    /// Defines the ability to power a device on and off
+    /// </summary>
+    public interface IHasPowerControl
+    {
+        void PowerOn();
+        void PowerOff();
+        void PowerToggle();
+    }
+
 	/// <summary>
 	/// 
 	/// </summary>
-	public static class IPowerExtensions
+	public static class IHasPowerControlExtensions
 	{
-		public static void LinkButtons(this IPower dev, BasicTriList triList)
+        public static void LinkButtons(this IHasPowerControl dev, BasicTriList triList)
 		{
 			triList.SetSigFalseAction(101, dev.PowerOn);
 			triList.SetSigFalseAction(102, dev.PowerOff);
 			triList.SetSigFalseAction(103, dev.PowerToggle);
-			dev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
+
+            var fbdev = dev as IHasPowerControlWithFeedback;
+            if (fbdev != null)
+            {
+                fbdev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
+            }
 		}
 
-		public static void UnlinkButtons(this IPower dev, BasicTriList triList)
+        public static void UnlinkButtons(this IHasPowerControl dev, BasicTriList triList)
 		{
 			triList.ClearBoolSigAction(101);
 			triList.ClearBoolSigAction(102);
 			triList.ClearBoolSigAction(103);
-			dev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
+
+            var fbdev = dev as IHasPowerControlWithFeedback;
+            if (fbdev != null)
+            {
+                fbdev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
+            }
 		}
 	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		bool HasDpad { get; }
 
-		PepperDash.Essentials.Core.Presets.DevicePresetsModel PresetsModel { get; }
+		PepperDash.Essentials.Core.Presets.DevicePresetsModel TvPresets { get; }
 		void LoadPresets(string filePath);
 
 		void DvrList(bool pressRelease);

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ITvPresetsProvider.cs

@@ -0,0 +1,9 @@
+using PepperDash.Essentials.Core.Presets;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface ITvPresetsProvider
+    {
+        DevicePresetsModel TvPresets { get; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/LanguageLabel.cs

@@ -1,6 +1,7 @@
-using PepperDash.Core;
+using System;
+using PepperDash.Core;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public class LanguageLabel
     {
@@ -9,4 +10,16 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         public string DisplayText { get; set; }
         public uint JoinNumber { get; set; }
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public class LanguageLabel
+    {
+        public string Key { get; set; }
+        public string Description { get; set; }
+        public string DisplayText { get; set; }
+        public uint JoinNumber { get; set; }
+    }
 }

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

@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DestinationListItem
+    {
+        [JsonProperty("sinkKey")]
+        public string SinkKey { get; set; }
+
+        private EssentialsDevice _sinkDevice;
+
+        [JsonIgnore]
+        public EssentialsDevice SinkDevice
+        {
+            get { return _sinkDevice ?? (_sinkDevice = DeviceManager.GetDeviceForKey(SinkKey) as EssentialsDevice); }
+        }
+
+        [JsonProperty("preferredName")]
+        public string PreferredName
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(Name))
+                {
+                    return Name;
+                }
+
+                return SinkDevice == null ? "---" : SinkDevice.Name;
+            }
+        }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("includeInDestinationList")]
+        public bool IncludeInDestinationList { get; set; }
+
+        [JsonProperty("order")]
+        public int Order { get; set; }
+
+        [JsonProperty("surfaceLocation")]
+        public int SurfaceLocation { get; set; }
+
+        [JsonProperty("verticalLocation")]
+        public int VerticalLocation { get; set; }
+        
+        [JsonProperty("horizontalLocation")]
+        public int HorizontalLocation { get; set; }
+
+        [JsonProperty("sinkType")]
+        public eRoutingSignalType SinkType { get; set; }
+    }
+}

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

@@ -20,8 +20,23 @@ namespace PepperDash.Essentials.Core
 		/// <param name="json"></param>
 		public static void DoDeviceActionWithJson(string json)
 		{
-			var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
+		    if (String.IsNullOrEmpty(json))
-			DoDeviceAction(action);
+		    {
+		        CrestronConsole.ConsoleCommandResponse(
+		            "Please provide a JSON object matching the format {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}.\r\nIf the method has no parameters, the \"params\" object may be omitted.");
+		        return;
+		    }
+		    try
+		    {
+		        var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
+
+		        DoDeviceAction(action);
+		    }
+		    catch (Exception ex)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Incorrect format for JSON. Please check that the format matches {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}");
+		    }
+		    
 		}
 
 
@@ -33,31 +48,65 @@ namespace PepperDash.Essentials.Core
 		{
 			var key = action.DeviceKey;
 			var obj = FindObjectOnPath(key);
-			if (obj == null)
+		    if (obj == null)
-				return;
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Unable to find object at path {0}", key);
+		        return;
+		    }
 
-			CType t = obj.GetType();
+		    if (action.Params == null)
-			var method = t.GetMethod(action.MethodName);
+		    {
-			if (method == null)
+                //no params, so setting action.Params to empty array
-			{
+		        action.Params = new object[0];
-				Debug.Console(0, "Method '{0}' not found", action.MethodName);
+		    }
-				return;
+
-			}
+		    CType t = obj.GetType();
-			var mParams = method.GetParameters();
+		    try
-			// Add empty params if not provided
+		    {
-			if (action.Params == null) action.Params = new object[0];
+		        var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();
-			if (mParams.Length > action.Params.Length)
+
-			{
+		        var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);
-				Debug.Console(0, "Method '{0}' requires {1} params", action.MethodName, mParams.Length);
+
-				return;
+		        if (method == null)
-			}
+		        {
-			object[] convertedParams = mParams
+		            CrestronConsole.ConsoleCommandResponse(
-								.Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
+		                "Unable to find method with name {0} and that matches parameters {1}", action.MethodName,
-									System.Globalization.CultureInfo.InvariantCulture))
+		                action.Params);
-								.ToArray();
+		            return;
-			object ret = method.Invoke(obj, convertedParams);
+		        }
+                var mParams = method.GetParameters();
+
+                var convertedParams = mParams
+                                    .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
+                                    .ToArray();
+                method.Invoke(obj, convertedParams);
+
+		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
+		            action.DeviceKey);
+		    }
+		    catch (Exception ex)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Unable to call method with name {0}. {1}", action.MethodName,
+		            ex.Message);}
 		}
 
+	    private static object ConvertType(object value, Type conversionType)
+	    {
+	        if (!conversionType.IsEnum)
+	        {
+	            return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
+	        }
+
+	        var stringValue = Convert.ToString(value);
+
+	        if (String.IsNullOrEmpty(stringValue))
+	        {
+	            throw new InvalidCastException(
+	                String.Format("{0} cannot be converted to a string prior to conversion to enum"));
+	        }
+	        return Enum.Parse(conversionType, stringValue, true);
+	    }
+
 		/// <summary>
 		/// Gets the properties on a device
 		/// </summary>
@@ -83,13 +132,13 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static object GetPropertyByName(string deviceObjectPath, string propertyName)
         {
-            var obj = FindObjectOnPath(deviceObjectPath);
+            var dev = FindObjectOnPath(deviceObjectPath);
-            if(obj == null)
+            if(dev == null)
                 return "{ \"error\":\"No Device\"}";
+	
+            object prop = dev.GetType().GetCType().GetProperty(propertyName).GetValue(dev, null);
 
-            CType t = obj.GetType();
+            // var prop = t.GetProperty(propertyName);
-
-            var prop = t.GetProperty(propertyName);
             if (prop != null)
             {
                 return prop;
@@ -242,6 +291,8 @@ namespace PepperDash.Essentials.Core
             //var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
             //return JsonConvert.SerializeObject(props, Formatting.Indented);
         }
+
+        
 	}
 
 	public class DeviceActionWrapper

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

@@ -1,342 +1,355 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-
+
-using PepperDash.Core;
+using PepperDash.Core;
-
+
-
+
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
-{
+{
-	public static class DeviceManager
+	public static class DeviceManager
-	{
+	{
-	    private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
+        public static event EventHandler<EventArgs> AllDevicesActivated;
-	    private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);
+
-		//public static List<Device> Devices { get { return _Devices; } }
+	    private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
-		//static List<Device> _Devices = new List<Device>();
+	    private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);
-
+		//public static List<Device> Devices { get { return _Devices; } }
-		static readonly Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);
+		//static List<Device> _Devices = new List<Device>();
-
+
-		/// <summary>
+		static readonly Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);
-		/// Returns a copy of all the devices in a list
+
-		/// </summary>
+		/// <summary>
-		public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }
+		/// Returns a copy of all the devices in a list
-
+		/// </summary>
-	    public static bool AddDeviceEnabled;
+		public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }
-
+
-		public static void Initialize(CrestronControlSystem cs)
+	    public static bool AddDeviceEnabled;
-		{
+
-		    AddDeviceEnabled = true;
+		public static void Initialize(CrestronControlSystem cs)
-			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
+		{
-				ConsoleAccessLevelEnum.AccessOperator);
+		    AddDeviceEnabled = true;
-			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
+			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
-				ConsoleAccessLevelEnum.AccessOperator);
+				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices", 
+			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
-				ConsoleAccessLevelEnum.AccessOperator);
+				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "", 
+			CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices", 
-				ConsoleAccessLevelEnum.AccessOperator);
+				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "", 
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
+				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
+			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
-                "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
-
+            CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
-            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
+                "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
+
-        }
+            CrestronConsole.AddNewConsoleCommand(SetDeviceStreamDebugging, "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
-
+            CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
-		/// <summary>
+        }
-		/// Calls activate steps on all Device class items
+
-		/// </summary>
+		/// <summary>
-		public static void ActivateAll()
+		/// Calls activate steps on all Device class items
-		{
+		/// </summary>
-		    try
+		public static void ActivateAll()
-		    {
+		{
-		        DeviceCriticalSection.Enter();
+		    try
-                AddDeviceEnabled = false;
+		    {
-		        // PreActivate all devices
+		        DeviceCriticalSection.Enter();
-		        foreach (var d in Devices.Values)
+                AddDeviceEnabled = false;
-		        {
+		        // PreActivate all devices
-		            try
+		        foreach (var d in Devices.Values)
-		            {
+		        {
-		                if (d is Device)
+		            try
-		                    (d as Device).PreActivate();
+		            {
-		            }
+		                if (d is Device)
-		            catch (Exception e)
+		                    (d as Device).PreActivate();
-		            {
+		            }
-		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
+		            catch (Exception e)
-		            }
+		            {
-		        }
+		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
-
+		            }
-		        // Activate all devices
+		        }
-		        foreach (var d in Devices.Values)
+
-		        {
+		        // Activate all devices
-		            try
+		        foreach (var d in Devices.Values)
-		            {
+		        {
-		                if (d is Device)
+		            try
-		                    (d as Device).Activate();
+		            {
-		            }
+		                if (d is Device)
-		            catch (Exception e)
+		                    (d as Device).Activate();
-		            {
+		            }
-		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
+		            catch (Exception e)
-		            }
+		            {
-		        }
+		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
-
+		            }
-		        // PostActivate all devices
+		        }
-		        foreach (var d in Devices.Values)
+
-		        {
+		        // PostActivate all devices
-		            try
+		        foreach (var d in Devices.Values)
-		            {
+		        {
-		                if (d is Device)
+		            try
-		                    (d as Device).PostActivate();
+		            {
-		            }
+		                if (d is Device)
-		            catch (Exception e)
+		                    (d as Device).PostActivate();
-		            {
+		            }
-		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
+		            catch (Exception e)
-		            }
+		            {
-		        }
+		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
-		    }
+		            }
-		    finally
+		        }
-		    {
+
-                DeviceCriticalSection.Leave();
+                OnAllDevicesActivated();
-		    }
+		    }
-		}
+		    finally
-
+		    {
-		/// <summary>
+                DeviceCriticalSection.Leave();
-		/// Calls activate on all Device class items
+		    }
-		/// </summary>
+		}
-		public static void DeactivateAll()
+
-		{
+        private static void OnAllDevicesActivated()
-		    try
+        {
-		    {
+            var handler = AllDevicesActivated;
-		        DeviceCriticalSection.Enter();
+            if (handler != null)
-		        foreach (var d in Devices.Values.OfType<Device>())
+            {
-		        {
+                handler(null, new EventArgs());
-		            d.Deactivate();
+            }
-		        }
+        }
-		    }
+
-		    finally
+		/// <summary>
-		    {
+		/// Calls activate on all Device class items
-		        DeviceCriticalSection.Leave();
+		/// </summary>
-		    }
+		public static void DeactivateAll()
-		}
+		{
-
+		    try
-		//static void ListMethods(string devKey)
+		    {
-		//{
+		        DeviceCriticalSection.Enter();
-		//    var dev = GetDeviceForKey(devKey);
+		        foreach (var d in Devices.Values.OfType<Device>())
-		//    if(dev != null)
+		        {
-		//    {
+		            d.Deactivate();
-		//        var type = dev.GetType().GetCType();
+		        }
-		//        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
+		    }
-		//        var sb = new StringBuilder();
+		    finally
-		//        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
+		    {
-		//        foreach (var m in methods)
+		        DeviceCriticalSection.Leave();
-		//        {
+		    }
-		//            sb.Append(string.Format("{0}(", m.Name));
+		}
-		//            var pars = m.GetParameters();
+
-		//            foreach (var p in pars)
+		//static void ListMethods(string devKey)
-		//                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
+		//{
-		//            sb.AppendLine(")");
+		//    var dev = GetDeviceForKey(devKey);
-		//        }
+		//    if(dev != null)
-		//        CrestronConsole.ConsoleCommandResponse(sb.ToString());
+		//    {
-		//    }
+		//        var type = dev.GetType().GetCType();
-		//}
+		//        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
-
+		//        var sb = new StringBuilder();
-	    private static void ListDevices(string s)
+		//        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
-	    {
+		//        foreach (var m in methods)
-	        Debug.Console(0, "{0} Devices registered with Device Manager:", Devices.Count);
+		//        {
-	        var sorted = Devices.Values.ToList();
+		//            sb.Append(string.Format("{0}(", m.Name));
-	        sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
+		//            var pars = m.GetParameters();
-
+		//            foreach (var p in pars)
-	        foreach (var d in sorted)
+		//                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
-	        {
+		//            sb.AppendLine(")");
-	            var name = d is IKeyName ? (d as IKeyName).Name : "---";
+		//        }
-	            Debug.Console(0, "  [{0}] {1}", d.Key, name);
+		//        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-	        }
+		//    }
-	    }
+		//}
-
+
-	    private static void ListDeviceFeedbacks(string devKey)
+	    private static void ListDevices(string s)
-	    {
+	    {
-	        var dev = GetDeviceForKey(devKey);
+	        Debug.Console(0, "{0} Devices registered with Device Manager:", Devices.Count);
-	        if (dev == null)
+	        var sorted = Devices.Values.ToList();
-	        {
+	        sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
-	            Debug.Console(0, "Device '{0}' not found", devKey);
+
-	            return;
+	        foreach (var d in sorted)
-	        }
+	        {
-	        var statusDev = dev as IHasFeedback;
+	            var name = d is IKeyName ? (d as IKeyName).Name : "---";
-	        if (statusDev == null)
+	            Debug.Console(0, "  [{0}] {1}", d.Key, name);
-	        {
+	        }
-	            Debug.Console(0, "Device '{0}' does not have visible feedbacks", devKey);
+	    }
-	            return;
+
-	        }
+	    private static void ListDeviceFeedbacks(string devKey)
-	        statusDev.DumpFeedbacksToConsole(true);
+	    {
-	    }
+	        var dev = GetDeviceForKey(devKey);
-
+	        if (dev == null)
-	    //static void ListDeviceCommands(string devKey)
+	        {
-        //{
+	            Debug.Console(0, "Device '{0}' not found", devKey);
-        //    var dev = GetDeviceForKey(devKey);
+	            return;
-        //    if (dev == null)
+	        }
-        //    {
+	        var statusDev = dev as IHasFeedback;
-        //        Debug.Console(0, "Device '{0}' not found", devKey);
+	        if (statusDev == null)
-        //        return;
+	        {
-        //    }
+	            Debug.Console(0, "Device '{0}' does not have visible feedbacks", devKey);
-        //    Debug.Console(0, "This needs to be reworked.  Stay tuned.", devKey);
+	            return;
-        //}
+	        }
-
+	        statusDev.DumpFeedbacksToConsole(true);
-	    private static void ListDeviceCommStatuses(string input)
+	    }
-	    {
+
-	        var sb = new StringBuilder();
+	    //static void ListDeviceCommands(string devKey)
-	        foreach (var dev in Devices.Values.OfType<ICommunicationMonitor>())
+        //{
-	        {
+        //    var dev = GetDeviceForKey(devKey);
-	            sb.Append(string.Format("{0}: {1}\r", dev,
+        //    if (dev == null)
-	                dev.CommunicationMonitor.Status));
+        //    {
-	        }
+        //        Debug.Console(0, "Device '{0}' not found", devKey);
-	        CrestronConsole.ConsoleCommandResponse(sb.ToString());
+        //        return;
-	    }
+        //    }
-
+        //    Debug.Console(0, "This needs to be reworked.  Stay tuned.", devKey);
-
+        //}
-	    //static void DoDeviceCommand(string command)
+
-        //{
+	    private static void ListDeviceCommStatuses(string input)
-        //    Debug.Console(0, "Not yet implemented.  Stay tuned");
+	    {
-        //}
+	        var sb = new StringBuilder();
-
+	        foreach (var dev in Devices.Values.OfType<ICommunicationMonitor>())
-		public static void AddDevice(IKeyed newDev)
+	        {
-		{
+	            sb.Append(string.Format("{0}: {1}\r", dev,
-		    try
+	                dev.CommunicationMonitor.Status));
-		    {
+	        }
-		        if (!DeviceCriticalSection.TryEnter())
+	        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-		        {
+	    }
-		            Debug.Console(0, Debug.ErrorLogLevel.Error, "Currently unable to add devices to Device Manager. Please try again");
+
-		            return;
+
-		        }
+	    //static void DoDeviceCommand(string command)
-		        // Check for device with same key
+        //{
-		        //var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
+        //    Debug.Console(0, "Not yet implemented.  Stay tuned");
-		        ////// If it exists, remove or warn??
+        //}
-		        //if (existingDevice != null)
+
-
+		public static void AddDevice(IKeyed newDev)
-		        if (!AddDeviceEnabled)
+		{
-		        {
+		    try
-		            Debug.Console(0, Debug.ErrorLogLevel.Error, "All devices have been activated. Adding new devices is not allowed.");
+		    {
-		            return;
+		        if (!DeviceCriticalSection.TryEnter())
-		        }
+		        {
-
+		            Debug.Console(0, Debug.ErrorLogLevel.Error, "Currently unable to add devices to Device Manager. Please try again");
-		        if (Devices.ContainsKey(newDev.Key))
+		            return;
-		        {
+		        }
-		            Debug.Console(0, newDev, "WARNING: A device with this key already exists.  Not added to manager");
+		        // Check for device with same key
-		            return;
+		        //var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
-		        }
+		        ////// If it exists, remove or warn??
-		        Devices.Add(newDev.Key, newDev);
+		        //if (existingDevice != null)
-		        //if (!(_Devices.Contains(newDev)))
+
-		        //    _Devices.Add(newDev);
+		        if (!AddDeviceEnabled)
-		    }
+		        {
-		    finally
+		            Debug.Console(0, Debug.ErrorLogLevel.Error, "All devices have been activated. Adding new devices is not allowed.");
-		    {
+		            return;
-		        DeviceCriticalSection.Leave();
+		        }
-		    }
+
-		}
+		        if (Devices.ContainsKey(newDev.Key))
-
+		        {
-	    public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
+		            Debug.Console(0, newDev, "WARNING: A device with this key already exists.  Not added to manager");
-	    {
+		            return;
-	        try
+		        }
-	        {
+		        Devices.Add(newDev.Key, newDev);
-	            if (!DeviceCriticalSection.TryEnter())
+		        //if (!(_Devices.Contains(newDev)))
-	            {
+		        //    _Devices.Add(newDev);
-	                Debug.Console(0, Debug.ErrorLogLevel.Error,
+		    }
-	                    "Currently unable to add devices to Device Manager. Please try again");
+		    finally
-	                return;
+		    {
-	            }
+		        DeviceCriticalSection.Leave();
-	            if (!AddDeviceEnabled)
+		    }
-	            {
+		}
-	                Debug.Console(0, Debug.ErrorLogLevel.Error,
+
-	                    "All devices have been activated. Adding new devices is not allowed.");
+	    public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
-	                return;
+	    {
-	            }
+	        try
-
+	        {
-	            foreach (var dev in devicesToAdd)
+	            if (!DeviceCriticalSection.TryEnter())
-	            {
+	            {
-	                try
+	                Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                {
+	                    "Currently unable to add devices to Device Manager. Please try again");
-	                    Devices.Add(dev.Key, dev);
+	                return;
-	                }
+	            }
-	                catch (ArgumentException ex)
+	            if (!AddDeviceEnabled)
-	                {
+	            {
-	                    Debug.Console(0, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
+	                Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                        dev.Key, ex.Message, ex.StackTrace);
+	                    "All devices have been activated. Adding new devices is not allowed.");
-	                }
+	                return;
-	            }
+	            }
-	        }
+
-	        finally
+	            foreach (var dev in devicesToAdd)
-	        {
+	            {
-	            DeviceCriticalSection.Leave();
+	                try
-	        }
+	                {
-	    }
+	                    Devices.Add(dev.Key, dev);
-
+	                }
-		public static void RemoveDevice(IKeyed newDev)
+	                catch (ArgumentException ex)
-		{
+	                {
-		    try
+	                    Debug.Console(0, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
-		    {
+	                        dev.Key, ex.Message, ex.StackTrace);
-                DeviceCriticalSection.Enter();
+	                }
-		        if (newDev == null)
+	            }
-		            return;
+	        }
-		        if (Devices.ContainsKey(newDev.Key))
+	        finally
-		            Devices.Remove(newDev.Key);
+	        {
-		            //if (_Devices.Contains(newDev))
+	            DeviceCriticalSection.Leave();
-		            //    _Devices.Remove(newDev);
+	        }
-		        else
+	    }
-		            Debug.Console(0, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
+
-		    }
+		public static void RemoveDevice(IKeyed newDev)
-		    finally
+		{
-		    {
+		    try
-		        DeviceCriticalSection.Leave();
+		    {
-		    }
+                DeviceCriticalSection.Enter();
-		}
+		        if (newDev == null)
-
+		            return;
-		public static IEnumerable<string> GetDeviceKeys()
+		        if (Devices.ContainsKey(newDev.Key))
-		{
+		            Devices.Remove(newDev.Key);
-		        //return _Devices.Select(d => d.Key).ToList();
+		            //if (_Devices.Contains(newDev))
-		        return Devices.Keys;
+		            //    _Devices.Remove(newDev);
-		}
+		        else
-
+		            Debug.Console(0, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
-		public static IEnumerable<IKeyed> GetDevices()
+		    }
-		{
+		    finally
-		        //return _Devices.Select(d => d.Key).ToList();
+		    {
-		        return Devices.Values;
+		        DeviceCriticalSection.Leave();
-		}
+		    }
-
+		}
-		public static IKeyed GetDeviceForKey(string key)
+
-		{
+		public static IEnumerable<string> GetDeviceKeys()
-		        //return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+		{
-		        if (key != null && Devices.ContainsKey(key))
+		        //return _Devices.Select(d => d.Key).ToList();
-		            return Devices[key];
+		        return Devices.Keys;
-
+		}
-		        return null;
+
-		}
+		public static IEnumerable<IKeyed> GetDevices()
-
+		{
-        /// <summary>
+		        //return _Devices.Select(d => d.Key).ToList();
-        /// Console handler that simulates com port data receive 
+		        return Devices.Values;
-        /// </summary>
+		}
-        /// <param name="s"></param>
+
-        public static void SimulateComReceiveOnDevice(string s)
+		public static IKeyed GetDeviceForKey(string key)
-        {
+		{
-            // devcomsim:1 xyzabc
+		        //return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-            var match = Regex.Match(s, @"(\S*)\s*(.*)");
+		        if (key != null && Devices.ContainsKey(key))
-            if (match.Groups.Count < 3)
+		            return Devices[key];
-            {
+
-                CrestronConsole.ConsoleCommandResponse("  Format: devsimreceive:P <device key> <string to send>");
+		        return null;
-                return;
+		}
-            }
+
-            //Debug.Console(2, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
+        /// <summary>
-
+        /// Console handler that simulates com port data receive 
-            var com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
+        /// </summary>
-            if (com == null)
+        /// <param name="s"></param>
-            {
+        public static void SimulateComReceiveOnDevice(string s)
-                CrestronConsole.ConsoleCommandResponse("'{0}' is not a comm port device", match.Groups[1].Value);
+        {
-                return;
+            // devcomsim:1 xyzabc
-            }
+            var match = Regex.Match(s, @"(\S*)\s*(.*)");
-            com.SimulateReceive(match.Groups[2].Value);
+            if (match.Groups.Count < 3)
+            {
+                CrestronConsole.ConsoleCommandResponse("  Format: devsimreceive:P <device key> <string to send>");
+                return;
+            }
+            //Debug.Console(2, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
+
+            var com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
+            if (com == null)
+            {
+                CrestronConsole.ConsoleCommandResponse("'{0}' is not a comm port device", match.Groups[1].Value);
+                return;
+            }
+            com.SimulateReceive(match.Groups[2].Value);
         }
 
         /// <summary>
@@ -347,9 +360,9 @@ namespace PepperDash.Essentials.Core
 	    {
 	        var device = GetDeviceForKey(s);
 
-	        if (device == null) return;
+            if (device == null) return;
-	        var inputPorts = (device as IRoutingInputsOutputs).InputPorts;
+            var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
-	        var outputPorts = (device as IRoutingInputsOutputs).OutputPorts;
+            var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
 	        if (inputPorts != null)
 	        {
 	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
@@ -366,82 +379,91 @@ namespace PepperDash.Essentials.Core
 	                Debug.Console(0, "{0}", routingOutputPort.Key);
 	            }
 	        }
-	    }
+	    }
-
+
-        /// <summary>
+        /// <summary>
-        /// Attempts to set the debug level of a device
+        /// Attempts to set the debug level of a device
-        /// </summary>
+        /// </summary>
-        /// <param name="s"></param>
+        /// <param name="s"></param>
-        public static void SetDeviceStreamDebugging(string s)
+        public static void SetDeviceStreamDebugging(string s)
-        {
+        {
-            var args = s.Split(' ');
+            if (String.IsNullOrEmpty(s) || s.Contains("?"))
-
+            {
-            var deviceKey = args[0];
+                CrestronConsole.ConsoleCommandResponse(
-            var setting = args[1];
+                    @"SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]
-
+    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use
-            var timeout= String.Empty;
+    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
-
+                return;
-            if (args.Length >= 3)
+            }
-            {
+
-                timeout = args[2];
+            var args = s.Split(' ');
-            }
+
-
+            var deviceKey = args[0];
-            var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
+            var setting = args[1];
-
+
-            if (device == null)
+            var timeout= String.Empty;
-            {
+
-                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
+            if (args.Length >= 3)
-                return;
+            {
-            }
+                timeout = args[2];
-
+            }
-            eStreamDebuggingSetting debugSetting;
+
-
+            var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
-            try
+
-            {
+            if (device == null)
-                debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
+            {
-            }
+                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
-            catch
+                return;
-            {
+            }
-                Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
+
-                return;
+            eStreamDebuggingSetting debugSetting;
-            }
+
-
+            try
-            if (!string.IsNullOrEmpty(timeout))
+            {
-            {
+                debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
-                try
+            }
-                {
+            catch
-                    var min = Convert.ToUInt32(timeout);
+            {
-
+                Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
-                    device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
+                return;
-                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
+            }
-
+
-                }
+            if (!string.IsNullOrEmpty(timeout))
-                catch (Exception e)
+            {
-                {
+                try
-                    Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
+                {
-                }
+                    var min = Convert.ToUInt32(timeout);
-            }
+
-            else
+                    device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-            {
+                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
-                device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
+
-                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
+                }
-            }
+                catch (Exception e)
-        }
+                {
-
+                    Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
-        /// <summary>
+                }
-        /// Sets stream debugging settings to off for all devices
+            }
-        /// </summary>
+            else
-        public static void DisableAllDeviceStreamDebugging()
+            {
-        {
+                device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-            foreach (var device in AllDevices)
+                Debug.Console(0, "Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
-            {
+            }
-                var streamDevice = device as IStreamDebugging;
+        }
-
+
-                if (streamDevice != null)
+        /// <summary>
-                {
+        /// Sets stream debugging settings to off for all devices
-                    streamDevice.StreamDebugging.SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting.Off);
+        /// </summary>
-                }
+        public static void DisableAllDeviceStreamDebugging()
-            }
+        {
-        }
+            foreach (var device in AllDevices)
-	}
+            {
+                var streamDevice = device as IStreamDebugging;
+
+                if (streamDevice != null)
+                {
+                    streamDevice.StreamDebugging.SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting.Off);
+                }
+            }
+        }
+	}
 }

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

@@ -1,113 +1,113 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
+using Crestron.SimplSharp.Reflection;
-
+
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Config;
-
+
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
+    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
-    /// </summary>
+    /// </summary>
-    [Description("The base Essentials Device Class")]
+    [Description("The base Essentials Device Class")]
-    public abstract class EssentialsDevice : Device
+    public abstract class EssentialsDevice : Device
-    {
+    {
-        protected EssentialsDevice(string key)
+        protected EssentialsDevice(string key)
-            : base(key)
+            : base(key)
-        {
+        {
-
+
-        }
+        }
-
+
-        protected EssentialsDevice(string key, string name)
+        protected EssentialsDevice(string key, string name)
-            : base(key, name)
+            : base(key, name)
-        {
+        {
-
+
-        }
+        }
-    }
+    }
-
+
-    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class DescriptionAttribute : Attribute
+    public class DescriptionAttribute : Attribute
-    {
+    {
-        private string _Description;
+        private string _Description;
-
+
-        public DescriptionAttribute(string description)
+        public DescriptionAttribute(string description)
-        {
+        {
-            Debug.Console(2, "Setting Description: {0}", description);
+            Debug.Console(2, "Setting Description: {0}", description);
-            _Description = description;
+            _Description = description;
-        }
+        }
-
+
-        public string Description
+        public string Description
-        {
+        {
-            get { return _Description; }
+            get { return _Description; }
-        }
+        }
-    }
+    }
-
+
-    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class ConfigSnippetAttribute : Attribute
+    public class ConfigSnippetAttribute : Attribute
-    {
+    {
-        private string _ConfigSnippet;
+        private string _ConfigSnippet;
-
+
-        public ConfigSnippetAttribute(string configSnippet)
+        public ConfigSnippetAttribute(string configSnippet)
-        {
+        {
-            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
-            _ConfigSnippet = configSnippet;
+            _ConfigSnippet = configSnippet;
-        }
+        }
-
+
-        public string ConfigSnippet
+        public string ConfigSnippet
-        {
+        {
-            get { return _ConfigSnippet; }
+            get { return _ConfigSnippet; }
-        }
+        }
-    }
+    }
-
+
-    /// <summary>
+    /// <summary>
-    /// Devices the basic needs for a Device Factory
+    /// Devices the basic needs for a Device Factory
-    /// </summary>
+    /// </summary>
-    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
+    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
-    {
+    {
-        #region IDeviceFactory Members
+        #region IDeviceFactory Members
-
+
-        /// <summary>
+        /// <summary>
-        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
+        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
-        /// </summary>
+        /// </summary>
-        public List<string> TypeNames { get; protected set; }
+        public List<string> TypeNames { get; protected set; }
-
+
-        /// <summary>
+        /// <summary>
-        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
+        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
-        /// </summary>
+        /// </summary>
-        public void LoadTypeFactories()
+        public void LoadTypeFactories()
-        {
+        {
-            foreach (var typeName in TypeNames)
+            foreach (var typeName in TypeNames)
-            {
+            {
-                Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
-                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
+                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
                 string description = descriptionAttribute[0].Description;
-                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
+                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
-                DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
+                DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
-            }
+            }
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// The method that will build the device
+        /// The method that will build the device
-        /// </summary>
+        /// </summary>
-        /// <param name="dc">The device config</param>
+        /// <param name="dc">The device config</param>
-        /// <returns>An instance of the device</returns>
+        /// <returns>An instance of the device</returns>
-        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
+        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
-
+
-        #endregion
+        #endregion
-    }
+    }
-
+
-    /// <summary>
+    /// <summary>
-    /// Devices the basic needs for a Device Factory
+    /// Devices the basic needs for a Device Factory
-    /// </summary>
+    /// </summary>
-    public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
+    public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
+        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
-        /// </summary>
+        /// </summary>
-        public string MinimumEssentialsFrameworkVersion { get; protected set; }
+        public string MinimumEssentialsFrameworkVersion { get; protected set; }
-    }
+    }
 }

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

@@ -7,7 +7,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 
-namespace PepperDash_Essentials_Core.Devices
+namespace PepperDash.Essentials.Core.Devices
 {
     public class GenericIrController: EssentialsBridgeableDevice
     {

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

@@ -1,7 +1,7 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
 using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core

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

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core.Config;
+
+
+namespace PepperDash.Essentials.Core.Devices
+{
+    public interface IReconfigurableDevice
+    {
+        event EventHandler<EventArgs> ConfigChanged;
+
+        DeviceConfig Config { get; }
+
+        void SetConfig(DeviceConfig config);
+    }
+}

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

@@ -7,13 +7,15 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Devices
 {
     /// <summary>
     /// 
     /// </summary>
-    public abstract class ReconfigurableDevice : EssentialsDevice
+    public abstract class ReconfigurableDevice : EssentialsDevice, IReconfigurableDevice
     {
         public event EventHandler<EventArgs> ConfigChanged;
 
@@ -52,6 +54,8 @@ namespace PepperDash.Essentials.Core.Devices
                 Name = config.Name;
         }
 
+
+
         /// <summary>
         /// Used by the extending class to allow for any custom actions to be taken (tell the ConfigWriter to write config, etc)
         /// </summary>

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

@@ -130,10 +130,24 @@ namespace PepperDash.Essentials.Core
         [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
 
+        /// <summary>
+        /// Indicates if the device associated with this source is controllable
+        /// </summary>
+        [JsonProperty("isControllable")]
+        public bool IsControllable { get; set; }
+
+        /// <summary>
+        /// Indicates that the device associated with this source has audio available
+        /// </summary>
+        [JsonProperty("isAudioSource")]
+        public bool IsAudioSource { get; set; }
+
 		public SourceListItem()
 		{
 			Icon = "Blank";
 		}
+
+        
 	}
 
 	public class SourceRouteListItem

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/BasicIrDisplay.cs

@@ -20,10 +20,13 @@ namespace PepperDash.Essentials.Core
 		public IrOutputPortController IrPort { get; private set; }
 		public ushort IrPulseTime { get; set; }
 
-		protected override Func<bool> PowerIsOnFeedbackFunc 
+        [Obsolete("This property will be removed in version 2.0.0")]
-		{ 
+        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
-			get { return () => _PowerIsOn; } 
+
-		}
+        protected Func<bool> PowerIsOnFeedbackFunc
+        {
+            get { return () => _PowerIsOn; }
+        }
 		protected override Func<bool> IsCoolingDownFeedbackFunc
 		{
 			get { return () => _IsCoolingDown; }
@@ -33,7 +36,7 @@ namespace PepperDash.Essentials.Core
 			get { return () => _IsWarmingUp; }
 		}
 
-		bool _PowerIsOn;
+        bool _PowerIsOn;
 		bool _IsWarmingUp;
 		bool _IsCoolingDown;
 
@@ -43,11 +46,14 @@ namespace PepperDash.Essentials.Core
 			IrPort = new IrOutputPortController(key + "-ir", port, irDriverFilepath);
 			DeviceManager.AddDevice(IrPort);
 
-			PowerIsOnFeedback.OutputChange += (o, a) => {
+            PowerIsOnFeedback = new BoolFeedback(PowerIsOnFeedbackFunc);
-				Debug.Console(2, this, "Power on={0}", _PowerIsOn);
+
-				if (_PowerIsOn) StartWarmingTimer();
+            PowerIsOnFeedback.OutputChange += (o, a) =>
-				else StartCoolingTimer();
+            {
-			};
+                Debug.Console(2, this, "Power on={0}", _PowerIsOn);
+                if (_PowerIsOn) StartWarmingTimer();
+                else StartCoolingTimer();
+            };
 			IsWarmingUpFeedback.OutputChange += (o, a) => Debug.Console(2, this, "Warming up={0}", _IsWarmingUp);
 			IsCoolingDownFeedback.OutputChange += (o, a) => Debug.Console(2, this, "Cooling down={0}", _IsCoolingDown);
 
@@ -110,21 +116,21 @@ namespace PepperDash.Essentials.Core
 		public override void PowerOn()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_ON, IrPulseTime);
-			_PowerIsOn = true;
+            _PowerIsOn = true;
-			PowerIsOnFeedback.FireUpdate();
+            PowerIsOnFeedback.FireUpdate();
 		}
 
 		public override void PowerOff()
 		{
-			_PowerIsOn = false;
+            _PowerIsOn = false;
-			PowerIsOnFeedback.FireUpdate();
+            PowerIsOnFeedback.FireUpdate();
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_OFF, IrPulseTime);
 		}
 
 		public override void PowerToggle()
 		{
-			_PowerIsOn = false;
+            _PowerIsOn = false;
-			PowerIsOnFeedback.FireUpdate();
+            PowerIsOnFeedback.FireUpdate();
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER, IrPulseTime);
 		}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -1,131 +1,118 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Bridges;
-
+
-
+
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
-{
+{
-	/// <summary>
+	/// <summary>
-	/// 
+	/// 
-	/// </summary>
+	/// </summary>
-	public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
+    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking, IPower
-	{
+	{
-        public event SourceInfoChangeHandler CurrentSourceChange;
+        public event SourceInfoChangeHandler CurrentSourceChange;
-
+
-        public string CurrentSourceInfoKey { get; set; }
+        public string CurrentSourceInfoKey { get; set; }
-        public SourceListItem CurrentSourceInfo
+        public SourceListItem CurrentSourceInfo
-        {
+        {
-            get
+            get
-            {
+            {
-                return _CurrentSourceInfo;
+                return _CurrentSourceInfo;
-            }
+            }
-            set
+            set
-            {
+            {
-                if (value == _CurrentSourceInfo) return;
+                if (value == _CurrentSourceInfo) return;
-
+
-                var handler = CurrentSourceChange;
+                var handler = CurrentSourceChange;
-
+
-                if (handler != null)
+                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.WillChange);
+                    handler(_CurrentSourceInfo, ChangeType.WillChange);
-
+
-                _CurrentSourceInfo = value;
+                _CurrentSourceInfo = value;
-
+
-                if (handler != null)
+                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.DidChange);
+                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-            }
+            }
-        }
+        }
-        SourceListItem _CurrentSourceInfo;
+        SourceListItem _CurrentSourceInfo;
-
+
-		public BoolFeedback PowerIsOnFeedback { get; protected set; }
+		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
-		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
+		public BoolFeedback IsWarmingUpFeedback { get; private set; }
-		public BoolFeedback IsWarmingUpFeedback { get; private set; }
+
-
+        [Obsolete("This property will be removed in version 2.0.0")]
-        public UsageTracking UsageTracker { get; set; }
+        public abstract BoolFeedback PowerIsOnFeedback { get; protected set; }
-
+
-		public uint WarmupTime { get; set; }
+        public UsageTracking UsageTracker { get; set; }
-		public uint CooldownTime { get; set; }
+
-
+		public uint WarmupTime { get; set; }
-		/// <summary>
+		public uint CooldownTime { get; set; }
-		/// Bool Func that will provide a value for the PowerIsOn Output. Must be implemented
+
-		/// by concrete sub-classes
+		/// <summary>
-		/// </summary>
+		/// Bool Func that will provide a value for the PowerIsOn Output. Must be implemented
-		abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
+		/// by concrete sub-classes
-		abstract protected Func<bool> IsCoolingDownFeedbackFunc { get; }
+		/// </summary>
-		abstract protected Func<bool> IsWarmingUpFeedbackFunc { get; }
+		abstract protected Func<bool> IsCoolingDownFeedbackFunc { get; }
-        
+		abstract protected Func<bool> IsWarmingUpFeedbackFunc { get; }
-
+        
-		protected CTimer WarmupTimer;
+
-		protected CTimer CooldownTimer;
+		protected CTimer WarmupTimer;
-
+		protected CTimer CooldownTimer;
-		#region IRoutingInputs Members
+
-
+		#region IRoutingInputs Members
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
-
+		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-		#endregion
+
-
+		#endregion
-	    protected DisplayBase(string key, string name)
+
-			: base(key, name)
+	    protected DisplayBase(string key, string name)
-		{
+			: base(key, name)
-			PowerIsOnFeedback = new BoolFeedback("PowerOnFeedback", PowerIsOnFeedbackFunc);
+		{
-			IsCoolingDownFeedback = new BoolFeedback("IsCoolingDown", IsCoolingDownFeedbackFunc);
+			IsCoolingDownFeedback = new BoolFeedback("IsCoolingDown", IsCoolingDownFeedbackFunc);
-			IsWarmingUpFeedback = new BoolFeedback("IsWarmingUp", IsWarmingUpFeedbackFunc);
+			IsWarmingUpFeedback = new BoolFeedback("IsWarmingUp", IsWarmingUpFeedbackFunc);
-
+
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
+			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-
+
-            PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
+		}
-		}
+
-
+		public abstract void PowerOn();
-        void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
+		public abstract void PowerOff();
-        {
+		public abstract void PowerToggle();
-            if (UsageTracker != null)
+
-            {
+        public virtual FeedbackCollection<Feedback> Feedbacks
-                if (PowerIsOnFeedback.BoolValue)
+		{
-                    UsageTracker.StartDeviceUsage();
+			get
-                else
+			{
-                    UsageTracker.EndDeviceUsage();
+                return new FeedbackCollection<Feedback>
-            }
+				{
-        }
+					IsCoolingDownFeedback,
-
+					IsWarmingUpFeedback
-		public abstract void PowerOn();
+				};
-		public abstract void PowerOff();
+			}
-		public abstract void PowerToggle();
+		}
-
+
-        public virtual FeedbackCollection<Feedback> Feedbacks
+	    public abstract void ExecuteSwitch(object selector);
-		{
+
-			get
+	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
-			{
+	        EiscApiAdvanced bridge)
-                return new FeedbackCollection<Feedback>
+	    {
-				{
+            var inputNumber = 0;
-					PowerIsOnFeedback,
+	        var inputKeys = new List<string>();
-					IsCoolingDownFeedback,
+
-					IsWarmingUpFeedback
+            var joinMap = new DisplayControllerJoinMap(joinStart);
-				};
+
-			}
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-		}
+
-
+            if (!string.IsNullOrEmpty(joinMapSerialized))
-		public abstract void ExecuteSwitch(object selector);
-
-	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
-	        EiscApiAdvanced bridge)
-	    {
-            var inputNumber = 0;
-	        var inputKeys = new List<string>();
-
-            var joinMap = new DisplayControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);
 
 	        if (bridge != null)
@@ -137,163 +124,198 @@ namespace PepperDash.Essentials.Core
 	            Debug.Console(0,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
 	        }
 
-	        Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+	        Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-            Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
+            Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
-
+
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
+            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
-
+
-            var commMonitor = displayDevice as ICommunicationMonitor;
+            var commMonitor = displayDevice as ICommunicationMonitor;
-            if (commMonitor != null)
+            if (commMonitor != null)
-            {
+            {
-                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            }
+            }
-
+
-            var inputNumberFeedback = new IntFeedback(() => inputNumber);
+            var inputNumberFeedback = new IntFeedback(() => inputNumber);
-
+
-            // Two way feedbacks
+            // Two way feedbacks
-            var twoWayDisplay = displayDevice as TwoWayDisplayBase;
+            var twoWayDisplay = displayDevice as TwoWayDisplayBase;
-
+
-            if (twoWayDisplay != null)
+            if (twoWayDisplay != null)
-            {
+            {
-                trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
+                trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
-
+
-                twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
+                twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
-
+
-
+
-                inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
+                inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
-            }
+            }
-
+
-            // Power Off
+            // Power Off
-            trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
+            trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
-            {
+            {
-                inputNumber = 102;
+                inputNumber = 102;
-                inputNumberFeedback.FireUpdate();
+                inputNumberFeedback.FireUpdate();
-                displayDevice.PowerOff();
+                displayDevice.PowerOff();
-            });
+            });
-
+
-            displayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
+            var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
-            {
+            if (twoWayDisplayDevice != null)
-                if (!a.BoolValue)
+            {
-                {
+                twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
-                    inputNumber = 102;
+                {
-                    inputNumberFeedback.FireUpdate();
+                    if (!a.BoolValue)
-
+                    {
-                }
+                        inputNumber = 102;
-                else
+                        inputNumberFeedback.FireUpdate();
-                {
+
-                    inputNumber = 0;
+                    }
-                    inputNumberFeedback.FireUpdate();
+                    else
-                }
+                    {
-            };
+                        inputNumber = 0;
-
+                        inputNumberFeedback.FireUpdate();
-            displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
+                    }
-
+                };
-            // PowerOn
+
-            trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
+                twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
-            {
+                twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
-                inputNumber = 0;
+            }
-                inputNumberFeedback.FireUpdate();
+
-                displayDevice.PowerOn();
+            // PowerOn
-            });
+            trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
-
+            {
-
+                inputNumber = 0;
-            displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
+                inputNumberFeedback.FireUpdate();
-
+                displayDevice.PowerOn();
-            for (int i = 0; i < displayDevice.InputPorts.Count; i++)
+            });
-            {
+
-                if (i < joinMap.InputNamesOffset.JoinSpan)
+
-                {
+
-                    inputKeys.Add(displayDevice.InputPorts[i].Key);
+            for (int i = 0; i < displayDevice.InputPorts.Count; i++)
-                    var tempKey = inputKeys.ElementAt(i);
+            {
-                    trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
+                if (i < joinMap.InputNamesOffset.JoinSpan)
-                        () => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
+                {
-                    Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
+                    inputKeys.Add(displayDevice.InputPorts[i].Key);
-                        joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
+                    var tempKey = inputKeys.ElementAt(i);
-                    trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
+                    trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
-                }
+                        () => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
-                else
+                    Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
-                    Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
+                        joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
-                        displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
+                    trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
-            }
+                }
-
+                else
-            Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
+                    Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
-            trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
+                        displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
-            {
+            }
-                if (a == 0)
+
-                {
+            Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
-                    displayDevice.PowerOff();
+            trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
-                    inputNumber = 0;
+            {
-                }
+                if (a == 0)
-                else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
+                {
-                {
+                    displayDevice.PowerOff();
-                    displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
+                    inputNumber = 0;
-                    inputNumber = a;
+                }
-                }
+                else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
-                else if (a == 102)
+                {
-                {
+                    displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-                    displayDevice.PowerToggle();
+                    inputNumber = a;
-
+                }
-                }
+                else if (a == 102)
-                if (twoWayDisplay != null)
+                {
-                    inputNumberFeedback.FireUpdate();
+                    displayDevice.PowerToggle();
-            });
+
-
+                }
-
+                if (twoWayDisplay != null)
-            var volumeDisplay = displayDevice as IBasicVolumeControls;
+                    inputNumberFeedback.FireUpdate();
-	        if (volumeDisplay == null) return;
+            });
-
+
-	        trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
+
-            trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
+            var volumeDisplay = displayDevice as IBasicVolumeControls;
-            trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
+	        if (volumeDisplay == null) return;
-
+
-	        var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
+	        trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
-
+            trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
-	        if (volumeDisplayWithFeedback == null) return;
+            trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
-            trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
+
-            trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
+	        var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
-
+
-
+	        if (volumeDisplayWithFeedback == null) return;
-            trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
+            trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
-            volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
+            trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
-            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
+
-            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
+
-            volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
+            trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
-	    }
+            volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
-	}
+            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
-
+            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
-	/// <summary>
+            volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
-	/// 
+	    }
-	/// </summary>
+
-    public abstract class TwoWayDisplayBase : DisplayBase
+    }
-	{
+
-        public StringFeedback CurrentInputFeedback { get; private set; }
+	/// <summary>
-
+	/// 
-        abstract protected Func<string> CurrentInputFeedbackFunc { get; }
+	/// </summary>
-
+    public abstract class TwoWayDisplayBase : DisplayBase, IRoutingFeedback, IHasPowerControlWithFeedback
-
+	{
-        public static MockDisplay DefaultDisplay
+        public StringFeedback CurrentInputFeedback { get; private set; }
-        { 
+
-			get 
+        abstract protected Func<string> CurrentInputFeedbackFunc { get; }
-			{
+
-				if (_DefaultDisplay == null)
+        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
-					_DefaultDisplay = new MockDisplay("default", "Default Display");
+
-				return _DefaultDisplay;
+        abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
-			} 
+
-		}
+
-		static MockDisplay _DefaultDisplay;
+        public static MockDisplay DefaultDisplay
-
+        { 
-		public TwoWayDisplayBase(string key, string name)
+			get 
-			: base(key, name)
+			{
-		{
+				if (_DefaultDisplay == null)
-            CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
+					_DefaultDisplay = new MockDisplay("default", "Default Display");
-
+				return _DefaultDisplay;
-			WarmupTime = 7000;
+			} 
-			CooldownTime = 15000;
+		}
-
+		static MockDisplay _DefaultDisplay;
-            Feedbacks.Add(CurrentInputFeedback);
+
-
+		public TwoWayDisplayBase(string key, string name)
-            
+			: base(key, name)
-		}
+		{
-
+            CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
-	}
+
+			WarmupTime = 7000;
+			CooldownTime = 15000;
+
+            PowerIsOnFeedback = new BoolFeedback("PowerOnFeedback", PowerIsOnFeedbackFunc);
+
+            Feedbacks.Add(CurrentInputFeedback);
+            Feedbacks.Add(PowerIsOnFeedback);
+
+            PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
+
+		}
+
+        void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
+        {
+            if (UsageTracker != null)
+            {
+                if (PowerIsOnFeedback.BoolValue)
+                    UsageTracker.StartDeviceUsage();
+                else
+                    UsageTracker.EndDeviceUsage();
+            }
+        }
+
+        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+
+        /// <summary>
+        /// Raise an event when the status of a switch object changes.
+        /// </summary>
+        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
+        protected void OnSwitchChange(RoutingNumericEventArgs e)
+        {
+            var newEvent = NumericSwitchChange;
+            if (newEvent != null) newEvent(this, e);
+        }
+	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/MockDisplay.cs

@@ -59,6 +59,9 @@ namespace PepperDash.Essentials.Core
 
 			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
 			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
+
+            WarmupTime = 10000;
+            CooldownTime = 5000;
 		}
 
 		public override void PowerOn()

essentials-framework/Essentials Core/PepperDashEssentialsBase/Extensions/JsonExtensions.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Essentials.Core
+{
+    public static class JsonExtensions
+    {
+        public static List<JToken> FindTokens(this JToken containerToken, string name)
+        {
+            List<JToken> matches = new List<JToken>();
+            FindTokens(containerToken, name, matches);
+            return matches;
+        }
+
+        private static void FindTokens(JToken containerToken, string name, List<JToken> matches)
+        {
+            if (containerToken.Type == JTokenType.Object)
+            {
+                foreach (JProperty child in containerToken.Children<JProperty>())
+                {
+                    if (child.Name == name)
+                    {
+                        matches.Add(child.Value);
+                    }
+                    FindTokens(child.Value, name, matches);
+                }
+            }
+            else if (containerToken.Type == JTokenType.Array)
+            {
+                foreach (JToken child in containerToken.Children())
+                {
+                    FindTokens(child, name, matches);
+                }
+            }
+        }
+    }
+}

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

@@ -1,149 +1,208 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharpPro.GeneralIO;
-using Crestron.SimplSharp.Reflection;
+using Crestron.SimplSharp.Reflection;
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core;
+using Newtonsoft.Json.Linq;
-using PepperDash.Essentials.Core.Config;
+using Newtonsoft.Json;
-using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Touchpanels;
+using PepperDash.Essentials.Core.Config;
-
+using PepperDash.Essentials.Core.CrestronIO;
-namespace PepperDash.Essentials.Core
+using PepperDash.Essentials.Core.Touchpanels;
-{
+
-    public class DeviceFactoryWrapper
+namespace PepperDash.Essentials.Core
-    {
+{
-        public CType CType { get; set; }
+    public class DeviceFactoryWrapper
-        public string Description { get; set; }
+    {
-        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
+        public CType CType { get; set; }
-
+        public string Description { get; set; }
-        public DeviceFactoryWrapper()
+        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
-        {
+
-            CType = null;
+        public DeviceFactoryWrapper()
-            Description = "Not Available";
+        {
-        }
+            CType = null;
-    }
+            Description = "Not Available";
-
+        }
-    public class DeviceFactory
+    }
-    {
+
-        public DeviceFactory()
+    public class DeviceFactory
-        {
+    {
-            var assy = Assembly.GetExecutingAssembly();
+        public DeviceFactory()
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
+        {
-
+            var assy = Assembly.GetExecutingAssembly();
-            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
+            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
+
-            if (types != null)
+            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-            {
+
-                foreach (var type in types)
+            if (types != null)
-                {
+            {
-                    try
+                foreach (var type in types)
-                    {
+                {
-                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                    try
-                        factory.LoadTypeFactories();
+                    {
-                    }
+                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                    catch (Exception e)
+                        factory.LoadTypeFactories();
-                    {
+                    }
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
+                    catch (Exception e)
-                    }
+                    {
-                }
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
-            }
+                    }
-        }
+                }
-
+            }
-		/// <summary>
+        }
-		/// A dictionary of factory methods, keyed by config types, added by plugins.
+
-		/// These methods are looked up and called by GetDevice in this class.
+		/// <summary>
-		/// </summary>
+		/// A dictionary of factory methods, keyed by config types, added by plugins.
-		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
+		/// These methods are looked up and called by GetDevice in this class.
-            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
+		/// </summary>
-
+		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
-		/// <summary>
+            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
-		/// Adds a plugin factory method
+
-		/// </summary>
+		/// <summary>
-		/// <param name="dc"></param>
+		/// Adds a plugin factory method
-		/// <returns></returns>
+		/// </summary>
-		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
+		/// <param name="dc"></param>
-		{
+		/// <returns></returns>
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
-            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
+		{
-		}
+			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-
+            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
-        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
+		}
-        {
+
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
-
+        {
-            if(FactoryMethods.ContainsKey(typeName))
+            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-            {
+
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
+            if(FactoryMethods.ContainsKey(typeName))
-                return;
+            {
-            }
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
-
+                return;
-            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
+            }
-            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
+
-        }
+            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
-
+            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
-		/// <summary>
+        }
-		/// The factory method for Core "things". Also iterates the Factory methods that have
+
-		/// been loaded from plugins
+        private static void CheckForSecrets(IEnumerable<JProperty> obj)
-		/// </summary>
+        {
-		/// <param name="dc"></param>
+            foreach (var prop in obj.Where(prop => prop.Value as JObject != null))
-		/// <returns></returns>
+            {
-        public static IKeyed GetDevice(DeviceConfig dc)
+                if (prop.Name.ToLower() == "secret")
-        {
+                {
-            var key = dc.Key;
+                    var secret = GetSecret(prop.Children().First().ToObject<SecretsPropertiesConfig>());
-            var name = dc.Name;
+                    //var secret = GetSecret(JsonConvert.DeserializeObject<SecretsPropertiesConfig>(prop.Children().First().ToString()));
-            var type = dc.Type;
+                    prop.Parent.Replace(secret);
-            var properties = dc.Properties;	
+                }
-
+                var recurseProp = prop.Value as JObject;
-            var typeName = dc.Type.ToLower();
+                if (recurseProp == null) return;
-
+                CheckForSecrets(recurseProp.Properties());
-            // Check for types that have been added by plugin dlls. 
+            }
-            if (FactoryMethods.ContainsKey(typeName))
+        }
-            {
+
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
+        private static string GetSecret(SecretsPropertiesConfig data)
-                return FactoryMethods[typeName].FactoryMethod(dc);
+        {
-            }
+            var secretProvider = SecretsManager.GetSecretProviderByKey(data.Provider);
-
+            if (secretProvider == null) return null;
-            return null;
+            var secret = secretProvider.GetSecret(data.Key);
-        }
+            if (secret != null) return (string) secret.Value;
-
+            Debug.Console(1,
-        /// <summary>
+                "Unable to retrieve secret {0}{1} - Make sure you've added it to the secrets provider",
-        /// Prints the type names and associated metadata from the FactoryMethods collection.
+                data.Provider, data.Key);
-        /// </summary>
+            return String.Empty;
-        /// <param name="command"></param>
+        }
-        public static void GetDeviceFactoryTypes(string filter)
+
-        {
+
-            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+        /// <summary>
-
+        /// The factory method for Core "things". Also iterates the Factory methods that have
-            if (!string.IsNullOrEmpty(filter))
+        /// been loaded from plugins
-            {
+        /// </summary>
-                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
+        /// <param name="dc"></param>
-            }
+        /// <returns></returns>
-            else
+        public static IKeyed GetDevice(DeviceConfig dc)
-            {
+        {
-                types = FactoryMethods;
+            try
-            }
+            {
-
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
-            Debug.Console(0, "Device Types:");
+
-
+                var localDc = new DeviceConfig(dc);
-            foreach (var type in types.OrderBy(t => t.Key))
+
-            {
+                var key = localDc.Key;
-                var description = type.Value.Description;
+                var name = localDc.Name;
-                var cType = "Not Specified by Plugin";
+                var type = localDc.Type;
-
+                var properties = localDc.Properties;
-                if(type.Value.CType != null)
+                //var propRecurse = properties;
-                {
+
-                    cType = type.Value.CType.FullName;
+                var typeName = localDc.Type.ToLower();
-                }
+
-
+
-                Debug.Console(0, 
+                var jObject = properties as JObject;
-                    @"Type: '{0}' 
+                if (jObject != null)
-                    CType: '{1}' 
+                {
-                    Description: {2}", type.Key, cType, description);
+                    var jProp = jObject.Properties();
-            }
+
-        }
+                    CheckForSecrets(jProp);
-    }
+                }
+
+                Debug.Console(2, "typeName = {0}", typeName);
+                // Check for types that have been added by plugin dlls. 
+                return !FactoryMethods.ContainsKey(typeName) ? null : FactoryMethods[typeName].FactoryMethod(localDc);
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
+
+                Debug.Console(2, "{0}", ex.StackTrace);
+
+                if (ex.InnerException == null)
+                {
+                    return null;
+                }
+
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Inner exception while creating device {0}: {1}", dc.Key,
+                    ex.InnerException.Message);
+                Debug.Console(2, "{0}", ex.InnerException.StackTrace);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Prints the type names and associated metadata from the FactoryMethods collection.
+        /// </summary>
+        /// <param name="command"></param>
+        public static void GetDeviceFactoryTypes(string filter)
+        {
+            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+
+            if (!string.IsNullOrEmpty(filter))
+            {
+                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
+            }
+            else
+            {
+                types = FactoryMethods;
+            }
+
+            Debug.Console(0, "Device Types:");
+
+            foreach (var type in types.OrderBy(t => t.Key))
+            {
+                var description = type.Value.Description;
+                var cType = "Not Specified by Plugin";
+
+                if(type.Value.CType != null)
+                {
+                    cType = type.Value.CType.FullName;
+                }
+
+                Debug.Console(0, 
+                    @"Type: '{0}' 
+                    CType: '{1}' 
+                    Description: {2}", type.Key, cType, description);
+            }
+        }
+    }
 }

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

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core
+namespace PepperDash.Essentials.Core
 {
     public class IsReadyEventArgs : EventArgs
     {
@@ -16,6 +17,27 @@ namespace PepperDash_Essentials_Core
         }
     }
 
+    public interface IHasReady
+    {
+        event EventHandler<IsReadyEventArgs> IsReadyEvent;
+        bool IsReady { get; }
+    }
+}
+
+namespace PepperDash_Essentials_Core
+{
+    [Obsolete("Use PepperDash.Essentials.Core")]
+    public class IsReadyEventArgs : EventArgs
+    {
+        public bool IsReady { get; set; }
+
+        public IsReadyEventArgs(bool data)
+        {
+            IsReady = data;
+        }
+    }
+
+    [Obsolete("Use PepperDash.Essentials.Core")]
     public interface IHasReady
     {
         event EventHandler<IsReadyEventArgs> IsReadyEvent;

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

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Core
 
 		protected bool ComputedValue;
 
-		public BoolFeedbackLogic()
+	    protected BoolFeedbackLogic()
 		{
 			Output = new BoolFeedback(() => ComputedValue);
 		}	
@@ -40,21 +40,18 @@ namespace PepperDash.Essentials.Core
 
 		public void AddOutputsIn(List<BoolFeedback> outputs)
 		{
-			foreach (var o in outputs)
+		    foreach (var o in outputs.Where(o => !OutputsIn.Contains(o)))
-			{
+		    {
-				// skip existing
+		        OutputsIn.Add(o);
-				if (OutputsIn.Contains(o)) continue;
+		        o.OutputChange += AnyInput_OutputChange;
-			
+		    }
-				OutputsIn.Add(o);
+		    Evaluate();
-				o.OutputChange += AnyInput_OutputChange;
-			}
-			Evaluate();
 		}
 
-		public void RemoveOutputIn(BoolFeedback output)
+	    public void RemoveOutputIn(BoolFeedback output)
 		{
 			// Don't double up outputs
-			if (OutputsIn.Contains(output)) return;
+			if (!OutputsIn.Contains(output)) return;
 
 			OutputsIn.Remove(output);
 			output.OutputChange -= AnyInput_OutputChange;
@@ -71,6 +68,12 @@ namespace PepperDash.Essentials.Core
 			Evaluate();
 		}
 
+	    public void ClearOutputs()
+	    {
+	        OutputsIn.Clear();
+            Evaluate();
+	    }
+
 		void AnyInput_OutputChange(object sender, EventArgs e)
 		{
 			Evaluate();
@@ -85,11 +88,12 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.All(o => o.BoolValue);
-			if (newValue != prevValue)
+		    if (newValue == prevValue)
-			{
+		    {
-				ComputedValue = newValue;
+		        return;
-				Output.FireUpdate();
+		    }
-			}
+		    ComputedValue = newValue;
+		    Output.FireUpdate();
 		}
 	}
 
@@ -99,33 +103,35 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.Any(o => o.BoolValue);
-			if (newValue != prevValue)
+		    if (newValue == prevValue)
-			{
+		    {
-				ComputedValue = newValue;
+		        return;
-				Output.FireUpdate();
+		    }
-			}
+		    ComputedValue = newValue;
+		    Output.FireUpdate();
 		}
 	}
 
 	public class BoolFeedbackLinq : BoolFeedbackLogic
 	{
-		Func<IEnumerable<BoolFeedback>, bool> Predicate;
+	    readonly Func<IEnumerable<BoolFeedback>, bool> _predicate;
 
 		public BoolFeedbackLinq(Func<IEnumerable<BoolFeedback>, bool> predicate)
 			: base()
 		{
-			Predicate = predicate;
+			_predicate = predicate;
 		}
 
 		protected override void Evaluate()
 		{
 			var prevValue = ComputedValue;
-			var newValue = Predicate(OutputsIn);
+			var newValue = _predicate(OutputsIn);
-			if (newValue != prevValue)
+		    if (newValue == prevValue)
-			{
+		    {
-				ComputedValue = newValue;
+		        return;
-				Output.FireUpdate();
+		    }
-			}
+		    ComputedValue = newValue;
+		    Output.FireUpdate();
 		} 
 	}
 }

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

@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core.Bridges;
+
+
+namespace PepperDash.Essentials.Core.Fusion
+{
+    public class EssentialsHuddleSpaceRoomFusionRoomJoinMap : JoinMapBaseAdvanced
+    {
+
+        // Processor Attributes
+        [JoinName("ProcessorIp1")]
+        public JoinDataComplete ProcessorIp1 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1, AttributeName = "Info - Processor - IP 1" },
+            new JoinMetadata { Description = "Info - Processor - IP 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorIp2")]
+        public JoinDataComplete ProcessorIp2 = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1, AttributeName = "Info - Processor - IP 2" },
+            new JoinMetadata { Description = "Info - Processor - IP 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorGateway")]
+        public JoinDataComplete ProcessorGateway = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1, AttributeName = "Info - Processor - Gateway" },
+            new JoinMetadata { Description = "Info - Processor - Gateway", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorHostname")]
+        public JoinDataComplete ProcessorHostname = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1, AttributeName = "Info - Processor - Hostname" },
+            new JoinMetadata { Description = "Info - Processor - Hostname", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorDomain")]
+        public JoinDataComplete ProcessorDomain = new JoinDataComplete(new JoinData { JoinNumber = 54, JoinSpan = 1, AttributeName = "Info - Processor - Domain" },
+            new JoinMetadata { Description = "Info - Processor - Domain", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorDns1")]
+        public JoinDataComplete ProcessorDns1 = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1, AttributeName = "Info - Processor - DNS 1" },
+            new JoinMetadata { Description = "Info - Processor - DNS 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorDns2")]
+        public JoinDataComplete ProcessorDns2 = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1, AttributeName = "Info - Processor - DNS 2" },
+            new JoinMetadata { Description = "Info - Processor - DNS 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorMac1")]
+        public JoinDataComplete ProcessorMac1 = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1, AttributeName = "Info - Processor - MAC 1" },
+            new JoinMetadata { Description = "Info - Processor - MAC 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorMac2")]
+        public JoinDataComplete ProcessorMac2 = new JoinDataComplete(new JoinData { JoinNumber = 58, JoinSpan = 1, AttributeName = "Info - Processor - MAC 2" },
+            new JoinMetadata { Description = "Info - Processor - MAC 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorNetMask1")]
+        public JoinDataComplete ProcessorNetMask1 = new JoinDataComplete(new JoinData { JoinNumber = 59, JoinSpan = 1, AttributeName = "Info - Processor - Net Mask 1" },
+            new JoinMetadata { Description = "Info - Processor - Net Mask 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorNetMask2")]
+        public JoinDataComplete ProcessorNetMask2 = new JoinDataComplete(new JoinData { JoinNumber = 60, JoinSpan = 1, AttributeName = "Info - Processor - Net Mask 2" },
+            new JoinMetadata { Description = "Info - Processor - Net Mask 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorFirmware")]
+        public JoinDataComplete ProcessorFirmware = new JoinDataComplete(new JoinData { JoinNumber = 61, JoinSpan = 1, AttributeName = "Info - Processor - Firmware" },
+            new JoinMetadata { Description = "Info - Processor - Firmware", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProgramNameStart")]
+        public JoinDataComplete ProgramNameStart = new JoinDataComplete(new JoinData { JoinNumber = 62, JoinSpan = 10, AttributeName = "Info - Processor - Program" },
+            new JoinMetadata { Description = "Info - Processor - Program", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorReboot")]
+        public JoinDataComplete ProcessorReboot = new JoinDataComplete(new JoinData { JoinNumber = 74, JoinSpan = 1, AttributeName = "Processor - Reboot" },
+            new JoinMetadata { Description = "Processor - Reboot", JoinCapabilities = eJoinCapabilities.FromFusion, JoinType = eJoinType.Digital });
+
+        // Volume Controls
+        [JoinName("VolumeFader1")]
+        public JoinDataComplete VolumeFader1 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1, AttributeName = "Volume - Fader01" },
+            new JoinMetadata { Description = "Volume - Fader01", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Analog });
+
+        // Codec Info
+        [JoinName("VcCodecInCall")]
+        public JoinDataComplete VcCodecInCall = new JoinDataComplete(new JoinData { JoinNumber = 69, JoinSpan = 1, AttributeName = "Conf - VC 1 In Call" },
+            new JoinMetadata { Description = "Conf - VC 1 In Call", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("VcCodecOnline")]
+        public JoinDataComplete VcCodecOnline = new JoinDataComplete(new JoinData { JoinNumber = 122, JoinSpan = 1, AttributeName = "Online - VC 1" },
+            new JoinMetadata { Description = "Online - VC 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("VcCodecIpAddress")]
+        public JoinDataComplete VcCodecIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 121, JoinSpan = 1, AttributeName = "IP Address - VC" },
+            new JoinMetadata { Description = "IP Address - VC", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("VcCodecIpPort")]
+        public JoinDataComplete VcCodecIpPort = new JoinDataComplete(new JoinData { JoinNumber = 150, JoinSpan = 1, AttributeName = "IP Port - VC" },
+            new JoinMetadata { Description = "IP Port - VC", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        // Source Attributes 
+        [JoinName("Display1CurrentSourceName")]
+        public JoinDataComplete Display1CurrentSourceName = new JoinDataComplete(new JoinData { JoinNumber = 84, JoinSpan = 1, AttributeName = "Display 1 - Current Source" },
+            new JoinMetadata { Description = "Display 1 - Current Source", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+
+        // Device Online Status
+        [JoinName("TouchpanelOnlineStart")]
+        public JoinDataComplete TouchpanelOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 150, JoinSpan = 10, AttributeName = "Online - Touch Panel" },
+            new JoinMetadata { Description = "Online - Touch Panel", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("XpanelOnlineStart")]
+        public JoinDataComplete XpanelOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 160, JoinSpan = 5, AttributeName = "Online - XPanel" },
+            new JoinMetadata { Description = "Online - XPanel", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("DisplayOnlineStart")]
+        public JoinDataComplete DisplayOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 170, JoinSpan = 10, AttributeName = "Online - Display" },
+            new JoinMetadata { Description = "Online - Display", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("Display1LaptopSourceStart")]
+        public JoinDataComplete Display1LaptopSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 166, JoinSpan = 5, AttributeName = "Display 1 - Source Laptop" },
+            new JoinMetadata { Description = "Display 1 - Source Laptop", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+        
+        [JoinName("Display1DiscPlayerSourceStart")]
+        public JoinDataComplete Display1DiscPlayerSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 181, JoinSpan = 5, AttributeName = "Display 1 - Source Disc Player" },
+            new JoinMetadata { Description = "Display 1 - Source Disc Player", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("Display1SetTopBoxSourceStart")]
+        public JoinDataComplete Display1SetTopBoxSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 188, JoinSpan = 5, AttributeName = "Display 1 - Source TV" },
+            new JoinMetadata { Description = "Display 1 - Source TV", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+
+        // Display 1 
+        [JoinName("Display1Start")]
+        public JoinDataComplete Display1Start = new JoinDataComplete(new JoinData { JoinNumber = 158, JoinSpan = 1 },
+            new JoinMetadata { Description = "Display 1 Start", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+
+
+        /// <summary>
+        /// Constructor to use when instantiating this Join Map without inheriting from it
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        public EssentialsHuddleSpaceRoomFusionRoomJoinMap(uint joinStart)
+            : base(joinStart, typeof(EssentialsHuddleSpaceRoomFusionRoomJoinMap))
+        {
+
+        }
+
+        /// <summary>
+        /// Constructor to use when extending this Join map
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        /// <param name="type">Type of the child join map</param>
+        public EssentialsHuddleSpaceRoomFusionRoomJoinMap(uint joinStart, Type type) : base(joinStart, type)
+        {
+        }
+    }   
+}

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

@@ -82,7 +82,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
                         deviceConfig.Properties = JToken.FromObject(devProps);
                     }
-                    else if (device is EssentialsRoomBase)
+                    else if (device is IEssentialsRoom)
                     {
                         // Set the room name
                         if (!string.IsNullOrEmpty(roomInfo.Name))

essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenRfgwController.cs

@@ -10,9 +10,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash_Essentials_Core;
 
 
 namespace PepperDash.Essentials.Core

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

@@ -26,6 +26,8 @@ namespace PepperDash.Essentials.Core
 
 		public static LicenseManager LicenseManager { get; set; }
 
+        public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
+
         /// <summary>
         /// The file path prefix to the folder containing configuration files
         /// </summary>

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

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharp.Scheduler;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core.Fusion;
+using PepperDash.Essentials.Room.Config;
+using Activator = System.Activator;
 
 namespace PepperDash.Essentials.Core
 {
@@ -14,13 +17,17 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public static class Scheduler
     {
-        private static Dictionary<string, ScheduledEventGroup> EventGroups = new Dictionary<string,ScheduledEventGroup>();
+        private static readonly Dictionary<string, ScheduledEventGroup> EventGroups = new Dictionary<string,ScheduledEventGroup>();
 
         static Scheduler()
         {
             CrestronConsole.AddNewConsoleCommand(ClearEventsFromGroup, "ClearAllEvents", "Clears all scheduled events for this group", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(ListAllEventGroups, "ListAllEventGroups", "Lists all the event groups by key", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(ListAllEventsForGroup, "ListEventsForGroup",
+                "Lists all events for the given group", ConsoleAccessLevelEnum.AccessOperator);
+
         }
 
         /// <summary>
@@ -29,12 +36,26 @@ namespace PepperDash.Essentials.Core
         /// <param name="groupName"></param>
         static void ClearEventsFromGroup(string groupName)
         {
+            if (!EventGroups.ContainsKey(groupName))
+            {
+                Debug.Console(0,
+                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
+                    groupName);
+                return;
+            }
+
             var group = EventGroups[groupName];
 
             if (group != null)
+            {
                 group.ClearAllEvents();
+
+                Debug.Console(0, "[Scheduler]: All events deleted from group '{0}'", groupName);
+            }
             else
-                Debug.Console(0, "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.", groupName);
+                Debug.Console(0,
+                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
+                    groupName);
         }
 
         static void ListAllEventGroups(string command)
@@ -46,10 +67,36 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        static void ListAllEventsForGroup(string args)
+        {
+            Debug.Console(0, "Getting events for group {0}...", args);
+
+            ScheduledEventGroup group;
+
+            if (!EventGroups.TryGetValue(args, out group))
+            {
+                Debug.Console(0, "Unabled to get event group for key {0}", args);
+                return;
+            }
+
+            foreach (var evt in group.ScheduledEvents)
+            {
+                Debug.Console(0,
+                    @"
+****Event key {0}****
+Event date/time: {1}
+Persistent: {2}
+Acknowlegable: {3}
+Recurrence: {4}
+Recurrence Days: {5}
+********************", evt.Key, evt.Value.DateAndTime, evt.Value.Persistent, evt.Value.Acknowledgeable,
+                    evt.Value.Recurrence.Recurrence, evt.Value.Recurrence.RecurrenceDays);
+            }
+        }
+
         /// <summary>
         /// Adds the event group to the global list
         /// </summary>
-        /// <param name="name"></param>
         /// <returns></returns>
         public static void AddEventGroup(ScheduledEventGroup eventGroup)
         {
@@ -67,6 +114,13 @@ namespace PepperDash.Essentials.Core
             if(!EventGroups.ContainsKey(eventGroup.Name))
                 EventGroups.Remove(eventGroup.Name);
         }
+
+        public static ScheduledEventGroup GetEventGroup(string key)
+        {
+            ScheduledEventGroup returnValue;
+
+            return EventGroups.TryGetValue(key, out returnValue) ? returnValue : null;
+        }
     }
 
     public static class SchedulerUtilities
@@ -135,5 +189,90 @@ namespace PepperDash.Essentials.Core
 
             return isMatch;
         }
+
+        public static bool CheckEventTimeForMatch(ScheduledEvent evnt, DateTime time)
+        {
+            return evnt.DateAndTime.Hour == time.Hour && evnt.DateAndTime.Minute == time.Minute;
+        }
+
+        public static bool CheckEventRecurrenceForMatch(ScheduledEvent evnt, ScheduledEventCommon.eWeekDays days)
+        {
+            return evnt.Recurrence.RecurrenceDays == days;
+        }
+
+        public static void CreateEventFromConfig(ScheduledEventConfig config, ScheduledEventGroup group, ScheduledEvent.UserEventCallBack handler)
+        {
+            if (group == null)
+            {
+                Debug.Console(0, "Unable to create event. Group is null");
+                return;
+            }
+            var scheduledEvent = new ScheduledEvent(config.Key, group)
+            {
+                Acknowledgeable = config.Acknowledgeable,
+                Persistent = config.Persistent
+            };
+
+            scheduledEvent.UserCallBack += handler;
+
+            scheduledEvent.DateAndTime.SetFirstDayOfWeek(ScheduledEventCommon.eFirstDayOfWeek.Sunday);
+
+            var eventTime = DateTime.Parse(config.Time);
+
+            if (DateTime.Now > eventTime)
+            {
+                eventTime = eventTime.AddDays(1);
+            }
+
+            Debug.Console(2, "[Scheduler] Current Date day of week: {0} recurrence days: {1}", eventTime.DayOfWeek,
+                config.Days);
+
+            var dayOfWeekConverted = ConvertDayOfWeek(eventTime);
+
+            Debug.Console(1, "[Scheduler] eventTime Day: {0}", dayOfWeekConverted);
+
+            while (!dayOfWeekConverted.IsFlagSet(config.Days))
+            {
+                eventTime = eventTime.AddDays(1);
+
+                dayOfWeekConverted = ConvertDayOfWeek(eventTime);
+            }
+
+            scheduledEvent.DateAndTime.SetAbsoluteEventTime(eventTime);
+
+            scheduledEvent.Recurrence.Weekly(config.Days);
+
+            if (config.Enable)
+            {
+                scheduledEvent.Enable();
+            }
+            else
+            {
+                scheduledEvent.Disable();
+            }
+        }
+
+        private static ScheduledEventCommon.eWeekDays ConvertDayOfWeek(DateTime eventTime)
+        {
+            return (ScheduledEventCommon.eWeekDays) Enum.Parse(typeof(ScheduledEventCommon.eWeekDays), eventTime.DayOfWeek.ToString(), true);
+        }
+
+        private static bool IsFlagSet<T>(this T value, T flag) where T : struct
+        {
+            CheckIsEnum<T>(true);
+
+            var lValue = Convert.ToInt64(value);
+            var lFlag = Convert.ToInt64(flag);
+
+            return (lValue & lFlag) != 0;
+        }
+
+        private static void CheckIsEnum<T>(bool withFlags)
+        {
+            if (!typeof(T).IsEnum)
+                throw new ArgumentException(string.Format("Type '{0}' is not an enum", typeof(T).FullName));
+            if (withFlags && !Attribute.IsDefined(typeof(T), typeof(FlagsAttribute)))
+                throw new ArgumentException(string.Format("Type '{0}' doesn't have the 'Flags' attribute", typeof(T).FullName));
+        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Interfaces/ILogStrings.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStrings : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string
+		/// </summary>
+		void SendToLog(IKeyed device, string logMessage);
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Interfaces/ILogStringsWithLevel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStringsWithLevel : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string with an int level
+		/// </summary>
+		void SendToLog(IKeyed device, Debug.ErrorLogLevel level,string logMessage);
+	}
+
+}

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

@@ -25,7 +25,7 @@ namespace PepperDash.Essentials.Core
 
             var joinMap = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
 
-            return joinMap;
+            return joinMap.ToString();
         }
 
         /// <summary>
@@ -45,16 +45,33 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static Dictionary<string, JoinData> TryGetJoinMapAdvancedForDevice(string joinMapKey)
         {
-            if (string.IsNullOrEmpty(joinMapKey))
+            try
+            {
+                if (string.IsNullOrEmpty(joinMapKey))
+                    return null;
+
+                if (!ConfigReader.ConfigObject.JoinMaps.ContainsKey(joinMapKey))
+                {
+                    Debug.Console(2, "No Join Map found in config with key: '{0}'", joinMapKey);
+                    return null;
+                }
+
+                Debug.Console(2, "Attempting to load custom join map with key: {0}", joinMapKey);
+
+                var joinMapJToken = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
+
+                if (joinMapJToken == null)
+                    return null;
+
+                var joinMapData = joinMapJToken.ToObject<Dictionary<string, JoinData>>();
+
+                return joinMapData;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, "Error getting join map for key: '{0}'.  Error: {1}", joinMapKey, e);
                 return null;
-
+            }
-            var joinMapSerialzed = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
-
-            if (joinMapSerialzed == null) return null;
-
-            var joinMapData = JsonConvert.DeserializeObject<Dictionary<string, JoinData>>(joinMapSerialzed);
-
-            return joinMapData;
         }
 
     }
@@ -216,7 +233,10 @@ namespace PepperDash.Essentials.Core
             }
 
 
-            PrintJoinMapInfo();
+            if (Debug.Level > 0)
+            {
+                PrintJoinMapInfo();
+            }
         }
 
         /// <summary>
@@ -266,7 +286,7 @@ namespace PepperDash.Essentials.Core
                     @"Join Number: {0} | JoinSpan: '{1}' | Description: '{2}' | Type: '{3}' | Capabilities: '{4}'",
                         join.Value.JoinNumber,
                         join.Value.JoinSpan,
-                        String.IsNullOrEmpty(join.Value.Metadata.Description) ? join.Value.Metadata.Label: join.Value.Metadata.Description,
+                        String.IsNullOrEmpty(join.Value.AttributeName) ? join.Value.Metadata.Label : join.Value.AttributeName,
                         join.Value.Metadata.JoinType.ToString(),
                         join.Value.Metadata.JoinCapabilities.ToString());
             }
@@ -288,7 +308,7 @@ namespace PepperDash.Essentials.Core
                 }
                 else
                 {
-                    Debug.Console(2, "No mathcing key found in join map for: '{0}'", customJoinData.Key);
+                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
                 }
             }
 
@@ -327,7 +347,10 @@ namespace PepperDash.Essentials.Core
         None = 0,
         ToSIMPL = 1,
         FromSIMPL = 2,
-        ToFromSIMPL = ToSIMPL | FromSIMPL
+        ToFromSIMPL = ToSIMPL | FromSIMPL,
+        ToFusion = 4,
+        FromFusion = 8,
+        ToFromFusion = ToFusion | FromFusion,
     }
 
     [Flags]
@@ -340,7 +363,7 @@ namespace PepperDash.Essentials.Core
         DigitalAnalog = Digital | Analog,
         DigitalSerial = Digital | Serial,
         AnalogSerial = Analog | Serial,
-        DigitalAnalogSerial = Digital | Analog | Serial
+        DigitalAnalogSerial = Digital | Analog | Serial,
     }
 
     /// <summary>
@@ -394,7 +417,7 @@ namespace PepperDash.Essentials.Core
     }
 
     /// <summary>
-    /// Data describing the join.  Can be 
+    /// Data describing the join.  Can be overridden from configuratino
     /// </summary>
     public class JoinData
     {
@@ -408,6 +431,11 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         [JsonProperty("joinSpan")]
         public uint JoinSpan { get; set; }
+        /// <summary>
+        /// Fusion Attribute Name (optional)
+        /// </summary>
+        [JsonProperty("attributeName")]
+        public string AttributeName { get; set; }
     }
 
     /// <summary>
@@ -419,6 +447,10 @@ namespace PepperDash.Essentials.Core
 
         private JoinData _data;
         public JoinMetadata Metadata { get; set; }
+        /// <summary>
+        /// To store some future information as you please
+        /// </summary>
+        public object UserObject { get; private set; }
 
         public JoinDataComplete(JoinData data, JoinMetadata metadata)
         {
@@ -449,6 +481,11 @@ namespace PepperDash.Essentials.Core
             get { return _data.JoinSpan; }
         }
 
+        public string AttributeName
+        {
+            get { return _data.AttributeName; }
+        }
+
         public void SetCustomJoinData(JoinData customJoinData)
         {
             _data = customJoinData;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs

@@ -88,8 +88,12 @@ namespace PepperDash.Essentials.Core.Privacy
             else
                 Debug.Console(0, this, "Unable to add Red LED device");
 
+            DeviceManager.AllDevicesActivated += (o, a) =>
+                {
+                    CheckPrivacyMode();
+                };
+
             AddPostActivationAction(() => {
-                CheckPrivacyMode();
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
             });

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

@@ -64,30 +64,34 @@ namespace PepperDash.Essentials.Core
 				initialStatus = MonitorStatus.InWarning;
 				prefix = "2:";
 			}
-			else if (InWarning.Count() > 0)
+			else if (IsOk.Count() > 0)
 				initialStatus = MonitorStatus.IsOk;
 			else
 				initialStatus = MonitorStatus.StatusUnknown;
 
 			// Build the error message string
-			if (InError.Count() > 0 || InWarning.Count() > 0)
+            if (InError.Count() > 0 || InWarning.Count() > 0)
-			{
+            {
-				StringBuilder sb = new StringBuilder(prefix);
+                StringBuilder sb = new StringBuilder(prefix);
-				if (InError.Count() > 0)
+                if (InError.Count() > 0)
-				{
+                {
-					// Do string splits and joins 
+                    // Do string splits and joins 
-					sb.Append(string.Format("{0} Errors:", InError.Count()));
+                    sb.Append(string.Format("{0} Errors:", InError.Count()));
-					foreach (var mon in InError)
+                    foreach (var mon in InError)
-						sb.Append(string.Format("{0}, ", mon.Parent.Key));
+                        sb.Append(string.Format("{0}, ", mon.Parent.Key));
-				}
+                }
-				if (InWarning.Count() > 0)
+                if (InWarning.Count() > 0)
-				{
+                {
-					sb.Append(string.Format("{0} Warnings:", InWarning.Count()));
+                    sb.Append(string.Format("{0} Warnings:", InWarning.Count()));
-					foreach (var mon in InWarning)
+                    foreach (var mon in InWarning)
-						sb.Append(string.Format("{0}, ", mon.Parent.Key));
+                        sb.Append(string.Format("{0}, ", mon.Parent.Key));
-				}
+                }
-				Message = sb.ToString();
+                Message = sb.ToString();
-			}
+            }
+            else
+            {
+                Message = "Room Ok.";
+            }
 
 			// Want to fire even if status doesn't change because the message may.
 			Status = initialStatus;