add the PowerIsOnFeedback back to DisplayBase and marked it Obsolete

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/rfi_request.md

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

.github/workflows/docker.yml

@@ -78,9 +78,16 @@ 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  }}
@@ -90,6 +97,7 @@ 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:
@@ -142,3 +150,160 @@ 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

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

PepperDashEssentials/ControlSystem.cs

@@ -12,7 +12,6 @@ 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;
@@ -36,7 +35,6 @@ namespace PepperDash.Essentials
             Thread.MaxNumberOfUserThreads = 400;
             Global.ControlSystem = this;
             DeviceManager.Initialize(this);
-            SecretsManager.Initialize();
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
         }
 
@@ -54,7 +52,7 @@ namespace PepperDash.Essentials
 
             if (Debug.DoNotLoadOnNextBoot)
             {
-                CrestronConsole.AddNewConsoleCommand(s => CrestronInvoke.BeginInvoke((o) => GoWithLoad()), "go", "Loads configuration file",
+                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
@@ -72,7 +70,7 @@ namespace PepperDash.Essentials
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
+                    CrestronConsole.ConsoleCommandResponse("  {0}\r", tl);
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -86,8 +84,8 @@ namespace PepperDash.Essentials
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
-                CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r\n" +
-                    "System URL:   {0}\r\n" +
+                CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
+                    "System URL:   {0}\r" +
                     "Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
             }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -131,46 +129,29 @@ namespace PepperDash.Essentials
 
                 if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                 {
-                    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");
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", Global.AssemblyVersion);
 
                     // Check if User/ProgramX exists
-                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + userFolder
+                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"{0}/program{1} directory found", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
+                        Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // Check if Nvram/Programx exists
-                    else if (Directory.Exists(directoryPrefix + dirSeparator + nvramFolder
+                    else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"{0}/program{1} directory found", nvramFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + nvramFolder
+                        Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // If neither exists, set path to User/ProgramX
                     else
                     {
-                        Debug.Console(0, @"No previous directory found.  Using {0}/program{1}", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
+                        Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                 }
@@ -341,12 +322,7 @@ namespace PepperDash.Essentials
                     // Skip this to prevent unnecessary warnings
                     if (devConf.Key == "processor")
                     {
-                        var prompt = Global.ControlSystem.ControllerPrompt;
-
-                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) &&
-                                        String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase);
-
-                        if (!typeMatch)
+                        if (devConf.Type.ToLower() != Global.ControlSystem.ControllerPrompt.ToLower())
                             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());
@@ -401,11 +377,11 @@ namespace PepperDash.Essentials
 					if (newDev != null)
 						DeviceManager.AddDevice(newDev);
 					else
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
                 }
             }
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
@@ -452,63 +428,32 @@ namespace PepperDash.Essentials
 
             foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
             {
-                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as IEssentialsRoom;
+                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
                 if (room != null)
                 {
-                    // 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)
+                    if (room is EssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, fusionIpId, fusionJoinMapKey));
+                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
 
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
                         CreateMobileControlBridge(room);
                     }
-                    else if (room is IEssentialsHuddleVtc1Room)
+                    else if (room is EssentialsHuddleVtc1Room)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
+                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
                         CreateMobileControlBridge(room);
                     }
-                    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);
-                    }
                     else
                     {
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion");
@@ -524,7 +469,7 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void CreateMobileControlBridge(IEssentialsRoom room)
+        private static void CreateMobileControlBridge(EssentialsRoomBase room)
         {
             var mobileControl = GetMobileControlDevice();
 
@@ -611,7 +556,7 @@ namespace PepperDash.Essentials
                 return ((logoDark != null && logoDark == "system") ||
                         (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
             }
-            catch
+            catch (Exception e)
             {
                 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(IEssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
-            : base(room, ipId, joinMapKey)
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
+            : base(room, ipId)
         {
 
         }
@@ -37,7 +37,7 @@ namespace PepperDash.Essentials.Fusion
         {
             try
             {
-                var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
                 if (codec == null)
                 {
@@ -55,25 +55,25 @@ namespace PepperDash.Essentials.Fusion
                 // Map FusionRoom Attributes:
 
                 // Codec volume
-                var codecVolume = FusionRoom.CreateOffsetUshortSig(JoinMap.VolumeFader1.JoinNumber, JoinMap.VolumeFader1.AttributeName, eSigIoMask.InputOutputSig);
+                var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
                 codecVolume.OutputSig.UserObject = new Action<ushort>(b => (codec as IBasicVolumeWithFeedback).SetVolume(b));
                 (codec as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(codecVolume.InputSig);
 
                 // In Call Status
-                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecInCall.JoinNumber, JoinMap.VcCodecInCall.AttributeName, eSigIoMask.InputSigOnly);
+                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
                 codec.CallStatusChange += new EventHandler<PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
                 
                 // Online status
                 if (codec is ICommunicationMonitor)
                 {
                     var c = codec as ICommunicationMonitor;
-                    var codecOnline = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecOnline.JoinNumber, JoinMap.VcCodecOnline.AttributeName, eSigIoMask.InputSigOnly);
+                    var codecOnline = FusionRoom.CreateOffsetBoolSig(122, "Online - VC 1", eSigIoMask.InputSigOnly);
                     codecOnline.InputSig.BoolValue = c.CommunicationMonitor.Status == MonitorStatus.IsOk;
                     c.CommunicationMonitor.StatusChange += (o, a) =>
                         {
                             codecOnline.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
                         };
-                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, JoinMap.VcCodecOnline.AttributeName);
+                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, "Online - VC 1");
                 }
 
                 // Codec IP Address
@@ -101,10 +101,10 @@ namespace PepperDash.Essentials.Fusion
 
                 if (codecHasIpInfo)
                 {
-                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpAddress.JoinNumber, JoinMap.VcCodecIpAddress.AttributeName, eSigIoMask.InputSigOnly);
+                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
                     codecIpAddressSig.InputSig.StringValue = codecIpAddress;
 
-                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpPort.JoinNumber, JoinMap.VcCodecIpPort.AttributeName, eSigIoMask.InputSigOnly);
+                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
                     codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
                 }
 
@@ -123,7 +123,7 @@ namespace PepperDash.Essentials.Fusion
                     FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
                 }
 
-                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Codec", tempAsset.InstanceId);
+                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
                 codecAsset.PowerOn.OutputSig.UserObject = codecPowerOnAction;
                 codecAsset.PowerOff.OutputSig.UserObject = codecPowerOffAction;
                 codec.StandbyIsOnFeedback.LinkComplementInputSig(codecAsset.PowerOn.InputSig);
@@ -141,7 +141,7 @@ namespace PepperDash.Essentials.Fusion
 
         void codec_CallStatusChange(object sender, PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs e)
         {
-            var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
             CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
         }
@@ -166,19 +166,20 @@ namespace PepperDash.Essentials.Fusion
 
             CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAdHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
 
             // Room to fusion room
             Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
 
             // Moved to 
-            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(JoinMap.Display1CurrentSourceName.JoinNumber, JoinMap.Display1CurrentSourceName.AttributeName, eSigIoMask.InputSigOnly);
+            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as IEssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
+            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as IEssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
  
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
@@ -187,7 +188,7 @@ namespace PepperDash.Essentials.Fusion
         protected override void SetUpSources()
         {
             // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as IEssentialsHuddleVtc1Room).SourceListKey);
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
             if (dict != null)
             {
                 // NEW PROCESS:
@@ -196,9 +197,9 @@ namespace PepperDash.Essentials.Fusion
                 uint i = 1;
                 foreach (var kvp in setTopBoxes)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > JoinMap.Display1SetTopBoxSourceStart.JoinSpan) // We only have five spots
+                    if (i > 5) // We only have five spots
                         break;
                 }
 
@@ -206,7 +207,7 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in discPlayers)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 5) // We only have five spots
                         break;
@@ -216,9 +217,9 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in laptops)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + i, JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > JoinMap.Display1LaptopSourceStart.JoinSpan) // We only have ten spots???
+                    if (i > 10) // We only have ten spots???
                         break;
                 }
 
@@ -238,7 +239,7 @@ namespace PepperDash.Essentials.Fusion
             else
             {
                 Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as IEssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
             }
         }
 
@@ -259,7 +260,7 @@ namespace PepperDash.Essentials.Fusion
                     display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
                 }
 
-                var defaultDisplay = (Room as IEssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -282,7 +283,7 @@ namespace PepperDash.Essentials.Fusion
                 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));
 
@@ -327,12 +328,12 @@ namespace PepperDash.Essentials.Fusion
 
         }
 
-        protected override void MapDisplayToRoomJoins(int displayIndex, uint joinOffset, DisplayBase display)
+        protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
         {
             string displayName = string.Format("Display {0} - ", displayIndex);
 
 
-            if (display == (Room as IEssentialsHuddleVtc1Room).DefaultDisplay)
+            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
             {
                 // Power on
                 var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
@@ -351,7 +352,7 @@ namespace PepperDash.Essentials.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
         }
     }

PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.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

@@ -133,23 +133,19 @@
     <Compile Include="Devices\Amplifier.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="Fusion\EssentialsTechRoomFusionSystemController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\SimplRoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
-    <Compile Include="Room\Config\EssentialsTechRoomConfig.cs" />
     <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
     <Compile Include="Room\Types\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/DDVC01RoomPropertiesConfig.cs

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

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -22,32 +22,37 @@ namespace PepperDash.Essentials.Room.Config
 		public static Device GetRoomObject(DeviceConfig roomConfig)
 		{
 			var typeName = roomConfig.Type.ToLower();
-
 			if (typeName == "huddle")
 			{
-                return new EssentialsHuddleSpaceRoom(roomConfig);
-			}
-		    if (typeName == "huddlevtc1")
-		    {
-		        return new EssentialsHuddleVtc1Room(roomConfig);
-		    }
-		    if (typeName == "ddvc01bridge")
-		    {
-		        return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
-		    }
-		    if (typeName == "dualdisplay")
-		    {
-		        return new EssentialsDualDisplayRoom(roomConfig);
-		    }
+                var huddle = new EssentialsHuddleSpaceRoom(roomConfig);
 
-		    return typeName != "techroom" ? null : new EssentialsTechRoom(roomConfig);
+                return huddle;
+			}
+            else if (typeName == "huddlevtc1")
+            {
+                var rm = new EssentialsHuddleVtc1Room(roomConfig);
+                
+                return rm;
+            }
+			else if (typeName == "ddvc01Bridge")
+			{
+				return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
+			}
+            else if (typeName == "dualdisplay")
+            {
+                var rm = new EssentialsDualDisplayRoom(roomConfig);
+
+                return rm;
+            }
+
+            return null;
 		}
 
         /// <summary>
         /// Gets and operating, standalone emergegncy object that can be plugged into a room.
         /// Returns null if there is no emergency defined
         /// </summary>
-        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, IEssentialsRoom room)
+        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, EssentialsRoomBase room)
         {
             // This emergency 
             var emergency = props.Emergency;
@@ -96,7 +101,7 @@ namespace PepperDash.Essentials.Room.Config
 			if (behaviour == "trackroomstate")
 			{
 				// Tie LED enable to room power state
-                var essRoom = room as IEssentialsRoom;
+                var essRoom = room as EssentialsRoomBase;
                 essRoom.OnFeedback.OutputChange += (o, a) =>
 				{
                     if (essRoom.OnFeedback.BoolValue)
@@ -177,9 +182,6 @@ 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; }
 
@@ -196,20 +198,9 @@ 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
@@ -234,32 +225,6 @@ 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

@@ -1,72 +0,0 @@
-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/Emergency/EsentialsRoomEmergencyContactClosure.cs

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

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -274,23 +274,10 @@ namespace PepperDash.Essentials
 
             CallTypeFeedback = new IntFeedback(() => 0);
 
-            SetSourceListKey();
+            SourceListKey = "default";
             EnablePowerOnToLastSource = true;
         }
 
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
-            }
-
-        }
-
         void InitializeDisplay(DisplayBase disp)
         {
             if (disp != null)
@@ -346,6 +333,7 @@ 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);
 
@@ -645,9 +633,9 @@ namespace PepperDash.Essentials
         public static void AllRoomsOff()
         {
             var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsHuddleSpaceRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+                d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
             foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as IEssentialsHuddleSpaceRoom).SourceListKey);
+                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as EssentialsHuddleSpaceRoom).SourceListKey);
         }
 
         #region IPrivacy Members

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -13,7 +13,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IEssentialsHuddleSpaceRoom
+    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
@@ -201,25 +201,11 @@ 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());
@@ -270,6 +256,7 @@ 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);
 

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, IEssentialsHuddleVtc1Room
-    {
-        private bool _codecExternalSourceChange;
+    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
+        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
+	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
 
@@ -51,6 +51,20 @@ namespace PepperDash.Essentials
 
         //************************
 
+		public override string SourceListKey
+		{
+			get
+			{
+				return _SourceListKey;
+			}
+			set
+			{
+				_SourceListKey = value;
+				SetCodecExternalSources();
+				
+			}
+		}
+
         protected override Func<bool> OnFeedbackFunc
         {
             get
@@ -178,12 +192,10 @@ namespace PepperDash.Essentials
 					handler(_CurrentSourceInfo, ChangeType.DidChange);
 
                 var vc = VideoCodec as IHasExternalSourceSwitching;
-                if (vc != null && !_codecExternalSourceChange)
+                if (vc != null)
                 {
                     vc.SetSelectedSource(CurrentSourceInfoKey);
                 }
-
-			    _codecExternalSourceChange = false;
 			}
 		}
 		SourceListItem _CurrentSourceInfo;
@@ -326,8 +338,7 @@ namespace PepperDash.Essentials
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
-                SetSourceListKey();
-
+                SourceListKey = "default";
                 EnablePowerOnToLastSource = true;
             }
             catch (Exception e)
@@ -336,21 +347,6 @@ 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());
@@ -374,14 +370,13 @@ 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>
@@ -423,12 +418,6 @@ namespace PepperDash.Essentials
             return true;
         }
 
-        public void RunRouteActionCodec(string routeKey, string sourceListKey)
-        {
-            _codecExternalSourceChange = true;
-            RunRouteAction(routeKey, sourceListKey);
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -608,21 +597,12 @@ namespace PepperDash.Essentials
                         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
@@ -732,10 +712,10 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public static void AllRoomsOff()
 		{
-			var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+			var allRooms = DeviceManager.AllDevices.Where(d => 
+				d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
 			foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
+				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
 		}
 
 
@@ -758,7 +738,7 @@ namespace PepperDash.Essentials
                     x => x.DestinationKey == VideoCodec.Key && x.DestinationPort == videoCodecWithExternalSwitching.ExternalSourceInputPort).DestinationPort;
 
                 videoCodecWithExternalSwitching.ClearExternalSources();
-                videoCodecWithExternalSwitching.RunRouteAction = RunRouteActionCodec;
+                videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
                 var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
                 foreach (var kvp in srcList)

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

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

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

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -764,10 +764,6 @@ 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(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
             
 //        }
 
-//        void CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = PendingSource.PreferredName;
 
 //        }
 
-//        void CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase 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, IEssentialsRoom currentRoom)
+        void SetUpGear(IAVDriver avDriver, EssentialsRoomBase currentRoom)
         {
             // Gear
             TriList.SetString(UIStringJoin.HeaderButtonIcon5, "Gear");
@@ -105,7 +105,7 @@ namespace PepperDash.Essentials
             {
                 string message = null;
                 var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
-                    as IEssentialsHuddleSpaceRoom;
+                    as EssentialsHuddleSpaceRoom;
                 if (room != null)
                     message = room.PropertiesConfig.HelpMessage;
                 else
@@ -207,7 +207,6 @@ 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)
@@ -222,7 +221,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleVtc1Room type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, IEssentialsHuddleVtc1Room currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, EssentialsHuddleVtc1Room currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 
@@ -284,7 +283,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleSpaceRoom type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, IEssentialsHuddleSpaceRoom currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, EssentialsHuddleSpaceRoom currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 

PepperDashEssentials/UIDrivers/Essentials/EssentialsPresentationPanelAvFunctionsDriver.cs

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

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -78,7 +78,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// 
 		/// </summary>
-		public IEssentialsHuddleSpaceRoom CurrentRoom
+		public EssentialsHuddleSpaceRoom CurrentRoom
 		{
 			get { return _CurrentRoom; }
 			set
@@ -86,7 +86,7 @@ namespace PepperDash.Essentials
 				SetCurrentRoom(value);
 			}
 		}
-		IEssentialsHuddleSpaceRoom _CurrentRoom;
+		EssentialsHuddleSpaceRoom _CurrentRoom;
 
         /// <summary>
         /// 
@@ -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 as IRunDefaultPresentRoute).RunDefaultPresentRoute();
+                CurrentRoom.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);
+			CurrentRoom.RunRouteAction(key, new Action(() => { }));
 		}
 
 		/// <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(IEssentialsHuddleSpaceRoom room)
+        public void RefreshCurrentRoom(EssentialsHuddleSpaceRoom room)
         {
             if (_CurrentRoom != null)
             {
@@ -836,7 +836,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void SetCurrentRoom(IEssentialsHuddleSpaceRoom room)
+		void SetCurrentRoom(EssentialsHuddleSpaceRoom room)
 		{
 			if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -871,7 +871,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(IEssentialsHuddleSpaceRoom room)
+        void UpdateMCJoins(EssentialsHuddleSpaceRoom room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -50,7 +50,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 
         /// </summary>
-        public IEssentialsHuddleVtc1Room CurrentRoom
+        public EssentialsHuddleVtc1Room CurrentRoom
         {
             get { return _CurrentRoom; }
             set
@@ -58,7 +58,7 @@ namespace PepperDash.Essentials
                 SetCurrentRoom(value);
             }
         }
-        IEssentialsHuddleVtc1Room _CurrentRoom;
+        EssentialsHuddleVtc1Room _CurrentRoom;
 
         /// <summary>
         /// For hitting feedbacks
@@ -652,7 +652,7 @@ namespace PepperDash.Essentials
 				if (!CurrentRoom.OnFeedback.BoolValue)
 				{
 					// If there's no default, show UI elements
-					if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
+					if (!CurrentRoom.RunDefaultPresentRoute())
 						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
 				}
             }
@@ -743,7 +743,7 @@ namespace PepperDash.Essentials
         void UiSelectSource(string key)
         {
             // Run the route and when it calls back, show the source
-            CurrentRoom.RunRouteAction(key);
+            CurrentRoom.RunRouteAction(key, new Action(() => { }));
         }
 
         /// <summary>
@@ -894,7 +894,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        void RefreshCurrentRoom(IEssentialsHuddleVtc1Room room)
+        void RefreshCurrentRoom(EssentialsHuddleVtc1Room room)
         {
 
             if (_CurrentRoom != null)
@@ -969,7 +969,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void SetCurrentRoom(IEssentialsHuddleVtc1Room room)
+        void SetCurrentRoom(EssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -1004,7 +1004,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(IEssentialsHuddleVtc1Room room)
+        void UpdateMCJoins(EssentialsHuddleVtc1Room room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -1035,7 +1035,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.RunRouteAction("codecOsd", CurrentRoom.SourceListKey);
 				}
 			}
 
@@ -1443,7 +1443,7 @@ namespace PepperDash.Essentials
     /// </summary>
     public interface IAVWithVCDriver : IAVDriver
     {
-        IEssentialsHuddleVtc1Room CurrentRoom { get; }
+        EssentialsHuddleVtc1Room 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(IEssentialsHuddleSpaceRoom room)
+		public void SetFeedbackForRoom(EssentialsHuddleSpaceRoom room)
 		{
 			var itemToSet = Items.FirstOrDefault(i => i.Room == room);
 			if (itemToSet != null)
@@ -48,11 +48,11 @@ namespace PepperDash.Essentials
 
 	public class SmartObjectRoomsListItem
 	{
-		public IEssentialsHuddleSpaceRoom Room { get; private set; }
+		public EssentialsHuddleSpaceRoom Room { get; private set; }
 		SmartObjectRoomsList Parent;
 		public uint Index { get; private set; }
 
-		public SmartObjectRoomsListItem(IEssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
+		public SmartObjectRoomsListItem(EssentialsHuddleSpaceRoom 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(IEssentialsRoom room, SourceListItem info, ChangeType type);
+    //public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
 }

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, ICommunicationMonitor
+    public class EiscApiAdvanced : BridgeApi
     {
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
@@ -98,35 +98,13 @@ 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);
@@ -152,14 +130,6 @@ namespace PepperDash.Essentials.Core.Bridges
                     bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                 }
             }
-        }
-
-        private void RegisterEisc()
-        {
-            if (Eisc.Registered)
-            {
-                return;
-            }
 
             var registerResult = Eisc.Register();
 
@@ -172,31 +142,6 @@ 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>
@@ -335,12 +280,6 @@ 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
@@ -351,9 +290,6 @@ namespace PepperDash.Essentials.Core.Bridges
         [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
-        [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
-
 
         public class ApiDevicePropertiesConfig
         {
@@ -367,25 +303,13 @@ 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", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -403,16 +327,6 @@ 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,14 +76,6 @@ 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 PIR Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Occ Sensor Ultrasonic 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,274 +1,131 @@
 using System;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Core.Bridges.JoinMaps
-{
-    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
-        /// </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
+	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("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("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("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("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("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("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("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
-            });
+		[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))
-        {
+		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

@@ -1,222 +0,0 @@
-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
-{
-    public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
-    {
+namespace PepperDash.Essentials.Core.Bridges
+{
+    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,10 +11,8 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
-	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
+    public class CecPortController : Device, IBasicCommunication
     {
-		public CommunicationStreamDebugging StreamDebugging { get; private set; }
-
         public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
         public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
@@ -25,8 +23,6 @@ namespace PepperDash.Essentials.Core
         public CecPortController(string key, Func<EssentialsControlPropertiesConfig, ICec> postActivationFunc,
             EssentialsControlPropertiesConfig config):base(key)
         {
-			StreamDebugging = new CommunicationStreamDebugging(key);
-
             AddPostActivationAction(() =>
             {
                 Port = postActivationFunc(config);
@@ -54,21 +50,15 @@ 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 (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.Console(0, this, "Received: '{0}'", s);
-				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
-			}
+            if (textHandler != null)
+                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
         }
 
         #region IBasicCommunication Members
@@ -77,8 +67,6 @@ 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;
         }
 
@@ -87,8 +75,6 @@ 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,11 +56,6 @@ 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();
@@ -92,20 +87,18 @@ 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)
-					Debug.Console(0, this, "Received: '{0}'", s);
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    Debug.Console(0, this, "Recevied: '{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,Debug.ErrorLogLevel.Notice, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			Debug.Console(0, "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,6 +47,13 @@ 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,7 +25,6 @@ namespace PepperDash.Essentials.Core
         public GenericComm(DeviceConfig config)
             : base(config)
         {
-
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
 
             var commPort = CommFactory.CreateCommForDevice(config);
@@ -97,6 +96,7 @@ 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,6 +33,7 @@ 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)
 		{
@@ -40,6 +41,7 @@ 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)
@@ -48,6 +50,7 @@ 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)
@@ -60,6 +63,10 @@ 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,8 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Newtonsoft.Json;
-
-using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -20,24 +23,11 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
 
-        [JsonProperty("destinationLists")]
-        public Dictionary<string, Dictionary<string,DestinationListItem>> DestinationLists { get; set; }
-
-        [JsonProperty("tieLines")]
+		[JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }
 
         [JsonProperty("joinMaps")]
-        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>();
-        }
+        public Dictionary<string, string> JoinMaps { get; set; }
 
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
@@ -50,21 +40,6 @@ 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,19 +30,7 @@ namespace PepperDash.Essentials.Core.Config
 
         [JsonProperty("properties")]
         [JsonConverter(typeof(DevicePropertiesConverter))]
-        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() {}
+        public JToken Properties { get; set; }
     }
 
     /// <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.CrestronIO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Core.Config;
-
-namespace PepperDash.Essentials.Core.Config
-{
-	/// <summary>
-	/// Loads the ConfigObject from the file
-	/// </summary>
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Core.Config;
+
+namespace PepperDash.Essentials.Core.Config
+{
+	/// <summary>
+	/// Loads the ConfigObject from the file
+	/// </summary>
 	public class ConfigReader
 	{
 	    public const string LocalConfigPresent =
             @"
 ***************************************************
 ************* Using Local config file *************
-***************************************************";
-
-		public static EssentialsConfig ConfigObject { get; private set; }
-
-		public static bool LoadConfig2()
-		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
-			try
-			{
-                // Check for local config file first
-                var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
-
-                bool localConfigFound = false;
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
-
-                // Check for local config directory first
-
-                var configFiles = GetConfigFiles(filePath);
-
-                if (configFiles != null)
-                {
-                    if (configFiles.Length > 1)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                            "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
-                        return false;
-                    }
-                    if(configFiles.Length == 1)
-                    {
+***************************************************";
+
+		public static EssentialsConfig ConfigObject { get; private set; }
+
+		public static bool LoadConfig2()
+		{
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
+			try
+			{
+                // Check for local config file first
+                var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
+
+                bool localConfigFound = false;
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
+
+                // Check for local config directory first
+
+                var configFiles = GetConfigFiles(filePath);
+
+                if (configFiles != null)
+                {
+                    if (configFiles.Length > 1)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                            "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
+                        return false;
+                    }
+                    if(configFiles.Length == 1)
+                    {
                         localConfigFound = true;
-                        
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                        "Local Configuration file not present.", filePath);
-
-                }
-
-                // Check for Portal Config
-                if(!localConfigFound)
-                {
-                    filePath = Global.FilePathPrefix + Global.ConfigFileName;
-
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
-
-                    configFiles = GetConfigFiles(filePath);
-
-                    if (configFiles != null)
-                    {
-                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
-
-                        if (configFiles.Length > 1)
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Error,
-                                "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
-                            return false;
-                        }
-                        else if (configFiles.Length == 1)
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
-                        }
-                        else
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                            "ERROR: Portal Configuration file not present. Please load file and reset program.");
-                        return false;
-                    }
-                }
-
-                // Get the actual file path
+                        
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                        "Local Configuration file not present.", filePath);
+
+                }
+
+                // Check for Portal Config
+                if(!localConfigFound)
+                {
+                    filePath = Global.FilePathPrefix + Global.ConfigFileName;
+
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
+
+                    configFiles = GetConfigFiles(filePath);
+
+                    if (configFiles != null)
+                    {
+                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
+
+                        if (configFiles.Length > 1)
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Error,
+                                "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
+                            return false;
+                        }
+                        else if (configFiles.Length == 1)
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
+                        }
+                        else
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                            "ERROR: Portal Configuration file not present. Please load file and reset program.");
+                        return false;
+                    }
+                }
+
+                // Get the actual file path
                 filePath = configFiles[0].FullName;
 
                 // Generate debug statement if using a local file.
 			    if (localConfigFound)
 			    {
                     GetLocalFileMessage(filePath);
-			    }
-
-                // Read the file
-                using (StreamReader fs = new StreamReader(filePath))
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
-
-                    if (localConfigFound)
-                    {
-                        ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
-
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
-
-                        return true;
-                    }
-                    else
-                    {
-                        var doubleObj = JObject.Parse(fs.ReadToEnd());
-                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
-
-                        // Extract SystemUrl and TemplateUrl into final config output
-
-                        if (doubleObj["system_url"] != null)
-                        {
-                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
-                        }
-
-                        if (doubleObj["template_url"] != null)
-                        {
-                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
-                        }
-                    }
-
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
-
-                    return true;
-                }
-			}
-			catch (Exception e)
-			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
-				return false;
-			}
-		}
-
-        /// <summary>
-        /// Returns all the files from the directory specified.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        public static FileInfo[] GetConfigFiles(string filePath)
-        {
-            // Get the directory
-            var dir = Path.GetDirectoryName(filePath);
-
-            if (Directory.Exists(dir))
-            {
-                Debug.Console(1, "Searching in Directory '{0}'", dir);
-                // Get the directory info
-                var dirInfo = new DirectoryInfo(dir);
-
-                // Get the file name
-                var fileName = Path.GetFileName(filePath);
-                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
-
-                // Get the files that match from the directory
-                return dirInfo.GetFiles(fileName);
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                    "Directory not found: ", dir);
-
-                return null;
-            }
-        }
-
-		/// <summary>
-		/// Returns the group for a given device key in config
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-        public static string GetGroupForDeviceKey(string key)
-        {
-            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-            return dev == null ? null : dev.Group;
+			    }
+
+                // Read the file
+                using (StreamReader fs = new StreamReader(filePath))
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
+
+                    if (localConfigFound)
+                    {
+                        ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
+
+                        return true;
+                    }
+                    else
+                    {
+                        var doubleObj = JObject.Parse(fs.ReadToEnd());
+                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
+
+                        // Extract SystemUrl and TemplateUrl into final config output
+
+                        if (doubleObj["system_url"] != null)
+                        {
+                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
+                        }
+
+                        if (doubleObj["template_url"] != null)
+                        {
+                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
+                        }
+                    }
+
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
+
+                    return true;
+                }
+			}
+			catch (Exception e)
+			{
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
+				return false;
+			}
+		}
+
+        /// <summary>
+        /// Returns all the files from the directory specified.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
+        public static FileInfo[] GetConfigFiles(string filePath)
+        {
+            // Get the directory
+            var dir = Path.GetDirectoryName(filePath);
+
+            if (Directory.Exists(dir))
+            {
+                Debug.Console(1, "Searching in Directory '{0}'", dir);
+                // Get the directory info
+                var dirInfo = new DirectoryInfo(dir);
+
+                // Get the file name
+                var fileName = Path.GetFileName(filePath);
+                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
+
+                // Get the files that match from the directory
+                return dirInfo.GetFiles(fileName);
+            }
+            else
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                    "Directory not found: ", dir);
+
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Returns the group for a given device key in config
+		/// </summary>
+		/// <param name="key"></param>
+		/// <returns></returns>
+        public static string GetGroupForDeviceKey(string key)
+        {
+            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+            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.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Config
-{
-    /// <summary>
-    /// Responsible for updating config at runtime, and writing the updates out to a local file
-    /// </summary>
-    public class ConfigWriter
-    {
-        public const string LocalConfigFolder = "LocalConfig";
-
-        public const long WriteTimeout = 30000;
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    /// <summary>
+    /// Responsible for updating config at runtime, and writing the updates out to a local file
+    /// </summary>
+    public class ConfigWriter
+    {
+        public const string LocalConfigFolder = "LocalConfig";
+
+        public const long WriteTimeout = 30000;
+
         public static CTimer WriteTimer;
-		static CCriticalSection fileLock = new CCriticalSection();
-
-        /// <summary>
-        /// Updates the config properties of a device
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="properties"></param>
-        /// <returns></returns>
-        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
-        {
-            bool success = false;
-
-            // Get the current device config
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
-
-            if (deviceConfig != null)
-            {
-                // Replace the current properties JToken with the new one passed into this method
-                deviceConfig.Properties = properties;
-
-                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        public static bool UpdateDeviceConfig(DeviceConfig config)
-        {
-            bool success = false;
-
-            var deviceConfigIndex = ConfigReader.ConfigObject.Devices.FindIndex(d => d.Key.Equals(config.Key));
-
-            if (deviceConfigIndex >= 0)
-            {
-                ConfigReader.ConfigObject.Devices[deviceConfigIndex] = config;
-
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        public static bool UpdateRoomConfig(DeviceConfig config)
-        {
-            bool success = false;
-
-			var roomConfigIndex = ConfigReader.ConfigObject.Rooms.FindIndex(d => d.Key.Equals(config.Key));
-
-			if (roomConfigIndex >= 0)
-            {
-                ConfigReader.ConfigObject.Rooms[roomConfigIndex] = config;
-
-                Debug.Console(1, "Updated room of device: '{0}'", config.Key);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        /// <summary>
-        /// Resets (or starts) the write timer
-        /// </summary>
-        static void ResetTimer()
-        {
-            if (WriteTimer == null)
-                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
-
-            WriteTimer.Reset(WriteTimeout);
-
-            Debug.Console(1, "Config File write timer has been reset.");
-        }
-
-        /// <summary>
-        /// Writes the current config to a file in the LocalConfig subfolder
-        /// </summary>
-        /// <returns></returns>
-        private static void WriteConfigFile(object o)
-        {
-            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
-
-            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
-
-            WriteFile(filePath, configData);
-        }
-
-        /// <summary>
-        /// Writes
-        /// </summary>
-        /// <param name="filepath"></param>
-        /// <param name="o"></param>
-        public static void WriteFile(string filePath, string configData)
-        {
-            if (WriteTimer != null)
-                WriteTimer.Stop();
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
-
-            try
-            {
-                if (fileLock.TryEnter())
-                {
-                    using (StreamWriter sw = new StreamWriter(filePath))
-                    {
-                        sw.Write(configData);
-                        sw.Flush();
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
-
-            }
-        }
-
-
-    }
+		static CCriticalSection fileLock = new CCriticalSection();
+
+        /// <summary>
+        /// Updates the config properties of a device
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <param name="properties"></param>
+        /// <returns></returns>
+        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
+        {
+            bool success = false;
+
+            // Get the current device config
+            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
+
+            if (deviceConfig != null)
+            {
+                // Replace the current properties JToken with the new one passed into this method
+                deviceConfig.Properties = properties;
+
+                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        public static bool UpdateDeviceConfig(DeviceConfig config)
+        {
+            bool success = false;
+
+            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(config.Key));
+
+            if (deviceConfig != null)
+            {
+                deviceConfig = config;
+
+                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        public static bool UpdateRoomConfig(DeviceConfig config)
+        {
+            bool success = false;
+
+            var deviceConfig = ConfigReader.ConfigObject.Rooms.FirstOrDefault(d => d.Key.Equals(config.Key));
+
+            if (deviceConfig != null)
+            {
+                deviceConfig = config;
+
+                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        /// <summary>
+        /// Resets (or starts) the write timer
+        /// </summary>
+        static void ResetTimer()
+        {
+            if (WriteTimer == null)
+                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
+
+            WriteTimer.Reset(WriteTimeout);
+
+            Debug.Console(1, "Config File write timer has been reset.");
+        }
+
+        /// <summary>
+        /// Writes the current config to a file in the LocalConfig subfolder
+        /// </summary>
+        /// <returns></returns>
+        private static void WriteConfigFile(object o)
+        {
+            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
+
+            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
+
+            WriteFile(filePath, configData);
+        }
+
+        /// <summary>
+        /// Writes
+        /// </summary>
+        /// <param name="filepath"></param>
+        /// <param name="o"></param>
+        public static void WriteFile(string filePath, string configData)
+        {
+            if (WriteTimer != null)
+                WriteTimer.Stop();
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
+
+            try
+            {
+                if (fileLock.TryEnter())
+                {
+                    using (StreamWriter sw = new StreamWriter(filePath))
+                    {
+                        sw.Write(configData);
+                        sw.Flush();
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
+            }
+            finally
+            {
+                if (fileLock != null && !fileLock.Disposed)
+                    fileLock.Leave();
+
+            }
+        }
+
+
+    }
 }

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

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

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

@@ -130,12 +130,6 @@ 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/DeviceTypeInterfaces/IHasBranding.cs

@@ -1,20 +1,8 @@
-using System;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+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,22 +1,7 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace 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);
-    }
-}
+using PepperDash.Essentials.Core;
 
 namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
     public interface IHasPhoneDialing
     {
         BoolFeedback PhoneOffHookFeedback { get; }

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

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

@@ -8,7 +8,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
     }
@@ -20,10 +20,6 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     {
         event EventHandler<EventArgs> UserCodeChanged;
 
-        event EventHandler<EventArgs> UserPromptedForCode;
-
-        event EventHandler<EventArgs> ClientJoined;
-
         string UserCode { get; }
 
         string QrCodeUrl { 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:IKeyed
+	public interface INumericKeypad
 	{
 		void Digit0(bool pressRelease);
 		void Digit1(bool pressRelease);

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 TvPresets { get; }
+		PepperDash.Essentials.Core.Presets.DevicePresetsModel PresetsModel { get; }
 		void LoadPresets(string filePath);
 
 		void DvrList(bool pressRelease);

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

@@ -1,9 +0,0 @@
-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,20 +1,7 @@
-using System;
-using PepperDash.Core;
-
-namespace 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; }
-    }
-}
+using PepperDash.Core;
 
 namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
     public class LanguageLabel
     {
         public string Key { get; set; }

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

@@ -1,54 +0,0 @@
-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,23 +20,8 @@ namespace PepperDash.Essentials.Core
 		/// <param name="json"></param>
 		public static void DoDeviceActionWithJson(string json)
 		{
-		    if (String.IsNullOrEmpty(json))
-		    {
-		        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]}");
-		    }
-		    
+			var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
+			DoDeviceAction(action);
 		}
 
 
@@ -48,65 +33,31 @@ namespace PepperDash.Essentials.Core
 		{
 			var key = action.DeviceKey;
 			var obj = FindObjectOnPath(key);
-		    if (obj == null)
-		    {
-		        CrestronConsole.ConsoleCommandResponse("Unable to find object at path {0}", key);
-		        return;
-		    }
+			if (obj == null)
+				return;
 
-		    if (action.Params == null)
-		    {
-                //no params, so setting action.Params to empty array
-		        action.Params = new object[0];
-		    }
-
-		    CType t = obj.GetType();
-		    try
-		    {
-		        var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();
-
-		        var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);
-
-		        if (method == null)
-		        {
-		            CrestronConsole.ConsoleCommandResponse(
-		                "Unable to find method with name {0} and that matches parameters {1}", action.MethodName,
-		                action.Params);
-		            return;
-		        }
-                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);}
+			CType t = obj.GetType();
+			var method = t.GetMethod(action.MethodName);
+			if (method == null)
+			{
+				Debug.Console(0, "Method '{0}' not found", action.MethodName);
+				return;
+			}
+			var mParams = method.GetParameters();
+			// Add empty params if not provided
+			if (action.Params == null) action.Params = new object[0];
+			if (mParams.Length > action.Params.Length)
+			{
+				Debug.Console(0, "Method '{0}' requires {1} params", action.MethodName, mParams.Length);
+				return;
+			}
+			object[] convertedParams = mParams
+								.Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
+									System.Globalization.CultureInfo.InvariantCulture))
+								.ToArray();
+			object ret = method.Invoke(obj, convertedParams);
 		}
 
-	    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>
@@ -132,13 +83,13 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static object GetPropertyByName(string deviceObjectPath, string propertyName)
         {
-            var dev = FindObjectOnPath(deviceObjectPath);
-            if(dev == null)
+            var obj = FindObjectOnPath(deviceObjectPath);
+            if(obj == null)
                 return "{ \"error\":\"No Device\"}";
-	
-            object prop = dev.GetType().GetCType().GetProperty(propertyName).GetValue(dev, null);
 
-            // var prop = t.GetProperty(propertyName);
+            CType t = obj.GetType();
+
+            var prop = t.GetProperty(propertyName);
             if (prop != null)
             {
                 return prop;
@@ -291,8 +242,6 @@ 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

@@ -46,7 +46,7 @@ namespace PepperDash.Essentials.Core
             CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
                 "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(SetDeviceStreamDebugging, "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "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);
         }
 
@@ -360,9 +360,9 @@ namespace PepperDash.Essentials.Core
 	    {
 	        var device = GetDeviceForKey(s);
 
-            if (device == null) return;
-            var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
-            var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
+	        if (device == null) return;
+	        var inputPorts = (device as IRoutingInputsOutputs).InputPorts;
+	        var outputPorts = (device as IRoutingInputsOutputs).OutputPorts;
 	        if (inputPorts != null)
 	        {
 	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
@@ -387,15 +387,6 @@ namespace PepperDash.Essentials.Core
         /// <param name="s"></param>
         public static void SetDeviceStreamDebugging(string s)
         {
-            if (String.IsNullOrEmpty(s) || s.Contains("?"))
-            {
-                CrestronConsole.ConsoleCommandResponse(
-                    @"SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]
-    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use
-    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
-                return;
-            }
-
             var args = s.Split(' ');
 
             var deviceKey = args[0];
@@ -435,7 +426,7 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)
@@ -446,7 +437,7 @@ namespace PepperDash.Essentials.Core
             else
             {
                 device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                Debug.Console(0, "Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
+                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

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

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

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

@@ -1,19 +0,0 @@
-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,15 +7,13 @@ 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, IReconfigurableDevice
+    public abstract class ReconfigurableDevice : EssentialsDevice
     {
         public event EventHandler<EventArgs> ConfigChanged;
 
@@ -54,8 +52,6 @@ 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,24 +130,10 @@ 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,7 +20,7 @@ namespace PepperDash.Essentials.Core
 		public IrOutputPortController IrPort { get; private set; }
 		public ushort IrPulseTime { get; set; }
 
-        [Obsolete("This property will be removed in version 2.0.0")]
+        [Obsolete("This property will be removed")]
         public override BoolFeedback PowerIsOnFeedback { get; protected set; }
 
         protected Func<bool> PowerIsOnFeedbackFunc

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

@@ -18,10 +18,13 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// 
 	/// </summary>
-    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking, IPower
+    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking
 	{
         public event SourceInfoChangeHandler CurrentSourceChange;
 
+        [Obsolete("This will be removed soon. Please update references")]
+        public abstract BoolFeedback PowerIsOnFeedback { get; protected set; }
+
         public string CurrentSourceInfoKey { get; set; }
         public SourceListItem CurrentSourceInfo
         {
@@ -49,9 +52,6 @@ namespace PepperDash.Essentials.Core
 		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
 		public BoolFeedback IsWarmingUpFeedback { get; private set; }
 
-        [Obsolete("This property will be removed in version 2.0.0")]
-        public abstract BoolFeedback PowerIsOnFeedback { get; protected set; }
-
         public UsageTracking UsageTracker { get; set; }
 
 		public uint WarmupTime { get; set; }
@@ -84,6 +84,8 @@ namespace PepperDash.Essentials.Core
 
 		}
 
+
+
 		public abstract void PowerOn();
 		public abstract void PowerOff();
 		public abstract void PowerToggle();
@@ -100,7 +102,7 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-	    public abstract void ExecuteSwitch(object selector);
+		public abstract void ExecuteSwitch(object selector);
 
 	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
 	        EiscApiAdvanced bridge)
@@ -263,7 +265,6 @@ namespace PepperDash.Essentials.Core
         abstract protected Func<string> CurrentInputFeedbackFunc { get; }
 
         public override BoolFeedback PowerIsOnFeedback { get; protected set; }
-
         abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
 
 
@@ -317,5 +318,7 @@ namespace PepperDash.Essentials.Core
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
         }
+
+
 	}
 }

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

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

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

@@ -7,8 +7,6 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.GeneralIO;
 using Crestron.SimplSharp.Reflection;
 using PepperDash.Core;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
@@ -69,13 +67,13 @@ namespace PepperDash.Essentials.Core
 		/// <returns></returns>
 		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
 		{
-			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+			Debug.Console(0, 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(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
 
             if(FactoryMethods.ContainsKey(typeName))
             {
@@ -85,81 +83,33 @@ namespace PepperDash.Essentials.Core
 
             var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
             DeviceFactory.FactoryMethods.Add(typeName, wrapper);
-        }
-
-        private static void CheckForSecrets(IEnumerable<JProperty> obj)
-        {
-            foreach (var prop in obj.Where(prop => prop.Value as JObject != null))
-            {
-                if (prop.Name.ToLower() == "secret")
-                {
-                    var secret = GetSecret(prop.Children().First().ToObject<SecretsPropertiesConfig>());
-                    //var secret = GetSecret(JsonConvert.DeserializeObject<SecretsPropertiesConfig>(prop.Children().First().ToString()));
-                    prop.Parent.Replace(secret);
-                }
-                var recurseProp = prop.Value as JObject;
-                if (recurseProp == null) return;
-                CheckForSecrets(recurseProp.Properties());
-            }
-        }
-
-        private static string GetSecret(SecretsPropertiesConfig data)
-        {
-            var secretProvider = SecretsManager.GetSecretProviderByKey(data.Provider);
-            if (secretProvider == null) return null;
-            var secret = secretProvider.GetSecret(data.Key);
-            if (secret != null) return (string) secret.Value;
-            Debug.Console(1,
-                "Unable to retrieve secret {0}{1} - Make sure you've added it to the secrets provider",
-                data.Provider, data.Key);
-            return String.Empty;
-        }
-
-
-        /// <summary>
-        /// The factory method for Core "things". Also iterates the Factory methods that have
-        /// been loaded from plugins
-        /// </summary>
-        /// <param name="dc"></param>
-        /// <returns></returns>
-        public static IKeyed GetDevice(DeviceConfig dc)
-        {
-            try
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
-
-                var localDc = new DeviceConfig(dc);
-
-                var key = localDc.Key;
-                var name = localDc.Name;
-                var type = localDc.Type;
-                var properties = localDc.Properties;
-                //var propRecurse = properties;
-
-                var typeName = localDc.Type.ToLower();
-
-
-                var jObject = properties as JObject;
-                if (jObject != null)
-                {
-                    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);
-                return null;
-            }
-        }
-
+        }
+
+		/// <summary>
+		/// The factory method for Core "things". Also iterates the Factory methods that have
+		/// been loaded from plugins
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <returns></returns>
+        public static IKeyed GetDevice(DeviceConfig dc)
+        {
+            var key = dc.Key;
+            var name = dc.Name;
+            var type = dc.Type;
+            var properties = dc.Properties;	
+
+            var typeName = dc.Type.ToLower();
+
+            // 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);
+                return FactoryMethods[typeName].FactoryMethod(dc);
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Prints the type names and associated metadata from the FactoryMethods collection.
         /// </summary>

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

@@ -3,30 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public class IsReadyEventArgs : EventArgs
-    {
-        public bool IsReady { get; set; }
-
-        public IsReadyEventArgs(bool data)
-        {
-            IsReady = data;
-        }
-    }
-
-    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; }
@@ -37,7 +16,6 @@ namespace PepperDash_Essentials_Core
         }
     }
 
-    [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;
 
-	    protected BoolFeedbackLogic()
+		public BoolFeedbackLogic()
 		{
 			Output = new BoolFeedback(() => ComputedValue);
 		}	
@@ -40,18 +40,21 @@ namespace PepperDash.Essentials.Core
 
 		public void AddOutputsIn(List<BoolFeedback> outputs)
 		{
-		    foreach (var o in outputs.Where(o => !OutputsIn.Contains(o)))
-		    {
-		        OutputsIn.Add(o);
-		        o.OutputChange += AnyInput_OutputChange;
-		    }
-		    Evaluate();
+			foreach (var o in outputs)
+			{
+				// skip existing
+				if (OutputsIn.Contains(o)) continue;
+			
+				OutputsIn.Add(o);
+				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;
@@ -68,12 +71,6 @@ namespace PepperDash.Essentials.Core
 			Evaluate();
 		}
 
-	    public void ClearOutputs()
-	    {
-	        OutputsIn.Clear();
-            Evaluate();
-	    }
-
 		void AnyInput_OutputChange(object sender, EventArgs e)
 		{
 			Evaluate();
@@ -88,12 +85,11 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.All(o => o.BoolValue);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		}
 	}
 
@@ -103,35 +99,33 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.Any(o => o.BoolValue);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		}
 	}
 
 	public class BoolFeedbackLinq : BoolFeedbackLogic
 	{
-	    readonly Func<IEnumerable<BoolFeedback>, bool> _predicate;
+		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);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			var newValue = Predicate(OutputsIn);
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		} 
 	}
 }

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

@@ -1,150 +0,0 @@
-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 IEssentialsRoom)
+                    else if (device is EssentialsRoomBase)
                     {
                         // Set the room name
                         if (!string.IsNullOrEmpty(roomInfo.Name))

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

@@ -10,7 +10,9 @@ 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,8 +26,6 @@ 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,14 +1,11 @@
 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
 {
@@ -17,17 +14,13 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public static class Scheduler
     {
-        private static readonly Dictionary<string, ScheduledEventGroup> EventGroups = new Dictionary<string,ScheduledEventGroup>();
+        private static 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>
@@ -36,26 +29,12 @@ 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)
@@ -67,36 +46,10 @@ 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)
         {
@@ -114,13 +67,6 @@ Recurrence Days: {5}
             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
@@ -189,90 +135,5 @@ Recurrence Days: {5}
 
             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

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

@@ -1,18 +0,0 @@
-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.ToString();
+            return joinMap;
         }
 
         /// <summary>
@@ -45,33 +45,16 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static Dictionary<string, JoinData> TryGetJoinMapAdvancedForDevice(string 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);
+            if (string.IsNullOrEmpty(joinMapKey))
                 return null;
-            }
+
+            var joinMapSerialzed = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
+
+            if (joinMapSerialzed == null) return null;
+
+            var joinMapData = JsonConvert.DeserializeObject<Dictionary<string, JoinData>>(joinMapSerialzed);
+
+            return joinMapData;
         }
 
     }
@@ -233,10 +216,7 @@ namespace PepperDash.Essentials.Core
             }
 
 
-            if (Debug.Level > 0)
-            {
-                PrintJoinMapInfo();
-            }
+            PrintJoinMapInfo();
         }
 
         /// <summary>
@@ -286,7 +266,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.AttributeName) ? join.Value.Metadata.Label : join.Value.AttributeName,
+                        String.IsNullOrEmpty(join.Value.Metadata.Description) ? join.Value.Metadata.Label: join.Value.Metadata.Description,
                         join.Value.Metadata.JoinType.ToString(),
                         join.Value.Metadata.JoinCapabilities.ToString());
             }
@@ -308,7 +288,7 @@ namespace PepperDash.Essentials.Core
                 }
                 else
                 {
-                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
+                    Debug.Console(2, "No mathcing key found in join map for: '{0}'", customJoinData.Key);
                 }
             }
 
@@ -347,10 +327,7 @@ namespace PepperDash.Essentials.Core
         None = 0,
         ToSIMPL = 1,
         FromSIMPL = 2,
-        ToFromSIMPL = ToSIMPL | FromSIMPL,
-        ToFusion = 4,
-        FromFusion = 8,
-        ToFromFusion = ToFusion | FromFusion,
+        ToFromSIMPL = ToSIMPL | FromSIMPL
     }
 
     [Flags]
@@ -363,7 +340,7 @@ namespace PepperDash.Essentials.Core
         DigitalAnalog = Digital | Analog,
         DigitalSerial = Digital | Serial,
         AnalogSerial = Analog | Serial,
-        DigitalAnalogSerial = Digital | Analog | Serial,
+        DigitalAnalogSerial = Digital | Analog | Serial
     }
 
     /// <summary>
@@ -417,7 +394,7 @@ namespace PepperDash.Essentials.Core
     }
 
     /// <summary>
-    /// Data describing the join.  Can be overridden from configuratino
+    /// Data describing the join.  Can be 
     /// </summary>
     public class JoinData
     {
@@ -431,11 +408,6 @@ 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>
@@ -447,10 +419,6 @@ 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)
         {
@@ -481,11 +449,6 @@ 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/Monitoring/StatusMonitorCollection.cs

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs

@@ -1,539 +1,460 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-	[Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
-    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0}")]
-	public abstract class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
-	{
-        public GlsOccupancySensorPropertiesConfig PropertiesConfig { get; private set; }
+    [Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
+    public class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
+    {
+        public GlsOccupancySensorBase OccSensor { get; private set; }
 
-	    protected GlsOccupancySensorBase OccSensor;
+        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
 
-		public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+        public BoolFeedback GraceOccupancyDetectedFeedback { get; private set; }
 
-		public BoolFeedback GraceOccupancyDetectedFeedback { get; private set; }
+        public BoolFeedback RawOccupancyFeedback { get; private set; }
 
-		public BoolFeedback RawOccupancyFeedback { get; private set; }
+        public BoolFeedback PirSensorEnabledFeedback { get; private set; }
 
-		public BoolFeedback PirSensorEnabledFeedback { get; private set; }
+        public BoolFeedback LedFlashEnabledFeedback { get; private set; }
 
-		public BoolFeedback LedFlashEnabledFeedback { get; private set; }
+        public BoolFeedback ShortTimeoutEnabledFeedback { get; private set; }
 
-		public BoolFeedback ShortTimeoutEnabledFeedback { get; private set; }
+        public IntFeedback PirSensitivityInVacantStateFeedback { get; private set; }
 
-		public IntFeedback PirSensitivityInVacantStateFeedback { get; private set; }
+        public IntFeedback PirSensitivityInOccupiedStateFeedback { get; private set; }
 
-		public IntFeedback PirSensitivityInOccupiedStateFeedback { get; private set; }
+        public IntFeedback CurrentTimeoutFeedback { get; private set; }
 
-		public IntFeedback CurrentTimeoutFeedback { get; private set; }
+        public IntFeedback LocalTimoutFeedback { get; private set; }
 
-		public IntFeedback LocalTimoutFeedback { get; private set; }
+        public IntFeedback InternalPhotoSensorValue { get; set; }
 
-		public IntFeedback InternalPhotoSensorValue { get; set; }
+        public IntFeedback ExternalPhotoSensorValue { get; set; }
 
-		public IntFeedback ExternalPhotoSensorValue { get; set; }
+        // Debug properties
+        public bool InTestMode { get; private set; }
 
-		// Debug properties
-		public bool InTestMode { get; private set; }
+        public bool TestRoomIsOccupiedFeedback { get; private set; }
 
-		public bool TestRoomIsOccupiedFeedback { get; private set; }
-
-		public Func<bool> RoomIsOccupiedFeedbackFunc
-		{
-			get
-			{
-				return () => InTestMode ? TestRoomIsOccupiedFeedback : OccSensor.OccupancyDetectedFeedback.BoolValue;
-			}
-		}
-
-	    protected GlsOccupancySensorBaseController(string key, DeviceConfig config)
-			: this(key, config.Name, config)
-		{
-		}
-
-	    protected GlsOccupancySensorBaseController(string key, string name, DeviceConfig config)
-            : base(key, name) 
+        public Func<bool> RoomIsOccupiedFeedbackFunc
         {
-
-            var props = config.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();
-
-            if (props != null)
+            get
             {
-                PropertiesConfig = props;
-            }
-            else
-            {
-                Debug.Console(1, this, "props are null.  Unable to deserialize into GlsOccupancySensorPropertiesConfig");
-            }
-
-            AddPostActivationAction(() =>
-                {
-                    OccSensor.OnlineStatusChange += (o, a) =>
-                    {
-                        if (a.DeviceOnLine)
-                        {
-                            ApplySettingsToSensorFromConfig();
-                        }
-                    };
-
-                    if (OccSensor.IsOnline)
-                    {
-                        ApplySettingsToSensorFromConfig();
-
-                    }
-                });
-        }
-
-
-        /// <summary>
-        /// Applies any sensor settings defined in config 
-        /// </summary>
-        protected virtual void ApplySettingsToSensorFromConfig()
-        {
-            Debug.Console(1, this, "Attempting to apply settings to sensor from config");
-
-            if (PropertiesConfig.EnablePir != null)
-            {
-                Debug.Console(1, this, "EnablePir found, attempting to set value from config");
-                SetPirEnable((bool)PropertiesConfig.EnablePir);
-            }
-            else
-            {
-                Debug.Console(1, this, "EnablePir null, no value specified in config");
-            }
-
-            if (PropertiesConfig.EnableLedFlash != null)
-            {
-                Debug.Console(1, this, "EnableLedFlash found, attempting to set value from config");
-                SetLedFlashEnable((bool)PropertiesConfig.EnableLedFlash);
-            }
-
-            if (PropertiesConfig.RemoteTimeout != null)
-            {
-                Debug.Console(1, this, "RemoteTimeout found, attempting to set value from config");
-                SetRemoteTimeout((ushort)PropertiesConfig.RemoteTimeout);
-            }
-            else
-            {
-                Debug.Console(1, this, "RemoteTimeout null, no value specified in config");
-            }
-
-            if (PropertiesConfig.ShortTimeoutState != null)
-            {
-                SetShortTimeoutState((bool)PropertiesConfig.ShortTimeoutState);
-            }
-
-            if (PropertiesConfig.EnableRawStates != null)
-            {
-                EnableRawStates((bool)PropertiesConfig.EnableRawStates);
-            }
-
-            if (PropertiesConfig.InternalPhotoSensorMinChange != null)
-            {
-                SetInternalPhotoSensorMinChange((ushort)PropertiesConfig.InternalPhotoSensorMinChange);
-            }
-
-            if (PropertiesConfig.ExternalPhotoSensorMinChange != null)
-            {
-                SetExternalPhotoSensorMinChange((ushort)PropertiesConfig.ExternalPhotoSensorMinChange);
+                return () => InTestMode ? TestRoomIsOccupiedFeedback : OccSensor.OccupancyDetectedFeedback.BoolValue;
             }
         }
 
-		protected void RegisterGlsOccupancySensorBaseController(GlsOccupancySensorBase occSensor)
-		{
-			OccSensor = occSensor;
-
-			RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
-
-			PirSensorEnabledFeedback = new BoolFeedback(() => OccSensor.PirEnabledFeedback.BoolValue);
-
-			LedFlashEnabledFeedback = new BoolFeedback(() => OccSensor.LedFlashEnabledFeedback.BoolValue);
-
-			ShortTimeoutEnabledFeedback = new BoolFeedback(() => OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
-
-			PirSensitivityInVacantStateFeedback =
-				new IntFeedback(() => OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
-
-			PirSensitivityInOccupiedStateFeedback =
-				new IntFeedback(() => OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue);
-
-			CurrentTimeoutFeedback = new IntFeedback(() => OccSensor.CurrentTimeoutFeedback.UShortValue);
-
-			LocalTimoutFeedback = new IntFeedback(() => OccSensor.LocalTimeoutFeedback.UShortValue);
-
-			GraceOccupancyDetectedFeedback =
-				new BoolFeedback(() => OccSensor.GraceOccupancyDetectedFeedback.BoolValue);
-
-			RawOccupancyFeedback = new BoolFeedback(() => OccSensor.RawOccupancyFeedback.BoolValue);
-
-			InternalPhotoSensorValue = new IntFeedback(() => OccSensor.InternalPhotoSensorValueFeedback.UShortValue);
-
-			ExternalPhotoSensorValue = new IntFeedback(() => OccSensor.ExternalPhotoSensorValueFeedback.UShortValue);
-
-			OccSensor.BaseEvent += OccSensor_BaseEvent;
-
-			OccSensor.GlsOccupancySensorChange += OccSensor_GlsOccupancySensorChange;
-		}
+        public GlsOccupancySensorBaseController(string key, Func<DeviceConfig, GlsOccupancySensorBase> preActivationFunc,
+            DeviceConfig config)
+            : base(key, config.Name)
+        {
 
 
-		/// <summary>
-		/// Catches events for feedbacks on the base class.  Any extending wrapper class should call this delegate after it checks for it's own event IDs.
-		/// </summary>
-		/// <param name="device"></param>
-		/// <param name="args"></param>
-		protected virtual void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
-		{
-			switch (args.EventId)
-			{
-				case GlsOccupancySensorBase.PirEnabledFeedbackEventId:
-					PirSensorEnabledFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.LedFlashEnabledFeedbackEventId:
-					LedFlashEnabledFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.ShortTimeoutEnabledFeedbackEventId:
-					ShortTimeoutEnabledFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.PirSensitivityInOccupiedStateFeedbackEventId:
-					PirSensitivityInOccupiedStateFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.PirSensitivityInVacantStateFeedbackEventId:
-					PirSensitivityInVacantStateFeedback.FireUpdate();
-					break;
-			}
-		}
-
-		protected virtual void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
-		{
-			Debug.Console(2, this, "GlsOccupancySensorChange  EventId: {0}", args.EventId);
-
-			switch (args.EventId)
-			{
-				case GlsOccupancySensorBase.RoomVacantFeedbackEventId:
-				case GlsOccupancySensorBase.RoomOccupiedFeedbackEventId:
-					Debug.Console(1, this, "Occupancy State: {0}", OccSensor.OccupancyDetectedFeedback.BoolValue);
-					RoomIsOccupiedFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.TimeoutFeedbackEventId:
-					CurrentTimeoutFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.TimeoutLocalFeedbackEventId:
-					LocalTimoutFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.GraceOccupancyDetectedFeedbackEventId:
-					GraceOccupancyDetectedFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.RawOccupancyFeedbackEventId:
-					RawOccupancyFeedback.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.InternalPhotoSensorValueFeedbackEventId:
-					InternalPhotoSensorValue.FireUpdate();
-					break;
-				case GlsOccupancySensorBase.ExternalPhotoSensorValueFeedbackEventId:
-					ExternalPhotoSensorValue.FireUpdate();
-					break;
-			}
-		}
-
-		public void SetTestMode(bool mode)
-		{
-			InTestMode = mode;
-
-			Debug.Console(1, this, "In Mock Mode: '{0}'", InTestMode);
-		}
-
-		public void SetTestOccupiedState(bool state)
-		{
-			if (!InTestMode)
-				Debug.Console(1, "Mock mode not enabled");
-			else
-			{
-				TestRoomIsOccupiedFeedback = state;
-
-				RoomIsOccupiedFeedback.FireUpdate();
-			}
-		}
-
-	    /// <summary>
-	    /// Enables or disables the PIR sensor
-	    /// </summary>
-	    /// <param name="state"></param>
-	    public void SetPirEnable(bool state)
-	    {
-	        Debug.Console(1, this, "Setting EnablePir to: {0}", state);
-
-	        OccSensor.EnablePir.BoolValue = state;
-	        OccSensor.DisablePir.BoolValue = !state;
-	    }
-
-	    /// <summary>
-	    /// Enables or disables the LED Flash
-	    /// </summary>
-	    /// <param name="state"></param>
-	    public void SetLedFlashEnable(bool state)
-	    {
-	        OccSensor.EnableLedFlash.BoolValue = state;
-	        OccSensor.DisableLedFlash.BoolValue = !state;
-	    }
-
-	    /// <summary>
-	    /// Enables or disables short timeout based on state
-	    /// </summary>
-	    /// <param name="state"></param>
-	    public void SetShortTimeoutState(bool state)
-	    {
-	        OccSensor.EnableShortTimeout.BoolValue = state;
-	        OccSensor.DisableShortTimeout.BoolValue = !state;
-	    }
-
-	    public void IncrementPirSensitivityInOccupiedState(bool pressRelease)
-		{
-			OccSensor.IncrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
-		}
-
-		public void DecrementPirSensitivityInOccupiedState(bool pressRelease)
-		{
-			OccSensor.DecrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
-		}
-
-		public void IncrementPirSensitivityInVacantState(bool pressRelease)
-		{
-			OccSensor.IncrementPirSensitivityInVacantState.BoolValue = pressRelease;
-		}
-
-		public void DecrementPirSensitivityInVacantState(bool pressRelease)
-		{
-			OccSensor.DecrementPirSensitivityInVacantState.BoolValue = pressRelease;
-		}
-
-        /// <summary>
-        /// Pulse ForceOccupied on the sensor for .5 seconds
-        /// </summary>
-	    public void ForceOccupied()
-	    {
-	        CrestronInvoke.BeginInvoke((o) =>
-	        {
-	            ForceOccupied(true);
-	            CrestronEnvironment.Sleep(500);
-	            ForceOccupied(false);
-	        });
-	    }
-
-		public void ForceOccupied(bool value)
-		{
-			OccSensor.ForceOccupied.BoolValue = value;
-		}
-
-        /// <summary>
-        /// Pulse ForceVacant on the sensor for .5 seconds
-        /// </summary>
-	    public void ForceVacant()
-	    {
-            CrestronInvoke.BeginInvoke((o) =>
+            AddPreActivationAction(() =>
             {
-                ForceVacant(true);
-                CrestronEnvironment.Sleep(500);
-                ForceVacant(false);
+                OccSensor = preActivationFunc(config);
+
+                RegisterCrestronGenericBase(OccSensor);
+
+                RegisterGlsOdtSensorBaseController(OccSensor);
+
             });
-	    }
+        }
 
-		public void ForceVacant(bool value)
-		{
-			OccSensor.ForceVacant.BoolValue = value;
-		}
+        public GlsOccupancySensorBaseController(string key, string name) : base(key, name) {}
 
-		public void EnableRawStates(bool state)
-		{
-			OccSensor.EnableRawStates.BoolValue = state;
-		}
+        protected void RegisterGlsOdtSensorBaseController(GlsOccupancySensorBase occSensor)
+        {
+            OccSensor = occSensor;
 
-		public void SetRemoteTimeout(ushort time)
-		{
-            Debug.Console(1, this, "Setting RemoteTimout to: {0}", time);
+            RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
 
-			OccSensor.RemoteTimeout.UShortValue = time;
-		}
+            PirSensorEnabledFeedback = new BoolFeedback(() => OccSensor.PirEnabledFeedback.BoolValue);
 
-		public void SetInternalPhotoSensorMinChange(ushort value)
-		{
-			OccSensor.InternalPhotoSensorMinimumChange.UShortValue = value;
-		}
+            LedFlashEnabledFeedback = new BoolFeedback(() => OccSensor.LedFlashEnabledFeedback.BoolValue);
 
-		public void SetExternalPhotoSensorMinChange(ushort value)
-		{
-			OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value;
-		}
+            ShortTimeoutEnabledFeedback = new BoolFeedback(() => OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
 
-	    /// <summary>
-	    /// Method to print current occ settings to console.
-	    /// </summary>
-	    public virtual void GetSettings()
-		{
-			var dash = new string('*', 50);
-			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+            PirSensitivityInVacantStateFeedback =
+                new IntFeedback(() => OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
 
-            Debug.Console(0, this, "Vacancy Detected: {0}",
-                OccSensor.VacancyDetectedFeedback.BoolValue);
+            PirSensitivityInOccupiedStateFeedback =
+                new IntFeedback(() => OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue);
 
-			Debug.Console(0, this, "Timeout Current: {0} | Local: {1}",
-				OccSensor.CurrentTimeoutFeedback.UShortValue,
-				OccSensor.LocalTimeoutFeedback.UShortValue);
+            CurrentTimeoutFeedback = new IntFeedback(() => OccSensor.CurrentTimeoutFeedback.UShortValue);
 
-			Debug.Console(0, this, "Short Timeout Enabled: {0}",
-				OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
+            LocalTimoutFeedback = new IntFeedback(() => OccSensor.LocalTimeoutFeedback.UShortValue);
 
-			Debug.Console(0, this, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}",
-				OccSensor.PirEnabledFeedback.BoolValue,
-				OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue,
-				OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
+            GraceOccupancyDetectedFeedback =
+                new BoolFeedback(() => OccSensor.GraceOccupancyDetectedFeedback.BoolValue);
 
-			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
-		}
+            RawOccupancyFeedback = new BoolFeedback(() => OccSensor.RawOccupancyFeedback.BoolValue);
 
-		protected void LinkOccSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
-			uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-		{
-			var joinMap = new GlsOccupancySensorBaseJoinMap(joinStart);
+            InternalPhotoSensorValue = new IntFeedback(() => OccSensor.InternalPhotoSensorValueFeedback.UShortValue);
 
-			var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            ExternalPhotoSensorValue = new IntFeedback(() => OccSensor.ExternalPhotoSensorValueFeedback.UShortValue);
 
-			if (!string.IsNullOrEmpty(joinMapSerialized))
-				joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(joinMapSerialized);
+            OccSensor.BaseEvent += OccSensor_BaseEvent;
 
-			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.");
-			}
-
-			Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-			occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
-
-			trilist.OnlineStatusChange += (d, args) =>
-			{
-				if (args.DeviceOnLine)
-				{
-					trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
-				}
-			};
-
-			LinkSingleTechSensorToApi(occController, trilist, joinMap);
-
-			LinkDualTechSensorToApi(occController, trilist, joinMap);
-		}
-
-	    private static void LinkDualTechSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
-	        GlsOccupancySensorBaseJoinMap joinMap)
-	    {
-	        var odtOccController = occController as GlsOdtOccupancySensorController;
-
-	        if (odtOccController == null)
-	        {
-	            return;
-	        }
-	        // OR When Vacated
-	        trilist.SetBoolSigAction(joinMap.OrWhenVacated.JoinNumber, odtOccController.SetOrWhenVacatedState);
-	        odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated.JoinNumber]);
-
-	        // AND When Vacated
-	        trilist.SetBoolSigAction(joinMap.AndWhenVacated.JoinNumber, odtOccController.SetAndWhenVacatedState);
-	        odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated.JoinNumber]);
-
-	        // Ultrasonic A Sensor
-	        trilist.SetSigTrueAction(joinMap.EnableUsA.JoinNumber, () => odtOccController.SetUsAEnable(true));
-	        trilist.SetSigTrueAction(joinMap.DisableUsA.JoinNumber, () => odtOccController.SetUsAEnable(false));
-	        odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA.JoinNumber]);
-
-	        // Ultrasonic B Sensor
-	        trilist.SetSigTrueAction(joinMap.EnableUsB.JoinNumber, () => odtOccController.SetUsBEnable(true));
-	        trilist.SetSigTrueAction(joinMap.DisableUsB.JoinNumber, () => odtOccController.SetUsBEnable(false));
-	        odtOccController.UltrasonicBEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB.JoinNumber]);
-
-	        // US Sensitivity in Occupied State
-	        trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState.JoinNumber,
-	            odtOccController.IncrementUsSensitivityInOccupiedState);
-	        trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState.JoinNumber,
-	            odtOccController.DecrementUsSensitivityInOccupiedState);
-	        odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(
-	            trilist.UShortInput[joinMap.UsSensitivityInOccupiedState.JoinNumber]);
-
-	        // US Sensitivity in Vacant State
-	        trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState.JoinNumber,
-	            odtOccController.IncrementUsSensitivityInVacantState);
-	        trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState.JoinNumber,
-	            odtOccController.DecrementUsSensitivityInVacantState);
-	        odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(
-	            trilist.UShortInput[joinMap.UsSensitivityInVacantState.JoinNumber]);
-
-	        //Sensor Raw States
-	        odtOccController.RawOccupancyPirFeedback.LinkInputSig(
-	            trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
-	        odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
-	    }
-
-	    private static void LinkSingleTechSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
-	        GlsOccupancySensorBaseJoinMap joinMap)
-	    {
-// Occupied status
-	        trilist.SetBoolSigAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
-	        trilist.SetBoolSigAction(joinMap.ForceVacant.JoinNumber, occController.ForceVacant);
-	        occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback.JoinNumber]);
-	        occController.RoomIsOccupiedFeedback.LinkComplementInputSig(
-	            trilist.BooleanInput[joinMap.RoomVacantFeedback.JoinNumber]);
-	        occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback.JoinNumber]);
-	        trilist.SetBoolSigAction(joinMap.EnableRawStates.JoinNumber, occController.EnableRawStates);
-
-	        // Timouts
-	        trilist.SetUShortSigAction(joinMap.Timeout.JoinNumber, occController.SetRemoteTimeout);
-	        occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout.JoinNumber]);
-	        occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback.JoinNumber]);
-
-	        // LED Flash
-	        trilist.SetSigTrueAction(joinMap.EnableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(true));
-	        trilist.SetSigTrueAction(joinMap.DisableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(false));
-	        occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash.JoinNumber]);
-
-	        // Short Timeout
-	        trilist.SetSigTrueAction(joinMap.EnableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(true));
-	        trilist.SetSigTrueAction(joinMap.DisableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(false));
-	        occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout.JoinNumber]);
-
-	        // PIR Sensor
-	        trilist.SetSigTrueAction(joinMap.EnablePir.JoinNumber, () => occController.SetPirEnable(true));
-	        trilist.SetSigTrueAction(joinMap.DisablePir.JoinNumber, () => occController.SetPirEnable(false));
-	        occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir.JoinNumber]);
-
-	        // PIR Sensitivity in Occupied State
-	        trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState.JoinNumber,
-	            occController.IncrementPirSensitivityInOccupiedState);
-	        trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState.JoinNumber,
-	            occController.DecrementPirSensitivityInOccupiedState);
-	        occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(
-	            trilist.UShortInput[joinMap.PirSensitivityInOccupiedState.JoinNumber]);
-
-	        // PIR Sensitivity in Vacant State
-	        trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState.JoinNumber,
-	            occController.IncrementPirSensitivityInVacantState);
-	        trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState.JoinNumber,
-	            occController.DecrementPirSensitivityInVacantState);
-	        occController.PirSensitivityInVacantStateFeedback.LinkInputSig(
-	            trilist.UShortInput[joinMap.PirSensitivityInVacantState.JoinNumber]);
-	    }
-	}
+            OccSensor.GlsOccupancySensorChange += OccSensor_GlsOccupancySensorChange;
+        }
 
 
+        /// <summary>
+        /// Catches events for feedbacks on the base class.  Any extending wrapper class should call this delegate after it checks for it's own event IDs.
+        /// </summary>
+        /// <param name="device"></param>
+        /// <param name="args"></param>
+        protected virtual void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
+        {
+            switch (args.EventId)
+            {
+                case GlsOccupancySensorBase.PirEnabledFeedbackEventId:
+                    PirSensorEnabledFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.LedFlashEnabledFeedbackEventId:
+                    LedFlashEnabledFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.ShortTimeoutEnabledFeedbackEventId:
+                    ShortTimeoutEnabledFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.PirSensitivityInOccupiedStateFeedbackEventId:
+                    PirSensitivityInOccupiedStateFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.PirSensitivityInVacantStateFeedbackEventId:
+                    PirSensitivityInVacantStateFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+        protected virtual void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
+        {
+            Debug.Console(2, this, "GlsOccupancySensorChange  EventId: {0}", args.EventId);
+
+            switch (args.EventId)
+            {
+                case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomVacantFeedbackEventId:
+                case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomOccupiedFeedbackEventId:
+                    Debug.Console(1, this, "Occupancy State: {0}", OccSensor.OccupancyDetectedFeedback.BoolValue);
+                    RoomIsOccupiedFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.TimeoutFeedbackEventId:
+                    CurrentTimeoutFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.TimeoutLocalFeedbackEventId:
+                    LocalTimoutFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.GraceOccupancyDetectedFeedbackEventId:
+                    GraceOccupancyDetectedFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.RawOccupancyFeedbackEventId:
+                    RawOccupancyFeedback.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.InternalPhotoSensorValueFeedbackEventId:
+                    InternalPhotoSensorValue.FireUpdate();
+                    break;
+                case GlsOccupancySensorBase.ExternalPhotoSensorValueFeedbackEventId:
+                    ExternalPhotoSensorValue.FireUpdate();
+                    break;
+            }
+        }
+
+        public void SetTestMode(bool mode)
+        {
+            InTestMode = mode;
+
+            Debug.Console(1, this, "In Mock Mode: '{0}'", InTestMode);
+        }
+
+        public void SetTestOccupiedState(bool state)
+        {
+            if (!InTestMode)
+                Debug.Console(1, "Mock mode not enabled");
+            else
+            {
+                TestRoomIsOccupiedFeedback = state;
+
+                RoomIsOccupiedFeedback.FireUpdate();
+            }
+        }
+
+        /// <summary>
+        /// Enables or disables the PIR sensor
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetPirEnable(bool state)
+        {
+            if (state)
+            {
+                OccSensor.EnablePir.BoolValue = state;
+                OccSensor.DisablePir.BoolValue = !state;
+            }
+            else
+            {
+                OccSensor.EnablePir.BoolValue = state;
+                OccSensor.DisablePir.BoolValue = !state;
+            }            
+        }
+
+        /// <summary>
+        /// Enables or disables the LED Flash
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetLedFlashEnable(bool state)
+        {
+            if (state)
+            {
+                OccSensor.EnableLedFlash.BoolValue = state;
+                OccSensor.DisableLedFlash.BoolValue = !state;
+            }
+            else
+            {
+                OccSensor.EnableLedFlash.BoolValue = state;
+                OccSensor.DisableLedFlash.BoolValue = !state;
+            }
+        }
+
+        /// <summary>
+        /// Enables or disables short timeout based on state
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetShortTimeoutState(bool state)
+        {
+            if (state)
+            {
+                OccSensor.EnableShortTimeout.BoolValue = state;
+                OccSensor.DisableShortTimeout.BoolValue = !state;
+            }
+            else
+            {
+                OccSensor.EnableShortTimeout.BoolValue = state;
+                OccSensor.DisableShortTimeout.BoolValue = !state;
+            }
+        }
+
+        public void IncrementPirSensitivityInOccupiedState(bool pressRelease)
+        {
+            OccSensor.IncrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
+        }
+
+        public void DecrementPirSensitivityInOccupiedState(bool pressRelease)
+        {
+            OccSensor.DecrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
+        }
+
+        public void IncrementPirSensitivityInVacantState(bool pressRelease)
+        {
+            OccSensor.IncrementPirSensitivityInVacantState.BoolValue = pressRelease;
+        }
+
+        public void DecrementPirSensitivityInVacantState(bool pressRelease)
+        {
+            OccSensor.DecrementPirSensitivityInVacantState.BoolValue = pressRelease;
+        }
+
+        public void ForceOccupied()
+        {
+            OccSensor.ForceOccupied.BoolValue = true;
+        }
+
+        public void ForceVacant()
+        {
+            OccSensor.ForceVacant.BoolValue = true;
+        }
+
+        public void EnableRawStates(bool state)
+        {
+            OccSensor.EnableRawStates.BoolValue = state;
+        }
+
+        public void SetRemoteTimeout(ushort time)
+        {
+            OccSensor.RemoteTimeout.UShortValue = time;
+        }
+
+        public void SetInternalPhotoSensorMinChange(ushort value)
+        {
+            OccSensor.InternalPhotoSensorMinimumChange.UShortValue = value;
+        }
+
+        public void SetExternalPhotoSensorMinChange(ushort value)
+        {
+            OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value;
+        }
+
+
+
+        protected void LinkOccSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
+            uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new GlsOccupancySensorBaseJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(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.");
+            }
+
+            Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            #region Single and Dual Sensor Stuff
+            occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
+
+            trilist.OnlineStatusChange += (d, args) =>
+            {
+                if (args.DeviceOnLine)
+                {
+                    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
+                }
+            };
+
+            // Occupied status
+            trilist.SetSigTrueAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
+            trilist.SetSigTrueAction(joinMap.ForceVacant.JoinNumber, occController.ForceVacant);
+            occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback.JoinNumber]);
+            occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback.JoinNumber]);
+            occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback.JoinNumber]);
+            trilist.SetBoolSigAction(joinMap.EnableRawStates.JoinNumber, occController.EnableRawStates);
+
+            // Timouts
+            trilist.SetUShortSigAction(joinMap.Timeout.JoinNumber, occController.SetRemoteTimeout);
+            occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout.JoinNumber]);
+            occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback.JoinNumber]);
+
+            // LED Flash
+            trilist.SetSigTrueAction(joinMap.EnableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(true));
+            trilist.SetSigTrueAction(joinMap.DisableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(false));
+            occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash.JoinNumber]);
+
+            // Short Timeout
+            trilist.SetSigTrueAction(joinMap.EnableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(true));
+            trilist.SetSigTrueAction(joinMap.DisableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(false));
+            occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout.JoinNumber]);
+
+            // PIR Sensor
+            trilist.SetSigTrueAction(joinMap.EnablePir.JoinNumber, () => occController.SetPirEnable(true));
+            trilist.SetSigTrueAction(joinMap.DisablePir.JoinNumber, () => occController.SetPirEnable(false));
+            occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir.JoinNumber]);
+
+            // PIR Sensitivity in Occupied State
+            trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState.JoinNumber, occController.IncrementPirSensitivityInOccupiedState);
+            trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState.JoinNumber, occController.DecrementPirSensitivityInOccupiedState);
+            occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInOccupiedState.JoinNumber]);
+
+            // PIR Sensitivity in Vacant State
+            trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState.JoinNumber, occController.IncrementPirSensitivityInVacantState);
+            trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState.JoinNumber, occController.DecrementPirSensitivityInVacantState);
+            occController.PirSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInVacantState.JoinNumber]);
+            #endregion
+
+            #region Dual Technology Sensor Stuff
+            var odtOccController = occController as GlsOdtOccupancySensorController;
+
+            if (odtOccController == null) return;
+            // OR When Vacated
+            trilist.SetBoolSigAction(joinMap.OrWhenVacated.JoinNumber, odtOccController.SetOrWhenVacatedState);
+            odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated.JoinNumber]);
+
+            // AND When Vacated
+            trilist.SetBoolSigAction(joinMap.AndWhenVacated.JoinNumber, odtOccController.SetAndWhenVacatedState);
+            odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated.JoinNumber]);
+
+            // Ultrasonic A Sensor
+            trilist.SetSigTrueAction(joinMap.EnableUsA.JoinNumber, () => odtOccController.SetUsAEnable(true));
+            trilist.SetSigTrueAction(joinMap.DisableUsA.JoinNumber, () => odtOccController.SetUsAEnable(false));
+            odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA.JoinNumber]);
+
+            // Ultrasonic B Sensor
+            trilist.SetSigTrueAction(joinMap.EnableUsB.JoinNumber, () => odtOccController.SetUsBEnable(true));
+            trilist.SetSigTrueAction(joinMap.DisableUsB.JoinNumber, () => odtOccController.SetUsBEnable(false));
+            odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB.JoinNumber]);
+
+            // US Sensitivity in Occupied State
+            trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState.JoinNumber, odtOccController.IncrementUsSensitivityInOccupiedState);
+            trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState.JoinNumber, odtOccController.DecrementUsSensitivityInOccupiedState);
+            odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInOccupiedState.JoinNumber]);
+
+            // US Sensitivity in Vacant State
+            trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState.JoinNumber, odtOccController.IncrementUsSensitivityInVacantState);
+            trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState.JoinNumber, odtOccController.DecrementUsSensitivityInVacantState);
+            odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInVacantState.JoinNumber]);
+
+            //Sensor Raw States
+            odtOccController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
+            odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
+
+            #endregion
+        }
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+        }
+
+        #region PreActivation
+
+        private static GlsOirCCn GetGlsOirCCn(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 GlsOirCCn", parentKey);
+                return new GlsOirCCn(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 GlsOirCCn", parentKey);
+                return new GlsOirCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+            }
+            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+            return null;
+        }
+        #endregion
+
+        public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
+        {
+            public GlsOccupancySensorBaseControllerFactory()
+            {
+                TypeNames = new List<string>() { "glsoirccn" };
+            }
+
+
+            public override EssentialsDevice BuildDevice(DeviceConfig dc)
+            {
+                Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+
+                return new GlsOccupancySensorBaseController(dc.Key, GetGlsOirCCn, dc);
+            }
+
+        }
+    }
+
+    
 
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorPropertiesConfig.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines configuration properties for Crestron GLS series occupancy sensors
-    /// </summary>
-    public class GlsOccupancySensorPropertiesConfig
-    {
-        // Single Technology Sensors (PIR): GlsOccupancySensorBase
-        [JsonProperty("enablePir")]
-        public bool? EnablePir { get; set; }
-
-        [JsonProperty("enableLedFlash")]
-        public bool? EnableLedFlash { get; set; }
-
-        [JsonProperty("shortTimeoutState")]
-        public bool? ShortTimeoutState { get; set; }
-
-        [JsonProperty("enableRawStates")]
-        public bool? EnableRawStates { get; set; }
-
-        [JsonProperty("remoteTimeout")]
-        public ushort? RemoteTimeout { get; set; }
-
-        [JsonProperty("internalPhotoSensorMinChange")]
-        public ushort? InternalPhotoSensorMinChange { get; set; }
-
-        [JsonProperty("externalPhotoSensorMinChange")]
-        public ushort? ExternalPhotoSensorMinChange { get; set; }
-
-        // Dual Technology Sensors: GlsOdtCCn
-        [JsonProperty("enableUsA")]
-        public bool? EnableUsA { get; set; }
-
-        [JsonProperty("enableUsB")]
-        public bool? EnableUsB { get; set; }
-
-        [JsonProperty("orWhenVacatedState")]
-        public bool? OrWhenVacatedState { get; set; }
-
-        [JsonProperty("andWhenVacatedState")]
-        public bool? AndWhenVacatedState { get; set; }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs

@@ -1,266 +1,183 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-	[Description("Wrapper class for Dual Technology GLS Occupancy Sensors")]
-    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0,\"enableUsA\": true,\"enableUsB\": true,\"orWhenVacatedState\": true}")]
+    [Description("Wrapper class for Dual Technology GLS Occupancy Sensors")]
     public class GlsOdtOccupancySensorController : GlsOccupancySensorBaseController
-	{
-	    private GlsOdtCCn _occSensor;
-
-		public BoolFeedback OrWhenVacatedFeedback { get; private set; }
-
-		public BoolFeedback AndWhenVacatedFeedback { get; private set; }
-
-		public BoolFeedback UltrasonicAEnabledFeedback { get; private set; }
-
-		public BoolFeedback UltrasonicBEnabledFeedback { get; private set; }
-
-		public IntFeedback UltrasonicSensitivityInVacantStateFeedback { get; private set; }
-
-		public IntFeedback UltrasonicSensitivityInOccupiedStateFeedback { get; private set; }
-
-		public BoolFeedback RawOccupancyPirFeedback { get; private set; }
-
-		public BoolFeedback RawOccupancyUsFeedback { get; private set; }
-
-
-		public GlsOdtOccupancySensorController(string key, Func<DeviceConfig, GlsOdtCCn> preActivationFunc,
-			DeviceConfig config)
-			: base(key, config.Name, config)
-		{
-			AddPreActivationAction(() =>
-			{
-				_occSensor = preActivationFunc(config);
-
-				RegisterCrestronGenericBase(_occSensor);
-
-				RegisterGlsOccupancySensorBaseController(_occSensor);
-
-				AndWhenVacatedFeedback = new BoolFeedback(() => _occSensor.AndWhenVacatedFeedback.BoolValue);
-
-				OrWhenVacatedFeedback = new BoolFeedback(() => _occSensor.OrWhenVacatedFeedback.BoolValue);
-
-				UltrasonicAEnabledFeedback = new BoolFeedback(() => _occSensor.UsAEnabledFeedback.BoolValue);
-
-				UltrasonicBEnabledFeedback = new BoolFeedback(() => _occSensor.UsBEnabledFeedback.BoolValue);
-
-				RawOccupancyPirFeedback = new BoolFeedback(() => _occSensor.RawOccupancyPirFeedback.BoolValue);
-
-				RawOccupancyUsFeedback = new BoolFeedback(() => _occSensor.RawOccupancyUsFeedback.BoolValue);
-
-				UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => _occSensor.UsSensitivityInVacantStateFeedback.UShortValue);
-
-				UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => _occSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);
-
-			});	
-		}
-
-        protected override void ApplySettingsToSensorFromConfig()
-        {
-            base.ApplySettingsToSensorFromConfig();
-
-            if (PropertiesConfig.EnableUsA != null)
-            {
-                Debug.Console(1, this, "EnableUsA found, attempting to set value from config");
-                SetUsAEnable((bool)PropertiesConfig.EnableUsA);   
-            }
-            else
-            {
-                Debug.Console(1, this, "EnableUsA null, no value specified in config");
-            }
-
-
-            if (PropertiesConfig.EnableUsB != null)
-            {
-                Debug.Console(1, this, "EnableUsB found, attempting to set value from config");
-                SetUsBEnable((bool)PropertiesConfig.EnableUsB);
-            }
-            else
-            {
-                Debug.Console(1, this, "EnablePir null, no value specified in config");
-            }
-
-
-            if (PropertiesConfig.OrWhenVacatedState != null)
-            {
-                SetOrWhenVacatedState((bool)PropertiesConfig.OrWhenVacatedState);
-            }
-
-            if (PropertiesConfig.AndWhenVacatedState != null)
-            {
-                SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
-            }
-        }
-
-		/// <summary>
-		/// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
-		/// Then calls the base delegate method to ensure any common event IDs are captured.
-		/// </summary>
-		/// <param name="device"></param>
-		/// <param name="args"></param>
-		protected override void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
-		{
-		    switch (args.EventId)
-		    {
-		        case GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId:
-		            AndWhenVacatedFeedback.FireUpdate();
-		            break;
-		        case GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId:
-		            OrWhenVacatedFeedback.FireUpdate();
-		            break;
-		        case GlsOccupancySensorBase.UsAEnabledFeedbackEventId:
-		            UltrasonicAEnabledFeedback.FireUpdate();
-		            break;
-		        case GlsOccupancySensorBase.UsBEnabledFeedbackEventId:
-		            UltrasonicBEnabledFeedback.FireUpdate();
-		            break;
-		        case GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId:
-		            UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
-		            break;
-		        case GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId:
-		            UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
-		            break;
-		    }
-
-		    base.OccSensor_GlsOccupancySensorChange(device, args);
-		}
-
-	    /// <summary>
-		/// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
-		/// Then calls the base delegate method to ensure any common event IDs are captured.
-		/// </summary>
-		/// <param name="device"></param>
-		/// <param name="args"></param>
-		protected override void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
-	    {
-	        switch (args.EventId)
-	        {
-	            case GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId:
-	                RawOccupancyPirFeedback.FireUpdate();
-	                break;
-	            case GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId:
-	                RawOccupancyUsFeedback.FireUpdate();
-	                break;
-	        }
-
-	        base.OccSensor_BaseEvent(device, args);
-	    }
-
-	    /// <summary>
-		/// Sets the OrWhenVacated state
-		/// </summary>
-		/// <param name="state"></param>
-		public void SetOrWhenVacatedState(bool state)
-		{
-			_occSensor.OrWhenVacated.BoolValue = state;
-		}
-
-		/// <summary>
-		/// Sets the AndWhenVacated state
-		/// </summary>
-		/// <param name="state"></param>
-		public void SetAndWhenVacatedState(bool state)
-		{
-			_occSensor.AndWhenVacated.BoolValue = state;
-		}
-
-		/// <summary>
-		/// Enables or disables the Ultrasonic A sensor
-		/// </summary>
-		/// <param name="state"></param>
-		public void SetUsAEnable(bool state)
-		{
-			_occSensor.EnableUsA.BoolValue = state;
-			_occSensor.DisableUsA.BoolValue = !state;
-		}
-
-
-		/// <summary>
-		/// Enables or disables the Ultrasonic B sensor
-		/// </summary>
-		/// <param name="state"></param>
-		public void SetUsBEnable(bool state)
-		{
-			_occSensor.EnableUsB.BoolValue = state;
-			_occSensor.DisableUsB.BoolValue = !state;
-		}
-
-		public void IncrementUsSensitivityInOccupiedState(bool pressRelease)
-		{
-			_occSensor.IncrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
-		}
-
-		public void DecrementUsSensitivityInOccupiedState(bool pressRelease)
-		{
-			_occSensor.DecrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
-		}
-
-		public void IncrementUsSensitivityInVacantState(bool pressRelease)
-		{
-			_occSensor.IncrementUsSensitivityInVacantState.BoolValue = pressRelease;
-		}
-
-		public void DecrementUsSensitivityInVacantState(bool pressRelease)
-		{
-			_occSensor.DecrementUsSensitivityInVacantState.BoolValue = pressRelease;
-		}
-
-		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-		{
-			LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
-		}
-
-		/// <summary>
-		/// Method to print occ sensor settings to console.
-		/// </summary>
-		public override void GetSettings()
-		{
-            base.GetSettings();
-
-			Debug.Console(0, this, "Ultrasonic Enabled A: {0} | B: {1}",
-				_occSensor.UsAEnabledFeedback.BoolValue,
-				_occSensor.UsBEnabledFeedback.BoolValue);
-
-			Debug.Console(0, this, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}",
-				_occSensor.UsSensitivityInOccupiedStateFeedback.UShortValue,
-				_occSensor.UsSensitivityInVacantStateFeedback.UShortValue);
-
-            var dash = new string('*', 50);
-			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
-		}
-
-	}
-
-    public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
     {
-        public GlsOdtOccupancySensorControllerFactory()
+        public new GlsOdtCCn OccSensor { get; private set; }
+
+        public BoolFeedback OrWhenVacatedFeedback { get; private set; }
+
+        public BoolFeedback AndWhenVacatedFeedback { get; private set; }
+
+        public BoolFeedback UltrasonicAEnabledFeedback { get; private set; }
+
+        public BoolFeedback UltrasonicBEnabledFeedback { get; private set; }
+
+        public IntFeedback UltrasonicSensitivityInVacantStateFeedback { get; private set; }
+
+        public IntFeedback UltrasonicSensitivityInOccupiedStateFeedback { get; private set; }
+
+        public BoolFeedback RawOccupancyPirFeedback { get; private set; }
+
+        public BoolFeedback RawOccupancyUsFeedback { get; private set; }
+
+
+        public GlsOdtOccupancySensorController(string key, Func<DeviceConfig, GlsOdtCCn> preActivationFunc,
+            DeviceConfig config)
+            : base(key, config.Name)
         {
-            TypeNames = new List<string> { "glsodtccn" };
+            AddPreActivationAction(() =>
+            {
+                OccSensor = preActivationFunc(config);
+
+                RegisterCrestronGenericBase(OccSensor);
+
+                RegisterGlsOdtSensorBaseController(OccSensor);
+
+                AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue);
+
+                OrWhenVacatedFeedback = new BoolFeedback(() => OccSensor.OrWhenVacatedFeedback.BoolValue);
+
+                UltrasonicAEnabledFeedback = new BoolFeedback(() => OccSensor.UsAEnabledFeedback.BoolValue);
+
+                UltrasonicBEnabledFeedback = new BoolFeedback(() => OccSensor.UsBEnabledFeedback.BoolValue);
+
+                RawOccupancyPirFeedback = new BoolFeedback(() => OccSensor.RawOccupancyPirFeedback.BoolValue);
+
+                RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyUsFeedback.BoolValue);
+
+                UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
+
+                UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);
+
+            });       
+        }
+
+        /// <summary>
+        /// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
+        /// Then calls the base delegate method to ensure any common event IDs are captured.
+        /// </summary>
+        /// <param name="device"></param>
+        /// <param name="args"></param>
+        protected override void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
+        {
+            if (args.EventId == GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId)
+                AndWhenVacatedFeedback.FireUpdate();
+            else if (args.EventId == GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId)
+                OrWhenVacatedFeedback.FireUpdate();
+            else if (args.EventId == GlsOccupancySensorBase.UsAEnabledFeedbackEventId)
+                UltrasonicAEnabledFeedback.FireUpdate();
+            else if (args.EventId == GlsOccupancySensorBase.UsBEnabledFeedbackEventId)
+                UltrasonicBEnabledFeedback.FireUpdate();
+            else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId)
+                UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
+            else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId)
+                UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
+
+            base.OccSensor_GlsOccupancySensorChange(device, args);
+        }
+
+        /// <summary>
+        /// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
+        /// Then calls the base delegate method to ensure any common event IDs are captured.
+        /// </summary>
+        /// <param name="device"></param>
+        /// <param name="args"></param>
+        protected override void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
+        {
+             if (args.EventId == GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId)
+                RawOccupancyPirFeedback.FireUpdate();
+            else if (args.EventId == GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId)
+                RawOccupancyUsFeedback.FireUpdate();
+
+            base.OccSensor_BaseEvent(device, args);
+        }
+
+        /// <summary>
+        /// Sets the OrWhenVacated state
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetOrWhenVacatedState(bool state)
+        {
+            OccSensor.OrWhenVacated.BoolValue = state;
+        }
+
+        /// <summary>
+        /// Sets the AndWhenVacated state
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetAndWhenVacatedState(bool state)
+        {
+            OccSensor.AndWhenVacated.BoolValue = state;
+        }
+
+        /// <summary>
+        /// Enables or disables the Ultrasonic A sensor
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetUsAEnable(bool state)
+        {
+            OccSensor.EnableUsA.BoolValue = state;
+            OccSensor.DisableUsA.BoolValue = !state;
         }
 
 
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        /// <summary>
+        /// Enables or disables the Ultrasonic B sensor
+        /// </summary>
+        /// <param name="state"></param>
+        public void SetUsBEnable(bool state)
         {
-            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
-
-            return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
+            OccSensor.EnableUsB.BoolValue = state;
+            OccSensor.DisableUsB.BoolValue = !state;
         }
 
+        public void IncrementUsSensitivityInOccupiedState(bool pressRelease)
+        {
+            OccSensor.IncrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
+        }
+
+        public void DecrementUsSensitivityInOccupiedState(bool pressRelease)
+        {
+            OccSensor.DecrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
+        }
+
+        public void IncrementUsSensitivityInVacantState(bool pressRelease)
+        {
+            OccSensor.IncrementUsSensitivityInVacantState.BoolValue = pressRelease;
+        }
+
+        public void DecrementUsSensitivityInVacantState(bool pressRelease)
+        {
+            OccSensor.DecrementUsSensitivityInVacantState.BoolValue = pressRelease;
+        }
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+        }
+
+        #region PreActivation
+
         private static GlsOdtCCn GetGlsOdtCCn(DeviceConfig dc)
         {
             var control = CommFactory.GetControlPropertiesConfig(dc);
             var cresnetId = control.CresnetIdInt;
             var branchId = control.ControlPortNumber;
-            var parentKey = String.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
 
             if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
             {
@@ -277,6 +194,24 @@ namespace PepperDash.Essentials.Core
             Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
             return null;
         }
+        #endregion
+
+        public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
+        {
+            public GlsOdtOccupancySensorControllerFactory()
+            {
+                TypeNames = new List<string>() { "glsodtccn" };
+            }
+
+
+            public override EssentialsDevice BuildDevice(DeviceConfig dc)
+            {
+                Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+
+                return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
+            }
+
+        }
     }
 
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOirOccupancySensorController.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-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
-{
-    public class GlsOirOccupancySensorController:GlsOccupancySensorBaseController
-    {
-        private GlsOirCCn _occSensor;
-
-        public GlsOirOccupancySensorController(string key, Func<DeviceConfig, GlsOirCCn> preActivationFunc,DeviceConfig config) : this(key,config.Name, preActivationFunc, config)
-        {
-        }
-
-        public GlsOirOccupancySensorController(string key, string name, Func<DeviceConfig, GlsOirCCn> preActivationFunc, DeviceConfig config) : base(key, name, config)
-        {
-            AddPreActivationAction(() =>
-            {
-                _occSensor = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_occSensor);
-
-                RegisterGlsOccupancySensorBaseController(_occSensor);
-            });
-        }
-
-        #region Overrides of CrestronGenericBridgeableBaseDevice
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
-        }
-
-        #endregion
-    }
-
-    public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
-    {
-        public GlsOccupancySensorBaseControllerFactory()
-        {
-            TypeNames = new List<string> { "glsoirccn" };
-        }
-
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new GlsOirOccupancySensorController Device");
-
-            return new GlsOirOccupancySensorController(dc.Key, GetGlsOirCCn, dc);
-        }
-
-        private static GlsOirCCn GetGlsOirCCn(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 GlsOirCCn", parentKey);
-                return new GlsOirCCn(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 GlsOirCCn", parentKey);
-                return new GlsOirCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/IOccupancyStatusProviderAggregator.cs

@@ -2,18 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp;
+
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Aggregates the RoomIsOccupied feedbacks of one or more IOccupancyStatusProvider objects
     /// </summary>
-    public class IOccupancyStatusProviderAggregator : EssentialsDevice, IOccupancyStatusProvider
+    public class IOccupancyStatusProviderAggregator : Device, IOccupancyStatusProvider
     {
         /// <summary>
         /// Aggregated feedback of all linked IOccupancyStatusProvider devices
@@ -22,51 +21,16 @@ namespace PepperDash.Essentials.Core
         {
             get
             {
-                return _aggregatedOccupancyStatus.Output;
+                return AggregatedOccupancyStatus.Output;
             }
         }
 
-        private readonly BoolFeedbackOr _aggregatedOccupancyStatus;
+        private BoolFeedbackOr AggregatedOccupancyStatus;
 
         public IOccupancyStatusProviderAggregator(string key, string name) 
             : base(key, name)
         {
-            _aggregatedOccupancyStatus = new BoolFeedbackOr();
-        }
-
-        public IOccupancyStatusProviderAggregator(string key, string name, OccupancyAggregatorConfig config)
-            : this(key, name)
-        {
-            AddPostActivationAction(() =>
-            {
-                if (config.DeviceKeys.Count == 0)
-                {
-                    return;
-                }
-
-                foreach (var deviceKey in config.DeviceKeys)
-                {
-                    var device = DeviceManager.GetDeviceForKey(deviceKey);
-
-                    if (device == null)
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "Unable to retrieve Occupancy provider with key {0}", deviceKey);
-                        continue;
-                    }
-
-                    var provider = device as IOccupancyStatusProvider;
-
-                    if (provider == null)
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "Device with key {0} does NOT implement IOccupancyStatusProvider. Please check configuration.");
-                        continue;
-                    }
-
-                    AddOccupancyStatusProvider(provider);
-                }
-            });
+            AggregatedOccupancyStatus = new BoolFeedbackOr();
         }
 
         /// <summary>
@@ -75,35 +39,7 @@ namespace PepperDash.Essentials.Core
         /// <param name="statusProvider"></param>
         public void AddOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
         {
-            _aggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
-        }
-
-        public void RemoveOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
-        {
-            _aggregatedOccupancyStatus.RemoveOutputIn(statusProvider.RoomIsOccupiedFeedback);
-        }
-
-        public void ClearOccupancyStatusProviders()
-        {
-            _aggregatedOccupancyStatus.ClearOutputs();
+            AggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
         }
-    }
-
-    public class OccupancyAggregatorFactory : EssentialsDeviceFactory<IOccupancyStatusProviderAggregator>
-    {
-        public OccupancyAggregatorFactory()
-        {
-            TypeNames = new List<string> { "occupancyAggregator", "occAggregate" };
-        }
-
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
-
-            var config = dc.Properties.ToObject<OccupancyAggregatorConfig>();
-                
-            return new IOccupancyStatusProviderAggregator(dc.Key, dc.Name, config);
-        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/OccupancyAggregatorConfig.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    public class OccupancyAggregatorConfig
-    {
-        [JsonProperty("deviceKeys")] public List<string> DeviceKeys { get; set; }
-
-        public OccupancyAggregatorConfig()
-        {
-            DeviceKeys = new List<string>();
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -4,7 +4,7 @@ using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Bridges.JoinMaps;
+using PepperDash_Essentials_Core.Bridges.JoinMaps;
 
 using System;
 using System.Collections.Generic;

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

@@ -48,39 +48,39 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
@@ -89,30 +89,30 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -143,7 +143,6 @@
     <Compile Include="Bridges\JoinMaps\Hrxxx0WirelessRemoteControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IRBlurayBaseJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
@@ -162,7 +161,6 @@
     <Compile Include="Config\Essentials\ConfigWriter.cs" />
     <Compile Include="Config\Essentials\EssentialsConfig.cs" />
     <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
-    <Compile Include="Crestron IO\C2nIo\C2nIoController.cs" />
     <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
     <Compile Include="Crestron IO\Cards\C3CardControllerBase.cs" />
     <Compile Include="Crestron IO\Cards\C3Com3Controller.cs" />
@@ -190,7 +188,6 @@
     <Compile Include="Device Info\IDeviceInfoProvider.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
-    <Compile Include="Devices\DestinationListItem.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
@@ -198,12 +195,10 @@
     <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IDspPreset.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
-    <Compile Include="Devices\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
@@ -211,7 +206,6 @@
     <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
-    <Compile Include="Extensions\JsonExtensions.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
     <Compile Include="Factory\ReadyEventArgs.cs" />
@@ -225,16 +219,10 @@
     <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
     <Compile Include="Fusion\FusionEventHandlers.cs" />
     <Compile Include="Fusion\FusionProcessorQueries.cs" />
-    <Compile Include="Fusion\EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs" />
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
     <Compile Include="Global\EthernetAdapterInfo.cs" />
-    <Compile Include="Interfaces\ILogStrings.cs" />
-    <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
-    <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
-    <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
-    <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
@@ -290,8 +278,6 @@
     <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
     <Compile Include="Room\EssentialsRoomBase.cs" />
-    <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
-    <Compile Include="Room\IEssentialsRoom.cs" />
     <Compile Include="Room\Interfaces.cs" />
     <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
@@ -325,10 +311,6 @@
     <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
     <Compile Include="Routing\RoutingPortNames.cs" />
     <Compile Include="Routing\TieLineConfig.cs" />
-    <Compile Include="Secrets\CrestronSecretsProvider.cs" />
-    <Compile Include="Secrets\Interfaces.cs" />
-    <Compile Include="Secrets\SecretsManager.cs" />
-    <Compile Include="Secrets\SecretsPropertiesConfig.cs" />
     <Compile Include="Shades\Shade Interfaces.cs" />
     <Compile Include="Shades\ShadeBase.cs" />
     <Compile Include="Shades\ShadeController.cs" />
@@ -339,7 +321,6 @@
     <Compile Include="Routing\TieLine.cs" />
     <Compile Include="Queues\StringResponseProcessor.cs" />
     <Compile Include="Timers\CountdownTimer.cs" />
-    <Compile Include="Timers\RetriggerableTimer.cs" />
     <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="Touchpanels\Interfaces.cs" />
     <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
@@ -350,7 +331,6 @@
     <Compile Include="UI PageManagers\SinglePageManager.cs" />
     <Compile Include="UI PageManagers\PageManager.cs" />
     <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
-    <Compile Include="Utilities\ActionSequence.cs" />
     <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
     <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
     <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />

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

@@ -14,7 +14,7 @@
     <tags>crestron 3series 4series</tags>
     <repository type="git" url="https://github.com/PepperDash/Essentials"/>
     <dependencies>
-      <dependency id="PepperDashCore" version="[1.0.45, 1.1.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.43, 1.1.0)"/>
     </dependencies>
   </metadata>
   <files>

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

@@ -358,27 +358,14 @@ namespace PepperDash.Essentials
                 try
                 {
                     var assy = loadedAssembly.Assembly;
-                    CType[] types = {};
-                    try
-                    {
-                        types = assy.GetTypes();
-                    }
-                    catch (TypeLoadException e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Warning, "Unable to get types for assembly {0}: {1}",
-                            loadedAssembly.Name, e.Message);
-                        Debug.Console(2, e.StackTrace);
-                        continue;
-                    }
-
+                    var types = assy.GetTypes();
                     foreach (var type in types)
                     {
                         try
                         {
-                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type) && !type.IsAbstract)
+                            if (typeof(IPluginDeviceFactory).IsAssignableFrom(type))
                             {
-                                var plugin =
-                                    (IPluginDeviceFactory) Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                                var plugin = (IPluginDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
                                 LoadCustomPlugin(plugin, loadedAssembly);
                             }
                             else
@@ -391,15 +378,10 @@ namespace PepperDash.Essentials
                                 }
                             }
                         }
-                        catch (NotSupportedException e)
-                        {
-                            //this happens for dlls that aren't PD dlls, like ports of Mono classes into S#. Swallowing.
-                               
-                        }
                         catch (Exception e)
                         {
                             Debug.Console(2, "Load Plugin not found. {0}.{2} is not a plugin factory. Exception: {1}",
-                                loadedAssembly.Name, e.Message, type.Name);
+                                loadedAssembly.Name, e, type.Name);
                             continue;
                         }
 
@@ -407,9 +389,7 @@ namespace PepperDash.Essentials
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "Error Loading assembly {0}: {1}",
-                           loadedAssembly.Name, e.Message);
-                    Debug.Console(2, "{0}", e.StackTrace);
+                    Debug.Console(2, "Error Loading Assembly: {0} Exception: {1} ", loadedAssembly.Name, e);
                     continue;
                 }
             }
@@ -422,16 +402,13 @@ namespace PepperDash.Essentials
         /// Loads a
         /// </summary>
         /// <param name="plugin"></param>
-        /// <param name="loadedAssembly"></param>
         static void LoadCustomPlugin(IPluginDeviceFactory plugin, LoadedAssembly loadedAssembly)
         {
             var passed = Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
 
             if (!passed)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Error,
-                    "\r\n********************\r\n\tPlugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin {1}\r\n********************",
-                    plugin.MinimumEssentialsFrameworkVersion, loadedAssembly.Name);
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", plugin.MinimumEssentialsFrameworkVersion);
                 return;
             }
             else

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs

@@ -1,300 +1,178 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
+
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
 using PepperDash.Core;
 
 //using SSMono.IO;
-using PepperDash.Core.WebApi.Presets;
 
 namespace PepperDash.Essentials.Core.Presets
 {
-    /// <summary>
-    /// Class that represents the model behind presets display
-    /// </summary>
-    public class DevicePresetsModel : Device
-    {
-        public delegate void PresetRecalledCallback(ISetTopBoxNumericKeypad device, string channel);
+	/// <summary>
+	/// Class that represents the model behind presets display
+	/// </summary>
+	public class DevicePresetsModel : Device
+	{
+		public event EventHandler PresetsLoaded;
 
-        public delegate void PresetsSavedCallback(List<PresetChannel> presets);
+		public int PulseTime { get; set; }
+		public int DigitSpacingMS { get; set; }
+		public bool PresetsAreLoaded { get; private set; }
 
-        private readonly CCriticalSection _fileOps = new CCriticalSection();
-        private readonly bool _initSuccess;
+		public List<PresetChannel> PresetsList { get { return _PresetsList.ToList(); } }
+		List<PresetChannel> _PresetsList;
+		public int Count { get { return PresetsList != null ? PresetsList.Count : 0; } }
 
-        private readonly ISetTopBoxNumericKeypad _setTopBox;
+		public bool UseLocalImageStorage { get; set; }
+		public string ImagesLocalHostPrefix { get; set; }
+		public string ImagesPathPrefix { get; set; }
+		public string ListPathPrefix { get; set; }
 
-        /// <summary>
-        /// The methods on the STB device to call when dialing
-        /// </summary>
-        private Dictionary<char, Action<bool>> _dialFunctions;
+		/// <summary>
+		/// The methods on the STB device to call when dialing
+		/// </summary>
+		Dictionary<char, Action<bool>> DialFunctions;
+		Action<bool> EnterFunction;
 
-        private bool _dialIsRunning;
-        private Action<bool> _enterFunction;
-        private string _filePath;
+		bool DialIsRunning;
+		string FilePath;
+		bool InitSuccess;
+        //SSMono.IO.FileSystemWatcher ListWatcher;
 
-        public DevicePresetsModel(string key, ISetTopBoxNumericKeypad setTopBox, string fileName)
-            : this(key, fileName)
-        {
-            try
-            {
-                _setTopBox = setTopBox;
+		public DevicePresetsModel(string key, ISetTopBoxNumericKeypad setTopBox, string fileName)
+			: base(key)
+		{
+			PulseTime = 150;
+			DigitSpacingMS = 150;
 
-                // Grab the digit functions from the device
-                // If any fail, the whole thing fails peacefully
-                _dialFunctions = new Dictionary<char, Action<bool>>(10)
-                {
-                    {'1', setTopBox.Digit1},
-                    {'2', setTopBox.Digit2},
-                    {'3', setTopBox.Digit3},
-                    {'4', setTopBox.Digit4},
-                    {'5', setTopBox.Digit5},
-                    {'6', setTopBox.Digit6},
-                    {'7', setTopBox.Digit7},
-                    {'8', setTopBox.Digit8},
-                    {'9', setTopBox.Digit9},
-                    {'0', setTopBox.Digit0},
-                    {'-', setTopBox.Dash}
-                };
-            }
-            catch
-            {
-                Debug.Console(0, "DevicePresets '{0}', not attached to INumericKeypad device. Ignoring", key);
-                _dialFunctions = null;
-                return;
-            }
+			try
+			{
+				// Grab the digit functions from the device
+				// If any fail, the whole thing fails peacefully
+				DialFunctions = new Dictionary<char, Action<bool>>(10)
+				{
+					{ '1', setTopBox.Digit1 },
+					{ '2', setTopBox.Digit2 },
+					{ '3', setTopBox.Digit3 },
+					{ '4', setTopBox.Digit4 },
+					{ '5', setTopBox.Digit5 },
+					{ '6', setTopBox.Digit6 },
+					{ '7', setTopBox.Digit7 },
+					{ '8', setTopBox.Digit8 },
+					{ '9', setTopBox.Digit9 },
+					{ '0', setTopBox.Digit0 },
+					{ '-', setTopBox.Dash }
+				};
+			}
+			catch
+			{
+				Debug.Console(0, "DevicePresets '{0}', not attached to INumericKeypad device. Ignoring", key);
+				DialFunctions = null;
+				return;
+			}
 
-            _enterFunction = setTopBox.KeypadEnter;
-        }
+			EnterFunction = setTopBox.KeypadEnter;
 
-        public DevicePresetsModel(string key, string fileName) : base(key)
-        {
-            PulseTime = 150;
-            DigitSpacingMs = 150;
+			UseLocalImageStorage = true;
 
-            UseLocalImageStorage = true;
+			ImagesLocalHostPrefix = "http://" + CrestronEthernetHelper.GetEthernetParameter(
+				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS,0);
+			ImagesPathPrefix = @"/presets/images.zip/";
+			ListPathPrefix = @"/html/presets/lists/";
 
-            ImagesLocalHostPrefix = "http://" + CrestronEthernetHelper.GetEthernetParameter(
-                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
-            ImagesPathPrefix = @"/presets/images.zip/";
-            ListPathPrefix = @"/html/presets/lists/";
+			SetFileName(fileName);
 
-            SetFileName(fileName);
-
-            _initSuccess = true;
-        }
-
-        public event PresetRecalledCallback PresetRecalled;
-        public event PresetsSavedCallback PresetsSaved;
-
-        public int PulseTime { get; set; }
-        public int DigitSpacingMs { get; set; }
-        public bool PresetsAreLoaded { get; private set; }
-
-        public List<PresetChannel> PresetsList { get; private set; }
-
-        public int Count
-        {
-            get { return PresetsList != null ? PresetsList.Count : 0; }
-        }
-
-        public bool UseLocalImageStorage { get; set; }
-        public string ImagesLocalHostPrefix { get; set; }
-        public string ImagesPathPrefix { get; set; }
-        public string ListPathPrefix { get; set; }
-        public event EventHandler PresetsLoaded;
+            //ListWatcher = new FileSystemWatcher(@"\HTML\presets\lists");
+            //ListWatcher.NotifyFilter = NotifyFilters.LastWrite;
+            //ListWatcher.EnableRaisingEvents = true;
+            //ListWatcher.Changed += ListWatcher_Changed;
+			InitSuccess = true;
+		}
 
 
-        public void SetFileName(string path)
-        {
-            _filePath = ListPathPrefix + path;
+		public void SetFileName(string path)
+		{
+			FilePath = ListPathPrefix + path;
+			LoadChannels();
+		}	
 
-            Debug.Console(2, this, "Setting presets file path to {0}", _filePath);
-            LoadChannels();
-        }
+		public void LoadChannels()
+		{
+			PresetsAreLoaded = false;
+			try
+			{
+				var pl = JsonConvert.DeserializeObject<PresetsList>(Crestron.SimplSharp.CrestronIO.File.ReadToEnd(FilePath, Encoding.ASCII));
+				Name = pl.Name;
+				_PresetsList = pl.Channels;
+			}
+			catch (Exception e)
+			{
+				Debug.Console(2, this, "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}", FilePath, e.Message);
+				// Just save a default empty list
+				_PresetsList = new List<PresetChannel>();
+			}
+			PresetsAreLoaded = true;
 
-        public void LoadChannels()
-        {
-            try
-            {
-                _fileOps.Enter();
+			var handler = PresetsLoaded;
+			if (handler != null)
+				handler(this, EventArgs.Empty);
+		}
 
-                Debug.Console(2, this, "Loading presets from {0}", _filePath);
-                PresetsAreLoaded = false;
-                try
-                {
-                    var pl = JsonConvert.DeserializeObject<PresetsList>(File.ReadToEnd(_filePath, Encoding.ASCII));
-                    Name = pl.Name;
-                    PresetsList = pl.Channels;
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, this,
-                        "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}",
-                        _filePath, e.Message);
-                    // Just save a default empty list
-                    PresetsList = new List<PresetChannel>();
-                }
-                PresetsAreLoaded = true;
+		public void Dial(int presetNum)
+		{
+			if (presetNum <= _PresetsList.Count)
+				Dial(_PresetsList[presetNum - 1].Channel);
+		}
 
-                var handler = PresetsLoaded;
-                if (handler != null)
-                {
-                    handler(this, EventArgs.Empty);
-                }
-            }
-            finally
-            {
-                _fileOps.Leave();
-            }
-        }
+		public void Dial(string chanNum)
+		{
+			if (DialIsRunning || !InitSuccess) return;
+			if (DialFunctions == null)
+			{
+				Debug.Console(1, "DevicePresets '{0}', not attached to keypad device. Ignoring channel", Key);
+				return;
+			}
 
-        public void Dial(int presetNum)
-        {
-            if (presetNum <= PresetsList.Count)
-            {
-                Dial(PresetsList[presetNum - 1].Channel);
-            }
-        }
+			DialIsRunning = true;
+			CrestronInvoke.BeginInvoke(o =>
+				{
+					foreach (var c in chanNum.ToCharArray())
+					{
+						if (DialFunctions.ContainsKey(c))
+							Pulse(DialFunctions[c]);
+						CrestronEnvironment.Sleep(DigitSpacingMS);
+					}
 
-        public void Dial(string chanNum)
-        {
-            if (_dialIsRunning || !_initSuccess)
-            {
-                return;
-            }
-            if (_dialFunctions == null)
-            {
-                Debug.Console(1, "DevicePresets '{0}', not attached to keypad device. Ignoring channel", Key);
-                return;
-            }
+					if (EnterFunction != null)
+						Pulse(EnterFunction);
+					DialIsRunning = false;
+				});
+		}
 
-            _dialIsRunning = true;
-            CrestronInvoke.BeginInvoke(o =>
-            {
-                foreach (var c in chanNum.ToCharArray())
-                {
-                    if (_dialFunctions.ContainsKey(c))
-                    {
-                        Pulse(_dialFunctions[c]);
-                    }
-                    CrestronEnvironment.Sleep(DigitSpacingMs);
-                }
+		void Pulse(Action<bool> act)
+		{
+			act(true);
+			CrestronEnvironment.Sleep(PulseTime);
+			act(false);
+		}
 
-                if (_enterFunction != null)
-                {
-                    Pulse(_enterFunction);
-                }
-                _dialIsRunning = false;
-            });
-
-            if (_setTopBox == null) return;
-
-            OnPresetRecalled(_setTopBox, chanNum);
-        }
-
-        public void Dial(int presetNum, ISetTopBoxNumericKeypad setTopBox)
-        {
-            if (presetNum <= PresetsList.Count)
-            {
-                Dial(PresetsList[presetNum - 1].Channel, setTopBox);
-            }
-        }
-
-        public void Dial(string chanNum, ISetTopBoxNumericKeypad setTopBox)
-        {
-            _dialFunctions = new Dictionary<char, Action<bool>>(10)
-            {
-                {'1', setTopBox.Digit1},
-                {'2', setTopBox.Digit2},
-                {'3', setTopBox.Digit3},
-                {'4', setTopBox.Digit4},
-                {'5', setTopBox.Digit5},
-                {'6', setTopBox.Digit6},
-                {'7', setTopBox.Digit7},
-                {'8', setTopBox.Digit8},
-                {'9', setTopBox.Digit9},
-                {'0', setTopBox.Digit0},
-                {'-', setTopBox.Dash}
-            };
-
-            _enterFunction = setTopBox.KeypadEnter;
-
-            OnPresetRecalled(setTopBox, chanNum);
-
-            Dial(chanNum);
-        }
-
-        private void OnPresetRecalled(ISetTopBoxNumericKeypad setTopBox, string channel)
-        {
-            var handler = PresetRecalled;
-
-            if (handler == null)
-            {
-                return;
-            }
-
-            handler(setTopBox, channel);
-        }
-
-        public void UpdatePreset(int index, PresetChannel preset)
-        {
-            if (index >= PresetsList.Count)
-            {
-                return;
-            }
-
-            PresetsList[index] = preset;
-
-            SavePresets();
-
-            OnPresetsSaved();
-        }
-
-        public void UpdatePresets(List<PresetChannel> presets)
-        {
-            PresetsList = presets;
-
-            SavePresets();
-
-            OnPresetsSaved();
-        }
-
-        private void SavePresets()
-        {
-            try
-            {
-                _fileOps.Enter();
-                var pl = new PresetsList {Channels = PresetsList, Name = Name};
-                var json = JsonConvert.SerializeObject(pl, Formatting.Indented);
-
-                using (var file = File.Open(_filePath, FileMode.Truncate))
-                {
-                    file.Write(json, Encoding.UTF8);
-                }
-            }
-            finally
-            {
-                _fileOps.Leave();
-            }
-            
-        }
-
-        private void OnPresetsSaved()
-        {
-            var handler = PresetsSaved;
-
-            if (handler == null) return;
-
-            handler(PresetsList);
-        }
-
-        private void Pulse(Action<bool> act)
-        {
-            act(true);
-            CrestronEnvironment.Sleep(PulseTime);
-            act(false);
-        }
-    }
+		/// <summary>
+		/// Event handler for filesystem watcher.  When directory changes, this is called
+		/// </summary>
+        //void ListWatcher_Changed(object sender, FileSystemEventArgs e)
+        //{
+        //    Debug.Console(1, this, "folder modified: {0}", e.FullPath);
+        //    if (e.FullPath.Equals(FilePath, StringComparison.OrdinalIgnoreCase))
+        //    {
+        //        Debug.Console(1, this, "File changed: {0}", e.ChangeType);			
+        //        LoadChannels();
+        //    }
+        //}
+	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/PresetChannel.cs

@@ -10,22 +10,19 @@ namespace PepperDash.Essentials.Core.Presets
 	public class PresetChannel
 	{
 
-		[JsonProperty(Required = Required.Always,PropertyName = "name")]
+		[JsonProperty(Required = Required.Always)]
 		public string Name { get; set; }
-
-		[JsonProperty(Required = Required.Always, PropertyName = "iconUrl")]
+		[JsonProperty(Required = Required.Always)]
 		public string IconUrl { get; set; }
-
-		[JsonProperty(Required = Required.Always, PropertyName = "channel")]
+		[JsonProperty(Required = Required.Always)]
 		public string Channel { get; set; }
 	}
 
 	public class PresetsList
 	{
-		[JsonProperty(Required=Required.Always,PropertyName = "name")]
+		[JsonProperty(Required=Required.Always)]
 		public string Name { get; set; }
-
-		[JsonProperty(Required = Required.Always, PropertyName = "channels")]
+		[JsonProperty(Required = Required.Always)]
 		public List<PresetChannel> Channels { get; set; }
 	}
 }