Merge pull request #428 from PepperDash/feature/vc4-eisc

Add VirtualControlEiscClient

.github/scripts/ZipBuildOutput.ps1

@@ -10,7 +10,7 @@ Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
-Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll" | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {
   $allowed = $true;
   # Exclude any files in submodules
   foreach ($exclude in $exclusions) {

.github/workflows/docker.yml

@@ -48,6 +48,8 @@ jobs:
         run: |
           Write-Output ${{ env.VERSION }}
           ./.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
@@ -107,6 +109,49 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   # This step always runs and pushes the build to the internal build rep
   Internal_Push_Output:
     needs: Build_Project

.github/workflows/main.yml

@@ -44,6 +44,8 @@ jobs:
         run: |
           Write-Output ${{ env.VERSION }}
           ./.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
@@ -85,6 +87,49 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   Internal_Push_Output:
     needs: Build_Project
     runs-on: windows-latest

.gitignore

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

.gitmodules

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

PepperDashEssentials/ControlSystem.cs

@@ -91,6 +91,9 @@ namespace PepperDash.Essentials
             }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
 
+            CrestronConsole.AddNewConsoleCommand(DeviceManager.GetRoutingPorts,
+                "getroutingports", "Reports all routing ports, if any.  Requires a device key", ConsoleAccessLevelEnum.AccessOperator);
+
             if (!Debug.DoNotLoadOnNextBoot)
             {
                 GoWithLoad();
@@ -324,7 +327,11 @@ namespace PepperDash.Essentials
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
 
             // Add global System Monitor device
-            DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+            if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
+            {
+                DeviceManager.AddDevice(
+                    new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+            }
 
             foreach (var devConf in ConfigReader.ConfigObject.Devices)
             {
@@ -440,7 +447,7 @@ namespace PepperDash.Essentials
         {
             if (ConfigReader.ConfigObject.Rooms == null)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Configuration contains no rooms - Is this intentional?  This may be a valid configuration.");
                 return;
             }
 
@@ -488,7 +495,7 @@ namespace PepperDash.Essentials
 
                 }
                 else
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Cannot create room from config, key '{0}' - Is this intentional?  This may be a valid configuration.", roomConfig.Key);
             }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");

PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json

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

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -2,340 +2,340 @@
 using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.Fusion;
-
-
+using Crestron.SimplSharpPro.Fusion;
+
+
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Fusion;
 
-namespace PepperDash.Essentials.Fusion
-{
-    public class EssentialsHuddleVtc1FusionController : EssentialsHuddleSpaceFusionSystemControllerBase
-    {
-        BooleanSigData CodecIsInCall;
-
-        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
-            : base(room, ipId)
-        {
-
-        }
-
-        /// <summary>
-        /// Called in base class constructor before RVI and GUID files are built
-        /// </summary>
-        protected override void ExecuteCustomSteps()
-        {
-            SetUpCodec();
-        }
-
-        /// <summary>
-        /// Creates a static asset for the codec and maps the joins to the main room symbol
-        /// </summary>
-        void SetUpCodec()
-        {
-            try
-            {
-                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
-
-                if (codec == null)
-                {
-                    Debug.Console(1, this, "Cannot link codec to Fusion because codec is null");
-                    return;
-                }
-
-                codec.UsageTracker = new UsageTracking(codec);
-                codec.UsageTracker.UsageIsTracked = true;
-                codec.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
-
-                var codecPowerOnAction = new Action<bool>(b => { if (!b) codec.StandbyDeactivate(); });
-                var codecPowerOffAction = new Action<bool>(b => { if (!b) codec.StandbyActivate(); });
-
-                // Map FusionRoom Attributes:
-
-                // Codec volume
-                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(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(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, "Online - VC 1");
-                }
-
-                // Codec IP Address
-                bool codecHasIpInfo = false;
-                var codecComm = codec.Communication;
-
-                string codecIpAddress = string.Empty;
-                int codecIpPort = 0;
-
-                StringSigData codecIpAddressSig;
-                StringSigData codecIpPortSig;
-
-                if(codecComm is GenericSshClient)
-                {
-                    codecIpAddress = (codecComm as GenericSshClient).Hostname;
-                    codecIpPort = (codecComm as GenericSshClient).Port;
-                    codecHasIpInfo = true;
-                }
-                else if (codecComm is GenericTcpIpClient)
-                {
-                    codecIpAddress = (codecComm as GenericTcpIpClient).Hostname;
-                    codecIpPort = (codecComm as GenericTcpIpClient).Port;
-                    codecHasIpInfo = true;
-                }
-
-                if (codecHasIpInfo)
-                {
-                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
-                    codecIpAddressSig.InputSig.StringValue = codecIpAddress;
-
-                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
-                    codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
-                }
-
-                var tempAsset = new FusionAsset();
-
-                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(c => c.Key.Equals(codec.Key));
-
-                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
-                {
-                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
-                }
-                else
-                {
-                    // Create a new asset
-                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), codec.Name, "Codec", "");
-                    FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
-                }
-
-                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);
-
-                // TODO: Map relevant attributes on asset symbol
-
-                codecAsset.TrySetMakeModel(codec);
-                codecAsset.TryLinkAssetErrorToCommunication(codec);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error setting up codec in Fusion: {0}", e);
-            }
-        }
-
-        void codec_CallStatusChange(object sender, PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs e)
-        {
-            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
-
-            CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
-        }
-
-        // These methods are overridden because they access the room class which is of a different type
-
-        protected override void CreateSymbolAndBasicSigs(uint ipId)
-        {
-            Debug.Console(1, this, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
-
-            FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();
-            FusionRoom.ExtenderFusionRoomDataReservedSigs.Use();
-
-            FusionRoom.Register();
-
-            FusionRoom.FusionStateChange += FusionRoom_FusionStateChange;
-
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.DeviceExtenderSigChange += FusionRoomSchedule_DeviceExtenderSigChange;
-            FusionRoom.ExtenderFusionRoomDataReservedSigs.DeviceExtenderSigChange += ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange;
-            FusionRoom.OnlineStatusChange += FusionRoom_OnlineStatusChange;
-
-            CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
-
-            // Room to fusion room
-            Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
-
-            // Moved to 
-            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;
-        }
-
-        protected override void SetUpSources()
-        {
-            // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
-            if (dict != null)
-            {
-                // NEW PROCESS:
-                // Make these lists and insert the fusion attributes by iterating these
-                var setTopBoxes = dict.Where(d => d.Value.SourceDevice is ISetTopBoxControls);
-                uint i = 1;
-                foreach (var kvp in setTopBoxes)
-                {
-                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
-                    i++;
-                    if (i > 5) // We only have five spots
-                        break;
-                }
-
-                var discPlayers = dict.Where(d => d.Value.SourceDevice is IDiscPlayerControls);
-                i = 1;
-                foreach (var kvp in discPlayers)
-                {
-                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
-                    i++;
-                    if (i > 5) // We only have five spots
-                        break;
-                }
-
-                var laptops = dict.Where(d => d.Value.SourceDevice is Core.Devices.Laptop);
-                i = 1;
-                foreach (var kvp in laptops)
-                {
-                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
-                    i++;
-                    if (i > 10) // We only have ten spots???
-                        break;
-                }
-
-                foreach (var kvp in dict)
-                {
-                    var usageDevice = kvp.Value.SourceDevice as IUsageTracking;
-
-                    if (usageDevice != null)
-                    {
-                        usageDevice.UsageTracker = new UsageTracking(usageDevice as Device);
-                        usageDevice.UsageTracker.UsageIsTracked = true;
-                        usageDevice.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
-                    }
-                }
-
-            }
-            else
-            {
-                Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
-            }
-        }
-
-        protected override void SetUpDisplay()
-        {
-            try
-            {
-                //Setup Display Usage Monitoring
-
-                var displays = DeviceManager.AllDevices.Where(d => d is DisplayBase);
-
-                //  Consider updating this in multiple display systems
-
-                foreach (DisplayBase display in displays)
-                {
-                    display.UsageTracker = new UsageTracking(display);
-                    display.UsageTracker.UsageIsTracked = true;
-                    display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
-                }
-
-                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
-                if (defaultDisplay == null)
-                {
-                    Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
-                    return;
-                }
-
-                var dispPowerOnAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOn(); });
-                var dispPowerOffAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOff(); });
-
-                // Display to fusion room sigs
-                FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
-                FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
-                defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-                if (defaultDisplay is IDisplayUsage)
-                    (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-
-
-
-                MapDisplayToRoomJoins(1, 158, defaultDisplay);
-
-
-                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
-
-                //Check for existing asset in GUIDs collection
-
-                var tempAsset = new FusionAsset();
-
-                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
-                {
-                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
-                }
-                else
-                {
-                    // Create a new asset
-                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), defaultDisplay.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;
-                defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
-                // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
-                // Use extension methods
-                dispAsset.TrySetMakeModel(defaultDisplay);
-                dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error setting up display in Fusion: {0}", e);
-            }
-
-        }
-
-        protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
-        {
-            string displayName = string.Format("Display {0} - ", displayIndex);
-
-
-            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
-            {
-                // Power on
-                var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
-                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-
-                // Power Off
-                var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off", eSigIoMask.InputOutputSig);
-                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOff(); }); ;
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-
-                // Current Source
-                var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
-            }
-        }
-    }
+namespace PepperDash.Essentials.Fusion
+{
+    public class EssentialsHuddleVtc1FusionController : EssentialsHuddleSpaceFusionSystemControllerBase
+    {
+        BooleanSigData CodecIsInCall;
+
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
+            : base(room, ipId)
+        {
+
+        }
+
+        /// <summary>
+        /// Called in base class constructor before RVI and GUID files are built
+        /// </summary>
+        protected override void ExecuteCustomSteps()
+        {
+            SetUpCodec();
+        }
+
+        /// <summary>
+        /// Creates a static asset for the codec and maps the joins to the main room symbol
+        /// </summary>
+        void SetUpCodec()
+        {
+            try
+            {
+                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
+
+                if (codec == null)
+                {
+                    Debug.Console(1, this, "Cannot link codec to Fusion because codec is null");
+                    return;
+                }
+
+                codec.UsageTracker = new UsageTracking(codec);
+                codec.UsageTracker.UsageIsTracked = true;
+                codec.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
+
+                var codecPowerOnAction = new Action<bool>(b => { if (!b) codec.StandbyDeactivate(); });
+                var codecPowerOffAction = new Action<bool>(b => { if (!b) codec.StandbyActivate(); });
+
+                // Map FusionRoom Attributes:
+
+                // Codec volume
+                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(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(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, "Online - VC 1");
+                }
+
+                // Codec IP Address
+                bool codecHasIpInfo = false;
+                var codecComm = codec.Communication;
+
+                string codecIpAddress = string.Empty;
+                int codecIpPort = 0;
+
+                StringSigData codecIpAddressSig;
+                StringSigData codecIpPortSig;
+
+                if(codecComm is GenericSshClient)
+                {
+                    codecIpAddress = (codecComm as GenericSshClient).Hostname;
+                    codecIpPort = (codecComm as GenericSshClient).Port;
+                    codecHasIpInfo = true;
+                }
+                else if (codecComm is GenericTcpIpClient)
+                {
+                    codecIpAddress = (codecComm as GenericTcpIpClient).Hostname;
+                    codecIpPort = (codecComm as GenericTcpIpClient).Port;
+                    codecHasIpInfo = true;
+                }
+
+                if (codecHasIpInfo)
+                {
+                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
+                    codecIpAddressSig.InputSig.StringValue = codecIpAddress;
+
+                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
+                    codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
+                }
+
+                var tempAsset = new FusionAsset();
+
+                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(c => c.Key.Equals(codec.Key));
+
+                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+                {
+                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
+                }
+                else
+                {
+                    // Create a new asset
+                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), codec.Name, "Codec", "");
+                    FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
+                }
+
+                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);
+
+                // TODO: Map relevant attributes on asset symbol
+
+                codecAsset.TrySetMakeModel(codec);
+                codecAsset.TryLinkAssetErrorToCommunication(codec);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error setting up codec in Fusion: {0}", e);
+            }
+        }
+
+        void codec_CallStatusChange(object sender, PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs e)
+        {
+            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
+
+            CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
+        }
+
+        // These methods are overridden because they access the room class which is of a different type
+
+        protected override void CreateSymbolAndBasicSigs(uint ipId)
+        {
+            Debug.Console(1, this, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
+
+            FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();
+            FusionRoom.ExtenderFusionRoomDataReservedSigs.Use();
+
+            FusionRoom.Register();
+
+            FusionRoom.FusionStateChange += FusionRoom_FusionStateChange;
+
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.DeviceExtenderSigChange += FusionRoomSchedule_DeviceExtenderSigChange;
+            FusionRoom.ExtenderFusionRoomDataReservedSigs.DeviceExtenderSigChange += ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange;
+            FusionRoom.OnlineStatusChange += FusionRoom_OnlineStatusChange;
+
+            CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
+
+            // Room to fusion room
+            Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
+
+            // Moved to 
+            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;
+        }
+
+        protected override void SetUpSources()
+        {
+            // Sources
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
+            if (dict != null)
+            {
+                // NEW PROCESS:
+                // Make these lists and insert the fusion attributes by iterating these
+                var setTopBoxes = dict.Where(d => d.Value.SourceDevice is ISetTopBoxControls);
+                uint i = 1;
+                foreach (var kvp in setTopBoxes)
+                {
+                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
+                    i++;
+                    if (i > 5) // We only have five spots
+                        break;
+                }
+
+                var discPlayers = dict.Where(d => d.Value.SourceDevice is IDiscPlayerControls);
+                i = 1;
+                foreach (var kvp in discPlayers)
+                {
+                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
+                    i++;
+                    if (i > 5) // We only have five spots
+                        break;
+                }
+
+                var laptops = dict.Where(d => d.Value.SourceDevice is Core.Devices.Laptop);
+                i = 1;
+                foreach (var kvp in laptops)
+                {
+                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
+                    i++;
+                    if (i > 10) // We only have ten spots???
+                        break;
+                }
+
+                foreach (var kvp in dict)
+                {
+                    var usageDevice = kvp.Value.SourceDevice as IUsageTracking;
+
+                    if (usageDevice != null)
+                    {
+                        usageDevice.UsageTracker = new UsageTracking(usageDevice as Device);
+                        usageDevice.UsageTracker.UsageIsTracked = true;
+                        usageDevice.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
+                    }
+                }
+
+            }
+            else
+            {
+                Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
+                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+            }
+        }
+
+        protected override void SetUpDisplay()
+        {
+            try
+            {
+                //Setup Display Usage Monitoring
+
+                var displays = DeviceManager.AllDevices.Where(d => d is DisplayBase);
+
+                //  Consider updating this in multiple display systems
+
+                foreach (DisplayBase display in displays)
+                {
+                    display.UsageTracker = new UsageTracking(display);
+                    display.UsageTracker.UsageIsTracked = true;
+                    display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
+                }
+
+                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                if (defaultDisplay == null)
+                {
+                    Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
+                    return;
+                }
+
+                var dispPowerOnAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOn(); });
+                var dispPowerOffAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOff(); });
+
+                // Display to fusion room sigs
+                FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
+                FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
+                defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
+                if (defaultDisplay is IDisplayUsage)
+                    (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
+
+
+
+                MapDisplayToRoomJoins(1, 158, defaultDisplay);
+
+
+                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
+
+                //Check for existing asset in GUIDs collection
+
+                var tempAsset = new FusionAsset();
+
+                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+                {
+                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
+                }
+                else
+                {
+                    // Create a new asset
+                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), defaultDisplay.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;
+                defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+                // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
+                // Use extension methods
+                dispAsset.TrySetMakeModel(defaultDisplay);
+                dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error setting up display in Fusion: {0}", e);
+            }
+
+        }
+
+        protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
+        {
+            string displayName = string.Format("Display {0} - ", displayIndex);
+
+
+            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
+            {
+                // Power on
+                var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
+                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });
+                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+                // Power Off
+                var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off", eSigIoMask.InputOutputSig);
+                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOff(); }); ;
+                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+                // Current Source
+                var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+            }
+        }
+    }
 }

PepperDashEssentials/PepperDashEssentials.csproj

@@ -71,13 +71,9 @@
       <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
-    </Reference>
-    <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\Essentials DM\Essentials_DM\bin\PepperDash_Essentials_DM.dll</HintPath>
+      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -215,6 +211,10 @@
       <Project>{892B761C-E479-44CE-BD74-243E9214AF13}</Project>
       <Name>Essentials Devices Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\essentials-framework\Essentials DM\Essentials_DM\PepperDash_Essentials_DM.csproj">
+      <Project>{9199CE8A-0C9F-4952-8672-3EED798B284F}</Project>
+      <Name>PepperDash_Essentials_DM</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -13,6 +13,7 @@ using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials
 {
@@ -50,6 +51,19 @@ namespace PepperDash.Essentials
 
         //************************
 
+		public override string SourceListKey
+		{
+			get
+			{
+				return _SourceListKey;
+			}
+			set
+			{
+				_SourceListKey = value;
+				SetCodecExternalSources();
+				
+			}
+		}
 
         protected override Func<bool> OnFeedbackFunc
         {
@@ -206,9 +220,11 @@ namespace PepperDash.Essentials
 
                 VideoCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.VideoCodecKey) as
                     PepperDash.Essentials.Devices.Common.VideoCodec.VideoCodecBase;
+				
+
                 if (VideoCodec == null)
                     throw new ArgumentNullException("codec cannot be null");
-
+				
                 AudioCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.AudioCodecKey) as
                     PepperDash.Essentials.Devices.Common.AudioCodec.AudioCodecBase;
                 if (AudioCodec == null)
@@ -298,6 +314,7 @@ namespace PepperDash.Essentials
 
 
                 VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+				VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); }; 
 
                 if (AudioCodec != null)
                     AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
@@ -346,11 +363,10 @@ namespace PepperDash.Essentials
             this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
-
+			
             return base.CustomActivate();
         }
 
-
         /// <summary>
         /// 
         /// </summary>
@@ -409,10 +425,14 @@ namespace PepperDash.Essentials
         {
             if (string.IsNullOrEmpty(sourceListKey))
             {
+                Debug.Console(1, this, "No sourceListKey present.  RunRouteAction assumes default source list.");
                 RunRouteAction(routeKey, new Action(() => { }));
             }
             else
+            {
+                Debug.Console(1, this, "sourceListKey present but not yet implemented");
                 throw new NotImplementedException();
+            }
         }
 
         /// <summary>
@@ -672,6 +692,49 @@ namespace PepperDash.Essentials
 				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
 		}
 
+
+		/// <summary>
+		/// Setup the external sources for the Cisco Touch 10 devices that support IHasExternalSourceSwitch
+		/// </summary>
+		private void SetCodecExternalSources()
+		{
+			var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
+
+			if (videoCodecWithExternalSwitching == null)
+			{
+				return;
+			}
+
+		    string codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
+		    videoCodecWithExternalSwitching.ClearExternalSources();
+		    videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
+		    var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
+
+		    foreach (var kvp in srcList)
+		    {
+		        var srcConfig = kvp.Value;
+
+		        if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
+		        {
+
+		            videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
+		            videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
+
+
+		        }
+		    }
+		}
+
+        private void SetCodecBranding()
+        {
+            var vcWithBranding = VideoCodec as IHasBranding;
+
+            if (vcWithBranding == null) return;
+
+            Debug.Console(1, this, "Setting Codec Branding");
+            vcWithBranding.InitializeBranding(Key);
+        }
+		
         #region IPrivacy Members
 
 

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -120,14 +120,22 @@ namespace PepperDash.Essentials
         /// 1206
         /// </summary>
         public const uint VCRecentsVisible = 1206;
-        /// <summary>
-        /// 1207
-        /// </summary>
-        public const uint VCCameraVisible = 1207;
+
 		/// <summary>
 		/// 1208
 		/// </summary>
-		public const uint VCSelfViewLayoutVisible = 1208;
+		public const uint VCCameraAutoVisible = 1208;
+
+        /// <summary>
+        /// 1209
+        /// </summary>
+        public const uint VCCameraManualVisible = 1209;
+
+        /// <summary>
+        /// 1210
+        /// </summary>
+        public const uint VCCameraOffVisible = 1210;
+
         /// <summary>
         /// 1211 - 1215
         /// </summary>
@@ -225,6 +233,59 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public const uint VCMinMaxEnable = 1256;
 
+        /// <summary>
+        /// 1260
+        /// </summary>
+        public const uint VCCameraModeBarVisible = 1260;
+
+        /// <summary>
+        /// 1261
+        /// </summary>
+        public const uint VCCameraSelectBarWithoutModeVisible = 1261;
+
+
+        /// <summary>
+        /// 1271
+        /// </summary>
+        public const uint VCCameraZoomIn = 1271;
+        /// <summary>
+        /// 1272
+        /// </summary>
+        public const uint VCCameraZoomOut = 1272;
+
+
+        /// <summary>
+        /// 1280
+        /// </summary>
+        public const uint VCCameraPresetSavedLabelVisible = 1280;
+        /// <summary>
+        /// 1281
+        /// </summary>
+        public const uint VCCameraPreset1 = 1281;
+        /// <summary>
+        /// 1282
+        /// </summary>
+        public const uint VCCameraPreset2 = 1282;
+        /// <summary>
+        /// 1283
+        /// </summary>
+        public const uint VCCameraPreset3 = 1283;
+
+
+        /// <summary>
+        /// 1291
+        /// </summary>
+        public const uint VCCameraPreset1Visible = 1291;
+        /// <summary>
+        /// 1292
+        /// </summary>
+        public const uint VCCameraPreset2Visible = 1292;
+        /// <summary>
+        /// 1293
+        /// </summary>
+        public const uint VCCameraPreset3Visible = 1293;
+
+
         // Letter joins start at 2921;
 
         //******************************************************

PepperDashEssentials/UI/JoinConstants/UISmartObjectJoin.cs

@@ -33,6 +33,21 @@
 		/// </summary>
 		public const uint VCLayoutsList = 1205;
 
+        /// <summary>
+        /// 1206 VC Camera Mode horizontal list
+        /// </summary>
+        public const uint VCCameraMode = 1206;
+
+        /// <summary>
+        /// 1207 VC Camera Mode Dpad
+        /// </summary>
+        public const uint VCCameraDpad = 1207;
+
+        /// <summary>
+        /// 1208 VC Camera Select
+        /// </summary>
+        public const uint VCCameraSelect = 1208;
+
 
         //******************************************************
         // General

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -41,6 +41,21 @@ namespace PepperDash.Essentials
 		public const uint VCRecentListTimeTextStart = 1231;
         //									RANGE IN USE
         public const uint VCRecentListTimeTextEnd = 1260;
+
+
+        /// <summary>
+        /// 1281
+        /// </summary>
+        public const uint VCCameraPresetLabel1 = 1281;
+        /// <summary>
+        /// 1282
+        /// </summary>
+        public const uint VCCameraPresetLabel2 = 1282;
+        /// <summary>
+        /// 1283
+        /// </summary>
+        public const uint VCCameraPresetLabel3 = 1283;
+
 		/// <summary>
 		/// 1291 - the current layout mode
 		/// </summary>

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -349,7 +349,7 @@ namespace PepperDash.Essentials
             // Check if the popup interlock is shown, and if one of the header popups is current, then show the carets subpage
             if (e.IsShown)
             {
-                if (e.NewJoin == Parent.EnvironmentDriver.BackgroundSubpageJoin)
+                if (Parent.EnvironmentDriver != null && e.NewJoin == Parent.EnvironmentDriver.BackgroundSubpageJoin)
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HeaderActiveCallsListVisible)
                     headerPopupShown = true;

PepperDashEssentials/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs

@@ -1,117 +1,139 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase
-	{
-        CTimer InactivityTimer;
-
-		/// <summary>
-		/// Assign the appropriate A/V driver.
-		/// Want to keep the AvDriver alive, because it may hold states
-		/// </summary>
-		public IAVDriver AvDriver { get; set; }
-
-        public EssentialsHeaderDriver HeaderDriver { get; set; }
-
-        public EssentialsEnvironmentDriver EnvironmentDriver { get; set; }
-
-		public PanelDriverBase CurrentChildDriver { get; private set; }
-
-        public ScreenSaverController ScreenSaverController { get; set; } 
-
-		CrestronTouchpanelPropertiesConfig Config;
-
-        /// <summary>
-        /// The main interlock for popups
-        /// </summary>
-        //public JoinedSigInterlock PopupInterlock { get; private set; }
-
-		public EssentialsPanelMainInterfaceDriver(BasicTriListWithSmartObject trilist,
-			CrestronTouchpanelPropertiesConfig config)
-			: base(trilist)
-		{
-			Config = config;
-
-            var tsx52or60 = trilist as Tswx52ButtonVoiceControl;
-
-            if (tsx52or60 != null)
-            {
-                tsx52or60.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
-            }
-            else
-            {
-                var tswx70 = trilist as TswX70Base;
-                if (tswx70 != null)
-                {
-                    tswx70.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
-                }
-            }
-		}
-
-        void ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange(Crestron.SimplSharpPro.DeviceExtender currentDeviceExtender, Crestron.SimplSharpPro.SigEventArgs args)
-        {
-            var timeoutMs = Config.ScreenSaverTimeoutMin * 60 * 1000;
-
-            if (args.Sig.BoolValue)
-            {
-                if (InactivityTimer != null)
-                {
-                    InactivityTimer.Reset(timeoutMs);
-                }
-                else
-                {
-                    InactivityTimer = new CTimer((o) => InactivityTimerExpired(), timeoutMs);
-                }
-            }
-        }
-
-        void InactivityTimerExpired()
-        {
-            InactivityTimer.Stop();
-            InactivityTimer.Dispose();
-            InactivityTimer = null;
-
-            ScreenSaverController.Show();
-        }
-
-		public override void Show()
-		{
-			CurrentChildDriver = null;
-			ShowSubDriver(AvDriver as PanelDriverBase);
-            base.Show();
-		}
-
-		public override void Hide()
-		{
-			TriList.BooleanInput[AvDriver.StartPageVisibleJoin].BoolValue = false;
-			base.Hide();
-		}
-
-		void ShowSubDriver(PanelDriverBase driver)
-		{
-			CurrentChildDriver = driver;
-			if (driver == null)
-				return;
-			this.Hide();
-			driver.Show();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public override void BackButtonPressed()
-		{
-			if(CurrentChildDriver != null)
-				CurrentChildDriver.BackButtonPressed();
-		}
-	}
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.UI;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.SmartObjects;
+
+namespace PepperDash.Essentials
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase, IHasScreenSaverController
+	{
+        CTimer InactivityTimer;
+
+		/// <summary>
+		/// Assign the appropriate A/V driver.
+		/// Want to keep the AvDriver alive, because it may hold states
+		/// </summary>
+		public IAVDriver AvDriver { get; set;}
+
+        public EssentialsHeaderDriver HeaderDriver { get; set; }
+
+        public EssentialsEnvironmentDriver EnvironmentDriver { get; set; }
+
+		public PanelDriverBase CurrentChildDriver { get; private set; }
+
+        public ScreenSaverController ScreenSaverController { get; set; }
+
+	    private readonly long _timeoutMs;
+
+		CrestronTouchpanelPropertiesConfig Config;
+
+        /// <summary>
+        /// The main interlock for popups
+        /// </summary>
+        //public JoinedSigInterlock PopupInterlock { get; private set; }
+
+		public EssentialsPanelMainInterfaceDriver(BasicTriListWithSmartObject trilist,
+			CrestronTouchpanelPropertiesConfig config)
+			: base(trilist)
+		{
+			Config = config;
+
+            _timeoutMs = Config.ScreenSaverTimeoutMin * 60 * 1000;
+
+            var tsx52or60 = trilist as Tswx52ButtonVoiceControl;
+
+            if (tsx52or60 != null)
+            {
+                tsx52or60.ExtenderTouchDetectionReservedSigs.Use();
+                tsx52or60.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
+                tsx52or60.ExtenderTouchDetectionReservedSigs.Time.UShortValue = 1;
+                ManageInactivityTimer();
+
+            }
+            else
+            {
+                var tswx70 = trilist as TswX70Base;
+                if (tswx70 != null)
+                {
+                    tswx70.ExtenderTouchDetectionReservedSigs.Use();
+                    tswx70.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
+                    tswx70.ExtenderTouchDetectionReservedSigs.Time.UShortValue = 1;
+                    ManageInactivityTimer();
+                }
+            }
+		}
+
+        void ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange(Crestron.SimplSharpPro.DeviceExtender currentDeviceExtender, Crestron.SimplSharpPro.SigEventArgs args)
+        {
+
+            if (args.Sig.BoolValue)
+            {
+                ManageInactivityTimer();
+            }
+        }
+
+	    private void ManageInactivityTimer()
+	    {
+            if (InactivityTimer != null)
+            {
+                InactivityTimer.Reset(_timeoutMs);
+            }
+            else
+            {
+                InactivityTimer = new CTimer((o) => InactivityTimerExpired(), _timeoutMs);
+            }
+	    }
+
+        void InactivityTimerExpired()
+        {
+            InactivityTimer.Stop();
+            InactivityTimer.Dispose();
+            InactivityTimer = null;
+
+            ScreenSaverController.Show();
+        }
+
+		public override void Show()
+		{
+			CurrentChildDriver = null;
+			ShowSubDriver(AvDriver as PanelDriverBase);
+
+            base.Show();
+		}
+
+		public override void Hide()
+		{
+			TriList.BooleanInput[AvDriver.StartPageVisibleJoin].BoolValue = false;
+			base.Hide();
+		}
+
+		void ShowSubDriver(PanelDriverBase driver)
+		{
+			CurrentChildDriver = driver;
+			if (driver == null)
+				return;
+			this.Hide();
+			driver.Show();
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public override void BackButtonPressed()
+		{
+			if(CurrentChildDriver != null)
+				CurrentChildDriver.BackButtonPressed();
+		}
+	}
+
+    public interface IHasScreenSaverController
+    {
+        ScreenSaverController ScreenSaverController { get; }
+    }
 }

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -114,7 +114,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// The parent driver for this
         /// </summary>
-        PanelDriverBase Parent;
+        public PanelDriverBase Parent { get; private set; }
 
         /// <summary>
         /// All children attached to this driver.  For hiding and showing as a group.

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -72,7 +72,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// The parent driver for this
         /// </summary>
-        PanelDriverBase Parent;
+        public PanelDriverBase Parent { get; private set; }
 
         /// <summary>
         /// All children attached to this driver.  For hiding and showing as a group.
@@ -1047,12 +1047,15 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void SetupSourceList()
 		{
-				
+					
 			var inCall = CurrentRoom.InCallFeedback.BoolValue;
 			var config = ConfigReader.ConfigObject.SourceLists;
+			
+			
 			if (config.ContainsKey(_CurrentRoom.SourceListKey))
 			{
 				var srcList = config[_CurrentRoom.SourceListKey].OrderBy(kv => kv.Value.Order);
+				
 
 				// Setup sources list			
 				SourceStagingSrl.Clear();
@@ -1076,6 +1079,8 @@ namespace PepperDash.Essentials
 						b => { if (!b) UiSelectSource(routeKey); });
 					SourceStagingSrl.AddItem(item); // add to the SRL
 					item.RegisterForSourceChange(_CurrentRoom);
+					Debug.Console(1, "**** KEY {0}", kvp.Key);
+					
 				}
 				SourceStagingSrl.Count = (ushort)(i - 1);
 			}
@@ -1425,6 +1430,7 @@ namespace PepperDash.Essentials
     /// </summary>
     public interface IAVDriver
     {
+        PanelDriverBase Parent { get; }
         JoinedSigInterlock PopupInterlock { get; }
         void ShowNotificationRibbon(string message, int timeout);
         void HideNotificationRibbon();

PepperDashEssentials/UIDrivers/ScreenSaverController.cs

@@ -14,6 +14,15 @@ namespace PepperDash.Essentials
     /// </summary>
     public class ScreenSaverController : PanelDriverBase
     {
+
+        /// <summary>
+        /// The parent driver for this
+        /// </summary>
+        private readonly EssentialsPanelMainInterfaceDriver _parent;
+
+
+        private JoinedSigInterlock PositionInterlock;
+
         CTimer PositionTimer;
 
         uint PositionTimeoutMs;
@@ -25,22 +34,30 @@ namespace PepperDash.Essentials
         public ScreenSaverController(EssentialsPanelMainInterfaceDriver parent, CrestronTouchpanelPropertiesConfig config)
             : base(parent.TriList)
         {
+            _parent = parent;
+
             PositionTimeoutMs = config.ScreenSaverMovePositionIntervalMs;
 
-            TriList.SetSigFalseAction(UIBoolJoin.MCScreenSaverClosePress, () => this.Hide());
+            PositionJoins = new List<uint>() { UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible };
 
-            PositionJoins = new List<uint>() 
-                { UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible };
+            PositionInterlock = new JoinedSigInterlock(parent.TriList);
 
-            CrestronConsole.AddNewConsoleCommand((o) => Show(), "showscreensaver", "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
+            var cmdName = String.Format("shwscrsvr-{0}", parent.TriList.ID);
+
+            CrestronConsole.AddNewConsoleCommand((o) => Show(), cmdName, "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
+
+            TriList.SetSigFalseAction(UIBoolJoin.MCScreenSaverClosePress, Hide);
         }
 
         public override void Show()
         {
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, true);
+            if (_parent.AvDriver != null)
+            {
+                _parent.AvDriver.PopupInterlock.ShowInterlocked(UIBoolJoin.MCScreenSaverVisible);
+            }
 
             CurrentPositionIndex = 0;
-            SetCurrentPosition();
+            ShowCurrentPosition();
             StartPositionTimer();
 
             base.Show();
@@ -48,19 +65,25 @@ namespace PepperDash.Essentials
 
         public override void Hide()
         {
-            PositionTimer.Stop();
-            PositionTimer.Dispose();
-            PositionTimer = null;
+            Debug.Console(1, "Hiding ScreenSaverController");
+
+            if (PositionTimer != null)
+            {
+                PositionTimer.Stop();
+                PositionTimer.Dispose();
+                PositionTimer = null;
+            }
 
             ClearAllPositions();
 
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, false);
+            if (_parent.AvDriver != null)
+            {
+                _parent.AvDriver.PopupInterlock.HideAndClear();
+            }
 
             base.Hide();
         }
 
-
-
         void StartPositionTimer()
         {
             if (PositionTimer == null)
@@ -78,7 +101,7 @@ namespace PepperDash.Essentials
         {
             IncrementPositionIndex();
 
-            SetCurrentPosition();
+            ShowCurrentPosition();
 
             StartPositionTimer();
         }
@@ -98,20 +121,16 @@ namespace PepperDash.Essentials
         }
 
         //
-        void SetCurrentPosition()
+        void ShowCurrentPosition()
         {
-            ClearAllPositions();
-
             // Set based on current index
-            TriList.SetBool(PositionJoins[CurrentPositionIndex], true);
+            PositionInterlock.ShowInterlocked(PositionJoins[CurrentPositionIndex]);
         }
 
         void ClearAllPositions()
         {
-            foreach (var join in PositionJoins)
-            {
-                TriList.SetBool(join, false);
-            }
+            Debug.Console(1, "Hiding all screensaver positions");
+            PositionInterlock.HideAndClear();
         }
     }
  

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
@@ -13,6 +14,7 @@ using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.UIDrivers.VC
 {
@@ -41,6 +43,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         JoinedSigInterlock VCControlsInterlock;
 
+        /// <summary>
+        /// For the camera control mode (auto/manual/off)
+        /// </summary>
+        JoinedSigInterlock VCCameraControlModeInterlock;
+
         /// <summary>
         /// For the different staging bars: Active, inactive
         /// </summary>
@@ -58,6 +65,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
         SmartObjectDynamicList RecentCallsList;
 
 		SmartObjectDynamicList DirectoryList;
+
+        SmartObjectDPad CameraPtzPad;
+
+        SmartObjectDynamicList CameraModeList;
+
+        SmartObjectDynamicList CameraSelectList;
         
         BoolFeedback DirectoryBackButtonVisibleFeedback;
 
@@ -76,6 +89,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
 		bool CodecHasFavorites;
 
+        bool ShowCameraModeControls;
+
 		CTimer BackspaceTimer;
 
 
@@ -118,6 +133,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
                 VCControlsInterlock = new JoinedSigInterlock(triList);
+                VCCameraControlModeInterlock = new JoinedSigInterlock(triList);
+
+
                 if (CodecHasFavorites)
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadWithFavoritesVisible);
                 else
@@ -161,6 +179,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 SetupDirectoryList();
 
+
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
 
@@ -196,6 +215,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if(HeaderDriver.HeaderButtonsAreSetUp)
                 HeaderDriver.ComputeHeaderCallStatus(Codec);
+
+            SetupCameraControls();
         }
 
         void SetupAddresses()
@@ -377,6 +398,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void ShowIncomingModal(CodecActiveCallItem call)
         {
+            Debug.Console(1, "Showing Incoming Call Modal");
+
 			(Parent as IAVWithVCDriver).PrepareForCodecIncomingCall();
             IncomingCallModal = new ModalDialog(TriList);
             string msg;
@@ -391,6 +414,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 icon = "Camera";
                 msg = string.Format("Incoming video call from: {0}", call.Name);
             }
+
+
+            // Hide screensaver
+            var screenSaverParent = Parent.Parent as IHasScreenSaverController;
+
+            if (screenSaverParent != null)
+            {
+                screenSaverParent.ScreenSaverController.Hide(); 
+            }
+            else
+            {
+                Debug.Console(1, "Parent.Parent is null or does not implement IHasScreenSaverController");
+            }
+
+
             IncomingCallModal.PresentModalDialog(2, "Incoming Call", icon, msg,
                 "Ignore", "Accept", false, false, b =>
                     {
@@ -441,6 +479,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingDirectoryPress, ShowDirectory);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingKeypadPress, ShowKeypad);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingRecentsPress, ShowRecents);
+            TriList.SetSigFalseAction(UIBoolJoin.VCStagingCameraPress, ShowCameraControls);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingConnectPress, ConnectPress);
             TriList.SetSigFalseAction(UIBoolJoin.CallEndPress, () =>
                 {
@@ -458,6 +497,393 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				});
         }
 
+        void SetupCameraControls()
+        {
+            CameraPtzPad = new SmartObjectDPad(TriList.SmartObjects[UISmartObjectJoin.VCCameraDpad], true);
+
+            // If the codec supports camera auto or off, we need to show the mode selector subpage
+            ShowCameraModeControls = Codec is IHasCameraAutoMode || Codec is IHasCameraOff;
+
+            if (ShowCameraModeControls)
+            {
+                CameraModeList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCCameraMode], true, 0);
+
+                VCControlsInterlock.StatusChanged += new EventHandler<StatusChangedEventArgs>(VCControlsInterlock_StatusChanged);
+
+
+                var codecOffCameras = Codec as IHasCameraOff;
+
+                var codecAutoCameras = Codec as IHasCameraAutoMode;
+
+                if (codecAutoCameras != null)
+                {
+                    CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
+                    TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
+                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
+                    //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
+                    //() => codecAutoCameras.CameraAutoModeOn());
+
+
+                    codecAutoCameras.CameraAutoModeIsOnFeedback.OutputChange += (o, a) =>
+                        {
+                            if (a.BoolValue)
+                            {
+                                SetCameraManualModeButtonFeedback(false);
+
+                                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                                {
+                                    VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraAutoVisible);
+                                }
+                                else
+                                {
+                                    VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
+                                }
+                            }
+                            else
+                            {
+                                ShowCameraManualMode();
+                            }
+
+                        };
+                }
+
+                // Manual button always visible
+                CameraModeList.SetItemButtonAction(2, (b) => ShowCameraManualMode());
+
+                TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 2 Visible"].BoolValue = true;
+                //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
+                //    () => ShowCameraManualMode());
+
+                if (codecOffCameras != null)
+                {
+                    TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
+                    codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
+                    CameraModeList.SetItemButtonAction(3, (b) => codecOffCameras.CameraOff());
+                    //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 3 Pressed"].SetSigFalseAction(
+                    //    () => codecOffCameras.CameraOff());
+
+                    codecOffCameras.CameraIsOffFeedback.OutputChange += (o, a) =>
+                        {
+                            if (a.BoolValue)
+                            {
+                                SetCameraManualModeButtonFeedback(false);
+
+                                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                                {
+                                    VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraOffVisible);
+                                }
+                                else
+                                {
+                                    VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraOffVisible);
+                                }
+                            }
+                            else
+                            {
+                                ShowCameraManualMode();
+                            }
+
+                        };
+                }
+            }
+
+            var camerasCodec = Codec as IHasCameras;
+
+            if(camerasCodec != null)
+            {
+                //CameraSelectList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect], true, 0);
+
+                var so = TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect];
+
+                so.SigChange += SmartObject_SigChange;
+
+                for (uint i = 1; i <= camerasCodec.Cameras.Count; i++)
+                {
+                    var cameraKey = camerasCodec.Cameras[(int)i - 1].Key;
+                    Debug.Console(1, "Setting up action for Camera {0} with Key: {1} for button Item {0} Pressed", i, cameraKey);
+
+                    //TODO: Fix camera selection action.  For some reson this action doesn't execute when the buttons are pressed
+
+                    var sig = so.BooleanOutput[String.Format("Item {0} Pressed", i)];
+
+                    so.BooleanOutput[string.Format("Item {0} Pressed", i)].SetSigFalseAction(
+                        () => camerasCodec.SelectCamera(cameraKey));
+                }
+
+                so.UShortInput["Set Number of Items"].UShortValue = (ushort)camerasCodec.Cameras.Count;
+                //TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].UShortOutput["Item Clicked"].SetUShortSigAction(
+                //    (u) =>
+                //    {
+                //        var cameraKey = camerasCodec.Cameras[u - 1].Key;
+                //        Debug.Console(1, "Selecting Camera {0} with Key: {1}", u, cameraKey);
+                //        camerasCodec.SelectCamera(cameraKey);
+                //    });
+
+
+                // Set the names for the cameras
+                for (int i = 1; i <= camerasCodec.Cameras.Count; i++)
+                {
+                    so.StringInput[string.Format("Set Item {0} Text", i)].StringValue = camerasCodec.Cameras[i - 1].Name;
+                }
+
+                SetCameraSelectedFeedback();
+                camerasCodec.CameraSelected += camerasCodec_CameraSelected;
+                MapCameraActions();
+            }
+
+            SetupPresets();
+ 
+        }
+
+        void SmartObject_SigChange(GenericBase currentDevice, SmartObjectEventArgs args)
+        {
+            var uo = args.Sig.UserObject;
+            if (uo is Action<bool>)
+                (uo as Action<bool>)(args.Sig.BoolValue);
+            else if (uo is Action<ushort>)
+                (uo as Action<ushort>)(args.Sig.UShortValue);
+            else if (uo is Action<string>)
+                (uo as Action<string>)(args.Sig.StringValue);
+        }
+
+        void VCControlsInterlock_StatusChanged(object sender, StatusChangedEventArgs e)
+        {
+            // Need to hide the camera mode interlock if the mode bar gets hidden
+            if (e.PreviousJoin == UIBoolJoin.VCCameraModeBarVisible)
+                VCCameraControlModeInterlock.Hide();
+
+            // These deal with hiding/showing the camera select bar if no mode controls are visible (tied to manual controls being visible)
+            if(!ShowCameraModeControls)
+            {
+                if(e.PreviousJoin == UIBoolJoin.VCCameraManualVisible)
+                    TriList.SetBool(UIBoolJoin.VCCameraSelectBarWithoutModeVisible, false);
+
+                if (e.NewJoin == UIBoolJoin.VCCameraManualVisible)
+                    TriList.SetBool(UIBoolJoin.VCCameraSelectBarWithoutModeVisible, true);
+            }
+
+
+        }
+
+
+        /// <summary>
+        /// Shows the preset saved label for 2 seconds
+        /// </summary>
+        void ShowPresetStoreFeedback()
+        {
+            TriList.BooleanInput[UIBoolJoin.VCCameraPresetSavedLabelVisible].BoolValue = true;
+
+            var timer = new CTimer((o) => TriList.BooleanInput[UIBoolJoin.VCCameraPresetSavedLabelVisible].BoolValue = false, 2000);
+        }
+
+        void presetsCodec_CodecRoomPresetsListHasChanged(object sender, EventArgs e)
+        {
+            SetupPresets();
+        }
+
+
+        void camerasCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
+        {
+            MapCameraActions();
+
+            SetCameraSelectedFeedback();
+        }
+
+        /// <summary>
+        /// Set the feedback for the button of the selected camera
+        /// </summary>
+        void SetCameraSelectedFeedback()
+        {
+            var camerasCodec = Codec as IHasCameras;
+
+            for (int i = 1; i <= camerasCodec.Cameras.Count; i++)
+            {
+                var cameraSelected = camerasCodec.SelectedCameraFeedback.StringValue;
+                var state = false;
+                if (cameraSelected == camerasCodec.Cameras[i - 1].Key)
+                {
+                    state = true;
+                }
+
+                TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].BooleanInput[string.Format("Item {0} Selected", i)].BoolValue = state;
+            }
+  
+        }
+
+        void SetupPresets()
+        {
+            var presetsCodec = Codec as IHasCodecRoomPresets;
+            if (presetsCodec != null)
+            {
+                uint holdTime = 5000;
+                presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CodecRoomPresetsListHasChanged);
+
+                var preset = 1;
+                if (presetsCodec.NearEndPresets[preset - 1] != null && presetsCodec.NearEndPresets[preset - 1].Defined)
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset1Visible, true);
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset1].SetSigHeldAction(
+                        holdTime, ShowPresetStoreFeedback,() => presetsCodec.CodecRoomPresetStore(preset, presetsCodec.NearEndPresets[preset - 1].Description), 
+                        () => presetsCodec.CodecRoomPresetSelect(preset));
+                    TriList.StringInput[UIStringJoin.VCCameraPresetLabel1].StringValue = presetsCodec.NearEndPresets[preset - 1].Description;
+                }
+                else
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset1Visible, false);
+                }
+
+                if (presetsCodec.NearEndPresets[1] != null && presetsCodec.NearEndPresets[1].Defined)
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset2Visible, true);
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset2].SetSigHeldAction(
+                        holdTime, ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetStore(preset, presetsCodec.NearEndPresets[preset - 1].Description),
+                        () => presetsCodec.CodecRoomPresetSelect(preset));
+                    TriList.StringInput[UIStringJoin.VCCameraPresetLabel2].StringValue = presetsCodec.NearEndPresets[1].Description;
+                }
+                else
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset2Visible, false);
+                }
+
+                if (presetsCodec.NearEndPresets[2] != null && presetsCodec.NearEndPresets[2].Defined)
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset3Visible, true);
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction(
+                        holdTime, ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetStore(preset, presetsCodec.NearEndPresets[preset - 1].Description),
+                        () => presetsCodec.CodecRoomPresetSelect(preset));
+                    TriList.StringInput[UIStringJoin.VCCameraPresetLabel3].StringValue = presetsCodec.NearEndPresets[2].Description;
+                }
+                else
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset3Visible, false);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Maps button actions to the selected camera
+        /// </summary>
+        void MapCameraActions()
+        {
+            // Now we setup the button actions for the manual controls
+            var camerasCodec = Codec as IHasCameras;
+
+            if (camerasCodec != null && camerasCodec.SelectedCamera != null)
+            {
+
+                var dpad = CameraPtzPad;
+
+                var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
+                if (camera != null)
+                {
+                    if (camerasCodec.SelectedCamera.CanTilt)
+                    {
+                        dpad.SigUp.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.TiltUp();
+                                else
+                                    camera.TiltStop();
+                            });
+                        dpad.SigDown.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.TiltDown();
+                                else
+                                    camera.TiltStop();
+                            });
+                    }
+
+                    if (camerasCodec.SelectedCamera.CanPan)
+                    {
+                        dpad.SigLeft.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.PanLeft();
+                                else
+                                    camera.PanStop();
+                            });
+                        dpad.SigRight.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.PanRight();
+                                else
+                                    camera.PanStop();
+                            });
+                    }
+
+
+                    //dpad.SigCenter.SetSigFalseAction(() => camera.PositionHome());
+
+                    //var homeButton = dpad.BooleanOutput["Home"];
+                    //if (homeButton != null)
+                    //{
+                    //    homeButton.SetSigFalseAction(() => camera.PositionHome());
+                    //}
+
+                    if (camerasCodec.SelectedCamera.CanZoom)
+                    {
+                        TriList.BooleanOutput[UIBoolJoin.VCCameraZoomIn].SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.ZoomIn();
+                                else
+                                    camera.ZoomStop();
+                            });
+                        TriList.BooleanOutput[UIBoolJoin.VCCameraZoomOut].SetBoolSigAction((b) =>
+                           {
+                               if (b)
+                                   camera.ZoomOut();
+                               else
+                                   camera.ZoomStop();
+                           });
+                    }
+
+                }
+            }
+        }
+
+        // Determines if codec is in manual camera control mode and shows feedback
+        void ShowCameraManualMode()
+        {
+            var inManualMode = true;
+
+            var codecOffCameras = Codec as IHasCameraOff;
+
+            var codecAutoCameras = Codec as IHasCameraAutoMode;
+
+            if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
+            {
+                inManualMode = false;
+            }
+
+            // Clear auto mode
+            if (codecAutoCameras != null )
+            {
+                if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
+                {
+                    codecAutoCameras.CameraAutoModeOff();
+                    inManualMode = true;
+                }
+            }
+
+            if (inManualMode)
+            {
+                VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraManualVisible);
+
+                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                    VCCameraControlModeInterlock.Show();
+            }
+
+            SetCameraManualModeButtonFeedback(inManualMode);
+
+        }
+
+        void SetCameraManualModeButtonFeedback(bool state)
+        {
+            // Set button feedback for manual mode
+            TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 2 Selected"].BoolValue = state;
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -918,7 +1344,32 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void ShowCameraControls()
         {
-            VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraVisible);
+            if (ShowCameraModeControls)
+            {
+                VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraModeBarVisible);
+
+                if (VCCameraControlModeInterlock.CurrentJoin != 0)
+                {
+                    VCCameraControlModeInterlock.Show();
+                }
+                else
+                {
+                    var codecAutoCamera = Codec as IHasCameraAutoMode;
+                    if (codecAutoCamera != null)
+                    {
+                        ShowCameraManualMode();
+                        VCCameraControlModeInterlock.Show();
+                    }
+                }
+            }
+            else
+            {
+                // Just show the manual camera control page
+                VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraManualVisible);
+            }
+
+
+
             StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingCameraPress);
         }
 
@@ -951,7 +1402,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// </summary>
 		void ShowSelfViewLayout()
 		{
-			VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCSelfViewLayoutVisible);
+			VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraAutoVisible);
 			StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingSelfViewLayoutPress);
 		}
 

README.md

@@ -1,26 +1,39 @@
-
 # PepperDash Essentials Framework (c) 2020
 
 ## [Latest Release](https://github.com/PepperDash/Essentials/releases/latest)
 
 ## License
+
 Provided under MIT license
 
 ## Overview
+
 PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs.
 
 Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.
 
 ## Minimum Requirements
+
 - Essentials Framework runs on any Crestron 3-series processor, **4-series** processor or Crestron's VC-4 platform.
 - To edit and compile the source, Microsoft Visual Studio 2008 Professional with SP1 is required.
 - Crestron's Simpl# Plugin is also required (must be obtained from Crestron).
 
 ## Dependencies
 
-The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required.  It is referenced as a submodule and will be automatically checked out when cloning this repo if set to recurse submodules.  This allows different builds of the PepperDash.Core library to be referenced by checking out the desired submodule commit.
+The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required. It is referenced via nuget. You must have nuget.exe installed and in the `PATH` environment variable to use the following command. Nuget.exe is available at [nuget.org](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe).
+
+### Installing Dependencies
+
+To install dependencies once nuget.exe is installed, run the following command:
+`nuget install .\packages.config -OutputDirectory .\packages -excludeVersion`.
+To verify that the packages installed correctly, open Essentials and make sure that all references are found, then try and build it.
+
+### Installing Different versions of PepperDash Core
+
+If you need a different version of PepperDash Core, use the command `nuget install .\packages.config -OutputDirectory .\packages -excludeVersion -Version {versionToGet}`. Omitting the `-Version` option will pull the version indicated in the packages.config file.
 
 ## Utilization
+
 Essentials was originally conceptualized as a standalone application for running control system logic entirely in Simpl# Pro. It is primarily designed around accomplishing this goal, but during development, it became obvious that it could easily be leveraged to also serve as a partner application to one or more SIMPL Windows programs.
 
 Utilization of Essentials Framework falls into the following categories:
@@ -34,13 +47,13 @@ Utilization of Essentials Framework falls into the following categories:
 - Advanced logic. Some logic operations that cannot be affectively accomplished in SIMPL Windows (ex. JSON/XML serialization/deserialization, database operations, etc.) can be done in the Simpl# Pro environment and the necessary input and output bridged to a SIMPL Windows program via EISC.
 
 3. Hybrid Application that may contain elements of both standalone control and SIMPL partner application integration.
-- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications.  The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
 
- ## Documentation
- For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
+- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications. The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
+
+## Documentation
+
+For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
 ## How-To (Getting Started)
 
 See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
-
-

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

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
 using Newtonsoft.Json;
@@ -82,9 +84,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
         protected Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
 
-        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+        public BasicTriList Eisc { get; private set; }
 
-        public EiscApiAdvanced(DeviceConfig dc) :
+        public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
             base(dc.Key)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
@@ -92,44 +94,52 @@ namespace PepperDash.Essentials.Core.Bridges
             PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
             //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
-            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
+            Eisc = eisc;
 
             Eisc.SigChange += Eisc_SigChange;
 
-            AddPostActivationAction( () =>
+            AddPostActivationAction(LinkDevices);
+        }
+
+        private void LinkDevices()
+        {
+            Debug.Console(1, this, "Linking Devices...");
+
+            foreach (var d in PropertiesConfig.Devices)
             {
-                Debug.Console(1, this, "Linking Devices...");
+                var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
 
-                foreach (var d in PropertiesConfig.Devices)
+                if (device == null)
                 {
-                    var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                    if (device == null) continue;
-
-                    Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
-
-                    if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                            device.Key);
-                        continue;
-                    }
-
-                    var bridge = device as IBridgeAdvanced;
-                    if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                    continue;
                 }
 
-                var registerResult = Eisc.Register();
+                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
 
-                if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                 {
-                    Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
-                    return;
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
+                    continue;
                 }
 
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
-            });
+                var bridge = device as IBridgeAdvanced;
+                if (bridge != null)
+                {
+                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                }
+            }
+
+            var registerResult = Eisc.Register();
+
+            if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+            {
+                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
+                return;
+            }
+
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
         }
 
         /// <summary>
@@ -152,7 +162,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Prints all the join maps on this bridge
         /// </summary>
-        public void PrintJoinMaps()
+        public virtual void PrintJoinMaps()
         {
             Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
 
@@ -247,7 +257,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="currentDevice"></param>
         /// <param name="args"></param>
-        void Eisc_SigChange(object currentDevice, SigEventArgs args)
+        protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
@@ -299,15 +309,34 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new EiscApiAdvanced Device");
 
-            return new EiscApiAdvanced(dc);
-            
+            var controlProperties = dc.Properties["control"].ToObject<ControlPropertiesConfig>();
+
+            switch (dc.Type)
+            {
+                case "eiscapiadv":
+                case "eiscapiadvanced":
+                {
+                    var eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                case "vceiscapiadv":
+                case "vceiscapiadvanced":
+                {
+                    var eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, InitialParametersClass.RoomId,
+                        Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                default:
+                    return null;
+            }
         }
     }
 

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

@@ -1,193 +1,210 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class CommFactory
-	{
-		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
-		{
-			try
-			{
-				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
-					(deviceConfig.Properties["control"].ToString());
-				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
-			}
-			catch (Exception e)
-			{
-
-				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
-				return null;
-			}
-		}
-
-
-		/// <summary>
-		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
-		/// </summary>
-		/// <param name="deviceConfig">The Device config object</param>
-		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
-		{
-			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
-			if (controlConfig == null)
-				return null;
-
-			IBasicCommunication comm = null;
-			try
-			{
-				var c = controlConfig.TcpSshProperties;
-				switch (controlConfig.Method)
-				{
-					case eControlMethod.Com:
-						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig);
-						break;
-                    case eControlMethod.Cec:
-                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-                        break;
-					case eControlMethod.IR:
-						break;
-                    case eControlMethod.Ssh:
-                        {
-                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-                            ssh.AutoReconnect = c.AutoReconnect;
-                            if(ssh.AutoReconnect)
-                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = ssh;
-                            break;
-                        }
-                    case eControlMethod.Tcpip:
-                        {
-                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-                            tcp.AutoReconnect = c.AutoReconnect;
-                            if (tcp.AutoReconnect)
-                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = tcp;
-                            break;
-                        }
-                    case eControlMethod.Udp:
-                        {
-                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-                            comm = udp;
-                            break;
-                        }
-					case eControlMethod.Telnet:
-						break;
-					default:
-						break;
-				}				
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
-					deviceConfig.Properties.ToString(), e);
-			}
-
-			// put it in the device manager if it's the right flavor
-			var comDev = comm as Device;
-			if (comDev != null)
-				DeviceManager.AddDevice(comDev);
-			return comm;
-		}
-
-		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
-		{
-			var comPar = config.ComParams;
-			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
-			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
-				return dev.ComPorts[config.ControlPortNumber];
-			Debug.Console(0, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
-			return null;
-		}
-
-        /// <summary>
-        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-        /// </summary>
-        /// <param name="config"></param>
-        /// <returns></returns>
-        public static ICec GetCecPort(ControlPropertiesConfig config)
-        {
-            var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
-
-            if (dev != null)
-            {          
-                var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
-
-                if (inputPort != null)
-                    if (inputPort.Port is ICec)
-                        return inputPort.Port as ICec;
-
-                var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
-
-                if (outputPort != null)
-                    if (outputPort.Port is ICec)
-                        return outputPort.Port as ICec;
-            }
-            Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'", config.ControlPortDevKey, config.ControlPortName);
-            return null;
-        }
-
-		/// <summary>
-		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
-		/// return the ControlSystem object from the Global class.
-		/// </summary>
-		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
-		{
-			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
-				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
-				&& Global.ControlSystem is IComPorts)
-				return Global.ControlSystem;
-			else
-			{
-				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
-				if (dev == null)
-					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
-				return dev;
-			}
-		}
-	}
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class EssentialsControlPropertiesConfig : 
-        PepperDash.Core.ControlPropertiesConfig
-    {
-
-        [JsonConverter(typeof(ComSpecJsonConverter))]
-        public ComPort.ComPortSpec ComParams { get; set; }
-
-		public string CresnetId { get; set; }
-
-        /// <summary>
-        /// Attempts to provide uint conversion of string CresnetId
-        /// </summary>
-        public uint CresnetIdInt
-        {
-            get
-            {
-                try 
-                {
-                    return Convert.ToUInt32(CresnetId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-                }
-            }
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class CommFactory
+	{
+		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
+		{
+			try
+			{
+				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
+					(deviceConfig.Properties["control"].ToString());
+				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
+			}
+			catch (Exception e)
+			{
+
+				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
+				return null;
+			}
+		}
+
+
+		/// <summary>
+		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
+		/// </summary>
+		/// <param name="deviceConfig">The Device config object</param>
+		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
+		{
+			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
+			if (controlConfig == null)
+				return null;
+
+			IBasicCommunication comm = null;
+			try
+			{
+				var c = controlConfig.TcpSshProperties;
+				switch (controlConfig.Method)
+				{
+					case eControlMethod.Com:
+						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig);
+						break;
+                    case eControlMethod.Cec:
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+                        break;
+					case eControlMethod.IR:
+						break;
+                    case eControlMethod.Ssh:
+                        {
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+                            ssh.AutoReconnect = c.AutoReconnect;
+                            if(ssh.AutoReconnect)
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = ssh;
+                            break;
+                        }
+                    case eControlMethod.Tcpip:
+                        {
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+                            tcp.AutoReconnect = c.AutoReconnect;
+                            if (tcp.AutoReconnect)
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = tcp;
+                            break;
+                        }
+                    case eControlMethod.Udp:
+                        {
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+                            comm = udp;
+                            break;
+                        }
+					case eControlMethod.Telnet:
+						break;
+					default:
+						break;
+				}				
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
+					deviceConfig.Properties.ToString(), e);
+			}
+
+			// put it in the device manager if it's the right flavor
+			var comDev = comm as Device;
+			if (comDev != null)
+				DeviceManager.AddDevice(comDev);
+			return comm;
+		}
+
+		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
+		{
+			var comPar = config.ComParams;
+			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
+			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
+				return dev.ComPorts[config.ControlPortNumber];
+			Debug.Console(0, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			return null;
+		}
+
+        /// <summary>
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        public static ICec GetCecPort(ControlPropertiesConfig config)
+        {
+            var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+
+            if (dev != null)
+            {
+                if (!String.IsNullOrEmpty(config.ControlPortName))
+                {
+
+                    var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
+
+                    if (inputPort != null)
+                    {
+                        if (inputPort.Port is ICec)
+                            return inputPort.Port as ICec;
+                    }
+
+                    var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
+
+                    if (outputPort != null)
+                    {
+                        if (outputPort.Port is ICec)
+                            return outputPort.Port as ICec;
+                    }
+
+                    else
+                        Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'",
+                            config.ControlPortDevKey, config.ControlPortName);
+                }
+                else
+                {
+                    Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+                }
+            }
+            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
+
+            return null;
         }
 
-        public string InfinetId { get; set; }
-
+		/// <summary>
+		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
+		/// return the ControlSystem object from the Global class.
+		/// </summary>
+		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
+		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
+		{
+			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
+				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
+				&& Global.ControlSystem is IComPorts)
+				return Global.ControlSystem;
+			else
+			{
+				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
+				if (dev == null)
+					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
+				return dev;
+			}
+		}
+	}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsControlPropertiesConfig : 
+        PepperDash.Core.ControlPropertiesConfig
+    {
+
+        [JsonConverter(typeof(ComSpecJsonConverter))]
+        public ComPort.ComPortSpec ComParams { get; set; }
+
+		public string CresnetId { get; set; }
+
+        /// <summary>
+        /// Attempts to provide uint conversion of string CresnetId
+        /// </summary>
+        public uint CresnetIdInt
+        {
+            get
+            {
+                try 
+                {
+                    return Convert.ToUInt32(CresnetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                }
+            }
+        }
+
+        public string InfinetId { get; set; }
+
         /// <summary>
         /// Attepmts to provide uiont conversion of string InifinetId
         /// </summary>
@@ -204,13 +221,13 @@ namespace PepperDash.Essentials.Core
                     throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
                 }
             }
-        }
-    }
-
-    public class IrControlSpec
-    {
-        public string PortDeviceKey { get; set; }
-        public uint PortNumber { get; set; }
-        public string File { get; set; }
-    }
+        }
+    }
+
+    public class IrControlSpec
+    {
+        public string PortDeviceKey { get; set; }
+        public uint PortNumber { get; set; }
+        public string File { get; set; }
+    }
 }

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

@@ -1,83 +1,83 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IRPortHelper
-	{
-		public static string IrDriverPathPrefix
-		{
-			get
-			{
-				return Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
-			}
-		}
-
-		/// <summary>
-		/// Finds either the ControlSystem or a device controller that contains IR ports and
-		/// returns a port from the hardware device
-		/// </summary>
-		/// <param name="propsToken"></param>
-		/// <returns>IrPortConfig object.  The port and or filename will be empty/null 
-		/// if valid values don't exist on config</returns>
-		public static IrOutPortConfig GetIrPort(JToken propsToken)
-		{
-			var control = propsToken["control"];
-			if (control == null)
-				return null;
-			if (control["method"].Value<string>() != "ir")
-			{
-				Debug.Console(0, "IRPortHelper called with non-IR properties");
-				return null;
-			}
-
-			var port = new IrOutPortConfig();
-
-			var portDevKey = control.Value<string>("controlPortDevKey");
-			var portNum = control.Value<uint>("controlPortNumber");
-			if (portDevKey == null || portNum == 0)
-			{
-				Debug.Console(1, "WARNING: Properties is missing port device or port number");
-				return port;
-			}
-
-			IIROutputPorts irDev = null;
-			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-				|| portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
-				irDev = Global.ControlSystem;
-			else
-				irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
-
-			if (irDev == null)
-			{
-				Debug.Console(1, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
-				return port;
-			}
-
-			if (portNum <= irDev.NumberOfIROutputPorts) // success!
-			{
-				var file = IrDriverPathPrefix + control["irFile"].Value<string>();
-				port.Port = irDev.IROutputPorts[portNum];
-				port.FileName = file;
-				return port; // new IrOutPortConfig { Port = irDev.IROutputPorts[portNum], FileName = file };
-			}
-			else
-			{
-				Debug.Console(1, "[Config] Error, device '{0}' IR port {1} out of range",
-					portDevKey, portNum);
-				return port;
-			}
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public static class IRPortHelper
+	{
+		public static string IrDriverPathPrefix
+		{
+			get
+			{
+				return Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
+			}
+		}
+
+		/// <summary>
+		/// Finds either the ControlSystem or a device controller that contains IR ports and
+		/// returns a port from the hardware device
+		/// </summary>
+		/// <param name="propsToken"></param>
+		/// <returns>IrPortConfig object.  The port and or filename will be empty/null 
+		/// if valid values don't exist on config</returns>
+		public static IrOutPortConfig GetIrPort(JToken propsToken)
+		{
+			var control = propsToken["control"];
+			if (control == null)
+				return null;
+			if (control["method"].Value<string>() != "ir")
+			{
+				Debug.Console(0, "IRPortHelper called with non-IR properties");
+				return null;
+			}
+
+			var port = new IrOutPortConfig();
+
+			var portDevKey = control.Value<string>("controlPortDevKey");
+			var portNum = control.Value<uint>("controlPortNumber");
+			if (portDevKey == null || portNum == 0)
+			{
+				Debug.Console(1, "WARNING: Properties is missing port device or port number");
+				return port;
+			}
+
+			IIROutputPorts irDev = null;
+			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
+				|| portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
+				irDev = Global.ControlSystem;
+			else
+				irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
+
+			if (irDev == null)
+			{
+				Debug.Console(1, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
+				return port;
+			}
+
+			if (portNum <= irDev.NumberOfIROutputPorts) // success!
+			{
+				var file = IrDriverPathPrefix + control["irFile"].Value<string>();
+				port.Port = irDev.IROutputPorts[portNum];
+				port.FileName = file;
+				return port; // new IrOutPortConfig { Port = irDev.IROutputPorts[portNum], FileName = file };
+			}
+			else
+			{
+				Debug.Console(1, "[Config] Error, device '{0}' IR port {1} out of range",
+					portDevKey, portNum);
+				return port;
+			}
 		}
 
 	    public static IROutputPort GetIrOutputPort(DeviceConfig dc)
@@ -124,7 +124,7 @@ namespace PepperDash.Essentials.Core
 	            Debug.Console(0, "WARNING: device with IR ports '{0}' not found", portDevKey);
 	            return null;
 	        }
-	        if (portNum >= irDev.NumberOfIROutputPorts)
+	        if (portNum > irDev.NumberOfIROutputPorts)
 	        {
 	            Debug.Console(0, "WARNING: device '{0}' IR port {1} out of range",
 	                portDevKey, portNum);
@@ -134,10 +134,9 @@ namespace PepperDash.Essentials.Core
 
 	        var port = irDev.IROutputPorts[portNum];
 
-	        port.LoadIRDriver(Global.FilePathPrefix + "IR" + Global.DirectorySeparator + control["irFile"].Value<string>());
+            
 
 	        return port;
-
 	    }
 
 	    public static IrOutputPortController GetIrOutputPortController(DeviceConfig config)
@@ -149,87 +148,88 @@ namespace PepperDash.Essentials.Core
 	            return null;
 	        }
 
-	        var irDevice = new IrOutputPortController(config.Key, GetIrOutputPort, config);
+            var postActivationFunc = new Func<DeviceConfig,IROutputPort> (GetIrOutputPort);
+	        var irDevice = new IrOutputPortController(config.Key + "-ir", postActivationFunc, config);
 
 	        return irDevice;
 	    }
 
-	    /*
-        /// <summary>
-        /// Returns a ready-to-go IrOutputPortController from a DeviceConfig object.
-        /// </summary>	
-        public static IrOutputPortController GetIrOutputPortController(DeviceConfig devConf)
-        {
-            var irControllerKey = devConf.Key + "-ir";
-            if (devConf.Properties == null)
-            {
-                Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
-                return new IrOutputPortController(irControllerKey, null, "");
-            }
-
-            var control = devConf.Properties["control"];
-            if (control == null)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: Device config does not include control properties.  IR will not function");
-                return c;
-            }
-
-            var portDevKey = control.Value<string>("controlPortDevKey");
-            var portNum = control.Value<uint>("controlPortNumber");
-            IIROutputPorts irDev = null;
-
-            if (portDevKey == null)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: control properties is missing ir device");
-                return c;
-            }
-
-            if (portNum == 0)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: control properties is missing ir port number");
-                return c;
-            } 
-
-            if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-                || portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
-                irDev = Global.ControlSystem;
-            else
-                irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
-
-            if (irDev == null)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
-                return c;
-            }
-
-            if (portNum <= irDev.NumberOfIROutputPorts) // success!
-                return new IrOutputPortController(irControllerKey, irDev.IROutputPorts[portNum],
-                    IrDriverPathPrefix + control["irFile"].Value<string>());
-            else
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: device '{0}' IR port {1} out of range",
-                    portDevKey, portNum);
-                return c;
-            }
+	    /*
+        /// <summary>
+        /// Returns a ready-to-go IrOutputPortController from a DeviceConfig object.
+        /// </summary>	
+        public static IrOutputPortController GetIrOutputPortController(DeviceConfig devConf)
+        {
+            var irControllerKey = devConf.Key + "-ir";
+            if (devConf.Properties == null)
+            {
+                Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
+                return new IrOutputPortController(irControllerKey, null, "");
+            }
+
+            var control = devConf.Properties["control"];
+            if (control == null)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: Device config does not include control properties.  IR will not function");
+                return c;
+            }
+
+            var portDevKey = control.Value<string>("controlPortDevKey");
+            var portNum = control.Value<uint>("controlPortNumber");
+            IIROutputPorts irDev = null;
+
+            if (portDevKey == null)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: control properties is missing ir device");
+                return c;
+            }
+
+            if (portNum == 0)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: control properties is missing ir port number");
+                return c;
+            } 
+
+            if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
+                || portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
+                irDev = Global.ControlSystem;
+            else
+                irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
+
+            if (irDev == null)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
+                return c;
+            }
+
+            if (portNum <= irDev.NumberOfIROutputPorts) // success!
+                return new IrOutputPortController(irControllerKey, irDev.IROutputPorts[portNum],
+                    IrDriverPathPrefix + control["irFile"].Value<string>());
+            else
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: device '{0}' IR port {1} out of range",
+                    portDevKey, portNum);
+                return c;
+            }
         }*/
-	}
-
-	/// <summary>
-	/// Wrapper to help in IR port creation
-	/// </summary>
-	public class IrOutPortConfig
-	{
-		public IROutputPort Port { get; set; }
-		public string FileName { get; set; }
-
-		public IrOutPortConfig()
-		{
-			FileName = "";
-		}
-	}
+	}
+
+	/// <summary>
+	/// Wrapper to help in IR port creation
+	/// </summary>
+	public class IrOutPortConfig
+	{
+		public IROutputPort Port { get; set; }
+		public string FileName { get; set; }
+
+		public IrOutPortConfig()
+		{
+			FileName = "";
+		}
+	}
 }

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

@@ -1,5 +1,6 @@
 using System;
-using System.Linq;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
@@ -12,8 +13,14 @@ namespace PepperDash.Essentials.Core.Config
 	/// <summary>
 	/// Loads the ConfigObject from the file
 	/// </summary>
-	public class ConfigReader
-	{
+	public class ConfigReader
+	{
+	    public const string LocalConfigPresent =
+            @"
+***************************************************
+************* Using Local config file *************
+***************************************************";
+
 		public static EssentialsConfig ConfigObject { get; private set; }
 
 		public static bool LoadConfig2()
@@ -40,10 +47,10 @@ namespace PepperDash.Essentials.Core.Config
                             "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
                         return false;
                     }
-                    else if(configFiles.Length == 1)
+                    if(configFiles.Length == 1)
                     {
-                        localConfigFound = true;
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
+                        localConfigFound = true;
+                        
                     }
                 }
                 else
@@ -91,7 +98,13 @@ namespace PepperDash.Essentials.Core.Config
                 }
 
                 // Get the actual file path
-                filePath = configFiles[0].FullName;
+                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))
@@ -177,7 +190,65 @@ namespace PepperDash.Essentials.Core.Config
         {
             var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
             return dev == null ? null : dev.Group;
-        }
+        }
+
+	    private static void GetLocalFileMessage(string filePath)
+	    {
+            var filePathLength = filePath.Length + 2;
+            var debugStringWidth = filePathLength + 12;
+
+            if (debugStringWidth < 51)
+            {
+                debugStringWidth = 51;
+            }
+            var qualifier = (filePathLength % 2 != 0)
+                ? " Using Local Config File "
+                : " Using Local  Config File ";
+            var bookend1 = (debugStringWidth - qualifier.Length) / 2;
+            var bookend2 = (debugStringWidth - filePathLength) / 2;
+
+
+	        var newDebugString = new StringBuilder()
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 1
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 2
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 3
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', debugStringWidth - 4))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 4
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', bookend1 - 2))
+	            .Append(qualifier)
+	            .Append(new string(' ', bookend1 - 2))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 5
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', bookend2 - 2))
+	            .Append(" " + filePath + " ")
+	            .Append(new string(' ', bookend2 - 2))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 6
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', debugStringWidth - 4))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 7
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 8
+	            .Append(new string('*', debugStringWidth));
+
+            Debug.Console(2, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
+            Debug.Console(0, newDebugString.ToString());
+	    }
 
 	}
 }

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

@@ -1,5 +1,5 @@
 using System;
-
+using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 
@@ -81,7 +81,7 @@ namespace PepperDash.Essentials.Core.Config
         //    }
         //} 
 
-        /// <summary>
+        /// <summary>, 
         /// The OS Version of the processor (Firmware Version)
         /// </summary>
         [JsonProperty("osVersion")]
@@ -92,5 +92,18 @@ namespace PepperDash.Essentials.Core.Config
 		//        return Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware;
 		//    }
 		//} 
+
+        /// <summary>
+        /// The information gathered by the processor at runtime about it's NICs and their IP addresses.   
+        /// </summary>
+        [JsonProperty("ipInfo")]
+        public Dictionary<short, EthernetAdapterInfo> IpInfo
+        {
+            get
+            {
+                return Global.EthernetAdapterInfoCollection;
+            }
+        }
     }
+
 }

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

@@ -179,7 +179,7 @@ namespace PepperDash.Essentials.Core
 	{
 		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
 		{
-			var result = device.Register();
+		    var result = device.Register();
 			var level = result == eDeviceRegistrationUnRegistrationResponse.Success ?
 				Debug.ErrorLogLevel.Notice : Debug.ErrorLogLevel.Error;
 			Debug.Console(0, level, "Register device result: '{0}', type '{1}', result {2}", key, device, result);

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

@@ -0,0 +1,8 @@
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface IHasBranding
+    {
+        bool BrandingEnabled { get; }
+        void InitializeBranding(string roomKey);
+    }
+}

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

@@ -337,7 +337,36 @@ namespace PepperDash.Essentials.Core
                 return;
             }
             com.SimulateReceive(match.Groups[2].Value);
-        }
+        }
+
+        /// <summary>
+        /// Prints a list of routing inputs and outputs by device key.
+        /// </summary>
+        /// <param name="s">Device key from which to report data</param>
+	    public static void GetRoutingPorts(string s)
+	    {
+	        var device = GetDeviceForKey(s);
+
+	        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);
+	            foreach (var routingInputPort in inputPorts)
+	            {
+	                Debug.Console(0, "{0}", routingInputPort.Key);
+	            }
+	        }
+	        if (outputPorts != null)
+	        {
+	            Debug.Console(0, "Device {0} has {1} Output Ports:", s, outputPorts.Count);
+	            foreach (var routingOutputPort in outputPorts)
+	            {
+	                Debug.Console(0, "{0}", routingOutputPort.Key);
+	            }
+	        }
+	    }
 
         /// <summary>
         /// Attempts to set the debug level of a device

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

@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash_Essentials_Core.Devices
+{
+    public class GenericIrController: EssentialsBridgeableDevice
+    {
+        //data storage for bridging
+        private BasicTriList _trilist;
+        private uint _joinStart;
+        private string _joinMapKey;
+        private EiscApiAdvanced _bridge;
+
+        private readonly IrOutputPortController _port; 
+
+        public string[] IrCommands {get { return _port.IrFileCommands; }}
+
+        public GenericIrController(string key, string name, IrOutputPortController irPort) : base(key, name)
+        {
+            _port = irPort;
+
+            if (_port == null)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "IR Port is null, device will not function");
+                return;
+            }
+            DeviceManager.AddDevice(_port);
+
+            _port.DriverLoaded.OutputChange += DriverLoadedOnOutputChange;
+        }
+
+        private void DriverLoadedOnOutputChange(object sender, FeedbackEventArgs args)
+        {
+            if (!args.BoolValue)
+            {
+                return;
+            }
+
+            if (_trilist == null || _bridge == null)
+            {
+                return;
+            }
+
+            LinkToApi(_trilist, _joinStart, _joinMapKey, _bridge);
+        }
+
+        #region Overrides of EssentialsBridgeableDevice
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            //if driver isn't loaded yet, store the variables until it is loaded, then call the LinkToApi method again
+            if (!_port.DriverIsLoaded)
+            {
+                _trilist = trilist;
+                _joinStart = joinStart;
+                _joinMapKey = joinMapKey;
+                _bridge = bridge;
+                return;
+            }
+
+            var joinMap = new GenericIrControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericIrControllerJoinMap>(joinMapSerialized);
+
+            for (uint i = 0; i < _port.IrFileCommands.Length; i++)
+            {
+                var cmd = _port.IrFileCommands[i];
+                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i, JoinSpan = 1},
+                    new JoinMetadata
+                    {
+                        Description = cmd,
+                        JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                        JoinType = eJoinType.Digital
+                    });
+
+                joinData.SetJoinOffset(joinStart);
+
+                joinMap.Joins.Add(cmd,joinData);
+
+                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
+            }
+
+            joinMap.PrintJoinMapInfo();
+
+            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.");
+            }
+        }
+
+        #endregion
+
+        public void Press(string command, bool pressRelease)
+        {
+            _port.PressRelease(command, pressRelease);
+        }
+    }
+
+    public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
+    {
+        public GenericIrControllerJoinMap(uint joinStart) : base(joinStart)
+        {
+        }
+    }
+
+    public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIrController>
+    {
+        public GenericIrControllerFactory()
+        {
+            TypeNames = new List<string> {"genericIrController"};
+        }
+        #region Overrides of EssentialsDeviceFactory<GenericIRController>
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic IR Controller Device");
+
+            var irPort = IRPortHelper.GetIrOutputPortController(dc);
+
+            return new GenericIrController(dc.Key, dc.Name, irPort);
+        }
+
+        #endregion
+    }
+}

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

@@ -1,138 +1,169 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json.Linq;
-using PepperDash.Essentials.Core.Config;
-
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-
-	/// <summary>
-	/// IR port wrapper. May act standalone
-	/// </summary>
-	public class IrOutputPortController : Device
-	{	
-		uint IrPortUid;
-		IROutputPort IrPort;
-
-		public ushort StandardIrPulseTime { get; set; }
-		public string DriverFilepath { get; private set; }
-		public bool DriverIsLoaded { get; private set; }
-
-		/// <summary>
-		/// Constructor for IrDevice base class.  If a null port is provided, this class will 
-		/// still function without trying to talk to a port.
-		/// </summary>
-		public IrOutputPortController(string key, IROutputPort port, string irDriverFilepath)
-			: base(key)
-		{
-			//if (port == null) throw new ArgumentNullException("port");
-			IrPort = port;
-			if (port == null)
-			{
-				Debug.Console(0, this, "WARNING No valid IR Port assigned to controller. IR will not function");
-				return;
-			}
-			LoadDriver(irDriverFilepath);
+using PepperDash.Essentials.Core.Config;
+
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+
+	/// <summary>
+	/// IR port wrapper. May act standalone
+	/// </summary>
+	public class IrOutputPortController : Device
+	{	
+		uint IrPortUid;
+		IROutputPort IrPort;
+
+        public BoolFeedback DriverLoaded { get; private set; }
+
+		public ushort StandardIrPulseTime { get; set; }
+		public string DriverFilepath { get; private set; }
+		public bool DriverIsLoaded { get; private set; }
+
+        public string[] IrFileCommands { get { return IrPort.AvailableStandardIRCmds(IrPortUid); } }
+
+		/// <summary>
+		/// Constructor for IrDevice base class.  If a null port is provided, this class will 
+		/// still function without trying to talk to a port.
+		/// </summary>
+		public IrOutputPortController(string key, IROutputPort port, string irDriverFilepath)
+			: base(key)
+		{
+			//if (port == null) throw new ArgumentNullException("port");
+
+		    DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
+			IrPort = port;
+			if (port == null)
+			{
+				Debug.Console(0, this, "WARNING No valid IR Port assigned to controller. IR will not function");
+				return;
+			}
+			LoadDriver(irDriverFilepath);
 		}
 
 	    public IrOutputPortController(string key, Func<DeviceConfig, IROutputPort> postActivationFunc,
 	        DeviceConfig config)
 	        : base(key)
 	    {
+            DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
             AddPostActivationAction(() =>
             {
                 IrPort = postActivationFunc(config);
+
+                if (IrPort == null)
+                {
+                    Debug.Console(0, this, "WARNING No valid IR Port assigned to controller. IR will not function");
+                    return;
+                }
+                
+                var filePath = Global.FilePathPrefix + "ir" + Global.DirectorySeparator + config.Properties["control"]["irFile"].Value<string>();
+                Debug.Console(1, "*************Attempting to load IR file: {0}***************", filePath);
+
+                LoadDriver(filePath);
+                    
+                PrintAvailableCommands();
             });
 	    }
 
+	    public void PrintAvailableCommands()
+	    {
+            Debug.Console(2, this, "Available IR Commands in IR File {0}", IrPortUid);
+            foreach (var cmd in IrPort.AvailableIRCmds())
+            {
+                Debug.Console(2, this, "{0}", cmd);
+            }
+	    }
 	    
 
-	    /// <summary>
-		/// Loads the IR driver at path
-		/// </summary>
-		/// <param name="path"></param>
-		public void LoadDriver(string path)
-		{
-			if (string.IsNullOrEmpty(path)) path = DriverFilepath;
-			try
-			{
-				IrPortUid = IrPort.LoadIRDriver(path);
-				DriverFilepath = path;
-				StandardIrPulseTime = 200;
-				DriverIsLoaded = true;
-			}
-			catch
-			{
-				DriverIsLoaded = false;
-				var message = string.Format("WARNING IR Driver '{0}' failed to load", path);
-				Debug.Console(0, this, message);
-				ErrorLog.Error(message);
-			}
-		}
-
-
-		/// <summary>
-		/// Starts and stops IR command on driver. Safe for missing commands
-		/// </summary>
-		public virtual void PressRelease(string command, bool state)
-		{
-			Debug.Console(2, this, "IR:'{0}'={1}", command, state);
-			if (IrPort == null)
-			{
-				Debug.Console(2, this, "WARNING No IR Port assigned to controller");
-				return;
-			} 
-			if (!DriverIsLoaded)
-			{
-				Debug.Console(2, this, "WARNING IR driver is not loaded");
-				return;
-			}
-			if (state)
-			{
-				if (IrPort.IsIRCommandAvailable(IrPortUid, command))
-					IrPort.Press(IrPortUid, command);
-				else
-					NoIrCommandError(command);
-			}
-			else
-				IrPort.Release();
-		}
-
-		/// <summary>
-		/// Pulses a command on driver. Safe for missing commands
-		/// </summary>
-		public virtual void Pulse(string command, ushort time)
-		{
-			if (IrPort == null)
-			{
-				Debug.Console(2, this, "WARNING No IR Port assigned to controller");
-				return;
-			} 
-			if (!DriverIsLoaded)
-			{
-				Debug.Console(2, this, "WARNING IR driver is not loaded");
-				return;
-			}
-			if (IrPort.IsIRCommandAvailable(IrPortUid, command))
-				IrPort.PressAndRelease(IrPortUid, command, time);
-			else
-				NoIrCommandError(command);
-		}
-
-		/// <summary>
-		/// Notifies the console when a bad command is used.
-		/// </summary>
-		protected void NoIrCommandError(string command)
-		{
-			Debug.Console(2, this, "Device {0}: IR Driver {1} does not contain command {2}",
-				Key, IrPort.IRDriverFileNameByIRDriverId(IrPortUid), command);
+	    /// <summary>
+		/// Loads the IR driver at path
+		/// </summary>
+		/// <param name="path"></param>
+		public void LoadDriver(string path)
+		{
+            Debug.Console(2, this, "***Loading IR File***");
+			if (string.IsNullOrEmpty(path)) path = DriverFilepath;
+	        try
+	        {
+	            IrPortUid = IrPort.LoadIRDriver(path);
+	            DriverFilepath = path;
+	            StandardIrPulseTime = 200;
+	            DriverIsLoaded = true;
+
+                DriverLoaded.FireUpdate();
+	        }
+			catch
+			{
+				DriverIsLoaded = false;
+				var message = string.Format("WARNING IR Driver '{0}' failed to load", path);
+				Debug.Console(0, this, Debug.ErrorLogLevel.Error, message);
+                DriverLoaded.FireUpdate();
+			}
 		}
-	}
+
+
+		/// <summary>
+		/// Starts and stops IR command on driver. Safe for missing commands
+		/// </summary>
+		public virtual void PressRelease(string command, bool state)
+		{
+			Debug.Console(2, this, "IR:'{0}'={1}", command, state);
+			if (IrPort == null)
+			{
+				Debug.Console(2, this, "WARNING No IR Port assigned to controller");
+				return;
+			} 
+			if (!DriverIsLoaded)
+			{
+				Debug.Console(2, this, "WARNING IR driver is not loaded");
+				return;
+			}
+			if (state)
+			{
+				if (IrPort.IsIRCommandAvailable(IrPortUid, command))
+					IrPort.Press(IrPortUid, command);
+				else
+					NoIrCommandError(command);
+			}
+			else
+				IrPort.Release();
+		}
+
+		/// <summary>
+		/// Pulses a command on driver. Safe for missing commands
+		/// </summary>
+		public virtual void Pulse(string command, ushort time)
+		{
+			if (IrPort == null)
+			{
+				Debug.Console(2, this, "WARNING No IR Port assigned to controller");
+				return;
+			} 
+			if (!DriverIsLoaded)
+			{
+				Debug.Console(2, this, "WARNING IR driver is not loaded");
+				return;
+			}
+			if (IrPort.IsIRCommandAvailable(IrPortUid, command))
+				IrPort.PressAndRelease(IrPortUid, command, time);
+			else
+				NoIrCommandError(command);
+		}
+
+		/// <summary>
+		/// Notifies the console when a bad command is used.
+		/// </summary>
+		protected void NoIrCommandError(string command)
+		{
+			Debug.Console(2, this, "Device {0}: IR Driver {1} does not contain command {2}",
+				Key, IrPort.IRDriverFileNameByIRDriverId(IrPortUid), command);
+		}
+	}
 }

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

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+    public class EthernetAdapterInfo
+    {
+        public EthernetAdapterType Type { get; set; }
+        public bool DhcpIsOn { get; set; }
+        public string Hostname { get; set; }
+        public string MacAddress { get; set; }
+        public string IpAddress { get; set; }
+        public string Subnet { get; set; }
+        public string Gateway { get; set; }
+        public string Dns1 { get; set; }
+        public string Dns2 { get; set; }
+        public string Dns3 { get; set; }
+        public string Domain { get; set; }
+    }
+}

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

@@ -1,175 +1,180 @@
-using System;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.CrestronDataStore;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-using PepperDash.Essentials.License;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public static class Global
-	{
+using System;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using System.Collections.Generic;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.CrestronDataStore;
+using Crestron.SimplSharpPro;
+
+using PepperDash.Core;
+using PepperDash.Essentials.License;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+
+
+namespace PepperDash.Essentials.Core
+{
+	public static class Global
+	{
 		public static CrestronControlSystem ControlSystem { get; set; }
 
-		public static LicenseManager LicenseManager { get; set; }
-
-        /// <summary>
-        /// The file path prefix to the folder containing configuration files
-        /// </summary>
-        public static string FilePathPrefix { get; private set; }
-
-        /// <summary>
-        /// The file path prefix to the applciation directory
-        /// </summary>
-        public static string ApplicationDirectoryPathPrefix 
-        {
-            get
-            {
-                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
-            }
-        }
-
-        /// <summary>
-        /// Returns the directory separator character based on the running OS
-        /// </summary>
-        public static char DirectorySeparator
-        {
-            get
-            {
-                return System.IO.Path.DirectorySeparatorChar;
-            }
-        }
-
-        /// <summary>
-        /// Wildcarded config file name for global reference
-        /// </summary>
-        public const string ConfigFileName = "*configurationFile*.json";
-
-        /// <summary>
-        /// Sets the file path prefix
-        /// </summary>
-        /// <param name="prefix"></param>
-        public static void SetFilePathPrefix(string prefix)
-        {
-            FilePathPrefix = prefix;
-        }
-
-        static string _AssemblyVersion;
-
-        /// <summary>
-        /// Gets the Assembly Version of Essentials
-        /// </summary>
-        /// <returns>The Assembly Version at Runtime</returns>
-        public static string AssemblyVersion
-        {
-            get
-            {
-                return _AssemblyVersion;
-            }
-            private set
-            {
-                _AssemblyVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Sets the Assembly version to the version of the Essentials Library
-        /// </summary>
-        /// <param name="assemblyVersion"></param>
-        public static void SetAssemblyVersion(string assemblyVersion)
-        {
-            AssemblyVersion = assemblyVersion;
-        }
-
-        /// <summary>
-        /// Checks to see if the running version meets or exceed the minimum specified version.  For beta versions (0.xx.yy), will always return true.
-        /// </summary>
-        /// <param name="minimumVersion">Minimum specified version in format of xx.yy.zz</param>
-        /// <returns>Returns true if the running version meets or exceeds the minimum specified version</returns>
-        public static bool IsRunningMinimumVersionOrHigher(string minimumVersion)
-        {
-            Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
-
-            if (String.IsNullOrEmpty(minimumVersion))
-            {
-                Debug.Console(0,"Plugin does not specify a minimum version. Loading plugin may not work as expected. Proceeding with loading plugin");
-                return true;
-            }
-            
-            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
-
-            var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
-            var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
-            var runtimeVersionBuild = Int16.Parse(runtimeVersion.Groups[3].Value);
-
-            var runtimeVer = new Version(runtimeVersionMajor, runtimeVersionMinor, runtimeVersionBuild);
-
-            Version minimumVer;
-            try
-            {
-                minimumVer = new Version(minimumVersion);
-            }
-            catch
-            {
-                Debug.Console(2, "unable to parse minimum version {0}. Bypassing plugin load.", minimumVersion);
-                return false;
-            }
-
-
-            // Check for beta build version
-            if (runtimeVer.Major != 0)
-            {
-                return runtimeVer.CompareTo(minimumVer) >= 0;
-            }
-
-            Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
-            return true;
-
-            /*
-            var minVersion = Regex.Match(minimumVersion, @"^(\d*).(\d*).(\d*)$");
-
-            if(!minVersion.Success)
-            {
-                
-            }
-
-            var minVersionMajor = Int16.Parse(minVersion.Groups[1].Value);
-            var minVersionMinor = Int16.Parse(minVersion.Groups[2].Value);
-            var minVersionBuild = Int16.Parse(minVersion.Groups[3].Value);
-
-
-
-            if (minVersionMajor > runtimeVersionMajor)
-                return false;
-
-            if (minVersionMinor > runtimeVersionMinor)
-                return false;
-
-            if (minVersionBuild > runtimeVersionBuild)
-                return false;
-
-            return true;
-             */
-        }
-
-		static Global()
-		{
-			// Fire up CrestronDataStoreStatic
-			var err = CrestronDataStoreStatic.InitCrestronDataStore();
-			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-			{
-				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
-				return;
-			}
-		}
-
-	}
+        public static eDevicePlatform Platform { get { return CrestronEnvironment.DevicePlatform; } }
+
+        public static Dictionary<short, EthernetAdapterInfo> EthernetAdapterInfoCollection { get; private set; }
+
+		public static LicenseManager LicenseManager { get; set; }
+
+        /// <summary>
+        /// The file path prefix to the folder containing configuration files
+        /// </summary>
+        public static string FilePathPrefix { get; private set; }
+
+        /// <summary>
+        /// The file path prefix to the applciation directory
+        /// </summary>
+        public static string ApplicationDirectoryPathPrefix 
+        {
+            get
+            {
+                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
+            }
+        }
+
+        /// <summary>
+        /// Returns the directory separator character based on the running OS
+        /// </summary>
+        public static char DirectorySeparator
+        {
+            get
+            {
+                return System.IO.Path.DirectorySeparatorChar;
+            }
+        }
+
+        /// <summary>
+        /// Wildcarded config file name for global reference
+        /// </summary>
+        public const string ConfigFileName = "*configurationFile*.json";
+
+        /// <summary>
+        /// Sets the file path prefix
+        /// </summary>
+        /// <param name="prefix"></param>
+        public static void SetFilePathPrefix(string prefix)
+        {
+            FilePathPrefix = prefix;
+        }
+
+        static string _AssemblyVersion;
+
+        /// <summary>
+        /// Gets the Assembly Version of Essentials
+        /// </summary>
+        /// <returns>The Assembly Version at Runtime</returns>
+        public static string AssemblyVersion
+        {
+            get
+            {
+                return _AssemblyVersion;
+            }
+            private set
+            {
+                _AssemblyVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the Assembly version to the version of the Essentials Library
+        /// </summary>
+        /// <param name="assemblyVersion"></param>
+        public static void SetAssemblyVersion(string assemblyVersion)
+        {
+            AssemblyVersion = assemblyVersion;
+        }
+
+        /// <summary>
+        /// Checks to see if the running version meets or exceed the minimum specified version.  For beta versions (0.xx.yy), will always return true.
+        /// </summary>
+        /// <param name="minimumVersion">Minimum specified version in format of xx.yy.zz</param>
+        /// <returns>Returns true if the running version meets or exceeds the minimum specified version</returns>
+        public static bool IsRunningMinimumVersionOrHigher(string minimumVersion)
+        {
+            Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
+
+            if (String.IsNullOrEmpty(minimumVersion))
+            {
+                Debug.Console(0,"Plugin does not specify a minimum version. Loading plugin may not work as expected. Proceeding with loading plugin");
+                return true;
+            }
+            
+            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
+
+            var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
+            var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
+            var runtimeVersionBuild = Int16.Parse(runtimeVersion.Groups[3].Value);
+
+            var runtimeVer = new Version(runtimeVersionMajor, runtimeVersionMinor, runtimeVersionBuild);
+
+            Version minimumVer;
+            try
+            {
+                minimumVer = new Version(minimumVersion);
+            }
+            catch
+            {
+                Debug.Console(2, "unable to parse minimum version {0}. Bypassing plugin load.", minimumVersion);
+                return false;
+            }
+
+
+            // Check for beta build version
+            if (runtimeVer.Major != 0)
+            {
+                return runtimeVer.CompareTo(minimumVer) >= 0;
+            }
+
+            Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
+            return true;
+
+            /*
+            var minVersion = Regex.Match(minimumVersion, @"^(\d*).(\d*).(\d*)$");
+
+            if(!minVersion.Success)
+            {
+                
+            }
+
+            var minVersionMajor = Int16.Parse(minVersion.Groups[1].Value);
+            var minVersionMinor = Int16.Parse(minVersion.Groups[2].Value);
+            var minVersionBuild = Int16.Parse(minVersion.Groups[3].Value);
+
+
+
+            if (minVersionMajor > runtimeVersionMajor)
+                return false;
+
+            if (minVersionMinor > runtimeVersionMinor)
+                return false;
+
+            if (minVersionBuild > runtimeVersionBuild)
+                return false;
+
+            return true;
+             */
+        }
+
+		static Global()
+		{
+			// Fire up CrestronDataStoreStatic
+			var err = CrestronDataStoreStatic.InitCrestronDataStore();
+			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+			{
+				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
+				return;
+			}
+		}
+
+	}
 }

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

@@ -1,5 +1,6 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Diagnostics;
@@ -100,25 +101,28 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             UptimeFeedback.FireUpdate();
             LastStartFeedback.FireUpdate();
-        }
-
-        private void ParseUptime(string response)
-        {
-            var splitString = response.Trim().Split('\r', '\n');
-
-            var lastStartRaw = splitString[2];
-            var lastStartIndex = lastStartRaw.IndexOf(':');
-
-            _lastStart = lastStartRaw.Substring(lastStartIndex + 1).Trim();
-
-            var uptimeRaw = splitString[0];
-
-            var forIndex = uptimeRaw.IndexOf("for", StringComparison.Ordinal);
-
-            //4 => "for " to get what's on the right
-            _uptime = uptimeRaw.Substring(forIndex + 4);
-        }
-
+        }
+
+        private void ParseUptime(string response)
+        {
+            var splitString = response.Trim().Split('\r', '\n');
+
+            var lastStartRaw = splitString.FirstOrDefault(o => o.Contains("started"));
+            var uptimeRaw = splitString.FirstOrDefault(o => o.Contains("running"));
+
+            if (!String.IsNullOrEmpty(lastStartRaw))
+            {
+                var lastStartIndex = lastStartRaw.IndexOf(':');
+                _lastStart = lastStartRaw.Substring(lastStartIndex + 1).Trim();
+            }
+
+            if (String.IsNullOrEmpty(uptimeRaw)) return;
+            var forIndex = uptimeRaw.IndexOf("for", StringComparison.Ordinal);
+
+            //4 => "for " to get what's on the right
+            _uptime = uptimeRaw.Substring(forIndex + 4);
+        }
+
         private void CrestronEnvironmentOnEthernetEventHandler(EthernetEventArgs ethernetEventArgs)
         {
             if (ethernetEventArgs.EthernetEventType != eEthernetEventType.LinkUp) return;

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

@@ -48,71 +48,83 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -188,11 +200,13 @@
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
+    <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
@@ -210,8 +224,13 @@
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
+    <Compile Include="Global\EthernetAdapterInfo.cs" />
+    <Compile Include="Queues\ComsMessage.cs" />
+    <Compile Include="Queues\ProcessStringMessage.cs" />
+    <Compile Include="Queues\GenericQueue.cs" />
     <Compile Include="Global\JobTimer.cs" />
     <Compile Include="Global\Scheduler.cs" />
+    <Compile Include="Queues\IQueue.cs" />
     <Compile Include="JoinMaps\JoinMapBase.cs" />
     <Compile Include="Lighting\Lighting Interfaces.cs" />
     <Compile Include="Lighting\LightingBase.cs" />
@@ -226,6 +245,7 @@
     <Compile Include="Plugins\PluginLoader.cs" />
     <Compile Include="Presets\PresetBase.cs" />
     <Compile Include="Plugins\IPluginDeviceFactory.cs" />
+    <Compile Include="Queues\IQueueMessage.cs" />
     <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
     <Compile Include="Config\BasicConfig.cs" />
     <Compile Include="Config\ConfigPropertiesHelpers.cs" />
@@ -301,6 +321,7 @@
     <Compile Include="SmartObjects\SmartObjectDPad.cs" />
     <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
     <Compile Include="Routing\TieLine.cs" />
+    <Compile Include="Queues\StringResponseProcessor.cs" />
     <Compile Include="Timers\CountdownTimer.cs" />
     <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="Touchpanels\Interfaces.cs" />

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>PepperDashEssentials</id>
+    <version>1.5.6</version>
+    <title>PepperDash Essentials</title>
+    <authors>PepperDash Technologies</authors>
+    <owners>pepperdash</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/PepperDash/PepperDashCore</projectUrl>
+    <copyright>Copyright 2020</copyright>
+    <description>PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs. Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.</description>
+    <tags>crestron 3series 4series</tags>
+    <repository type="git" url="https://github.com/PepperDash/Essentials"/>
+    <dependencies>
+      <dependency id="PepperDashCore" version="[1.0, 1.1)"/>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="**" target="lib\net35"/>
+    <file src="**" target="lib\net47"/>
+  </files>
+</package>

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

@@ -0,0 +1,73 @@
+using System;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// IBasicCommunication Message for IQueue
+    /// </summary>
+    public class ComsMessage : IQueueMessage
+    {
+        private readonly byte[] _bytes;
+        private readonly IBasicCommunication _coms;
+        private readonly string _string;
+        private readonly bool _isByteMessage;
+
+        /// <summary>
+        /// Constructor for a string message
+        /// </summary>
+        /// <param name="coms">IBasicCommunication to send the message</param>
+        /// <param name="message">Message to send</param>
+        public ComsMessage(IBasicCommunication coms, string message)
+        {
+            Validate(coms, message);
+            _coms = coms;
+            _string = message;
+        }
+
+        /// <summary>
+        /// Constructor for a byte message
+        /// </summary>
+        /// <param name="coms">IBasicCommunication to send the message</param>
+        /// <param name="message">Message to send</param>
+        public ComsMessage(IBasicCommunication coms, byte[] message)
+        {
+            Validate(coms, message);
+            _coms = coms;
+            _bytes = message;
+            _isByteMessage = true;
+        }
+
+        private void Validate(IBasicCommunication coms, object message)
+        {
+            if (_coms == null)
+                throw new ArgumentNullException("coms");
+
+            if (message == null)
+                throw new ArgumentNullException("message");
+        }
+
+        /// <summary>
+        /// Dispatchs the string/byte[] to the IBasicCommunication specified
+        /// </summary>
+        public void Dispatch()
+        {
+            if (_isByteMessage)
+            {
+                _coms.SendBytes(_bytes);
+            }
+            else
+            {
+                _coms.SendText(_string);
+            }
+        }
+
+        /// <summary>
+        /// Shows either the byte[] or string to be sent
+        /// </summary>
+        public override string ToString()
+        {
+            return _bytes != null ? _bytes.ToString() : _string;
+        }
+    }
+}

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

@@ -0,0 +1,144 @@
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.CrestronThread;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Threadsafe processing of queued items with pacing if required
+    /// </summary>
+    public class GenericQueue : IQueue<IQueueMessage>
+    {
+        private readonly string _key;
+        protected readonly CrestronQueue<IQueueMessage> _queue;
+        protected readonly Thread _worker;
+        protected readonly CEvent _waitHandle = new CEvent();
+        
+        private readonly bool _delayEnabled;
+        private readonly int _delayTime;
+
+        /// <summary>
+        /// If the instance has been disposed.
+        /// </summary>
+        public bool Disposed { get; private set; }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        public GenericQueue(string key)
+        {
+            _key = key;
+            _queue = new CrestronQueue<IQueueMessage>();
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running);
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose();
+            };
+        }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="pacing">Pacing in ms between actions</param>
+        public GenericQueue(string key, int pacing)
+            : this(key)
+        {
+            _delayEnabled = pacing > 0;
+            _delayTime = pacing;
+        }
+
+        /// <summary>
+        /// Thread callback
+        /// </summary>
+        /// <param name="obj">The action used to process dequeued items</param>
+        /// <returns>Null when the thread is exited</returns>
+        private object ProcessQueue(object obj)
+        {
+            while (true)
+            {
+                IQueueMessage item = null;
+
+                if (_queue.Count > 0)
+                {
+                    item = _queue.Dequeue();
+                    if (item == null)
+                        break;
+                }
+                if (item != null)
+                {
+                    try
+                    {
+                        Debug.Console(2, this, "Processing queue item: '{0}'", item.ToString());
+                        item.Dispatch();
+
+                        if (_delayEnabled)
+                            Thread.Sleep(_delayTime);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.ConsoleWithLog(0, this, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
+                    }
+                }
+                else _waitHandle.Wait();
+            }
+
+            return null;
+        }
+
+        public void Enqueue(IQueueMessage item)
+        {
+            _queue.Enqueue(item);
+            _waitHandle.Set();
+        }
+
+        /// <summary>
+        /// Disposes the thread and cleans up resources.  Thread cannot be restarted once
+        /// disposed.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            CrestronEnvironment.GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Actually does the disposing.  If you override this method, be sure to either call the base implementation 
+        /// or clean up all the resources yourself.
+        /// </summary>
+        /// <param name="disposing">set to true unless called from finalizer</param>
+        protected void Dispose(bool disposing)
+        {
+            if (Disposed)
+                return;
+
+            if (disposing)
+            {
+                Enqueue(null);
+                _worker.Join();
+                _waitHandle.Close();
+            }
+
+            Disposed = true;
+        }
+
+        ~GenericQueue()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _key; }
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    public interface IQueue<T> : IKeyed, IDisposable where T : class 
+    {
+        void Enqueue(T item);
+        bool Disposed { get; }
+    }
+}

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

@@ -0,0 +1,7 @@
+namespace PepperDash_Essentials_Core.Queues
+{
+    public interface IQueueMessage
+    {
+        void Dispatch();
+    }
+}

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

@@ -0,0 +1,44 @@
+using System;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Message class for processing strings via an IQueue
+    /// </summary>
+    public class ProcessStringMessage : IQueueMessage
+    {
+        private readonly Action<string> _action;
+        private readonly string _message;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="message">Message to be processed</param>
+        /// <param name="action">Action to invoke on the message</param>
+        public ProcessStringMessage(string message, Action<string> action)
+        {
+            _message = message;
+            _action = action;
+        }
+
+        /// <summary>
+        /// Processes the string with the given action
+        /// </summary>
+        public void Dispatch()
+        {
+            if (_action == null || String.IsNullOrEmpty(_message))
+                return;
+
+            _action(_message);
+        }
+
+        /// <summary>
+        /// To string
+        /// </summary>
+        /// <returns>The current message</returns>
+        public override string ToString()
+        {
+            return _message ?? String.Empty;
+        }
+    }
+}

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

@@ -0,0 +1,106 @@
+using System;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    public sealed class StringResponseProcessor : IKeyed, IDisposable
+    {
+        private readonly Action<string> _processStringAction; 
+        private readonly IQueue<IQueueMessage> _queue;
+        private readonly IBasicCommunication _coms;
+        private readonly CommunicationGather _gather;
+
+        private StringResponseProcessor(string key, Action<string> processStringAction)
+        {
+            _processStringAction = processStringAction;
+            _queue = new GenericQueue(key);
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose();
+            };
+        }
+
+        /// <summary>
+        /// Constructor that builds an instance and subscribes to coms TextReceived for processing
+        /// </summary>
+        /// <param name="coms">Com port to process strings from</param>
+        /// <param name="processStringAction">Action to process the incoming strings</param>
+        public StringResponseProcessor(IBasicCommunication coms, Action<string> processStringAction)
+            : this(coms.Key, processStringAction)
+        {
+            _coms = coms;
+            coms.TextReceived += OnResponseReceived;
+        }
+
+        /// <summary>
+        /// Constructor that builds an instance and subscribes to gather Line Received for processing
+        /// </summary>
+        /// <param name="gather">Gather to process strings from</param>
+        /// <param name="processStringAction">Action to process the incoming strings</param>
+        public StringResponseProcessor(CommunicationGather gather, Action<string> processStringAction)
+            : this(gather.Port.Key, processStringAction)
+        {
+            _gather = gather;
+            gather.LineReceived += OnResponseReceived;
+        }
+
+        private void OnResponseReceived(object sender, GenericCommMethodReceiveTextArgs args)
+        {
+            _queue.Enqueue(new ProcessStringMessage(args.Text, _processStringAction));
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _queue.Key; }
+        }
+
+        /// <summary>
+        /// Disposes the instance and cleans up resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            CrestronEnvironment.GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (Disposed)
+                return;
+
+            if (disposing)
+            {
+                if (_coms != null)
+                    _coms.TextReceived -= OnResponseReceived;
+
+                if (_gather != null)
+                {
+                    _gather.LineReceived -= OnResponseReceived;
+                    _gather.Stop();
+                }
+
+                _queue.Dispose();
+            }
+
+            Disposed = true;
+        }
+
+        /// <summary>
+        /// If the instance has been disposed or not.  If it has, you can not use it anymore
+        /// </summary>
+        public bool Disposed { get; private set; }
+
+        ~StringResponseProcessor()
+        {
+            Dispose(false);
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs

@@ -18,32 +18,29 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    [Description("Wrapper class for all HR-Series remotes")]
-    public class Hrxx0WirelessRemoteController : EssentialsBridgeableDevice, IHasFeedback
+    [Description("Wrapper class for all HR-Series remotes")]
+    public class Hrxx0WirelessRemoteController : EssentialsBridgeableDevice, IHasFeedback, IHR52Button
     {
         private CenRfgwController _gateway;
 
         private GatewayBase _gatewayBase;
 
-
-        private Hr1x0WirelessRemoteBase _remote;
-
+        private Hr1x0WirelessRemoteBase _remote;
+
         public FeedbackCollection<Feedback> Feedbacks { get; set; }
 
         public CrestronCollection<Button> Buttons { get { return _remote.Button; } }
 
-        private DeviceConfig _config;
-
+        private DeviceConfig _config;
+
         public Hrxx0WirelessRemoteController(string key, Func<DeviceConfig, Hr1x0WirelessRemoteBase> preActivationFunc, 
             DeviceConfig config)
             : base(key, config.Name)
         {
             Feedbacks = new FeedbackCollection<Feedback>();
 
-            var props = JsonConvert.DeserializeObject<CrestronRemotePropertiesConfig>(config.Properties.ToString());
-
-            var type = config.Type;
-            var rfId = (uint)props.Control.InfinetIdInt;
+            var props = JsonConvert.DeserializeObject<CrestronRemotePropertiesConfig>(config.Properties.ToString());
+
             _config = config;
             
             if (props.GatewayDeviceKey == "processor")
@@ -128,7 +125,20 @@ namespace PepperDash.Essentials.Core
                 if (handler is Action<bool>)
                 {
                     (handler as Action<bool>)(args.Button.State == eButtonState.Pressed ? true : false);
-                }
+                }
+
+                var newHandler = ButtonStateChange;
+                if (ButtonStateChange != null)
+                {
+                    newHandler(device, args);
+                }
+
+                var newerHandler = EssentialsButtonStateChange;
+                if (EssentialsButtonStateChange != null)
+                {
+                    newerHandler(this, args);
+                }
+
             }
             catch (Exception e)
             {
@@ -312,6 +322,504 @@ namespace PepperDash.Essentials.Core
         public void SetTrilistBool(BasicTriList trilist, uint join, bool b)
         {
             trilist.BooleanInput[join].BoolValue = b;
-        }
+        }
+
+
+
+        #region IHR52Button Members
+
+        public Button Custom9
+        {
+            get
+            {
+                var localRemote = (IHR52Button) _remote;
+                return localRemote == null ? null : localRemote.Custom9;
+            }
+        }
+
+        public Button Favorite
+        {
+            get
+            {
+                var localRemote = (IHR52Button)_remote;
+                return localRemote == null ? null : localRemote.Favorite;
+            }
+        }
+        
+
+        public Button Home
+        {
+            get
+            {
+                var localRemote = (IHR52Button)_remote;
+                return localRemote == null ? null : localRemote.Home;
+            }
+        }
+
+        #endregion
+
+        #region IHR49Button Members
+
+        public Button Clear
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Clear;
+            }
+        }
+
+        public Button Custom5
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom5;
+            }
+        }
+
+        public Button Custom6
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom6;
+            }
+        }
+
+        public Button Custom7
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom7;
+            }
+        }
+
+        public Button Custom8
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Custom8;
+            }
+        }
+
+        public Button Enter
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Enter;
+            }
+        }
+
+        public Button Keypad0
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad0;
+            }
+        }
+
+        public Button Keypad1
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad1;
+            }
+        }
+
+        public Button Keypad2Abc
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad2Abc;
+            }
+        }
+
+        public Button Keypad3Def
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad3Def;
+            }
+        }
+
+        public Button Keypad4Ghi
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad4Ghi;
+            }
+        }
+
+        public Button Keypad5Jkl
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad5Jkl;
+            }
+        }
+
+        public Button Keypad6Mno
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad6Mno;
+            }
+        }
+
+        public Button Keypad7Pqrs
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad7Pqrs;
+            }
+        }
+
+        public Button Keypad8Tuv
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad8Tuv;
+            }
+        }
+
+        public Button Keypad9Wxyz
+        {
+            get
+            {
+                var localRemote = (IHR49Button)_remote;
+                return localRemote == null ? null : localRemote.Keypad9Wxyz;
+            }
+        }
+
+        #endregion
+
+        #region IHR33Button Members
+
+        public Button Blue
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Blue;
+            }
+        }
+
+        public Button ChannelDown
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.ChannelDown;
+            }
+        }
+
+        public Button ChannelUp
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.ChannelUp;
+            }
+        }
+
+        public Button Custom1
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom1;
+            }
+        }
+
+        public Button Custom2
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom2;
+            }
+        }
+
+        public Button Custom3
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom3;
+            }
+        }
+
+        public Button Custom4
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Custom4;
+            }
+        }
+
+        public Button DialPadDown
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadDown;
+            }
+        }
+
+        public Button DialPadEnter
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadEnter;
+            }
+        }
+
+        public Button DialPadLeft
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadLeft;
+            }
+        }
+
+        public Button DialPadRight
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadRight;
+            }
+        }
+
+        public Button DialPadUp
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.DialPadUp;
+            }
+        }
+
+        public Button Dvr
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Dvr;
+            }
+        }
+
+        public Button Exit
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Exit;
+            }
+        }
+
+        public Button FastForward
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.FastForward;
+            }
+        }
+
+        public Button Green
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Green;
+            }
+        }
+
+        public Button Guide
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Blue;
+            }
+        }
+
+        public Button Information
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Information;
+            }
+        }
+
+        public Button Last
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Last;
+            }
+        }
+
+        public Button Menu
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Menu;
+            }
+        }
+
+        public Button Mute
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Mute;
+            }
+        }
+
+        public Button NextTrack
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.NextTrack;
+            }
+        }
+
+        public Button Pause
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Pause;
+            }
+        }
+
+        public Button Play
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Play;
+            }
+        }
+
+        public Button Power
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Power;
+            }
+        }
+
+        public Button PreviousTrack
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.PreviousTrack;
+            }
+        }
+
+        public Button Record
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Record;
+            }
+        }
+
+        public Button Red
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Red;
+            }
+        }
+
+        public Button Rewind
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Rewind;
+            }
+        }
+
+        public Button Stop
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Stop;
+            }
+        }
+
+        public Button VolumeDown
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.VolumeDown;
+            }
+        }
+
+        public Button VolumeUp
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.VolumeUp;
+            }
+        }
+
+        public Button Yellow
+        {
+            get
+            {
+                var localRemote = (IHR33Button)_remote;
+                return localRemote == null ? null : localRemote.Yellow;
+            }
+        }
+
+        #endregion
+
+        #region IButton Members
+
+        public CrestronCollection<Button> Button
+        {
+            get { return Buttons; }
+        }
+
+        public event ButtonEventHandler ButtonStateChange;
+
+        public delegate void EssentialsButtonEventHandler(EssentialsDevice device, ButtonEventArgs args);
+
+        public event EssentialsButtonEventHandler EssentialsButtonStateChange;
+
+        #endregion
     }
 }

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

@@ -51,7 +51,19 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// The config name of the source list
         /// </summary>
-        public string SourceListKey { get; set; }
+		/// 
+		protected string _SourceListKey;
+        public virtual string SourceListKey {
+			get
+			{
+				return _SourceListKey;
+			}
+			set
+			{
+				_SourceListKey = value; 
+
+			}
+		}
 
         /// <summary>
         /// Timer used for informing the UIs of a shutdown

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

@@ -198,6 +198,7 @@ namespace PepperDash.Essentials.DM
             Chassis.DMInputChange += new DMInputEventHandler(Chassis_DMInputChange);
             Chassis.DMSystemChange += new DMSystemEventHandler(Chassis_DMSystemChange);
             Chassis.DMOutputChange += new DMOutputEventHandler(Chassis_DMOutputChange);
+            Chassis.BaseEvent += ChassisOnBaseEvent;
             VideoOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             AudioOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             UsbOutputRoutedToFeebacks = new Dictionary<uint, IntFeedback>();
@@ -355,6 +356,20 @@ namespace PepperDash.Essentials.DM
                                 InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
                                 return (int)(inputCard.Card as Dmc4kHdBase).HdmiInput.HdcpReceiveCapability;
                             }
+                            if (inputCard.Card is Dmc4kHdDspBase)
+                            {
+                                if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
+                                {
+                                    InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
+                                    return (int)(inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpReceiveCapability;
+                                }
+
+                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+                                if ((inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                                    return 1;
+                                return 0;
+                            }
+
                             if (inputCard.Card is Dmc4kCBase)
                             {
                                 if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
@@ -861,6 +876,24 @@ namespace PepperDash.Essentials.DM
                                 Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
                             break;
                         }
+                    case DMInputEventIds.HdcpSupportOffEventId:
+                        {
+                            Debug.Console(2, this, "DM Input {0} HdcpSupportOffEventId", args.Number);
+                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                            else
+                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
+                            break;
+                        }
+                    case DMInputEventIds.HdcpSupportOnEventId:
+                        {
+                            Debug.Console(2, this, "DM Input {0} HdcpSupportOnEventId", args.Number);
+                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                            else
+                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
+                            break;
+                        }
                     default:
                         {
                             Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
@@ -1184,8 +1217,8 @@ namespace PepperDash.Essentials.DM
 
             var hdmiInPortWCec = port as HdmiInputWithCEC;
             
- 
-            SetHdcpStateAction(true, hdmiInPortWCec, joinMap.HdcpSupportState.JoinNumber + ioSlotJoin, trilist);
+            
+            SetHdcpStateAction(PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], hdmiInPortWCec, joinMap.HdcpSupportState.JoinNumber + ioSlotJoin, trilist);
             
 
             InputCardHdcpStateFeedbacks[ioSlot].LinkInputSig(
@@ -1474,10 +1507,12 @@ namespace PepperDash.Essentials.DM
                     {
                         if (s == 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to off", join, s); 
                             port.HdcpSupportOff();
                         }
                         else if (s > 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to on", join, s); 
                             port.HdcpSupportOn();
                         }
                     });
@@ -1487,6 +1522,7 @@ namespace PepperDash.Essentials.DM
                 trilist.SetUShortSigAction(join,
                         u =>
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpReceiveCapability to: {2}", join, u, (eHdcpCapabilityType)u); 
                             port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
                         });
             }
@@ -1501,10 +1537,12 @@ namespace PepperDash.Essentials.DM
                     {
                         if (s == 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to off", join, s);
                             port.HdcpSupportOff();
                         }
                         else if (s > 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to on", join, s);
                             port.HdcpSupportOn();
                         }
                     });
@@ -1514,6 +1552,7 @@ namespace PepperDash.Essentials.DM
                 trilist.SetUShortSigAction(join,
                         u =>
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpReceiveCapability to: {2}", join, u, (eHdcpCapabilityType)u);
                             port.HdcpCapability = (eHdcpCapabilityType)u;
                         });
             }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;

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

@@ -48,43 +48,48 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasExternalSourceSwitching.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+{
+	public interface IHasExternalSourceSwitching
+	{
+		bool ExternalSourceListEnabled { get; }
+		void AddExternalSource(string connectorId, string key, string name, eExternalSourceType type);
+		void SetExternalSourceState(string key, eExternalSourceMode mode);
+		void ClearExternalSources();
+		Action<string, string> RunRouteAction { set;}
+	}
+
+}

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

@@ -48,51 +48,53 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
-    </Reference>
-    <Reference Include="PepperDash_Essentials_Core, Version=0.0.0.22043, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Essentials Core\PepperDashEssentialsBase\bin\PepperDash_Essentials_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -112,6 +114,7 @@
     <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\eMeetingPrivacy.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
+    <Compile Include="Codec\IHasExternalSourceSwitching.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
     <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
     <Compile Include="Power Controllers\Digitallogger.cs" />
@@ -180,6 +183,12 @@
     <Compile Include="VideoCodec\ZoomRoom\ZoomRoomPropertiesConfig.cs" />
     <None Include="Properties\ControlSystem.cfg" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
+      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
+      <Name>PepperDash_Essentials_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Streaming/AppleTV.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
@@ -32,39 +33,50 @@ namespace PepperDash.Essentials.Devices.Common
 			AnyAudioOut = new RoutingOutputPort(RoutingPortNames.AnyAudioOut, eRoutingSignalType.Audio, 
 				eRoutingPortConnectionType.DigitalAudio, null, this);
 			OutputPorts = new RoutingPortCollection<RoutingOutputPort> { HdmiOut, AnyAudioOut };
+
+            PrintExpectedIrCommands();
 		}
 
+        public void PrintExpectedIrCommands()
+        {
+            var cmds = typeof (AppleTvIrCommands).GetCType().GetFields(BindingFlags.Public | BindingFlags.Static);
 
-		#region IDPad Members
+            foreach (var value in cmds.Select(cmd => cmd.GetValue(null)).OfType<string>())
+            {
+                Debug.Console(2, this, "Expected IR Function Name: {0}", value);
+            }
+        }
+
+        #region IDPad Members
 
 		public void Up(bool pressRelease)
 		{
-			IrPort.PressRelease("+", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Up, pressRelease);
 		}
 
 		public void Down(bool pressRelease)
 		{
-			IrPort.PressRelease("-", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Down, pressRelease);
 		}
 
 		public void Left(bool pressRelease)
 		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_TRACK_MINUS, pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Left, pressRelease);
 		}
 
 		public void Right(bool pressRelease)
 		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_TRACK_PLUS, pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Right, pressRelease);
 		}
 
 		public void Select(bool pressRelease)
 		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_ENTER, pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Enter, pressRelease);
 		}
 
 		public void Menu(bool pressRelease)
 		{
-			IrPort.PressRelease("Menu", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Menu, pressRelease);
 		}
 
 		public void Exit(bool pressRelease)
@@ -78,12 +90,12 @@ namespace PepperDash.Essentials.Devices.Common
 
 		public void Play(bool pressRelease)
 		{
-			IrPort.PressRelease("PLAY/PAUSE", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.PlayPause, pressRelease);
 		}
 
 		public void Pause(bool pressRelease)
 		{
-			IrPort.PressRelease("PLAY/PAUSE", pressRelease);
+            IrPort.PressRelease(AppleTvIrCommands.PlayPause, pressRelease);
 		}
 
 		/// <summary>
@@ -190,4 +202,17 @@ namespace PepperDash.Essentials.Devices.Common
         }
     }
 
+    public static class AppleTvIrCommands
+    {
+        
+        public static string Up = "+";
+        public static string Down = "-";
+        public static string Left = IROutputStandardCommands.IROut_TRACK_MINUS;
+        public static string Right = IROutputStandardCommands.IROut_TRACK_PLUS;
+        public static string Enter = IROutputStandardCommands.IROut_ENTER;
+        public static string PlayPause = "PLAY/PAUSE";
+        public static string Rewind = "REWIND";
+        public static string Menu = "Menu";
+        public static string FastForward = "FASTFORWARD";
+    }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -12,22 +12,27 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
     enum eCommandType { SessionStart, SessionEnd, Command, GetStatus, GetConfiguration };
+	public enum eExternalSourceType {camera, desktop, document_camera, mediaplayer, PC, whiteboard, other}
+	public enum eExternalSourceMode {Ready, NotReady, Hidden, Error} 
 
     public class CiscoSparkCodec : VideoCodecBase, IHasCallHistory, IHasCallFavorites, IHasDirectory,
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
-        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets
+        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching, IHasBranding
     {
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
 
+        private CTimer _brandingTimer;
+
         public CommunicationGather PortGather { get; private set; }
 
         public StatusMonitorBase CommunicationMonitor { get; private set; }
@@ -348,6 +353,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             CallHistory = new CodecCallHistory();
 
+			
             if (props.Favorites != null)
             {
                 CallFavorites = new CodecCallFavorites();
@@ -398,9 +404,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SetUpCameras();
 
 			CreateOsdSource();
+
+            ExternalSourceListEnabled = props.ExternalSourceListEnabled;
+
+            if (props.UiBranding == null)
+            {
+                return;
+            }
+            Debug.Console(2, this, "Setting branding properties enable: {0} _brandingUrl {1}", props.UiBranding.Enable,
+                props.UiBranding.BrandingUrl);
+
+            BrandingEnabled = props.UiBranding.Enable;
+            _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
-        /// <summary>
         /// Runs in it's own thread to dequeue messages in the order they were received to be processed
         /// </summary>
         /// <returns></returns>
@@ -436,6 +453,83 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			TieLineCollection.Default.Add(tl);
 		}
 
+        public void InitializeBranding(string roomKey)
+        {
+            Debug.Console(1, this, "Initializing Branding for room {0}", roomKey);
+
+            if (!BrandingEnabled)
+            {
+                return;
+            }
+
+            var mcBridgeKey = String.Format("mobileControlBridge-{0}", roomKey);
+
+            var mcBridge = DeviceManager.GetDeviceForKey(mcBridgeKey) as IMobileControlRoomBridge;
+
+            if (!String.IsNullOrEmpty(_brandingUrl))
+            {
+                Debug.Console(1, this, "Branding URL found: {0}", _brandingUrl);
+                if (_brandingTimer != null)
+                {
+                    _brandingTimer.Stop();
+                    _brandingTimer.Dispose();
+                }
+
+                _brandingTimer = new CTimer((o) =>
+                {
+                    if (_sendMcUrl)
+                    {
+                        SendMcBrandingUrl(mcBridge);
+                        _sendMcUrl = false;
+                    }
+                    else
+                    {
+                        SendBrandingUrl();
+                        _sendMcUrl = true;
+                    }
+                }, 0, 15000);
+            } else if (String.IsNullOrEmpty(_brandingUrl))
+            {
+                Debug.Console(1, this, "No Branding URL found");
+                if (mcBridge == null) return;
+
+                Debug.Console(2, this, "Setting QR code URL: {0}", mcBridge.QrCodeUrl);
+
+                mcBridge.UserCodeChanged += (o, a) => SendMcBrandingUrl(mcBridge);
+
+                SendMcBrandingUrl(mcBridge);
+            }
+        }
+
+        private void SendMcBrandingUrl(IMobileControlRoomBridge mcBridge)
+        {
+            if (mcBridge == null)
+            {
+                return;
+            }
+
+            Debug.Console(1, this, "Sending url: {0}", mcBridge.QrCodeUrl);
+
+            SendText("xconfiguration userinterface custommessage: \"Scan the QR code with a mobile phone to get started\"");
+            SendText("xconfiguration userinterface osd halfwakemessage: \"Tap the touch panel or scan the QR code with a mobile phone to get started\"");
+
+            SendText(String.Format(
+                            "xcommand userinterface branding fetch type: branding url: {0}",
+                            mcBridge.QrCodeUrl));
+            SendText(String.Format(
+                "xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                mcBridge.QrCodeUrl));
+        }
+
+        private void SendBrandingUrl()
+        {
+            Debug.Console(1, this, "Sending url: {0}", _brandingUrl);
+
+            SendText(String.Format("xcommand userinterface branding fetch type: branding url: {0}",
+                            _brandingUrl));
+            SendText(String.Format("xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                _brandingUrl));
+        }
         /// <summary>
         /// Starts the HTTP feedback server and syncronizes state of codec
         /// </summary>
@@ -472,7 +566,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Bookings" + Delimiter +
                 prefix + "/Event/CallDisconnect" + Delimiter + 
                 prefix + "/Event/Bookings" + Delimiter +
-                prefix + "/Event/CameraPresetListUpdated" + Delimiter;
+                prefix + "/Event/CameraPresetListUpdated" + Delimiter +
+				prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
 
             return base.CustomActivate();
         }
@@ -629,6 +724,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         }
                 }
             }
+			
                 
         }
 
@@ -853,6 +949,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 					{
 						GetBookings(null);
 					}
+					
+					else if (response.IndexOf("\"UserInterface\":{") > -1 || response.IndexOf("\"UserInterface\": {") > -1) // External Source Trigger
+					{
+						CiscoCodecEvents.RootObject eventReceived = new CiscoCodecEvents.RootObject();
+                        JsonConvert.PopulateObject(response, eventReceived);
+						Debug.Console(2, this, "*** Got an External Source Selection {0} {1}", eventReceived, eventReceived.Event.UserInterface, eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value);
+
+						if (RunRouteAction != null)
+						{
+							RunRouteAction(eventReceived.Event.UserInterface.Presentation.ExternalSource.Selected.SourceIdentifier.Value, null);
+						}
+					}
                 }
                 else if (response.IndexOf("\"CommandResponse\":{") > -1 || response.IndexOf("\"CommandResponse\": {") > -1)
                 {
@@ -1802,9 +1910,80 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText(string.Format("xCommand Call FarEndControl RoomPreset Activate CallId: {0} PresetId: {1}", GetCallId(), preset));
         }
 
-    }
 
-    /// <summary>
+		#region IHasExternalSourceSwitching Members
+
+		/// <summary>
+		/// Weather the Cisco supports External Source Lists or not 
+		/// </summary>
+		public bool ExternalSourceListEnabled
+		{
+			get;
+			private set; 
+		}
+
+        public bool BrandingEnabled { get; private set; }
+        private string _brandingUrl;
+        private bool _sendMcUrl;
+
+		/// <summary>
+		/// Adds an external source to the Cisco 
+		/// </summary>
+		/// <param name="connectorId"></param>
+		/// <param name="key"></param>
+		/// <param name="name"></param>
+		public void AddExternalSource(string connectorId, string key, string name, eExternalSourceType type)
+		{
+			int id = 2;
+			if (connectorId.ToLower() == "hdmiin3")
+			{
+				id = 3;
+			}
+			SendText(string.Format("xCommand UserInterface Presentation ExternalSource Add ConnectorId: {0} SourceIdentifier: \"{1}\" Name: \"{2}\" Type: {3}", id, key, name, type.ToString()));
+			// SendText(string.Format("xCommand UserInterface Presentation ExternalSource State Set SourceIdentifier: \"{0}\" State: Ready", key));
+			Debug.Console(2, this, "Adding ExternalSource {0} {1}", connectorId, name);
+
+		}
+
+
+		/// <summary>
+		/// Sets the state of the External Source 
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="mode"></param>
+		public void SetExternalSourceState(string key, eExternalSourceMode mode)
+		{
+			SendText(string.Format("xCommand UserInterface Presentation ExternalSource State Set SourceIdentifier: \"{0}\" State: {1}", key, mode.ToString()));
+		}
+		/// <summary>
+		/// Clears all external sources on the codec
+		/// </summary>
+		public void ClearExternalSources()
+		{
+			SendText("xCommand UserInterface Presentation ExternalSource RemoveAll");
+			
+		}
+
+		/// <summary>
+		/// Action that will run when the External Source is selected. 
+		/// </summary>
+		public Action<string, string> RunRouteAction { private get;  set; }
+				
+
+
+
+
+
+		#endregion
+		#region ExternalDevices 
+
+
+		
+		#endregion
+	}
+
+
+	/// <summary>
     /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
     /// </summary>
     public class CodecCommandWithLabel
@@ -1918,6 +2097,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new Cisco Codec Device");
+
             var comm = CommFactory.CreateCommForDevice(dc);
             return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
         }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs

@@ -1,47 +1,62 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-    public class CiscoSparkCodecPropertiesConfig
-    {
-        [JsonProperty("communicationMonitorProperties")]
-        public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
-
-        [JsonProperty("favorites")]
-        public List<CodecActiveCallItem> Favorites { get; set; }
-
-        /// <summary>
-        /// Valid values: "Local" or "Corporate"
-        /// </summary>
-        [JsonProperty("phonebookMode")]
-        public string PhonebookMode { get; set; }
-
-        [JsonProperty("showSelfViewByDefault")]
-        public bool ShowSelfViewByDefault { get; set; }
-
-        [JsonProperty("sharing")]
-        public SharingProperties Sharing { get; set; }
-
-        /// <summary>
-        /// Optionsal property to set the limit of any phonebook queries for directory or searching
-        /// </summary>
-        [JsonProperty("phonebookResultsLimit")]
-        public uint PhonebookResultsLimit { get; set; }
-
-    }
-
-    public class SharingProperties
-    {
-        [JsonProperty("autoShareContentWhileInCall")]
-        public bool AutoShareContentWhileInCall { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+{
+    public class CiscoSparkCodecPropertiesConfig
+    {
+        [JsonProperty("communicationMonitorProperties")]
+        public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
+
+        [JsonProperty("favorites")]
+        public List<CodecActiveCallItem> Favorites { get; set; }
+
+        /// <summary>
+        /// Valid values: "Local" or "Corporate"
+        /// </summary>
+        [JsonProperty("phonebookMode")]
+        public string PhonebookMode { get; set; }
+
+        [JsonProperty("showSelfViewByDefault")]
+        public bool ShowSelfViewByDefault { get; set; }
+
+        [JsonProperty("sharing")]
+        public SharingProperties Sharing { get; set; }
+
+		[JsonProperty("externalSourceListEnabled")]
+		public bool ExternalSourceListEnabled { get; set; }
+
+        /// <summary>
+        /// Optionsal property to set the limit of any phonebook queries for directory or searching
+        /// </summary>
+        [JsonProperty("phonebookResultsLimit")]
+        public uint PhonebookResultsLimit { get; set; }
+
+        [JsonProperty("UiBranding")]
+        public BrandingLogoProperties UiBranding { get; set; }       
+
+    }
+
+    public class SharingProperties
+    {
+        [JsonProperty("autoShareContentWhileInCall")]
+        public bool AutoShareContentWhileInCall { get; set; }
+    }
+
+    public class BrandingLogoProperties
+    {
+        [JsonProperty("enable")]
+        public bool Enable { get; set; }
+
+        [JsonProperty("brandingUrl")]
+        public string BrandingUrl { get; set; }
+    }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xEvent.cs

@@ -126,11 +126,36 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Encryption Encryption { get; set; }
             public RequestedURI RequestedURI { get; set; }
             public PeopleCountAverage PeopleCountAverage { get; set; }
-        }
-
+        }
+		public class UserInterface
+		{
+			public string id { get; set; }
+			public Presentation Presentation { get; set; }
+		}
+		public class Presentation
+		{
+			public string id { get; set; }
+			public ExternalSource ExternalSource { get; set; }
+		}
+		public class ExternalSource
+		{
+			public string id { get; set; }
+			public Selected Selected { get; set; }
+		}
+		public class Selected
+		{
+			public string id { get; set; }
+			public SourceIdentifier SourceIdentifier { get; set; }
+		}
+		public class SourceIdentifier
+		{
+			public string id { get; set; }
+			public string Value { get; set; }
+		}
         public class Event
         {
-            public CallDisconnect CallDisconnect { get; set; }
+            public CallDisconnect CallDisconnect { get; set; }
+			public UserInterface UserInterface { get; set; }
         }
 
         public class RootObject

packages.config

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