change phase for PR triggered builds to beta

.github/scripts/GenerateVersionNumber-2.0.0.ps1

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

.github/workflows/Build Essentials.yml

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

.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;
@@ -53,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);
             }
 
@@ -432,31 +431,12 @@ namespace PepperDash.Essentials
                 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 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...");
@@ -468,24 +448,12 @@ namespace PepperDash.Essentials
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 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");
@@ -588,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(EssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
-            : base(room, ipId, joinMapKey)
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
+            : base(room, ipId)
         {
 
         }
@@ -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);
@@ -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 EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
             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;
@@ -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;
                 }
 
@@ -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,7 +328,7 @@ 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);
 

PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs

@@ -1,98 +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>())
-                {
-                    Debug.Console(2, this, "Setting up Static Asset for {0}", display.Key);
-
-                    display.UsageTracker = new UsageTracking(display) { UsageIsTracked = true };
-                    display.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
-
-                    var dispPowerOnAction = new Action<bool>(b =>
-                    {
-                        if (!b)
-                        {
-                            display.PowerOn();
-                        }
-                    });
-                    var dispPowerOffAction = new Action<bool>(b =>
-                    {
-                        if (!b)
-                        {
-                            display.PowerOff();
-                        }
-                    });
-
-                    var deviceConfig = ConfigReader.ConfigObject.GetDeviceForKey(display.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),
-                            display.Name, "Display", "");
-                        FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
-                    }
-
-                    var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
-                        tempAsset.InstanceId);
-                    dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
-                    dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
-
-                    var defaultTwoWayDisplay = display as IHasPowerControlWithFeedback;
-                    if (defaultTwoWayDisplay != null)
-                    {
-                        defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-                        if (display is IDisplayUsage)
-                        {
-                            (display as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-                        }
-
-                        defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
-                    }
-
-                    // Use extension methods
-                    dispAsset.TrySetMakeModel(display);
-                    dispAsset.TryLinkAssetErrorToCommunication(display);
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error setting up displays in Fusion: {0}", e);
-            }
-        }
-    }
-}

PepperDashEssentials/PepperDashEssentials.csproj

@@ -133,7 +133,6 @@
     <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" />
@@ -142,13 +141,11 @@
     <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="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -22,25 +22,30 @@ 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>
@@ -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; }
 
@@ -223,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,40 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Room.Config
-{
-    public class EssentialsTechRoomConfig
-    {
-        [JsonProperty("dummySourceKey")]
-        public string DummySourceKey { get; set; }
-
-        [JsonProperty("displays")]
-        public List<string> Displays;
-        
-        [JsonProperty("tuners")]
-        public List<string> Tuners;
-
-        [JsonProperty("userPin")]
-        public string UserPin;
-
-        [JsonProperty("techPin")]
-        public string TechPin;
-
-        [JsonProperty("presetsFileName")]
-        public string PresetsFileName;
-
-        [JsonProperty("scheduledEvents")]
-        public List<ScheduledEventConfig> ScheduledEvents;
-
-        [JsonProperty("isPrimary")] public bool IsPrimary;
-
-        [JsonProperty("isTvPresetsProvider")] public bool IsTvPresetsProvider;
-
-        public EssentialsTechRoomConfig()
-        {
-            Displays = new List<string>();
-            Tuners = new List<string>();
-            ScheduledEvents = new List<ScheduledEventConfig>();
-        }
-    }
-}

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

@@ -1,473 +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)
-        {
-            if (!_currentPresets.ContainsKey(device.Key))
-            {
-                return;
-            }
-
-            _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))
-            {
-                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)
-            {
-                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;
-            }
-
-            i = 0;
-            foreach (var setTopBox in _tuners)
-            {
-                var tuner = setTopBox;
-
-                trilist.SetStringSigAction(joinMap.CurrentPreset.JoinNumber + i, s => _tunerPresets.Dial(s, tuner.Value));
-
-                i++;
-            }
-        }
-
-        #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;
-    }
-}

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

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/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();

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/Config/BasicConfig.cs

@@ -7,8 +7,6 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
-using Newtonsoft.Json.Linq;
-
 namespace PepperDash.Essentials.Core.Config
 {
 	/// <summary>
@@ -29,7 +27,7 @@ namespace PepperDash.Essentials.Core.Config
 		public List<TieLineConfig> TieLines { get; set; }
 
         [JsonProperty("joinMaps")]
-        public Dictionary<string, JObject> JoinMaps { get; set; }
+        public Dictionary<string, string> JoinMaps { get; set; }
 
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null

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/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/Devices/DeviceJsonApi.cs

@@ -83,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;

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

@@ -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);

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

@@ -20,8 +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")]
-        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
+        public BoolFeedback PowerIsOnFeedback { get; private set; }
 
         protected Func<bool> PowerIsOnFeedbackFunc
         {

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

@@ -18,7 +18,7 @@ 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;
 
@@ -49,9 +49,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 +81,8 @@ namespace PepperDash.Essentials.Core
 
 		}
 
+
+
 		public abstract void PowerOn();
 		public abstract void PowerOff();
 		public abstract void PowerToggle();
@@ -100,7 +99,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)
@@ -262,8 +261,7 @@ namespace PepperDash.Essentials.Core
 
         abstract protected Func<string> CurrentInputFeedbackFunc { get; }
 
-        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
-
+        public BoolFeedback PowerIsOnFeedback { get; protected set; }
         abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
 
 
@@ -317,5 +315,7 @@ namespace PepperDash.Essentials.Core
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
         }
+
+
 	}
 }

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/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,7 +14,7 @@ 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()
         {
@@ -52,6 +49,7 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// Adds the event group to the global list
         /// </summary>
+        /// <param name="name"></param>
         /// <returns></returns>
         public static void AddEventGroup(ScheduledEventGroup eventGroup)
         {
@@ -69,13 +67,6 @@ namespace PepperDash.Essentials.Core
             if(!EventGroups.ContainsKey(eventGroup.Name))
                 EventGroups.Remove(eventGroup.Name);
         }
-
-        public static ScheduledEventGroup GetEventGroup(string key)
-        {
-            ScheduledEventGroup returnValue;
-
-            return EventGroups.TryGetValue(key, out returnValue) ? returnValue : null;
-        }
     }
 
     public static class SchedulerUtilities
@@ -144,90 +135,5 @@ namespace PepperDash.Essentials.Core
 
             return isMatch;
         }
-
-        public static bool CheckEventTimeForMatch(ScheduledEvent evnt, DateTime time)
-        {
-            return evnt.DateAndTime.Hour == time.Hour && evnt.DateAndTime.Minute == time.Minute;
-        }
-
-        public static bool CheckEventRecurrenceForMatch(ScheduledEvent evnt, ScheduledEventCommon.eWeekDays days)
-        {
-            return evnt.Recurrence.RecurrenceDays == days;
-        }
-
-        public static void CreateEventFromConfig(ScheduledEventConfig config, ScheduledEventGroup group, ScheduledEvent.UserEventCallBack handler)
-        {
-            if (group == null)
-            {
-                Debug.Console(0, "Unable to create event. Group is null");
-                return;
-            }
-            var scheduledEvent = new ScheduledEvent(config.Key, group)
-            {
-                Acknowledgeable = config.Acknowledgeable,
-                Persistent = config.Persistent
-            };
-
-            scheduledEvent.UserCallBack += handler;
-
-            scheduledEvent.DateAndTime.SetFirstDayOfWeek(ScheduledEventCommon.eFirstDayOfWeek.Sunday);
-
-            var eventTime = DateTime.Parse(config.Time);
-
-            if (DateTime.Now > eventTime)
-            {
-                eventTime = eventTime.AddDays(1);
-            }
-
-            Debug.Console(2, "[Scheduler] Current Date day of week: {0} recurrence days: {1}", eventTime.DayOfWeek,
-                config.Days);
-
-            var dayOfWeekConverted = ConvertDayOfWeek(eventTime);
-
-            Debug.Console(1, "[Scheduler] eventTime Day: {0}", dayOfWeekConverted);
-
-            while (!dayOfWeekConverted.IsFlagSet(config.Days))
-            {
-                eventTime = eventTime.AddDays(1);
-
-                dayOfWeekConverted = ConvertDayOfWeek(eventTime);
-            }
-
-            scheduledEvent.DateAndTime.SetAbsoluteEventTime(eventTime);
-
-            scheduledEvent.Recurrence.Weekly(config.Days);
-
-            if (config.Enable)
-            {
-                scheduledEvent.Enable();
-            }
-            else
-            {
-                scheduledEvent.Disable();
-            }
-        }
-
-        private static ScheduledEventCommon.eWeekDays ConvertDayOfWeek(DateTime eventTime)
-        {
-            return (ScheduledEventCommon.eWeekDays) Enum.Parse(typeof(ScheduledEventCommon.eWeekDays), eventTime.DayOfWeek.ToString(), true);
-        }
-
-        private static bool IsFlagSet<T>(this T value, T flag) where T : struct
-        {
-            CheckIsEnum<T>(true);
-
-            var lValue = Convert.ToInt64(value);
-            var lFlag = Convert.ToInt64(flag);
-
-            return (lValue & lFlag) != 0;
-        }
-
-        private static void CheckIsEnum<T>(bool withFlags)
-        {
-            if (!typeof(T).IsEnum)
-                throw new ArgumentException(string.Format("Type '{0}' is not an enum", typeof(T).FullName));
-            if (withFlags && !Attribute.IsDefined(typeof(T), typeof(FlagsAttribute)))
-                throw new ArgumentException(string.Format("Type '{0}' doesn't have the 'Flags' attribute", typeof(T).FullName));
-        }
     }
 }

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

@@ -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;
         }
 
     }
@@ -283,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());
             }
@@ -305,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);
                 }
             }
 
@@ -344,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]
@@ -360,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>
@@ -414,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
     {
@@ -428,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>
@@ -444,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)
         {
@@ -478,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/PepperDash_Essentials_Core.csproj

@@ -199,7 +199,6 @@
     <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" />
@@ -220,13 +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="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
@@ -282,7 +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\Interfaces.cs" />
     <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.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

@@ -402,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; }
 	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/ComsMessage.cs

@@ -40,7 +40,7 @@ namespace PepperDash_Essentials_Core.Queues
 
         private void Validate(IBasicCommunication coms, object message)
         {
-            if (coms == null)
+            if (_coms == null)
                 throw new ArgumentNullException("coms");
 
             if (message == null)

essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs

@@ -15,37 +15,23 @@ namespace PepperDash_Essentials_Core.Queues
         protected readonly Thread _worker;
         protected readonly CEvent _waitHandle = new CEvent();
         
-        private bool _delayEnabled;
-        private int _delayTime;
+        private readonly bool _delayEnabled;
+        private readonly int _delayTime;
 
         /// <summary>
         /// If the instance has been disposed.
         /// </summary>
         public bool Disposed { get; private set; }
 
-        /// <summary>
-        /// Constructor with no thread priority
-        /// </summary>
-        /// <param name="key"></param>
-        public GenericQueue(string key)
-            : this(key, Thread.eThreadPriority.MediumPriority)
-        {
-
-        }
-
         /// <summary>
         /// Constructor for generic queue with no pacing
         /// </summary>
         /// <param name="key">Key</param>
-        /// <param name="priority"></param>
-        public GenericQueue(string key, Thread.eThreadPriority priority)
+        public GenericQueue(string key)
         {
             _key = key;
-            _queue = new CrestronQueue<IQueueMessage>(25);
-            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
-                {
-                    Priority = priority
-                };
+            _queue = new CrestronQueue<IQueueMessage>();
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running);
 
             CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
             {
@@ -63,28 +49,11 @@ namespace PepperDash_Essentials_Core.Queues
         /// <param name="pacing">Pacing in ms between actions</param>
         public GenericQueue(string key, int pacing)
             : this(key)
-        {
-            SetDelayValues(pacing);
-        }
-
-        /// <summary>
-        /// Constructor with pacing and priority
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="pacing"></param>
-        /// <param name="priority"></param>
-        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority)
-            : this(key, priority)
-        {
-            SetDelayValues(pacing);
-        }
-
-        private void SetDelayValues(int pacing)
         {
             _delayEnabled = pacing > 0;
             _delayTime = pacing;
         }
-        
+
         /// <summary>
         /// Thread callback
         /// </summary>
@@ -114,7 +83,7 @@ namespace PepperDash_Essentials_Core.Queues
                     }
                     catch (Exception ex)
                     {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
+                        Debug.ConsoleWithLog(0, this, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
                     }
                 }
                 else _waitHandle.Wait();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Config/EssentialsRoomScheduledEventsConfig.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharp.Scheduler;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Room.Config
-{
-    public class EssentialsRoomScheduledEventsConfig
-    {
-        [JsonProperty("scheduledEvents")]
-        public List<ScheduledEventConfig> ScheduledEvents;
-    }
-
-    public class ScheduledEventConfig
-    {
-        [JsonProperty("key")]
-        public string Key;
-
-        [JsonProperty("name")]
-        public string Name;
-
-        [JsonProperty("days")]
-        public ScheduledEventCommon.eWeekDays Days;
-
-        [JsonProperty("time")]
-        public string Time;
-
-        [JsonProperty("actions")]
-        public List<DeviceActionWrapper> Actions;
-
-        [JsonProperty("persistent")]
-        public bool Persistent;
-
-        [JsonProperty("acknowledgeable")]
-        public bool Acknowledgeable;
-
-        [JsonProperty("enable")]
-        public bool Enable;
-    }
-}

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

@@ -41,14 +41,6 @@ namespace PepperDash.Essentials.Core
 
     }
 
-    /// <summary>
-    /// Simplified routing direct from source to destination
-    /// </summary>
-    public interface IRunDirectRouteAction
-    {
-        void RunDirectRoute(string sourceKey, string destinationKey);
-    }
-
     /// <summary>
     /// For rooms that default presentation only routing
     /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxThreePanelPageManager.cs

@@ -169,9 +169,9 @@ namespace PepperDash.Essentials.Core.PageManagers
             }
 
 			// Build presets
-            if (stb.HasPresets && stb.TvPresets != null)
+            if (stb.HasPresets && stb.PresetsModel != null)
 			{
-				PresetsView = new DevicePresetsView(trilist, stb.TvPresets);
+				PresetsView = new DevicePresetsView(trilist, stb.PresetsModel);
 			}
 		}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxTwoPanelPageManager.cs

@@ -18,8 +18,8 @@ namespace PepperDash.Essentials.Core.PageManagers
 		{
 			SetTopBox = stb;
 			TriList = trilist;
-			if(stb.TvPresets != null)
-				PresetsView = new DevicePresetsView(trilist, stb.TvPresets);
+			if(stb.PresetsModel != null)
+				PresetsView = new DevicePresetsView(trilist, stb.PresetsModel);
 		}
 
 		public override void Show()

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -49,9 +49,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback EnableAudioBreakawayFeedback { get; private set; }
         public BoolFeedback EnableUsbBreakawayFeedback { get; private set; }
 
-        public Dictionary<uint, IntFeedback> InputCardHdcpStateFeedbacks { get; private set; }
-        public Dictionary<uint, IntFeedback> InputStreamCardStateFeedbacks { get; private set; }
-        public Dictionary<uint, IntFeedback> OutputStreamCardStateFeedbacks { get; private set; }
+        public Dictionary<uint, IntFeedback> InputCardHdcpStateFeedbacks { get; private set; }
 
         public Dictionary<uint, eHdcpCapabilityType> InputCardHdcpCapabilityTypes { get; private set; }
 
@@ -225,9 +223,7 @@ namespace PepperDash.Essentials.DM
             EnableUsbBreakawayFeedback =
                 new BoolFeedback(() => (Chassis as DmMDMnxn).EnableUSBBreakawayFeedback.BoolValue);
 
-            InputCardHdcpStateFeedbacks = new Dictionary<uint, IntFeedback>();
-            InputStreamCardStateFeedbacks = new Dictionary<uint, IntFeedback>();
-            OutputStreamCardStateFeedbacks = new Dictionary<uint, IntFeedback>();
+            InputCardHdcpStateFeedbacks = new Dictionary<uint, IntFeedback>();
             InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
 
             for (uint x = 1; x <= Chassis.NumberOfOutputs; x++)
@@ -311,33 +307,6 @@ namespace PepperDash.Essentials.DM
                         //     return hdMdNxMHdmiOutput.HdmiOutputPort.DisabledByHdcpFeedback.BoolValue;
 
                         return false;
-                    });
-                    OutputStreamCardStateFeedbacks[tempX] = new IntFeedback(() =>
-                    {
-                        try
-                        {
-                            var outputCard = Chassis.Outputs[tempX];
-
-                            if (outputCard.Card is DmcStroAV)
-                            {
-                                Debug.Console(2, "Found output stream card in slot: {0}.", tempX);
-                                var streamCard = outputCard.Card as DmcStroAV;
-                                if (streamCard.Control.StartFeedback.BoolValue == true)
-                                    return 1;
-                                else if (streamCard.Control.StopFeedback.BoolValue == true)
-                                    return 2;
-                                else if (streamCard.Control.PauseFeedback.BoolValue == true)
-                                    return 3;
-                                else
-                                    return 0;
-                            }
-                            return 0;
-                        }
-                        catch (InvalidOperationException iopex)
-                        {
-                            Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "Error adding output stream card in slot: {0}. Error: {1}", tempX, iopex);
-                            return 0;
-                        }
                     });
                 }
 
@@ -437,33 +406,6 @@ namespace PepperDash.Essentials.DM
                             Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "The Input Card in slot: {0} supports HDCP 2.  Please update the configuration value in the inputCardSupportsHdcp2 object to true. Error: {1}", tempX, iopex);
                             return 0;
                         }   
-                    });
-                    InputStreamCardStateFeedbacks[tempX] = new IntFeedback(() =>
-                    {
-                        try
-                        {
-                            var inputCard = Chassis.Inputs[tempX];
-
-                            if (inputCard.Card is DmcStr)
-                            {
-                                Debug.Console(2, "Found input stream card in slot: {0}.", tempX);
-                                var streamCard = inputCard.Card as DmcStr;
-                                if (streamCard.Control.StartFeedback.BoolValue == true)
-                                    return 1;
-                                else if (streamCard.Control.StopFeedback.BoolValue == true)
-                                    return 2;
-                                else if (streamCard.Control.PauseFeedback.BoolValue == true)
-                                    return 3;
-                                else
-                                    return 0;
-                            }
-                            return 0;
-                        }
-                        catch (InvalidOperationException iopex)
-                        {
-                            Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "Error adding input stream card in slot: {0}. Error: {1}", tempX, iopex);
-                            return 0;
-                        }
                     });
                 }
             }
@@ -973,19 +915,6 @@ namespace PepperDash.Essentials.DM
                             else
                                 Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
                             break;
-                        }
-                    case DMInputEventIds.StartEventId:
-                    case DMInputEventIds.StopEventId:
-                    case DMInputEventIds.PauseEventId:
-                        {
-                            Debug.Console(2, this, "DM Input {0} Stream Status EventId", args.Number);
-                            if (InputStreamCardStateFeedbacks[args.Number] != null)
-                            {
-                                InputStreamCardStateFeedbacks[args.Number].FireUpdate();
-                            }
-                            else
-                                Debug.Console(2, this, "No index of {0} found in InputStreamCardStateFeedbacks");
-                            break;
                         }
                     default:
                         {
@@ -1114,19 +1043,6 @@ namespace PepperDash.Essentials.DM
                     Debug.Console(2, this, "DM Output {0} DisabledByHdcpEventId", args.Number);
                     OutputDisabledByHdcpFeedbacks[args.Number].FireUpdate();
                     break;
-                }
-                case DMOutputEventIds.StartEventId:
-                case DMOutputEventIds.StopEventId:
-                case DMOutputEventIds.PauseEventId:
-                {
-                    Debug.Console(2, this, "DM Output {0} Stream Status EventId", args.Number);
-                    if (OutputStreamCardStateFeedbacks[args.Number] != null)
-                    {
-                        OutputStreamCardStateFeedbacks[args.Number].FireUpdate();
-                    }
-                    else
-                        Debug.Console(2, this, "No index of {0} found in OutputStreamCardStateFeedbacks");
-                    break;
                 }
                 default:
                 {
@@ -1326,16 +1242,13 @@ namespace PepperDash.Essentials.DM
                 }
                 else
                 {
-                    LinkHdmiInputToApi(trilist, ioSlot, joinMap, ioSlotJoin);
-                    LinkStreamInputToApi(trilist, ioSlot, joinMap, ioSlotJoin);
-                }
-
-                if (RxDictionary.ContainsKey(ioSlot))
-                {
-                    LinkRxToApi(trilist, ioSlot, joinMap, ioSlotJoin);
-                }
-                else
-                    LinkStreamOutputToApi(trilist, ioSlot, joinMap, ioSlotJoin);
+                    LinkHdmiInputToApi(trilist, ioSlot, joinMap, ioSlotJoin);
+                }
+
+                if (RxDictionary.ContainsKey(ioSlot))
+                {
+                    LinkRxToApi(trilist, ioSlot, joinMap, ioSlotJoin);
+                }
             }
         }
 
@@ -1382,86 +1295,6 @@ namespace PepperDash.Essentials.DM
             {
                 trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
             }
-        }
-
-        private void LinkStreamInputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
-        {
-            var inputPort = InputPorts[string.Format("inputCard{0}--streamIn", ioSlot)];
-            if (inputPort == null)
-            {
-                return;
-            }
-            var streamCard = Chassis.Inputs[ioSlot].Card as DmcStr;
-            var join = joinMap.InputStreamCardState.JoinNumber + ioSlotJoin;
-
-            Debug.Console(1, "Port value for input card {0} is set as a stream card", ioSlot);
-
-            trilist.SetUShortSigAction(join, s =>
-            {
-                if (s == 1)
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Setting stream state to start", join, s);
-                    streamCard.Control.Start();
-                }
-                else if (s == 2)
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Setting stream state to stop", join, s);
-                    streamCard.Control.Stop();
-                }
-                else if (s == 3)
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Setting stream state to pause", join, s);
-                    streamCard.Control.Pause();
-                }
-                else
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Ignore stream state", join, s);
-                }
-            });
-
-            InputStreamCardStateFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[join]);
-
-            trilist.UShortInput[join].UShortValue = InputStreamCardStateFeedbacks[ioSlot].UShortValue;
-        }
-
-        private void LinkStreamOutputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
-        {
-            var outputPort = OutputPorts[string.Format("outputCard{0}--streamOut", ioSlot)];
-            if (outputPort == null)
-            {
-                return;
-            }
-            var streamCard = Chassis.Outputs[ioSlot].Card as DmcStroAV;
-            var join = joinMap.OutputStreamCardState.JoinNumber + ioSlotJoin;
-
-            Debug.Console(1, "Port value for output card {0} is set as a stream card", ioSlot);
-
-            trilist.SetUShortSigAction(join, s =>
-            {
-                if (s == 1)
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Setting stream state to start", join, s);
-                    streamCard.Control.Start();
-                }
-                else if (s == 2)
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Setting stream state to stop", join, s);
-                    streamCard.Control.Stop();
-                }
-                else if (s == 3)
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Setting stream state to pause", join, s);
-                    streamCard.Control.Pause();
-                }
-                else
-                {
-                    Debug.Console(2, this, "Join {0} value {1}: Ignore stream state", join, s);
-                }
-            });
-
-            OutputStreamCardStateFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[join]);
-
-            trilist.UShortInput[join].UShortValue = OutputStreamCardStateFeedbacks[ioSlot].UShortValue;
         }
 
         private void LinkRxToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)

essentials-framework/Essentials DM/Essentials_DM/Endpoints/DGEs/Dge100Controller.cs

@@ -39,12 +39,12 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs
         {
             _dge = device;
             _dgeEthernetInfo = _dge.ExtenderEthernetReservedSigs;
-            //_dgeEthernetInfo.DeviceExtenderSigChange += (extender, args) => UpdateDeviceInfo();
+            _dgeEthernetInfo.DeviceExtenderSigChange += (extender, args) => UpdateDeviceInfo();
             _dgeEthernetInfo.Use();
 
             DeviceInfo = new DeviceInfo();
 
-            //_dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
+            _dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
 
             _dc = dc;
 

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -1,44 +1,44 @@
-using Crestron.SimplSharpPro;
-using System;
-using System.Linq;
-//using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-
-namespace PepperDash.Essentials.DM
-{
-    using eVst = eX02VideoSourceType;
-    using eAst = eX02AudioSourceType;
-
-
+using Crestron.SimplSharpPro;
+using System;
+using System.Linq;
+//using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.DM
+{
+    using eVst = eX02VideoSourceType;
+    using eAst = eX02AudioSourceType;
+
+
     [Description("Wrapper class for DM-TX-4K-Z-302-C")]
-    public class DmTx4kz302CController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFeedback,
-        IIROutputPorts, IComPorts
-    {
-        public DmTx4kz302C Tx { get; private set; }
-
-        public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
-        public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
-        public RoutingInputPortWithVideoStatuses DisplayPortIn { get; private set; }
-        public RoutingOutputPort DmOut { get; private set; }
-        public RoutingOutputPort HdmiLoopOut { get; private set; }
-
-        public override StringFeedback ActiveVideoInputFeedback { get; protected set; }
-        public IntFeedback VideoSourceNumericFeedback { get; protected set; }
-        public IntFeedback AudioSourceNumericFeedback { get; protected set; }
-        public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
-        public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
-        public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
-        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
-        public BoolFeedback DisplayPortVideoSyncFeedback { get; protected set; }
-
-        //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
+    public class DmTx4kz302CController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFeedback,
+        IIROutputPorts, IComPorts
+    {
+        public DmTx4kz302C Tx { get; private set; }
+
+        public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
+        public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
+        public RoutingInputPortWithVideoStatuses DisplayPortIn { get; private set; }
+        public RoutingOutputPort DmOut { get; private set; }
+        public RoutingOutputPort HdmiLoopOut { get; private set; }
+
+        public override StringFeedback ActiveVideoInputFeedback { get; protected set; }
+        public IntFeedback VideoSourceNumericFeedback { get; protected set; }
+        public IntFeedback AudioSourceNumericFeedback { get; protected set; }
+        public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
+        public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
+        public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
+        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
+        public BoolFeedback DisplayPortVideoSyncFeedback { get; protected set; }
+
+        //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
         //public override ushort HdcpSupportCapability { get; protected set; }
 
         //IroutingNumericEvent
@@ -52,286 +52,272 @@ namespace PepperDash.Essentials.DM
         {
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
-        }
-
-        /// <summary>
-        /// Helps get the "real" inputs, including when in Auto
-        /// </summary>
-        public eX02VideoSourceType ActualActiveVideoInput
-        {
-            get
-            {
-                if (Tx.VideoSourceFeedback != eVst.Auto)
-                    return Tx.VideoSourceFeedback;
-                if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    return eVst.Hdmi1;
-                if (Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-                    return eVst.Hdmi2;
-
-                return Tx.DisplayPortInput.SyncDetectedFeedback.BoolValue ? eVst.Vga : eVst.AllDisabled;
-            }
-        }
-        public RoutingPortCollection<RoutingInputPort> InputPorts
-        {
-            get
-            {
-                return new RoutingPortCollection<RoutingInputPort> 
-				{ 
-					HdmiIn1,
-					HdmiIn2,
-					DisplayPortIn, 
-					AnyVideoInput 
-				};
-            }
-        }
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts
-        {
-            get
-            {
-                return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
-            }
-        }
-        public DmTx4kz302CController(string key, string name, DmTx4kz302C tx)
-            : base(key, name, tx)
-        {
-            Tx = tx;
-
-            HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
+        }
+
+        /// <summary>
+        /// Helps get the "real" inputs, including when in Auto
+        /// </summary>
+        public eX02VideoSourceType ActualActiveVideoInput
+        {
+            get
+            {
+                if (Tx.VideoSourceFeedback != eVst.Auto)
+                    return Tx.VideoSourceFeedback;
+                if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                    return eVst.Hdmi1;
+                if (Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
+                    return eVst.Hdmi2;
+
+                return Tx.DisplayPortInput.SyncDetectedFeedback.BoolValue ? eVst.Vga : eVst.AllDisabled;
+            }
+        }
+        public RoutingPortCollection<RoutingInputPort> InputPorts
+        {
+            get
+            {
+                return new RoutingPortCollection<RoutingInputPort> 
+				{ 
+					HdmiIn1,
+					HdmiIn2,
+					DisplayPortIn, 
+					AnyVideoInput 
+				};
+            }
+        }
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts
+        {
+            get
+            {
+                return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
+            }
+        }
+        public DmTx4kz302CController(string key, string name, DmTx4kz302C tx)
+            : base(key, name, tx)
+        {
+            Tx = tx;
+
+            HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
                 VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]))
             {
                 FeedbackMatchObject = eVst.Hdmi1
-            };
-            HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
+            };
+            HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
                 VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]))
             {
                 FeedbackMatchObject = eVst.Hdmi2
-            };
-            DisplayPortIn = new RoutingInputPortWithVideoStatuses(DmPortName.DisplayPortIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DisplayPort, eVst.DisplayPort, this,
+            };
+            DisplayPortIn = new RoutingInputPortWithVideoStatuses(DmPortName.DisplayPortIn,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DisplayPort, eVst.DisplayPort, this,
                 VideoStatusHelper.GetDisplayPortInputStatusFuncs(tx.DisplayPortInput))
             {
                 FeedbackMatchObject = eVst.DisplayPort
-            };
-            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
-                () => ActualActiveVideoInput.ToString());
-
-            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
-            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
-            Tx.BaseEvent += Tx_BaseEvent;
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
-
-            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
-            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
-
-            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
-
-            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
-            HdcpStateFeedback =
-                new IntFeedback(
-                    () =>
-                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
-                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
-                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
-            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
-
-            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
-
-            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
-
-            DisplayPortVideoSyncFeedback = new BoolFeedback(() => (bool)tx.DisplayPortInput.SyncDetectedFeedback.BoolValue);
-
-
-            var combinedFuncs = new VideoStatusFuncsWrapper
-            {
-                HdcpActiveFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
-                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-
-                HdcpStateFeedbackFunc = () =>
-                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    return ActualActiveVideoInput == eVst.Hdmi2 ? tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString() : "";
-                },
-
-                VideoResolutionFeedbackFunc = () =>
-                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    return ActualActiveVideoInput == eVst.Vga ? tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString() : "";
-                },
-                VideoSyncFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
-                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Vga
-                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
-
-            };
-
-            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
-
-            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DmCat, null, this);
-            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
-
-
-            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
-                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
-                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
-                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback);
-
-            // Set Ports for CEC
-            HdmiIn1.Port = Tx.HdmiInputs[1];
-            HdmiIn2.Port = Tx.HdmiInputs[2];
-            HdmiLoopOut.Port = Tx.HdmiOutput;
-            DmOut.Port = Tx.DmOutput;
-        }
-
-        void DisplayPortInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
-        {
-            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
-
-            switch (args.EventId)
-            {
-                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
-                    DisplayPortVideoSyncFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-
-
-        public override bool CustomActivate()
-        {
-            // Link up all of these damned events to the various RoutingPorts via a helper handler
-            Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
-            Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
-
-            Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
-            Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
-
-            Tx.DisplayPortInput.InputStreamChange += (o, a) => FowardInputStreamChange(DisplayPortIn, a.EventId);
-            Tx.DisplayPortInput.VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(DisplayPortIn, a.EventId);
-
-            // Base does register and sets up comm monitoring.
-            return base.CustomActivate();
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = GetDmTxJoinMap(joinStart, joinMapKey);
-
-            if (Hdmi1VideoSyncFeedback != null)
-            {
-                Hdmi1VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input1VideoSyncStatus.JoinNumber]);
-            }
-            if (Hdmi2VideoSyncFeedback != null)
-            {
-                Hdmi2VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input2VideoSyncStatus.JoinNumber]);
-            }
-            if (DisplayPortVideoSyncFeedback != null)
-            {
-                DisplayPortVideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input3VideoSyncStatus.JoinNumber]);
-            }
-
-            LinkDmTxToApi(this, trilist, joinMap, bridge);
-        }
-
-        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
-        {
-            Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input);
-
-                switch (input)
-                {
-                    case 0:
-                        {
-                            ExecuteSwitch(eVst.Auto, null, type);
-                            break;
-                        }
-                    case 1:
-                        {
-                            ExecuteSwitch(HdmiIn1.Selector, null, type);
-                            break;
-                        }
-                    case 2:
-                        {
-                            ExecuteSwitch(HdmiIn2.Selector, null, type);
-                            break;
-                        }
-                    case 3:
-                        {
-                            ExecuteSwitch(DisplayPortIn.Selector, null, type);
-                            break;
-                        }
-                    case 4:
-                        {
-                            ExecuteSwitch(eVst.AllDisabled, null, type);
-                            break;
-                        }
-                    default:
-                    {
-                        Debug.Console(2, this, "Unable to execute numeric switch to input {0}", input);
-                        break;
-                    }
-
-                }
-            
-
-        }
-
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
-            try
-            {
-                Debug.Console(2, this, "Attempting to switch InputSelector {0}", ((eVst)inputSelector).ToString());
-                if ((signalType | eRoutingSignalType.Video) == eRoutingSignalType.Video)
-                    Tx.VideoSource = (eVst)inputSelector;
-
-                // NOTE:  It's possible that this particular TX model may not like the AudioSource property being set.  
-                // The SIMPL definition only shows a single analog for AudioVideo Source
-                if ((signalType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
-                    //it doesn't
-                    Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key);
-                //Tx.AudioSource = (eAst)inputSelector;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Exception in ExecuteSwitch: {0}", e);
-            }
-        }
-
-        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
-        {
-            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
-
-            switch (args.EventId)
-            {
-                case EndpointInputStreamEventIds.HdcpSupportOffFeedbackEventId:
-                case EndpointInputStreamEventIds.HdcpSupportOnFeedbackEventId:
-                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
-                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
-                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
-                    HdcpStateFeedback.FireUpdate();
-                    break;
-                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
-                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
-                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
-                    break;
-            }
+            };
+            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
+                () => ActualActiveVideoInput.ToString());
+
+            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
+            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
+            Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
+            Tx.BaseEvent += Tx_BaseEvent;
+            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
+
+            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+
+            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
+
+            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+
+            HdcpStateFeedback =
+                new IntFeedback(
+                    () =>
+                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
+                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
+                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+
+            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
+
+            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
+
+            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
+
+            DisplayPortVideoSyncFeedback = new BoolFeedback(() => (bool)tx.DisplayPortInput.SyncDetectedFeedback.BoolValue);
+
+
+            var combinedFuncs = new VideoStatusFuncsWrapper
+            {
+                HdcpActiveFeedbackFunc = () =>
+                    (ActualActiveVideoInput == eVst.Hdmi1
+                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
+
+                HdcpStateFeedbackFunc = () =>
+                {
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
+                    return ActualActiveVideoInput == eVst.Hdmi2 ? tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString() : "";
+                },
+
+                VideoResolutionFeedbackFunc = () =>
+                {
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
+                    return ActualActiveVideoInput == eVst.Vga ? tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString() : "";
+                },
+                VideoSyncFeedbackFunc = () =>
+                    (ActualActiveVideoInput == eVst.Hdmi1
+                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.Vga
+                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
+
+            };
+
+            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
+
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.DmCat, null, this);
+            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this);
+
+
+            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
+                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
+                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
+                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback);
+
+            // Set Ports for CEC
+            HdmiIn1.Port = Tx.HdmiInputs[1];
+            HdmiIn2.Port = Tx.HdmiInputs[2];
+            HdmiLoopOut.Port = Tx.HdmiOutput;
+            DmOut.Port = Tx.DmOutput;
+        }
+
+        void DisplayPortInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        {
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+
+            switch (args.EventId)
+            {
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                    DisplayPortVideoSyncFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+
+
+        public override bool CustomActivate()
+        {
+            // Link up all of these damned events to the various RoutingPorts via a helper handler
+            Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
+            Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
+
+            Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
+            Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
+
+            Tx.DisplayPortInput.InputStreamChange += (o, a) => FowardInputStreamChange(DisplayPortIn, a.EventId);
+            Tx.DisplayPortInput.VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(DisplayPortIn, a.EventId);
+
+            // Base does register and sets up comm monitoring.
+            return base.CustomActivate();
+        }
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = GetDmTxJoinMap(joinStart, joinMapKey);
+
+            if (Hdmi1VideoSyncFeedback != null)
+            {
+                Hdmi1VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input1VideoSyncStatus.JoinNumber]);
+            }
+            if (Hdmi2VideoSyncFeedback != null)
+            {
+                Hdmi2VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input2VideoSyncStatus.JoinNumber]);
+            }
+            if (DisplayPortVideoSyncFeedback != null)
+            {
+                DisplayPortVideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input3VideoSyncStatus.JoinNumber]);
+            }
+
+            LinkDmTxToApi(this, trilist, joinMap, bridge);
+        }
+
+        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
+        {
+            Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input);
+
+                switch (input)
+                {
+                    case 0:
+                        {
+                            ExecuteSwitch(eVst.Auto, null, eRoutingSignalType.Audio | eRoutingSignalType.Video);
+                            break;
+                        }
+                    case 1:
+                        {
+                            ExecuteSwitch(HdmiIn1.Selector, null, eRoutingSignalType.Audio | eRoutingSignalType.Video);
+                            break;
+                        }
+                    case 2:
+                        {
+                            ExecuteSwitch(HdmiIn2.Selector, null, eRoutingSignalType.Audio | eRoutingSignalType.Video);
+                            break;
+                        }
+                    case 3:
+                        {
+                            ExecuteSwitch(DisplayPortIn.Selector, null, eRoutingSignalType.Audio | eRoutingSignalType.Video);
+                            break;
+                        }
+                    case 4:
+                        {
+                            ExecuteSwitch(eVst.AllDisabled, null, eRoutingSignalType.Audio | eRoutingSignalType.Video);
+                            break;
+                        }
+                }
+            
+
+        }
+
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        {
+            if ((signalType | eRoutingSignalType.Video) == eRoutingSignalType.Video)
+                Tx.VideoSource = (eVst)inputSelector;
+
+            // NOTE:  It's possible that this particular TX model may not like the AudioSource property being set.  
+            // The SIMPL definition only shows a single analog for AudioVideo Source
+            if ((signalType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
+                //it doesn't
+                Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key);
+                //Tx.AudioSource = (eAst)inputSelector;
+        }
+
+        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        {
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+
+            switch (args.EventId)
+            {
+                case EndpointInputStreamEventIds.HdcpSupportOffFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpSupportOnFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
+                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
+                    HdcpStateFeedback.FireUpdate();
+                    break;
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
+                    break;
+            }
         }
 
         void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
@@ -370,57 +356,57 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
             }
-        }
-
-        /// <summary>
-        /// Relays the input stream change to the appropriate RoutingInputPort.
-        /// </summary>
-        void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-        {
-            if (eventId != EndpointInputStreamEventIds.SyncDetectedFeedbackEventId) return;
-            inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
-            AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
-        }
-
-        /// <summary>
-        /// Relays the VideoAttributes change to a RoutingInputPort
-        /// </summary>
-        void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-        {
-            //// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
-            //Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
-            //    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
-            switch (eventId)
-            {
-                case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
-                    inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
-                    break;
-                case VideoAttributeEventIds.HdcpStateFeedbackEventId:
-                    inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
-                    break;
-                case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
-                case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
-                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    break;
-                case VideoAttributeEventIds.FramesPerSecondFeedbackEventId:
-                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-
-        #region IIROutputPorts Members
-        public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
-        public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
-        #endregion
-
-        #region IComPorts Members
-        public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
-        public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
-        #endregion
-    }
+        }
+
+        /// <summary>
+        /// Relays the input stream change to the appropriate RoutingInputPort.
+        /// </summary>
+        void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
+        {
+            if (eventId != EndpointInputStreamEventIds.SyncDetectedFeedbackEventId) return;
+            inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
+            AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
+        }
+
+        /// <summary>
+        /// Relays the VideoAttributes change to a RoutingInputPort
+        /// </summary>
+        void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
+        {
+            //// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
+            //Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
+            //    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
+            switch (eventId)
+            {
+                case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
+                    inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
+                    break;
+                case VideoAttributeEventIds.HdcpStateFeedbackEventId:
+                    inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
+                    break;
+                case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
+                case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
+                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    break;
+                case VideoAttributeEventIds.FramesPerSecondFeedbackEventId:
+                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+
+        #region IIROutputPorts Members
+        public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
+        public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
+        #endregion
+
+        #region IComPorts Members
+        public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
+        public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
+        #endregion
+    }
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -122,9 +122,7 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
-                        if (typeName.StartsWith("hdbasettx"))
-                            return new HDBaseTTxController(key, name, new HDTx3CB(chassis.Inputs[num]));
-                    }
+					}
 					else
 					{
 						if (typeName.StartsWith("dmtx200"))
@@ -147,9 +145,7 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
-                        if (typeName.StartsWith("hdbasettx"))
-                            return new HDBaseTTxController(key, name, new HDTx3CB(ipid, chassis.Inputs[num]));
-                    }
+					}
 				}
 				catch (Exception e)
 				{
@@ -359,7 +355,7 @@ namespace PepperDash.Essentials.DM
         public DmTxControllerFactory()
         {
             TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g"  };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/HDBaseTTxController.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-
-namespace PepperDash.Essentials.DM
-{
-    /// <summary>
-    /// Controller class for suitable for HDBaseT transmitters
-    /// </summary>
-    [Description("Wrapper Class for HDBaseT devices based on HDTx3CB class")]
-    public class HDBaseTTxController: BasicDmTxControllerBase, IRoutingInputsOutputs, IComPorts
-    {
-        public RoutingInputPort HdmiIn { get; private set; }
-        public RoutingOutputPort DmOut { get; private set; }
-
-        public HDBaseTTxController(string key, string name, HDTx3CB tx)
-            : base(key, name, tx)
-        {
-            HdmiIn = new RoutingInputPort(DmPortName.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this) { Port = tx };
-
-            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DmCat, null, this);
-
-            InputPorts = new RoutingPortCollection<RoutingInputPort> { HdmiIn };
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort> { DmOut };
-        }
-
-        #region IRoutingInputs Members
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-        #endregion
-
-        #region IRoutingOutputs Members
-
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
-
-        #endregion
-        
-        #region IComPorts Members
-
-        public CrestronCollection<ComPort> ComPorts { get { return (Hardware as HDTx3CB).ComPorts; } }
-        public int NumberOfComPorts { get { return (Hardware as HDTx3CB).NumberOfComPorts; } }
-
-        #endregion
-
-        #region CrestronBridgeableBaseDevice abstract overrides
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new HDBaseTTxControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<HDBaseTTxControllerJoinMap>(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, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            this.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-
-        }
-
-        #endregion
-    }
-
-    public class HDBaseTTxControllerJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 1,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "HDBaseT device online feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Digital
-            });
-	
-        /// <summary>
-		/// Plugin device BridgeJoinMap constructor
-		/// </summary>
-		/// <param name="joinStart">This will be the join it starts on the EISC bridge</param>
-        public HDBaseTTxControllerJoinMap(uint joinStart)
-            : base(joinStart, typeof(HDBaseTTxControllerJoinMap))
-		{
-		}
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -65,12 +65,12 @@
     </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">
@@ -79,7 +79,7 @@
     </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">
@@ -108,7 +108,6 @@
     <Compile Include="Endpoints\Transmitters\DmTx4kz202CController.cs" />
     <Compile Include="Endpoints\Transmitters\DmTx201SController.cs" />
     <Compile Include="Endpoints\Transmitters\DmTx4kz100Controller.cs" />
-    <Compile Include="Endpoints\Transmitters\HDBaseTTxController.cs" />
     <Compile Include="Endpoints\Transmitters\TxInterfaces.cs" />
     <Compile Include="IDmSwitch.cs" />
     <Compile Include="Config\DmpsRoutingConfig.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -69,12 +69,12 @@
     </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">
@@ -83,7 +83,7 @@
     </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">

essentials-framework/Essentials Devices Common/Essentials Devices Common/SetTopBox/IRSetTopBoxBase.cs

@@ -12,12 +12,11 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common
 {
     [Description("Wrapper class for an IR Set Top Box")]
-    public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl, ITvPresetsProvider
+    public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl
 	{
 		public IrOutputPortController IrPort { get; private set; }
 
@@ -29,7 +28,7 @@ namespace PepperDash.Essentials.Devices.Common
         public bool HasDpad { get; set; }
         public bool HasNumeric { get; set; }
 
-        public DevicePresetsModel TvPresets { get; private set; }
+        public DevicePresetsModel PresetsModel { get; private set; }
 
 		public IRSetTopBoxBase(string key, string name, IrOutputPortController portCont,
             SetTopBoxPropertiesConfig props)
@@ -55,7 +54,7 @@ namespace PepperDash.Essentials.Devices.Common
 			KeypadAccessoryButton1Label = "-";
 
 			HasKeypadAccessoryButton2 = true;
-			KeypadAccessoryButton2Command = "KEYPAD_ENTER";
+			KeypadAccessoryButton2Command = "NumericEnter";
 			KeypadAccessoryButton2Label = "Enter";
 
 			AnyVideoOut = new RoutingOutputPort(RoutingPortNames.AnyVideoOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
@@ -67,8 +66,8 @@ namespace PepperDash.Essentials.Devices.Common
 
 		public void LoadPresets(string filePath)
 		{
-			TvPresets = new DevicePresetsModel(Key + "-presets", this, filePath);
-			DeviceManager.AddDevice(TvPresets);
+			PresetsModel = new DevicePresetsModel(Key + "-presets", this, filePath);
+			DeviceManager.AddDevice(PresetsModel);
 		}
 
 

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.45" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.43" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>