Merge branch 'development' into feature/add-camera-config-props

.github/workflows/docker.yml

@@ -32,6 +32,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+          submodules: true
         # Fetch all tags
       - name: Fetch tags
         run: git fetch --tags
@@ -40,7 +41,7 @@ jobs:
         shell: powershell
         run: |
           $version = ./.github/scripts/GenerateVersionNumber.ps1
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
@@ -59,7 +60,7 @@ jobs:
       - name: Build Solution
         shell: powershell
         run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder:v1.4.1 c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
       # Zip up the output files as needed
       - name: Zip Build Output
         shell: powershell
@@ -122,7 +123,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       - name: Download Build output
@@ -179,7 +180,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch
@@ -258,7 +259,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch

.github/workflows/main.yml

@@ -24,14 +24,20 @@ jobs:
       # First we checkout the source repo
       - name: Checkout repo
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+      # And any submodules
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
       # Generate the appropriate version number
       - name: Set Version Number
         shell: powershell
         env:
           TAG_NAME: ${{ github.event.release.tag_name }}
-        run: echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        run: Write-Output "::set-env name=VERSION::$($Env:TAG_NAME)"
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
@@ -95,7 +101,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       - name: Download Build output
@@ -149,7 +155,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch
@@ -222,7 +228,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout main branch

PepperDashEssentials/ControlSystem.cs

@@ -538,20 +538,6 @@ namespace PepperDash.Essentials
         /// </summary>
         void LoadLogoServer()
         {
-            if (ConfigReader.ConfigObject.Rooms == null)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured. Bypassing Logo server startup.");
-                return;
-            }
-
-            if (
-                !ConfigReader.ConfigObject.Rooms.Any(
-                    CheckRoomConfig))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured to use system Logo server. Bypassing Logo server startup");
-                return;
-            }
-
             try
             {
                 LogoServer = new HttpLogoServer(8080, Global.DirectorySeparator + "html" + Global.DirectorySeparator + "logo");
@@ -561,30 +547,5 @@ namespace PepperDash.Essentials
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
             }
         }
-
-        private bool CheckRoomConfig(DeviceConfig c)
-        {
-            string logoDark = null;
-            string logoLight = null;
-            string logo = null;
-
-            if (c.Properties["logoDark"] != null)
-            {
-                logoDark = c.Properties["logoDark"].Value<string>("type");
-            }
-
-            if (c.Properties["logoLight"] != null)
-            {
-                logoLight = c.Properties["logoLight"].Value<string>("type");
-            }
-
-            if (c.Properties["logo"] != null)
-            {
-                logo = c.Properties["logo"].Value<string>("type");
-            }
-
-            return ((logoDark != null && logoDark == "system") ||
-                    (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
-        }
     }
 }

PepperDashEssentials/UI/HttpLogoServer.cs

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Cards/InternalCardCageController.cs

@@ -73,21 +73,21 @@ namespace PepperDash.Essentials.Core.CrestronIO.Cards
                 string cardType;
                 if (!_config.Cards.TryGetValue(i, out cardType))
                 {
-                    Debug.Console(0, this, "No card found for slot {0}", i);
+                    Debug.Console(1, this, "No card found for slot {0}", i);
                     continue;
                 }
 
                 if (String.IsNullOrEmpty(cardType))
                 {
                     Debug.Console(0, this, "No card specified for slot {0}", i);
-                    continue;
+                    return;
                 }
 
                 Func<uint, C3CardControllerBase> cardBuilder;
                 if (!_cardDict.TryGetValue(cardType.ToLower(), out cardBuilder))
                 {
                     Debug.Console(0, "Unable to find factory for 3-Series card type {0}.", cardType);
-                    continue;
+                    return;
                 }
 
                 try

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

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

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

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

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

@@ -1,13 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.DeviceInfo
-{
-    public interface IDeviceInfoProvider
-    {
-        DeviceInfo DeviceInfo { get; }
-
-        event EventHandler<DeviceInfoEventArgs> DeviceInfoChanged;
-
-        void UpdateDeviceInfo();
-    }
-}

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

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    public interface ILanguageDefinition
-    {
-        string LocaleName { get; set; }
-        string FriendlyName { get; set; }
-        bool Enable { get; set; }
-        List<LanguageLabel> UiLabels { get; set; }
-        List<LanguageLabel> Sources { get; set; }
-        List<LanguageLabel> Destinations { get; set; }
-        List<LanguageLabel> SourceGroupNames { get; set; } 
-        List<LanguageLabel> DestinationGroupNames { get; set; }
-        List<LanguageLabel> RoomNames { get; set; } 
-    }
-}

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

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-        public interface ILanguageProvider
-    {
-        ILanguageDefinition CurrentLanguage { get; set; }
-
-        event EventHandler CurrentLanguageChanged;
-    }
-
-}

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

@@ -1,12 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    public class LanguageLabel
-    {
-        public string Key { get; set; }
-        public string Description { get; set; }
-        public string DisplayText { get; set; }
-        public uint JoinNumber { get; set; }
-    }
-}

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

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IHasDspPresets
-    {
-        List<IDspPreset> Presets { get; }
-
-        void RecallPreset(IDspPreset preset);
-
-    }
-
-    public interface IDspPreset
-    {
-        string Name { get; }
-    }
-}

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

@@ -17,8 +17,8 @@ namespace PepperDash.Essentials.Core
 {
 	/// <summary>
 	/// 
-	/// </summary>
-    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
+	/// </summary>
+	public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
 	{
         public event SourceInfoChangeHandler CurrentSourceChange;
 
@@ -258,14 +258,13 @@ namespace PepperDash.Essentials.Core
             volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
             volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
             volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
-	    }
-
-    }
+	    }
+	}
 
 	/// <summary>
 	/// 
-	/// </summary>
-    public abstract class TwoWayDisplayBase : DisplayBase, IRoutingFeedback
+	/// </summary>
+    public abstract class TwoWayDisplayBase : DisplayBase
 	{
         public StringFeedback CurrentInputFeedback { get; private set; }
 
@@ -294,20 +293,7 @@ namespace PepperDash.Essentials.Core
             Feedbacks.Add(CurrentInputFeedback);
 
             
-		}
-
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        protected void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
-
+		}
+
 	}
 }

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

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash_Essentials_Core.Gateways
-{
-    public class CenCn2Controller
-    {
-    }
-}

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

@@ -183,9 +183,6 @@
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
-    <Compile Include="Device Info\DeviceInfo.cs" />
-    <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
-    <Compile Include="Device Info\IDeviceInfoProvider.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
@@ -193,16 +190,12 @@
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
     <Compile Include="Devices\GenericIRController.cs" />
-    <Compile Include="Devices\IDspPreset.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\LanguageLabel.cs" />
-    <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
-    <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs

@@ -111,87 +111,10 @@ namespace PepperDash.Essentials.Core
         IntFeedback AudioVideoSourceNumericFeedback { get; }
     }
 
-
-    /// <summary>
-    /// Defines an IRmcRouting with a feedback event 
-    /// </summary>
-    public interface ITxRoutingWithFeedback : ITxRouting
-    {
-    }
-
-    /// <summary>
-    /// Defines an IRmcRouting with a feedback event 
-    /// </summary>
-    public interface IRmcRoutingWithFeedback : IRmcRouting
-    {
-    }
-
-    /// <summary>
+	/// <summary>
 	/// Defines an IRoutingOutputs devices as being a source - the start of the chain
 	/// </summary>
 	public interface IRoutingSource : IRoutingOutputs
 	{
 	}
-
-    /// <summary>
-    /// Defines an event structure for reporting output route data
-    /// </summary>
-    public interface IRoutingFeedback : IKeyName
-    {
-        event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-        //void OnSwitchChange(RoutingNumericEventArgs e);
-    }
-
-    /// <summary>
-    /// Defines an IRoutingNumeric with a feedback event 
-    /// </summary>
-    public interface IRoutingNumericWithFeedback : IRoutingNumeric, IRoutingFeedback
-    {
-    }
-
-    /// <summary>
-    /// Defines an IRouting with a feedback event
-    /// </summary>
-    public interface IRoutingWithFeedback : IRouting, IRoutingFeedback
-    {
-        
-    }
-
-    public class RoutingNumericEventArgs : EventArgs
-    {
-
-        public uint? Output { get; set; }
-        public uint? Input { get; set; }
-
-        public eRoutingSignalType SigType { get; set; }
-        public RoutingInputPort InputPort { get; set; }
-        public RoutingOutputPort OutputPort { get; set; }
-
-        public RoutingNumericEventArgs(uint output, uint input, eRoutingSignalType sigType) : this(output, input, null, null, sigType)
-        {
-        }
-
-        public RoutingNumericEventArgs(RoutingOutputPort outputPort, RoutingInputPort inputPort,
-            eRoutingSignalType sigType)
-            : this(null, null, outputPort, inputPort, sigType)
-        {
-        }
-
-        public RoutingNumericEventArgs()
-            : this(null, null, null, null, 0)
-        {
- 
-        }
-
-        public RoutingNumericEventArgs(uint? output, uint? input, RoutingOutputPort outputPort,
-            RoutingInputPort inputPort, eRoutingSignalType sigType)
-        {
-            OutputPort = outputPort;
-            InputPort = inputPort;
-
-            Output = output;
-            Input = input;
-            SigType = sigType;
-        }
-    }
 }

essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs

@@ -17,7 +17,7 @@ using PepperDash.Essentials.Core.Config;
 namespace PepperDash.Essentials.DM.AirMedia
 {
     [Description("Wrapper class for an AM-200 or AM-300")]
-    public class AirMediaController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IIROutputPorts, IComPorts
+    public class AirMediaController : CrestronGenericBridgeableBaseDevice, IRoutingNumeric, IIROutputPorts, IComPorts
     {
         public AmX00 AirMedia { get; private set; }
 
@@ -29,10 +29,6 @@ namespace PepperDash.Essentials.DM.AirMedia
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
 
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
         public BoolFeedback IsInSessionFeedback { get; private set; }
         public IntFeedback ErrorFeedback { get; private set; }
         public IntFeedback NumberOfUsersConnectedFeedback { get; set; }
@@ -47,7 +43,6 @@ namespace PepperDash.Essentials.DM.AirMedia
         public AirMediaController(string key, string name, AmX00 device, DeviceConfig dc, AirMediaPropertiesConfig props)
             : base(key, name, device)
         {
-
             AirMedia = device;
 
             DeviceConfig = dc;
@@ -58,36 +53,21 @@ namespace PepperDash.Essentials.DM.AirMedia
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
 
             InputPorts.Add(new RoutingInputPort(DmPortName.Osd, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.None, new Action(SelectPinPointUxLandingPage), this)
-            {
-                FeedbackMatchObject = 0
-            });
+                eRoutingPortConnectionType.None, new Action(SelectPinPointUxLandingPage), this));
 
             InputPorts.Add(new RoutingInputPort(DmPortName.AirMediaIn, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Streaming, new Action(SelectAirMedia), this)
-            {
-                FeedbackMatchObject = 1
-            });
+                eRoutingPortConnectionType.Streaming, new Action(SelectAirMedia), this));
 
             InputPorts.Add(new RoutingInputPort(DmPortName.HdmiIn, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, new Action(SelectHdmiIn), this)
-                {
-                    FeedbackMatchObject = 2
-                });
+                eRoutingPortConnectionType.Hdmi, new Action(SelectHdmiIn), this));
 
             InputPorts.Add(new RoutingInputPort(DmPortName.AirBoardIn, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.None, new Action(SelectAirboardIn), this)
-                {
-                    FeedbackMatchObject = 4
-                });
+                eRoutingPortConnectionType.None, new Action(SelectAirboardIn), this));
 
             if (AirMedia is Am300)
             {
                 InputPorts.Add(new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.AudioVideo,
-                    eRoutingPortConnectionType.DmCat, new Action(SelectDmIn), this)
-                    {
-                        FeedbackMatchObject = 3
-                    });
+                    eRoutingPortConnectionType.DmCat, new Action(SelectDmIn), this));
             }
 
             OutputPorts.Add(new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo,
@@ -173,17 +153,6 @@ namespace PepperDash.Essentials.DM.AirMedia
             SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback.JoinNumber]);
         }
 
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
-
         void AirMedia_AirMediaChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args)
         {
             if (args.EventId == AirMediaInputSlot.AirMediaStatusFeedbackEventId)
@@ -203,20 +172,12 @@ namespace PepperDash.Essentials.DM.AirMedia
         void DisplayControl_DisplayControlChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args)
         {
             if (args.EventId == AmX00.VideoOutFeedbackEventId)
-            {
                 VideoOutFeedback.FireUpdate();
-
-                var localInputPort =
-                    InputPorts.FirstOrDefault(p => (int) p.FeedbackMatchObject == VideoOutFeedback.UShortValue);
-
-                OnSwitchChange(new RoutingNumericEventArgs(1, VideoOutFeedback.UShortValue, OutputPorts.First(),
-                    localInputPort, eRoutingSignalType.AudioVideo));
-            }
             else if (args.EventId == AmX00.EnableAutomaticRoutingFeedbackEventId)
                 AutomaticInputRoutingEnabledFeedback.FireUpdate();
         }
 
-        void HdmiIn_StreamChange(Stream stream, Crestron.SimplSharpPro.DeviceSupport.StreamEventArgs args)
+        void HdmiIn_StreamChange(Crestron.SimplSharpPro.DeviceSupport.Stream stream, Crestron.SimplSharpPro.DeviceSupport.StreamEventArgs args)
         {
             if (args.EventId == DMInputEventIds.SourceSyncEventId)
                 HdmiVideoSyncDetectedFeedback.FireUpdate();

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

@@ -21,15 +21,12 @@ namespace PepperDash.Essentials.DM {
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
     /// </summary>
-    public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
+    public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumeric
     {
         public DMChassisPropertiesConfig PropertiesConfig { get; set; }
 
         public Switch Chassis { get; private set; }
 
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
         public Dictionary<uint, IntFeedback> AudioOutputFeedbacks { get; private set; }
@@ -290,15 +287,6 @@ namespace PepperDash.Essentials.DM {
             }
         }
 
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
 
 
         void AddHdmiInBladePorts(uint number, ICec cecPort) {
@@ -389,10 +377,7 @@ namespace PepperDash.Essentials.DM {
         void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType) {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Chassis.Inputs[cardNum]
-            };
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
 
             InputPorts.Add(inputPort);
         }
@@ -400,20 +385,19 @@ namespace PepperDash.Essentials.DM {
         /// <summary>
         /// Adds InputPort and sets Port as ICec object
         /// </summary>
-        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
-            eRoutingPortConnectionType portType, ICec cecPort)
-        {
+        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort) {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Chassis.Inputs[cardNum]
-            };
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
 
-            if (cecPort != null)
-                inputPort.Port = cecPort;
+            if (inputPort != null) {
+                if (cecPort != null)
+                    inputPort.Port = cecPort;
 
-            InputPorts.Add(inputPort);
+                InputPorts.Add(inputPort);
+            }
+            else
+                Debug.Console(2, this, "inputPort is null");
         }
 
 
@@ -423,10 +407,7 @@ namespace PepperDash.Essentials.DM {
         void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
             var portKey = string.Format("{0}--{1}", cardName, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
-            {
-                FeedbackMatchObject = Chassis.Outputs[(uint)selector]
-            });
+            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this));
         }
 
 
@@ -477,84 +458,54 @@ namespace PepperDash.Essentials.DM {
                     }
             }
         }
-
         /// 
         /// </summary>
-        private void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
+        void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args) 
         {
             var output = args.Number;
 
-            switch (args.EventId)
-            {
-                case DMOutputEventIds.VolumeEventId:
-                {
-                    if (VolumeControls.ContainsKey(output))
-                    {
-                        VolumeControls[args.Number].VolumeEventFromChassis();
+            switch (args.EventId) {
+                case DMOutputEventIds.VolumeEventId: {
+                        if (VolumeControls.ContainsKey(output)) {
+                            VolumeControls[args.Number].VolumeEventFromChassis();
+                        }
+                        break;
                     }
-                    break;
-                }
-                case DMOutputEventIds.EndpointOnlineEventId:
-                {
-                    Debug.Console(2, this,
-                        "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}",
-                        args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                    if (Chassis.Outputs[output].Endpoint != null)
-                        Debug.Console(2, this,
-                            "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}",
-                            args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
-
-                    OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.OnlineFeedbackEventId:
-                {
-                    Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}",
-                        args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                    OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                    break;
-                }
-                case DMOutputEventIds.VideoOutEventId:
-                {
-
-                    var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.Outputs[output].VideoOutFeedback.Number;
-
-                    Debug.Console(2, this, "DMSwitchAudioVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
-                        inputNumber, output);
-
-                    if (VideoOutputFeedbacks.ContainsKey(output))
-                    {
-                        var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].VideoOutFeedback);
-                        var localOutputPort =
-                            OutputPorts.FirstOrDefault(p => (DMOutput) p.FeedbackMatchObject == Chassis.Outputs[output]);
-
-
-                        VideoOutputFeedbacks[output].FireUpdate();
-                        OnSwitchChange(new RoutingNumericEventArgs(output,
-                            inputNumber,
-                            localOutputPort,
-                            localInputPort,
-                            eRoutingSignalType.AudioVideo));
+                case DMOutputEventIds.EndpointOnlineEventId: {
+                        Debug.Console(2, this, "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}", args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
+                        if(Chassis.Outputs[output].Endpoint != null)
+                            Debug.Console(2, this, "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}", args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
 
+                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
+                        break;
                     }
-                    if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
-                    {
-                        OutputVideoRouteNameFeedbacks[output].FireUpdate();
+                case DMOutputEventIds.OnlineFeedbackEventId: {
+                        Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}", args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
+                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
+                        break;
+                    }
+                case DMOutputEventIds.VideoOutEventId: {
+                        if (Chassis.Outputs[output].VideoOutFeedback != null) {
+                            Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, Chassis.Outputs[output].VideoOutFeedback.Number, output);
+                        }
+                        if (VideoOutputFeedbacks.ContainsKey(output)) {
+                            VideoOutputFeedbacks[output].FireUpdate();
+
+                        }
+                        if (OutputVideoRouteNameFeedbacks.ContainsKey(output)) {
+                            OutputVideoRouteNameFeedbacks[output].FireUpdate();
+                        }
+                        break;
+                    }
+                case DMOutputEventIds.OutputNameEventId: {
+                        Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
+                        OutputNameFeedbacks[output].FireUpdate();
+                        break;
+                    }
+                default: {
+                        Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}", args.Number, args.EventId);
+                        break;
                     }
-                    break;
-                }
-                case DMOutputEventIds.OutputNameEventId:
-                {
-                    Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                    OutputNameFeedbacks[output].FireUpdate();
-                    break;
-                }
-                default:
-                {
-                    Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}",
-                        args.Number, args.EventId);
-                    break;
-                }
             }
 
         }

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

@@ -20,15 +20,12 @@ namespace PepperDash.Essentials.DM
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
     /// </summary>
-    [Description("Wrapper class for all DM-MD chassis variants from 8x8 to 32x32")]
-    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
+    [Description("Wrapper class for all DM-MD chassis variants from 8x8 to 32x32")]
+    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumeric
     {
         public DMChassisPropertiesConfig PropertiesConfig { get; set; }
 
-        public Switch Chassis { get; private set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+        public Switch Chassis { get; private set; }
 
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
@@ -190,8 +187,7 @@ namespace PepperDash.Essentials.DM
         /// <param name="chassis"></param>
         public DmChassisController(string key, string name, DmMDMnxn chassis)
             : base(key, name, chassis)
-        {
-
+        {
             Chassis = chassis;
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
@@ -741,10 +737,7 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Chassis.Inputs[cardNum]
-            };
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
 
             InputPorts.Add(inputPort);
         }
@@ -756,15 +749,12 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Chassis.Inputs[cardNum]
-            }; ;
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
 
             if (cecPort != null)
                 inputPort.Port = cecPort;
 
-            InputPorts.Add(inputPort);
+            InputPorts.Add(inputPort);
         }
 
         /// <summary>
@@ -773,11 +763,8 @@ namespace PepperDash.Essentials.DM
         void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector)
         {
             var portKey = string.Format("{0}--{1}", cardName, portName);
-            Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
-            {
-                FeedbackMatchObject = Chassis.Outputs[(uint)selector]
-            });
+            Debug.Console(2, this, "Adding output port '{0}'", portKey);
+            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this));
         }
 
         /// <summary>
@@ -787,15 +774,12 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("{0}--{1}", cardName, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this)
-            {
-                FeedbackMatchObject = Chassis.Outputs[(uint)selector]
-            }; ;
+            var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this);
 
             if (cecPort != null)
                 outputPort.Port = cecPort;
 
-            OutputPorts.Add(outputPort);
+            OutputPorts.Add(outputPort);
         }
 
         /// <summary>
@@ -921,17 +905,6 @@ namespace PepperDash.Essentials.DM
             {
                 Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Error in Chassis_DMInputChange: {0}", ex);
             }
-        }
-
-        /// <summary>
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
         }
 
         /// 
@@ -965,59 +938,30 @@ namespace PepperDash.Essentials.DM
                     OutputEndpointOnlineFeedbacks[output].FireUpdate();
                     break;
                 }
-                case DMOutputEventIds.VideoOutEventId:
+                case DMOutputEventIds.VideoOutEventId:
                 {
-                    
-                    var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.
-                    Outputs[output].VideoOutFeedback.Number;
-
-                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
-
-                    if (VideoOutputFeedbacks.ContainsKey(output))
-                    {
-                        var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].VideoOutFeedback);
-                        var localOutputPort =
-                            OutputPorts.FirstOrDefault(p => (DMOutput) p.FeedbackMatchObject == Chassis.Outputs[output]);
-
-
-                        VideoOutputFeedbacks[output].FireUpdate();
-                        OnSwitchChange(new RoutingNumericEventArgs(output,
-                            inputNumber,
-                            localOutputPort,
-                            localInputPort,
-                            eRoutingSignalType.Video));
-                    }
-
+                    if (Chassis.Outputs[output].VideoOutFeedback != null)
+                        Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, Chassis.Outputs[output].VideoOutFeedback.Number, output);
+
+                    if (VideoOutputFeedbacks.ContainsKey(output))
+                        VideoOutputFeedbacks[output].FireUpdate();
+
                     if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
                         OutputVideoRouteNameFeedbacks[output].FireUpdate();
 
                     break;
                 }
-                case DMOutputEventIds.AudioOutEventId:
-                {
-                    var inputNumber = Chassis.Outputs[output].AudioOutFeedback == null ? 0 : Chassis.
-                    Outputs[output].AudioOutFeedback.Number;
-
-                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
-
-                    if (AudioOutputFeedbacks.ContainsKey(output))
-                    {
-                        var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].AudioOutFeedback);
-                        var localOutputPort =
-                            OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == Chassis.Outputs[output]);
-
-
-                        AudioOutputFeedbacks[output].FireUpdate();
-                        OnSwitchChange(new RoutingNumericEventArgs(output,
-                            inputNumber,
-                            localOutputPort,
-                            localInputPort,
-                            eRoutingSignalType.Audio));
-                    }
-
-                    if (OutputAudioRouteNameFeedbacks.ContainsKey(output))
-                        OutputAudioRouteNameFeedbacks[output].FireUpdate();
-
+                case DMOutputEventIds.AudioOutEventId:
+                {
+                    if (Chassis.Outputs[output].AudioOutFeedback != null)
+                        Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, Chassis.Outputs[output].AudioOutFeedback.Number, output);
+
+                    if (AudioOutputFeedbacks.ContainsKey(output))
+                        AudioOutputFeedbacks[output].FireUpdate();
+
+                    if (OutputAudioRouteNameFeedbacks.ContainsKey(output))
+                        OutputAudioRouteNameFeedbacks[output].FireUpdate();
+
                     break;
                 }
                 case DMOutputEventIds.OutputNameEventId:

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

@@ -19,13 +19,10 @@ using Feedback = PepperDash.Essentials.Core.Feedback;
 
 namespace PepperDash.Essentials.DM
 {
-    public class DmpsRoutingController : EssentialsBridgeableDevice, IRoutingNumericWithFeedback, IHasFeedback
+    public class DmpsRoutingController : EssentialsBridgeableDevice, IRoutingNumeric, IHasFeedback
     {
         public CrestronControlSystem Dmps { get; set; }
-        public ISystemControl SystemControl { get; private set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+        public ISystemControl SystemControl { get; private set; }
 
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
@@ -57,25 +54,13 @@ namespace PepperDash.Essentials.DM
         /// <summary>
         /// Text that represents when an output has no source routed to it
         /// </summary>
-        public string NoRouteText = "";
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
+        public string NoRouteText = "";
 
         public static DmpsRoutingController GetDmpsRoutingController(string key, string name,
             DmpsRoutingPropertiesConfig properties)
         {
             try
             {
-                
                 ISystemControl systemControl = null;
  
                 systemControl = Global.ControlSystem.SystemControl as ISystemControl;
@@ -133,10 +118,7 @@ namespace PepperDash.Essentials.DM
             OutputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
 
             Debug.Console(1, this, "{0} Switcher Inputs Present.", Dmps.SwitcherInputs.Count);
-            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
-
-            Debug.Console(1, this, "{0} Inputs in ControlSystem", Dmps.NumberOfSwitcherInputs);
-            Debug.Console(1, this, "{0} Outputs in ControlSystem", Dmps.NumberOfSwitcherOutputs);
+            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
 
             SetupOutputCards();
 
@@ -146,50 +128,32 @@ namespace PepperDash.Essentials.DM
         public override bool CustomActivate()
         {
             // Set input and output names from config
-            SetInputNames();
-
-            SetOutputNames();
+            if (InputNames != null)
+            {
+                foreach (var kvp in InputNames)
+                {
+                    var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
+                    if (input != null)
+                        input.Name.StringValue = kvp.Value;
+                }
+            }
+            if (OutputNames != null)
+            {
+                foreach (var kvp in OutputNames)
+                {
+                    var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
+                    if (output != null)
+                        output.Name.StringValue = kvp.Value;
+                }
+            }
 
             // Subscribe to events
-            Dmps.DMInputChange += Dmps_DMInputChange;
-            Dmps.DMOutputChange += Dmps_DMOutputChange;
+            Dmps.DMInputChange += new DMInputEventHandler(Dmps_DMInputChange);
+            Dmps.DMOutputChange += new DMOutputEventHandler(Dmps_DMOutputChange);
 
             return base.CustomActivate();
-        }
-
-        private void SetOutputNames()
-        {
-            if (OutputNames == null)
-            {
-                return;
-            }
-
-            foreach (var kvp in OutputNames)
-            {
-                var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
-                if (output != null && output.Name.Type != eSigType.NA)
-                {
-                    output.Name.StringValue = kvp.Value;
-                }
-            }
-        }
-
-        private void SetInputNames()
-        {
-            if (InputNames == null)
-            {
-                return;
-            }
-            foreach (var kvp in InputNames)
-            {
-                var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
-                if (input != null && input.Name.Type != eSigType.NA)
-                {
-                    input.Name.StringValue = kvp.Value;
-                }
-            }
-        }
-
+        }
+
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
             var joinMap = new DmpsRoutingControllerJoinMap(joinStart);
@@ -211,197 +175,171 @@ namespace PepperDash.Essentials.DM
             Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             // Link up outputs
-            LinkInputsToApi(trilist, joinMap);
+            for (uint i = 1; i <= Dmps.NumberOfSwitcherInputs; i++)
+            {
+                Debug.Console(2, this, "Linking Input Card {0}", i);
 
-            LinkOutputsToApi(trilist, joinMap);
-        }
-
-        private void LinkOutputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
-        {
-            for (uint i = 1; i <= Dmps.SwitcherOutputs.Count; i++)
-            {
-                Debug.Console(2, this, "Linking Output Card {0}", i);
-
                 var ioSlot = i;
-                var ioSlotJoin = ioSlot - 1;
-
-                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
-                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
-
-                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
-                {
-                    var outputCard = Dmps.SwitcherOutputs[ioSlot] as DMOutput;
-
-                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
-
-                    if (outputCard == null)
-                    {
-                        return;
-                    }
-                    //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
-
-                    if (outputCard is Card.Dmps3CodecOutput || outputCard.NameFeedback == null)
-                    {
-                        return;
-                    }
-                    if (string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
-                    {
-                        return;
-                    }
-                    //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
-
-                    if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
-                    {
-                        outputCard.Name.StringValue = s;
-                    }
-                });
-
-                // Feedback
-                if (VideoOutputFeedbacks[ioSlot] != null)
-                {
-                    VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
-                }
-                if (AudioOutputFeedbacks[ioSlot] != null)
-                {
-                    AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputNameFeedbacks[ioSlot] != null)
-                {
-                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputVideoRouteNameFeedbacks[ioSlot] != null)
-                {
-                    OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(
-                        trilist.StringInput[joinMap.OutputCurrentVideoInputNames.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputAudioRouteNameFeedbacks[ioSlot] != null)
-                {
-                    OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(
-                        trilist.StringInput[joinMap.OutputCurrentAudioInputNames.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputEndpointOnlineFeedbacks[ioSlot] != null)
-                {
-                    OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
-                        trilist.BooleanInput[joinMap.OutputEndpointOnline.JoinNumber + ioSlotJoin]);
-                }
-            }
-        }
-
-        private void LinkInputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
-        {
-            for (uint i = 1; i <= Dmps.SwitcherInputs.Count; i++)
-            {
-                Debug.Console(2, this, "Linking Input Card {0}", i);
-
-                var ioSlot = i;
-                var ioSlotJoin = ioSlot - 1;
-
+                var ioSlotJoin = ioSlot - 1;
+
+                //if (TxDictionary.ContainsKey(ioSlot))
+                //{
+                //    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
+                //    var TxKey = TxDictionary[ioSlot];
+                //    var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase;
+                //    //TxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                //    // TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                //    // trilist.SetUShortSigAction((ApiMap.HdcpSupport[ioSlot]), u => TxDevice.SetHdcpSupportAll((ePdtHdcpSupport)(u)));
+                //    // TxDevice.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap. + ioSlot]);
+                //    // trilist.UShortInput[ApiMap.HdcpSupportCapability[ioSlot]].UShortValue = TxDevice.HdcpSupportCapability;
+                //}
+                //else
+                //{
+                //    // dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[ApiMap.TxVideoSyncStatus[ioSlot]]);
+                //}
+
                 if (VideoInputSyncFeedbacks[ioSlot] != null)
-                {
-                    VideoInputSyncFeedbacks[ioSlot].LinkInputSig(
-                        trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
-                }
-
+                    VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
+
                 if (InputNameFeedbacks[ioSlot] != null)
-                {
                     InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames.JoinNumber + ioSlotJoin]);
-                }
-
-                trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, s =>
-                {
-                    var inputCard = Dmps.SwitcherInputs[ioSlot] as DMInput;
-
-                    if (inputCard == null)
-                    {
-                        return;
-                    }
-
-                    if (inputCard.NameFeedback == null || string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) ||
-                        inputCard.NameFeedback.StringValue == s)
-                    {
-                        return;
-                    }
-
-                    if (inputCard.Name != null)
-                    {
-                        inputCard.Name.StringValue = s;
-                    }
-                });
-
 
+                trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, new Action<string>(s =>
+                {
+                    var inputCard = Dmps.SwitcherInputs[ioSlot] as DMInput;
+
+                    if (inputCard != null)
+                    {
+                        if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) && inputCard.NameFeedback.StringValue != s)
+                            if (inputCard.Name != null)
+                                inputCard.Name.StringValue = s;
+                    }
+                }));
+
+
                 if (InputEndpointOnlineFeedbacks[ioSlot] != null)
-                {
-                    InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
-                        trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
-                }
-            }
-        }
-
+                    InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
+            }
+
+            for (uint i = 1; i <= Dmps.NumberOfSwitcherOutputs; i++)
+            {
+                Debug.Console(2, this, "Linking Output Card {0}", i);
+
+                var ioSlot = i;
+                var ioSlotJoin = ioSlot - 1;
+
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
 
+                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
+                {
+                    var outputCard = Dmps.SwitcherOutputs[ioSlot] as DMOutput;
+
+                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
+
+                    if (outputCard != null)
+                    {
+                        //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
+
+                        if (!(outputCard is Card.Dmps3CodecOutput) && outputCard.NameFeedback != null)
+                        {
+                            if (!string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                            {
+                                //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
+
+                                if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
+                                {
+                                    outputCard.Name.StringValue = s;
+                                }
+                            }
+                        }
+                    }
+                });
+
+                // Feedback
+                if (VideoOutputFeedbacks[ioSlot] != null)
+                    VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
+                if (AudioOutputFeedbacks[ioSlot] != null)
+                    AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio.JoinNumber + ioSlotJoin]);
+                if (OutputNameFeedbacks[ioSlot] != null)
+                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
+                if (OutputVideoRouteNameFeedbacks[ioSlot] != null)
+                    OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames.JoinNumber + ioSlotJoin]);
+                if (OutputAudioRouteNameFeedbacks[ioSlot] != null)
+                    OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames.JoinNumber + ioSlotJoin]);
+                if (OutputEndpointOnlineFeedbacks[ioSlot] != null)
+                    OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline.JoinNumber + ioSlotJoin]);
+            }
+        }
+
+
         /// <summary>
         /// Iterate the SwitcherOutputs collection to setup feedbacks and add routing ports
         /// </summary>
         void SetupOutputCards()
         {
-            foreach (var card in Dmps.SwitcherOutputs)
-            {
-                Debug.Console(1, this, "Output Card Type: {0}", card.CardInputOutputType);
+            foreach (var card in Dmps.SwitcherOutputs)
+            {
+
+                var outputCard = card as DMOutput;
 
-                var outputCard = card as DMOutput;
-
-                if (outputCard == null)
-                {
-                    Debug.Console(1, this, "Output card {0} is not a DMOutput", card.CardInputOutputType);
-                    continue;
-                }
-
                 Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
-                VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
+
+                if (outputCard != null)
                 {
-                    if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
-                    return 0;
-                    ;
-                });
-                AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
-                {
-                    if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
-                    return 0;
-                    ;
-                });
-
-                OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
-                    if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                    VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
                     {
-                        Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
-                        return outputCard.NameFeedback.StringValue;
-                    }
-                    return "";
-                });
-
-                OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
-                    if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
+                        if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
+                        else { return 0; };
+                    });
+                    AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
                     {
-                        return outputCard.VideoOutFeedback.NameFeedback.StringValue;
-                    }
-                    return NoRouteText;
-                });
-                OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
-                    if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
+                        if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
+                        else { return 0; };
+                    });
+
+                    OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
                     {
-                        return outputCard.AudioOutFeedback.NameFeedback.StringValue;
-                    }
-                    return NoRouteText;
-                });
+                        if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                        {
+                            Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
+                            return outputCard.NameFeedback.StringValue;
+                        }
+                        else
+                        {
+                            return "";
+                        }
+                    });
 
-                OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => outputCard.EndpointOnlineFeedback);
+                    OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                    {
+                        if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
+                        {
+                            return outputCard.VideoOutFeedback.NameFeedback.StringValue;
+                        }
+                        else
+                        {
+                            return NoRouteText;
+                        }
+                    });
+                    OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                    {
+                        if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
+                        {
+                            return outputCard.AudioOutFeedback.NameFeedback.StringValue;
+                        }
+                        else
+                        {
+                            return NoRouteText;
 
-                AddOutputCard(outputCard.Number, outputCard);
+                        }
+                    });
+
+                    OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => { return outputCard.EndpointOnlineFeedback; });
+
+                    AddOutputCard(outputCard.Number, outputCard);
+                }
             }
         }
 
@@ -513,26 +451,21 @@ namespace PepperDash.Essentials.DM
 
                 AddInputPortWithDebug(number, string.Format("AirMediaIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
             }
-        }
-
-
-        /// <summary>
-        /// Adds InputPort
-        /// </summary>
-        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
-            eRoutingPortConnectionType portType)
-        {
-            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherInputs[cardNum]
-            };
-            ;
-
-            InputPorts.Add(inputPort);
-        }
-
+        }
+
+
+        /// <summary>
+        /// Adds InputPort
+        /// </summary>
+        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType)
+        {
+            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
+            Debug.Console(2, this, "Adding input port '{0}'", portKey);
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
+
+            InputPorts.Add(inputPort);
+        }
+
         /// <summary>
         /// Adds InputPort and sets Port as ICec object
         /// </summary>
@@ -540,18 +473,13 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherInputs[cardNum]
-            }; 
-            ;
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
 
             if (cecPort != null)
                 inputPort.Port = cecPort;
 
             InputPorts.Add(inputPort);
-        }
-
+        }
 
         /// <summary>
         /// Builds the appropriate ports and calls the appropriate add port method
@@ -566,23 +494,18 @@ namespace PepperDash.Essentials.DM
 
                 var cecPort = hdmiOutputCard.HdmiOutputPort;
 
-                AddHdmiOutputPort(number, cecPort);
-            }
-            else if (outputCard is Card.Dmps3HdmiOutputBackend)
-            {
-                var hdmiOutputCard = outputCard as Card.Dmps3HdmiOutputBackend;
-
-                var cecPort = hdmiOutputCard.HdmiOutputPort;
-
-                AddHdmiOutputPort(number, cecPort);
+                AddHdmiOutputPort(number, cecPort);
+
+                return;
             }
             else if (outputCard is Card.Dmps3DmOutput)
-            {
-                AddDmOutputPort(number);
-            }
-            else if (outputCard is Card.Dmps3DmOutputBackend)
-            {
-                AddDmOutputPort(number);
+            {
+                var dmOutputCard = outputCard as Card.Dmps3DmOutput;
+
+                var cecPort = dmOutputCard.DmOutputPort;
+
+                AddDmOutputPort(number);
+                return;
             }
             else if (outputCard is Card.Dmps3ProgramOutput)
             {
@@ -590,51 +513,50 @@ namespace PepperDash.Essentials.DM
 
                 var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                DeviceManager.AddDevice(programOutput);
+                DeviceManager.AddDevice(programOutput);
+
+                return;
             }
-            else if (outputCard is Card.Dmps3AuxOutput)
-            {
-                switch (outputCard.CardInputOutputType)
-                {
-                    case eCardInputOutputType.Dmps3Aux1Output:
-                    {
-                        AddAudioOnlyOutputPort(number, "Aux1");
+            else if (outputCard is Card.Dmps3AuxOutput)
+            {
+                if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux1Output)
+                {
+                    AddAudioOnlyOutputPort(number, "Aux1");
 
-                        var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+                    var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                        DeviceManager.AddDevice(aux1Output);
-                    }
-                        break;
-                    case eCardInputOutputType.Dmps3Aux2Output:
-                    {
-                        AddAudioOnlyOutputPort(number, "Aux2");
+                    DeviceManager.AddDevice(aux1Output);
+                }
+                else if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux2Output)
+                {
+                    AddAudioOnlyOutputPort(number, "Aux2");
 
-                        var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+                    var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                        DeviceManager.AddDevice(aux2Output);
-                    }
-                        break;
-                }
-            }
-            else if (outputCard is Card.Dmps3CodecOutput)
-            {
-                switch (number)
-                {
-                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1:
-                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1:
-                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1:
-                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
-                        break;
-                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2:
-                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2:
-                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2:
-                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
-                        break;
-                }
-            }
+                    DeviceManager.AddDevice(aux2Output);
+                }
+                return;
+            }
+            else if (outputCard is Card.Dmps3CodecOutput)
+            {
+                if (number == (uint)CrestronControlSystem.eDmps300cOutputs.Codec1 
+                    || number == (uint)CrestronControlSystem.eDmps3200cOutputs.Codec1
+                    || number == (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1
+                    || number == (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1
+                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1)
+                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
+                else if (number == (uint)CrestronControlSystem.eDmps300cOutputs.Codec2
+                    || number == (uint)CrestronControlSystem.eDmps3200cOutputs.Codec2
+                    || number == (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2
+                    || number == (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2
+                    || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2)
+                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
+                return;
+            }
             else if (outputCard is Card.Dmps3DialerOutput)
             {
-                AddAudioOnlyOutputPort(number, "Dialer");
+                AddAudioOnlyOutputPort(number, "Dialer");
+                return;
             }
             else if (outputCard is Card.Dmps3DigitalMixOutput)
             {
@@ -645,11 +567,13 @@ namespace PepperDash.Essentials.DM
                 if (number == (uint)CrestronControlSystem.eDmps34K250COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K300COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Mix2)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
+                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
+                return;
             }
             else if (outputCard is Card.Dmps3AecOutput)
             {
-                AddAudioOnlyOutputPort(number, "Aec");
+                AddAudioOnlyOutputPort(number, "Aec");
+                return;
             }
             else
             {
@@ -692,10 +616,7 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherOutputs[cardNum]
-            });
+            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this));
         }
 
         /// <summary>
@@ -705,10 +626,7 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherOutputs[cardNum]
-            };
+            var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this);
 
             if (cecPort != null)
                 outputPort.Port = cecPort;
@@ -768,74 +686,39 @@ namespace PepperDash.Essentials.DM
             {
                 OutputEndpointOnlineFeedbacks[output].FireUpdate();
             }
-            else if (args.EventId == DMOutputEventIds.VideoOutEventId)
-            {
-                if (outputCard == null) return;
-
-                var outputFeedbackIndex = outputCard.VideoOutFeedback == null ? 0 : outputCard.VideoOutFeedback.Number;
-
-                Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputFeedbackIndex, output);
-
-                if (VideoOutputFeedbacks.ContainsKey(output))
-                {
-                    var localInputPort =
-                        InputPorts.FirstOrDefault(p => (DMInput) p.FeedbackMatchObject == outputCard.VideoOutFeedback);
-                    var localOutputPort = OutputPorts.FirstOrDefault(p => (DMOutput) p.FeedbackMatchObject == outputCard);
-
-                    VideoOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, VideoOutputFeedbacks[output].UShortValue,
-                        localOutputPort, localInputPort, eRoutingSignalType.Video));
-                }
-                if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
-                {
-                    OutputVideoRouteNameFeedbacks[output].FireUpdate();
-                }
-            }
-            else if (args.EventId == DMOutputEventIds.AudioOutEventId)
-            {
-                /*
-                if (outputCard == null || outputCard.AudioOutFeedback == null) return;
-                
-                Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputCard.AudioOutFeedback.Number, output);
-                
-                if (AudioOutputFeedbacks.ContainsKey(output))
-                {
-                    AudioOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, AudioOutputFeedbacks[output].UShortValue, eRoutingSignalType.Audio));
-                }
-                 */
-
-                if (outputCard == null) return;
-
-                var outputFeedbackIndex = outputCard.AudioOutFeedback == null ? 0 : outputCard.VideoOutFeedback.Number;
-
-                Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputFeedbackIndex, output);
-
-                if (AudioOutputFeedbacks.ContainsKey(output))
-                {
-                    var localInputPort =
-                        InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == outputCard.AudioOutFeedback);
-                    var localOutputPort = OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == outputCard);
-
-                    AudioOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, AudioOutputFeedbacks[output].UShortValue,
-                        localOutputPort, localInputPort, eRoutingSignalType.Audio));
-                }
-                if (OutputAudioRouteNameFeedbacks.ContainsKey(output))
-                {
-                    OutputAudioRouteNameFeedbacks[output].FireUpdate();
-                }
-            }
-            else if (args.EventId == DMOutputEventIds.OutputNameEventId
-                     && OutputNameFeedbacks.ContainsKey(output))
-            {
-                Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                OutputNameFeedbacks[output].FireUpdate();
-            }
-
+            else if (args.EventId == DMOutputEventIds.VideoOutEventId)
+            {
+                if (outputCard != null && outputCard.VideoOutFeedback != null)
+                {
+                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, outputCard.VideoOutFeedback.Number, output);
+                }
+                if (VideoOutputFeedbacks.ContainsKey(output))
+                {
+                    VideoOutputFeedbacks[output].FireUpdate();
+                }
+                if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
+                {
+                    OutputVideoRouteNameFeedbacks[output].FireUpdate();
+                }
+            }
+            else if (args.EventId == DMOutputEventIds.AudioOutEventId)
+            {
+                if (outputCard != null && outputCard.AudioOutFeedback != null)
+                {
+                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, outputCard.AudioOutFeedback.Number, output);
+                }
+                if (AudioOutputFeedbacks.ContainsKey(output))
+                {
+                    AudioOutputFeedbacks[output].FireUpdate();
+                }
+            }
+            else if (args.EventId == DMOutputEventIds.OutputNameEventId
+                && OutputNameFeedbacks.ContainsKey(output))
+            {
+                Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
+                OutputNameFeedbacks[output].FireUpdate();
+            }
+
         }
 
         /// <summary>

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

@@ -16,14 +16,11 @@ using PepperDash.Essentials.Core.Config;
 namespace PepperDash.Essentials.DM.Chassis
 {
     [Description("Wrapper class for all HdMdNxM4E switchers")]
-    public class HdMdNxM4kEBridgeableController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IHasFeedback
+    public class HdMdNxM4kEBridgeableController : CrestronGenericBridgeableBaseDevice, IRoutingInputsOutputs, IRoutingNumeric, IHasFeedback
     {
         private HdMdNxM _Chassis;
         private HdMd4x14kE _Chassis4x1;
 
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
         public Dictionary<uint, string> InputNames { get; set; }
         public Dictionary<uint, string> OutputNames { get; set; }
 
@@ -73,34 +70,26 @@ namespace PepperDash.Essentials.DM.Chassis
 
             for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
             {
-                var index = i;
-                var inputName = InputNames[index];
-                _Chassis.Inputs[index].Name.StringValue = inputName;
+                var inputName = InputNames[i];
+                _Chassis.Inputs[i].Name.StringValue = inputName;
 
                 InputPorts.Add(new RoutingInputPort(inputName, eRoutingSignalType.AudioVideo,
-                    eRoutingPortConnectionType.Hdmi, index, this)
-                {
-                    FeedbackMatchObject = _Chassis.HdmiInputs[index]
-                });
-                VideoInputSyncFeedbacks.Add(new BoolFeedback(inputName, () => _Chassis.Inputs[index].VideoDetectedFeedback.BoolValue));
-                InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[index].Name.StringValue));
-                InputHdcpEnableFeedback.Add(new BoolFeedback(inputName, () => _Chassis.HdmiInputs[index].HdmiInputPort.HdcpSupportOnFeedback.BoolValue));
+                    eRoutingPortConnectionType.Hdmi, i, this));
+                VideoInputSyncFeedbacks.Add(new BoolFeedback(inputName, () => _Chassis.Inputs[i].VideoDetectedFeedback.BoolValue));
+                InputNameFeedbacks.Add(new StringFeedback(inputName, () => _Chassis.Inputs[i].Name.StringValue));
+                InputHdcpEnableFeedback.Add(new BoolFeedback(inputName, () => _Chassis.HdmiInputs[i].HdmiInputPort.HdcpSupportOnFeedback.BoolValue));
             }
 
             for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
             {
-                var index = i;
-                var outputName = OutputNames[index];
+                var outputName = OutputNames[i];
                 _Chassis.Outputs[i].Name.StringValue = outputName;
 
                 OutputPorts.Add(new RoutingOutputPort(outputName, eRoutingSignalType.AudioVideo,
-                    eRoutingPortConnectionType.Hdmi, index, this)
-                {
-                    FeedbackMatchObject = _Chassis.HdmiOutputs[index]
-                });
-                VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => (int)_Chassis.Outputs[index].VideoOutFeedback.Number));
-                OutputNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[index].Name.StringValue));
-                OutputRouteNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[index].VideoOutFeedback.NameFeedback.StringValue));
+                    eRoutingPortConnectionType.Hdmi, i, this));
+                VideoOutputRouteFeedbacks.Add(new IntFeedback(outputName, () => (int)_Chassis.Outputs[i].VideoOutFeedback.Number));
+                OutputNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[i].Name.StringValue));
+                OutputRouteNameFeedbacks.Add(new StringFeedback(outputName, () => _Chassis.Outputs[i].VideoOutFeedback.NameFeedback.StringValue));
             }
 
             _Chassis.DMInputChange += new DMInputEventHandler(Chassis_DMInputChange);
@@ -113,16 +102,6 @@ namespace PepperDash.Essentials.DM.Chassis
 
         #region Methods
 
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
         public void EnableHdcp(uint port)
         {
             if (port > _Chassis.NumberOfInputs) return;
@@ -349,45 +328,44 @@ namespace PepperDash.Essentials.DM.Chassis
 
         void Chassis_OnlineStatusChange(Crestron.SimplSharpPro.GenericBase currentDevice, Crestron.SimplSharpPro.OnlineOfflineEventArgs args)
         {
-            if (!args.DeviceOnLine) return;
-            for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
+            if (args.DeviceOnLine)
             {
-                _Chassis.Inputs[i].Name.StringValue = InputNames[i];
-            }
-            for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
-            {
-                _Chassis.Outputs[i].Name.StringValue = OutputNames[i];
-            }
+                for (uint i = 1; i <= _Chassis.NumberOfInputs; i++)
+                {
+                    _Chassis.Inputs[i].Name.StringValue = InputNames[i];
+                }
+                for (uint i = 1; i <= _Chassis.NumberOfOutputs; i++)
+                {
+                    _Chassis.Outputs[i].Name.StringValue = OutputNames[i];
+                }
 
-            foreach (var feedback in Feedbacks)
-            {
-                feedback.FireUpdate();
+                foreach (var feedback in Feedbacks)
+                {
+                    feedback.FireUpdate();
+                }
             }
+            
         }
 
         void Chassis_DMOutputChange(Switch device, DMOutputEventArgs args)
         {
-            if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
-
-            for (var i = 0; i < VideoOutputRouteFeedbacks.Count; i++)
+            if (args.EventId == DMOutputEventIds.VideoOutEventId)
             {
-                var index = i;
-                var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == _Chassis.HdmiOutputs[(uint)index + 1].VideoOutFeedback);
-                var localOutputPort =
-                    OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == _Chassis.HdmiOutputs[(uint)index + 1]);
-
-
-                VideoOutputRouteFeedbacks[i].FireUpdate();
-                OnSwitchChange(new RoutingNumericEventArgs((ushort)i, VideoOutputRouteFeedbacks[i].UShortValue, localOutputPort, localInputPort, eRoutingSignalType.AudioVideo));
+                foreach (var item in VideoOutputRouteFeedbacks)
+                {
+                    item.FireUpdate();
+                }
             }
         }
 
         void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
         {
-            if (args.EventId != DMInputEventIds.VideoDetectedEventId) return;
-            foreach (var item in VideoInputSyncFeedbacks)
+            if (args.EventId == DMInputEventIds.VideoDetectedEventId)
             {
-                item.FireUpdate();
+                foreach (var item in VideoInputSyncFeedbacks)
+                {
+                    item.FireUpdate();
+                }
             }
         }
 

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
+using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
@@ -15,19 +14,15 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Essentials.Core.DeviceInfo;
-
+using Crestron.SimplSharpPro.DeviceSupport;
+
 namespace PepperDash.Essentials.DM.Endpoints.DGEs
 {
     [Description("Wrapper class for DGE-100")]    
-    public class Dge100Controller : CrestronGenericBaseDevice, IComPorts, IIROutputPorts, IHasBasicTriListWithSmartObject, ICec, IDeviceInfoProvider
+    public class Dge100Controller : CrestronGenericBaseDevice, IComPorts, IIROutputPorts, IHasBasicTriListWithSmartObject, ICec
     {
-        private const int CtpPort = 41795;
         private readonly Dge100 _dge;
 
-        private readonly TsxCcsUcCodec100EthernetReservedSigs _dgeEthernetInfo;
-
         public BasicTriListWithSmartObject Panel { get { return _dge; } }
 
         private DeviceConfig _dc;
@@ -37,12 +32,7 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs
         public Dge100Controller(string key, string name, Dge100 device, DeviceConfig dc, CrestronTouchpanelPropertiesConfig props)
             :base(key, name, device)
         {
-            _dge = device;
-            _dgeEthernetInfo = _dge.ExtenderEthernetReservedSigs;
-            _dgeEthernetInfo.DeviceExtenderSigChange += (extender, args) => UpdateDeviceInfo();
-            _dgeEthernetInfo.Use();
-
-            DeviceInfo = new DeviceInfo();
+            _dge = device;
 
             _dc = dc;
 
@@ -79,86 +69,8 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs
 
         #region ICec Members
         public Cec StreamCec { get { return _dge.HdmiOut.StreamCec; } }
-        #endregion
-
-        #region Implementation of IDeviceInfoProvider
-
-        public DeviceInfo DeviceInfo { get; private set; }
-
-        public event EventHandler<DeviceInfoEventArgs> DeviceInfoChanged;
-
-        public void UpdateDeviceInfo()
-        {
-            DeviceInfo.IpAddress = _dgeEthernetInfo.IpAddressFeedback.StringValue;
-            DeviceInfo.MacAddress = _dgeEthernetInfo.MacAddressFeedback.StringValue;
-
-            GetFirmwareAndSerialInfo();
-
-            OnDeviceInfoChange();
-        }
-
-        private void GetFirmwareAndSerialInfo()
-        {
-            if (String.IsNullOrEmpty(_dgeEthernetInfo.IpAddressFeedback.StringValue))
-            {
-                Debug.Console(1, this, "IP Address information not yet received. No device is online");
-                return;
-            }
-
-            var tcpClient = new GenericTcpIpClient("", _dgeEthernetInfo.IpAddressFeedback.StringValue, CtpPort, 1024);
-
-            var gather = new CommunicationGather(tcpClient, "\r\n\r\n");
-
-            tcpClient.ConnectionChange += (sender, args) =>
-            {
-                if (!args.Client.IsConnected)
-                {
-                    return;
-                }
-
-                args.Client.SendText("ver\r\n");
-            };
-
-            gather.LineReceived += (sender, args) =>
-            {
-                if (args.Text.ToLower().Contains("host"))
-                {
-                    DeviceInfo.HostName = args.Text.Split(';')[1].Trim();
-
-                    tcpClient.Disconnect();
-                    return;
-                }
-
-                //ignore console prompt
-                if (args.Text.ToLower().Contains(">"))
-                {
-                    return;
-                }
-
-                if (!args.Text.ToLower().Contains("dge"))
-                {
-                    return;
-                }
-
-                DeviceInfo.SerialNumber = args.Text.Split('[')[1].Split(' ')[4].Replace("#", "");
-                DeviceInfo.FirmwareVersion = args.Text.Split('[')[1].Split(' ')[1];
-
-                tcpClient.SendText("host\r\n");
-            };
-
-            tcpClient.Connect();
-        }
-
-        private void OnDeviceInfoChange()
-        {
-            var handler = DeviceInfoChanged;
-
-            if (handler == null) return;
-
-            handler(this, new DeviceInfoEventArgs(DeviceInfo));
-        }
-
-        #endregion
+        #endregion
+
     }
 
     public class Dge100ControllerFactory : EssentialsDeviceFactory<Dge100Controller>

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

@@ -13,7 +13,7 @@ using PepperDash.Core;
 namespace PepperDash.Essentials.DM
 {
     [Description("Wrapper Class for DM-RMC-4K-Z-SCALER-C")]
-    public class DmRmc4kZScalerCController : DmRmcControllerBase, IRmcRoutingWithFeedback,
+    public class DmRmc4kZScalerCController : DmRmcControllerBase, IRmcRouting,
         IIROutputPorts, IComPorts, ICec
     {
         private readonly DmRmc4kzScalerC _rmc;
@@ -31,34 +31,14 @@ namespace PepperDash.Essentials.DM
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
 
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
-
         public DmRmc4kZScalerCController(string key, string name, DmRmc4kzScalerC rmc)
             : base(key, name, rmc)
         {
             _rmc = rmc;
             DmIn = new RoutingInputPort(DmPortName.DmIn, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.DmCat, 0, this)
-            {
-                FeedbackMatchObject = 1
-            };
+                eRoutingPortConnectionType.DmCat, 0, this);
             HdmiIn = new RoutingInputPort(DmPortName.HdmiIn, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, 0, this)
-            {
-                FeedbackMatchObject = 2
-            };
+                eRoutingPortConnectionType.Hdmi, 0, this);
             HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo,
                 eRoutingPortConnectionType.Hdmi, null, this);
 
@@ -75,20 +55,12 @@ namespace PepperDash.Essentials.DM
             _rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
             _rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
 
-            _rmc.OnlineStatusChange += _rmc_OnlineStatusChange;
-
             // Set Ports for CEC
             HdmiOut.Port = _rmc.HdmiOutput;
 
             AudioVideoSourceNumericFeedback = new IntFeedback(() => (ushort)(_rmc.SelectedSourceFeedback));
         }
 
-        private void _rmc_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            AudioVideoSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioVideoSourceNumericFeedback.UShortValue, eRoutingSignalType.AudioVideo));
-        }
-
         void HdmiOutput_OutputStreamChange(EndpointOutputStream outputStream, EndpointOutputStreamEventArgs args)
         {
             if (args.EventId == EndpointOutputStreamEventIds.HorizontalResolutionFeedbackEventId || args.EventId == EndpointOutputStreamEventIds.VerticalResolutionFeedbackEventId ||
@@ -99,12 +71,7 @@ namespace PepperDash.Essentials.DM
 
             if (args.EventId == EndpointOutputStreamEventIds.SelectedSourceFeedbackEventId)
             {
-                var localInputPort =
-                    InputPorts.FirstOrDefault(p => (int)p.FeedbackMatchObject == AudioVideoSourceNumericFeedback.UShortValue);
-
-
                 AudioVideoSourceNumericFeedback.FireUpdate();
-                OnSwitchChange(new RoutingNumericEventArgs(1, AudioVideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputPort, eRoutingSignalType.AudioVideo));
             }
         }
 

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

@@ -2,22 +2,19 @@
 using System.Collections.Generic;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Cards;
 using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.DeviceInfo;
 using PepperDash.Essentials.DM.Config;
 using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.DM
 {
     [Description("Wrapper class for all DM-RMC variants")]
-	public abstract class DmRmcControllerBase : CrestronGenericBridgeableBaseDevice, IDeviceInfoProvider
+	public abstract class DmRmcControllerBase : CrestronGenericBridgeableBaseDevice
     {
-        private const int CtpPort = 41795;
         private readonly EndpointReceiverBase _rmc; //kept here just in case. Only property or method on this class that's not device-specific is the DMOutput that it's attached to.
 
         public StringFeedback VideoOutputResolutionFeedback { get; protected set; }
@@ -34,8 +31,6 @@ namespace PepperDash.Essentials.DM
             PreventRegistration = _rmc.DMOutput != null;
 			
             AddToFeedbackList(VideoOutputResolutionFeedback, EdidManufacturerFeedback, EdidSerialNumberFeedback, EdidNameFeedback, EdidPreferredTimingFeedback);
-
-            DeviceInfo = new DeviceInfo();
         }
 
         protected void LinkDmRmcToApi(DmRmcControllerBase rmc, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
@@ -83,89 +78,7 @@ namespace PepperDash.Essentials.DM
 
             trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber, a => routing.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
         }
-
-        #region Implementation of IDeviceInfoProvider
-
-        public DeviceInfo DeviceInfo { get; private set; }
-        public event EventHandler<DeviceInfoEventArgs> DeviceInfoChanged;
-
-        public void UpdateDeviceInfo()
-        {
-            if (!_rmc.IsOnline || _rmc.ConnectedIpList.Count == 0)
-            {
-                Debug.Console(1, this, "IP Address information not yet received. No device is online");
-                return;
-            }
-
-            DeviceInfo.IpAddress = _rmc.ConnectedIpList[0].DeviceIpAddress;
-
-            foreach (var ip in _rmc.ConnectedIpList)
-            {
-                Debug.Console(0, this, "Connected IP Address: {0}", ip.DeviceIpAddress);
-            }
-
-            GetFirmwareAndSerialInfo();
-
-            OnDeviceInfoChange();
-        }
-
-        private void GetFirmwareAndSerialInfo()
-        {
-            var tcpClient = new GenericTcpIpClient("", _rmc.ConnectedIpList[0].DeviceIpAddress, CtpPort, 1024);
-
-            var gather = new CommunicationGather(tcpClient, "\r\n\r\n");
-
-            tcpClient.ConnectionChange += (sender, args) =>
-            {
-                if (!args.Client.IsConnected)
-                {
-                    return;
-                }
-
-                args.Client.SendText("ver\r\n");
-            };
-
-            gather.LineReceived += (sender, args) =>
-            {
-                if (args.Text.ToLower().Contains("host"))
-                {
-                    DeviceInfo.HostName = args.Text.Split(';')[1].Trim();
-
-                    tcpClient.Disconnect();
-                    return;
-                }
-
-                //ignore console prompt
-                if (args.Text.ToLower().Contains(">"))
-                {
-                    return;
-                }
-
-                if (!args.Text.ToLower().Contains("rmc"))
-                {
-                    return;
-                }
-
-                DeviceInfo.SerialNumber = args.Text.Split('[')[1].Split(' ')[4].Replace("#", "");
-                DeviceInfo.FirmwareVersion = args.Text.Split('[')[1].Split(' ')[1];
-
-                tcpClient.SendText("host\r\n");
-            };
-
-            tcpClient.Connect();
-        }
-
-        private void OnDeviceInfoChange()
-        {
-            var handler = DeviceInfoChanged;
-
-            if (handler == null) return;
-
-            handler(this, new DeviceInfoEventArgs(DeviceInfo));
-        }
-
-        #endregion
-    }
+	}
 
     public abstract class DmHdBaseTControllerBase : CrestronGenericBaseDevice
     {
@@ -308,10 +221,6 @@ namespace PepperDash.Essentials.DM
 	        DmRmcPropertiesConfig props, string pKey, uint ipid)
 	    {
 	        var parentDev = DeviceManager.GetDeviceForKey(pKey);
-	        if (parentDev is DmpsRoutingController)
-	        {
-	            return GetDmRmcControllerForDmps(key, name, typeName, parentDev as DmpsRoutingController, props.ParentOutputNumber);
-	        }
 	        if (!(parentDev is IDmSwitch))
 	        {
 	            Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a DM Chassis.",
@@ -376,28 +285,6 @@ namespace PepperDash.Essentials.DM
 	        return null;
 	    }
 
-	    private static CrestronGenericBaseDevice GetDmRmcControllerForDmps(string key, string name, string typeName,
-	        DmpsRoutingController controller, uint num)
-	    {
-	        Func<string, string, DMOutput, CrestronGenericBaseDevice> dmpsHandler;
-	        if (ChassisCpu3Dict.TryGetValue(typeName.ToLower(), out dmpsHandler))
-	        {
-	            var output = controller.Dmps.SwitcherOutputs[num] as DMOutput;
-
-	            if (output != null)
-	            {
-	                return dmpsHandler(key, name, output);
-	            }
-	            Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                "Cannot attach DM-RMC of type '{0}' to output {1} on DMPS chassis. Output is not a DM Output.",
-	                typeName, num);
-	            return null;
-	        }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot create DM-RMC of type '{0}' to output {1} on DMPS chassis", typeName, num);
-	        return null;
-	    }
-
 	    private static CrestronGenericBaseDevice GetDmRmcControllerForProcessor(string key, string name, string typeName, uint ipid)
 	    {
 	        try
@@ -418,8 +305,6 @@ namespace PepperDash.Essentials.DM
                 return null;
 	        }
 	    }
-
-        
 	}
 
     public class DmRmcControllerFactory : EssentialsDeviceFactory<DmRmcControllerBase>

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

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -18,7 +17,7 @@ namespace PepperDash.Essentials.DM
     /// Controller class for all DM-TX-201C/S/F transmitters
     /// </summary>
     [Description("Wrapper class for DM-TX-200-C")]
-    public class DmTx200Controller : DmTxControllerBase, ITxRoutingWithFeedback, IHasFreeRun, IVgaBrightnessContrastControls
+    public class DmTx200Controller : DmTxControllerBase, ITxRouting, IHasFreeRun, IVgaBrightnessContrastControls
     {
         public DmTx200C2G Tx { get; private set; }
 
@@ -36,21 +35,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback FreeRunEnabledFeedback { get; protected set; }
 
         public IntFeedback VgaBrightnessFeedback { get; protected set; }
-        public IntFeedback VgaContrastFeedback { get; protected set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
@@ -100,22 +85,14 @@ namespace PepperDash.Essentials.DM
         public DmTx200Controller(string key, string name, DmTx200C2G tx)
             : base(key, name, tx)
         {
-            Tx = tx;
-
-            HdmiInput = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi,
-                DmTx200Base.eSourceSelection.Digital, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput))
-            {
-                FeedbackMatchObject = DmTx200Base.eSourceSelection.Digital
-            };
-
-            VgaInput = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
-                eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, DmTx200Base.eSourceSelection.Analog, this,
-                VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput))
-            {
-                FeedbackMatchObject = DmTx200Base.eSourceSelection.Analog
-            };
+            Tx = tx;
+
+            HdmiInput = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, DmTx200Base.eSourceSelection.Digital, this,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput));
+            VgaInput = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
+                eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, DmTx200Base.eSourceSelection.Analog, this,
+                VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
 
             ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
                 () => ActualActiveVideoInput.ToString());
@@ -218,19 +195,12 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection) p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection) p.Selector == Tx.AudioSourceFeedback);
-
-
+        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+        {
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
+            AudioSourceNumericFeedback.FireUpdate();
+
         }
 
         public override bool CustomActivate()
@@ -333,18 +303,14 @@ namespace PepperDash.Essentials.DM
 
             switch (id)
             {
-                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.VideoSourceFeedback);
+                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
+                    ActiveVideoInputFeedback.FireUpdate();
                     break;
-                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.AudioSourceFeedback);
+                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
+                    AudioSourceNumericFeedback.FireUpdate();
                     break;
             }
         }

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

@@ -4,7 +4,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Endpoints;
 using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-using System.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -15,8 +14,8 @@ namespace PepperDash.Essentials.DM
     /// <summary>
     /// Controller class for all DM-TX-201C/S/F transmitters
     /// </summary>
-    [Description("Wrapper class for DM-TX-201-C")]
-    public class DmTx201CController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFreeRun, IVgaBrightnessContrastControls
+    [Description("Wrapper class for DM-TX-201-C")]
+    public class DmTx201CController : DmTxControllerBase, ITxRouting, IHasFreeRun, IVgaBrightnessContrastControls
 	{
 		public DmTx201C Tx { get; private set; }
 
@@ -35,20 +34,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback FreeRunEnabledFeedback { get; protected set; }
 
         public IntFeedback VgaBrightnessFeedback { get; protected set; }
-        public IntFeedback VgaContrastFeedback { get; protected set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
 		/// <summary>
 		/// Helps get the "real" inputs, including when in Auto
@@ -103,22 +89,14 @@ namespace PepperDash.Essentials.DM
 		public DmTx201CController(string key, string name, DmTx201C tx)
 			: base(key, name, tx)
 		{
-			Tx = tx;
-
-            HdmiInput = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi,
-                DmTx200Base.eSourceSelection.Digital, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput))
-            {
-                FeedbackMatchObject = DmTx200Base.eSourceSelection.Digital
-            };
-
-            VgaInput = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
-                eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, DmTx200Base.eSourceSelection.Analog, this,
-                VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput))
-            {
-                FeedbackMatchObject = DmTx200Base.eSourceSelection.Analog
-            };
+			Tx = tx;
+
+			HdmiInput = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
+				eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, DmTx200Base.eSourceSelection.Digital, this,
+				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput));
+			VgaInput = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
+				eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, DmTx200Base.eSourceSelection.Analog, this,
+				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
 
 			ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
 				() => ActualActiveVideoInput.ToString());
@@ -212,22 +190,15 @@ namespace PepperDash.Essentials.DM
                     VgaContrastFeedback.FireUpdate();
                     break;
             }
-        }
-
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.AudioSourceFeedback);
-
-
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
         }
+
+        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+        {
+            ActiveVideoInputFeedback.FireUpdate();
+            VideoSourceNumericFeedback.FireUpdate();
+            AudioSourceNumericFeedback.FireUpdate();
+            
+        }
 
         private void VgaInputOnInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
         {
@@ -341,26 +312,23 @@ namespace PepperDash.Essentials.DM
         }
 
 		void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-		{
-            var id = args.EventId;
+		{
+			var id = args.EventId;
             Debug.Console(2, this, "EventId {0}", args.EventId);
 
             switch (id)
             {
                 case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.VideoSourceFeedback);
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
+                    ActiveVideoInputFeedback.FireUpdate();	                    
                     VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
+            	    ActiveVideoInputFeedback.FireUpdate();
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
-            }        
+            }          
 		}
 
         void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)

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

@@ -4,7 +4,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Endpoints;
 using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-using System.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -16,7 +15,7 @@ namespace PepperDash.Essentials.DM
     /// Controller class for all DM-TX-201S/F transmitters
     /// </summary>
     [Description("Wrapper class for DM-TX-201-S/F")]
-    public class DmTx201SController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFreeRun, IVgaBrightnessContrastControls
+    public class DmTx201SController : DmTxControllerBase, ITxRouting, IHasFreeRun, IVgaBrightnessContrastControls
     {
         public DmTx201S Tx { get; private set; } 
 
@@ -37,21 +36,6 @@ namespace PepperDash.Essentials.DM
         public IntFeedback VgaBrightnessFeedback { get; protected set; }
         public IntFeedback VgaContrastFeedback { get; protected set; }
 
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
-
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
         /// </summary>
@@ -108,19 +92,11 @@ namespace PepperDash.Essentials.DM
             Tx = tx;
 
             HdmiInput = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi,
-                DmTx200Base.eSourceSelection.Digital, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput))
-            {
-                FeedbackMatchObject = DmTx200Base.eSourceSelection.Digital
-            };
-
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, DmTx200Base.eSourceSelection.Digital, this,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput));
             VgaInput = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
                 eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, DmTx200Base.eSourceSelection.Analog, this,
-                VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput))
-            {
-                FeedbackMatchObject = DmTx200Base.eSourceSelection.Analog
-            };
+                VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
 
             ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
                 () => ActualActiveVideoInput.ToString());
@@ -218,18 +194,11 @@ namespace PepperDash.Essentials.DM
 
         void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
         {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.AudioSourceFeedback);
-
-
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
             AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
-        }
+
+        }
 
         private void VgaInputOnInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
         {
@@ -350,20 +319,17 @@ namespace PepperDash.Essentials.DM
             switch (id)
             {
                 case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.VideoSourceFeedback);
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
+                    ActiveVideoInputFeedback.FireUpdate();
                     VideoSourceNumericFeedback.FireUpdate();
                     ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (DmTx200Base.eSourceSelection)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
             }
-        }
+        }
 
         void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
         {

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

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.DM
 	using eVst = DmTx401C.eSourceSelection;
 
     [Description("Wrapper class for DM-TX-401-C")]
-    public class DmTx401CController : DmTxControllerBase, ITxRoutingWithFeedback, IIROutputPorts, IComPorts, IHasFreeRun, IVgaBrightnessContrastControls
+    public class DmTx401CController : DmTxControllerBase, ITxRouting, IIROutputPorts, IComPorts, IHasFreeRun, IVgaBrightnessContrastControls
 	{
 		public DmTx401C Tx { get; private set; }
 
@@ -41,21 +41,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback FreeRunEnabledFeedback { get; protected set; }
 
         public IntFeedback VgaBrightnessFeedback { get; protected set; }
-        public IntFeedback VgaContrastFeedback { get; protected set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
 		/// <summary>
 		/// Helps get the "real" inputs, including when in Auto
@@ -118,33 +104,20 @@ namespace PepperDash.Essentials.DM
 
 			HdmiIn = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.HDMI, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput))
-			{
-			    FeedbackMatchObject = eVst.HDMI
-			};
+				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInput));
 			DisplayPortIn = new RoutingInputPortWithVideoStatuses(DmPortName.DisplayPortIn,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.DisplayPort, this,
-				VideoStatusHelper.GetDisplayPortInputStatusFuncs(tx.DisplayPortInput))
-			{
-			    FeedbackMatchObject = eVst.DisplayPort
-			};
+				VideoStatusHelper.GetDisplayPortInputStatusFuncs(tx.DisplayPortInput));
 			VgaIn = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
                 eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, eVst.VGA, this, 
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput))
-			{
-			    FeedbackMatchObject = eVst.VGA
-			};
+				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
 			CompositeIn = new RoutingInputPortWithVideoStatuses(DmPortName.CompositeIn,
                 eRoutingSignalType.Video, eRoutingPortConnectionType.Composite, eVst.Composite, this,
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput))
-			{
-			    FeedbackMatchObject = eVst.Composite
-			};
+				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
 
             Tx.HdmiInput.InputStreamChange += HdmiInputStreamChangeEvent;
             Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChangeEvent;
             Tx.BaseEvent += Tx_BaseEvent;
-		    Tx.OnlineStatusChange += Tx_OnlineStatusChange;
             Tx.VgaInput.InputStreamChange += VgaInputOnInputStreamChange;
             tx.VgaInput.VideoControls.ControlChange += VideoControls_ControlChange;
 
@@ -313,20 +286,6 @@ namespace PepperDash.Essentials.DM
                 Tx.AudioSource = (eVst)inputSelector;
         }
 
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.AudioSourceFeedback);
-
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
-        }
-
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
         {
             var id = args.EventId;
@@ -335,20 +294,16 @@ namespace PepperDash.Essentials.DM
             switch (id)
             {
                 case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
                     ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.AudioSourceFeedback);
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
             }
-        }
+        }
 
         void VideoControls_ControlChange(object sender, GenericEventArgs args)
         {

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

@@ -20,8 +20,8 @@ namespace PepperDash.Essentials.DM
     using eVst = Crestron.SimplSharpPro.DeviceSupport.eX02VideoSourceType;
     using eAst = Crestron.SimplSharpPro.DeviceSupport.eX02AudioSourceType;
 
-    [Description("Wrapper class for DM-TX-4K-202-C")]
-    public class DmTx4k202CController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFeedback,
+    [Description("Wrapper class for DM-TX-4K-202-C")]
+    public class DmTx4k202CController : DmTxControllerBase, ITxRouting, IHasFeedback,
         IIROutputPorts, IComPorts
     {
         public DmTx4k202C Tx { get; private set; }
@@ -37,21 +37,7 @@ namespace PepperDash.Essentials.DM
         public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
         public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
         public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
-        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
+        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
 
         //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
         //public override ushort HdcpSupportCapability { get; protected set; }
@@ -94,121 +80,106 @@ namespace PepperDash.Essentials.DM
             {
                 return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
             }
-        }
-
-        public DmTx4k202CController(string key, string name, DmTx4k202C tx)
-            : base(key, name, tx)
-        {
-            Tx = tx;
-
-            HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]))
-            {
-                FeedbackMatchObject = eVst.Hdmi1
-            };
-            HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]))
-            {
-                FeedbackMatchObject = eVst.Hdmi2
-            };
-
-            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
-                () => ActualActiveVideoInput.ToString());
-
-
-
-            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
-            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-
-            Tx.BaseEvent += Tx_BaseEvent;
-
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
-
-            VideoSourceNumericFeedback = new IntFeedback(() => (int) Tx.VideoSourceFeedback);
-
-            AudioSourceNumericFeedback = new IntFeedback(() => (int) Tx.AudioSourceFeedback);
-
-            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability",
-                () => (int) tx.HdmiInputs[1].HdcpCapabilityFeedback);
-
-            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability",
-                () => (int) tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
-            HdcpStateFeedback =
-                new IntFeedback(
-                    () =>
-                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
-                            ? (int) tx.HdmiInputs[1].HdcpCapabilityFeedback
-                            : (int) tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
-            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
-
-            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool) tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
-
-            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool) tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
-
-            var combinedFuncs = new VideoStatusFuncsWrapper
-            {
-                HdcpActiveFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
-                     && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
-                        && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-
-                HdcpStateFeedbackFunc = () =>
-                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-                    return "";
-                },
-
-                VideoResolutionFeedbackFunc = () =>
-                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    return "";
-                },
-                VideoSyncFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
-                     && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
-                        && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-
-            };
-
-            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this,
-                combinedFuncs);
-
-            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DmCat, null, this);
-            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
-
-
-            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
-                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
-                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
-                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback,
-                HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback);
-
-            // Set Ports for CEC
-            HdmiIn1.Port = Tx.HdmiInputs[1];
-            HdmiIn2.Port = Tx.HdmiInputs[2];
-            HdmiLoopOut.Port = Tx.HdmiOutput;
-            DmOut.Port = Tx.DmOutput;
-        }
-
-
-
+        }
+        public DmTx4k202CController(string key, string name, DmTx4k202C tx)
+            : base(key, name, tx)
+        {
+            Tx = tx;
+
+            HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]));
+            HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]));
+            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
+                () => ActualActiveVideoInput.ToString());
+
+
+
+            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
+            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
+
+            Tx.BaseEvent += Tx_BaseEvent;
+
+            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+
+            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.AudioSourceFeedback);
+
+            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
+
+            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+
+            HdcpStateFeedback =
+                new IntFeedback(
+                    () =>
+                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
+                            ? (int) tx.HdmiInputs[1].HdcpCapabilityFeedback
+                            : (int) tx.HdmiInputs[2].HdcpCapabilityFeedback);
+
+            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
+
+            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
+
+            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
+
+            var combinedFuncs = new VideoStatusFuncsWrapper
+            {
+                HdcpActiveFeedbackFunc = () =>
+                    (ActualActiveVideoInput == eVst.Hdmi1
+                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
+
+                HdcpStateFeedbackFunc = () =>
+                {
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
+                    return "";
+                },
+
+                VideoResolutionFeedbackFunc = () =>
+                {
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
+                    return "";
+                },
+                VideoSyncFeedbackFunc = () =>
+                    (ActualActiveVideoInput == eVst.Hdmi1
+                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
+
+            };
+
+            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
+
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.DmCat, null, this);
+            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this);
+
+
+            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
+                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
+                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
+                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback);
+
+            // Set Ports for CEC
+            HdmiIn1.Port = Tx.HdmiInputs[1];
+            HdmiIn2.Port = Tx.HdmiInputs[2];
+            HdmiLoopOut.Port = Tx.HdmiOutput;
+            DmOut.Port = Tx.DmOutput;
+        }
+
+
+
         public override bool CustomActivate()
         {
             // Link up all of these damned events to the various RoutingPorts via a helper handler
@@ -323,43 +294,26 @@ namespace PepperDash.Essentials.DM
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
                     break;
             }
-        }
-
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
-        }
-
-        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            var id = args.EventId;
-            Debug.Console(2, this, "EventId {0}", args.EventId);
-
-            switch (id)
-            {
-                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
-                    VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-                    break;
-                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
-                    break;
-            }
+        }
+
+        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
+        {
+            var id = args.EventId;
+            Debug.Console(2, this, "EventId {0}", args.EventId);
+
+            switch (id)
+            {
+                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
+                    Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
+                    ActiveVideoInputFeedback.FireUpdate();
+                    VideoSourceNumericFeedback.FireUpdate();
+                    ActiveVideoInputFeedback.FireUpdate();
+                    break;
+                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
+                    Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
+                    AudioSourceNumericFeedback.FireUpdate();
+                    break;
+            } 
         }
 
         /// <summary>

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

@@ -21,7 +21,7 @@ namespace PepperDash.Essentials.DM
     using eAst = Crestron.SimplSharpPro.DeviceSupport.eX02AudioSourceType;
 
     [Description("Wrapper class for DM-TX-4K-302-C")]
-    public class DmTx4k302CController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFeedback, 
+    public class DmTx4k302CController : DmTxControllerBase, ITxRouting, IHasFeedback, 
 		IIROutputPorts, IComPorts, IHasFreeRun, IVgaBrightnessContrastControls
 	{
 		public DmTx4k302C Tx { get; private set; }
@@ -44,21 +44,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback FreeRunEnabledFeedback { get; protected set; }
 
         public IntFeedback VgaBrightnessFeedback { get; protected set; }
-        public IntFeedback VgaContrastFeedback { get; protected set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
 		/// <summary>
 		/// Helps get the "real" inputs, including when in Auto
@@ -109,24 +95,13 @@ namespace PepperDash.Essentials.DM
 
 			HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]))
-			{
-			    FeedbackMatchObject = eVst.Hdmi1
-			};
+				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]));
 			HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
-				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]))
-            {
-                FeedbackMatchObject = eVst.Hdmi2
-            };
-            
+				VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]));
 			VgaIn = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
                 eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, eVst.Vga, this, 
-				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput))
-            {
-                FeedbackMatchObject = eVst.Vga
-            };
-
+				VideoStatusHelper.GetVgaInputStatusFuncs(tx.VgaInput));
 			ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
 				() => ActualActiveVideoInput.ToString());
 
@@ -135,8 +110,6 @@ namespace PepperDash.Essentials.DM
             Tx.VgaInput.InputStreamChange += VgaInputOnInputStreamChange;
             Tx.BaseEvent += Tx_BaseEvent;
 
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
-
             VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
             AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.AudioSourceFeedback);
 
@@ -414,42 +387,23 @@ namespace PepperDash.Essentials.DM
                     break;
             }
         }
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
-        }
 
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
         {
             var id = args.EventId;
-            Debug.Console(2, this, "EventId {0}", args.EventId);
-
             switch (id)
             {
                 case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
                     ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
             }
-        }
+        }
 
         /// <summary>
 		/// Relays the input stream change to the appropriate RoutingInputPort.

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

@@ -1,6 +1,4 @@
 using Crestron.SimplSharpPro;
-using System;
-using System.Linq;
 //using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -14,9 +12,9 @@ using PepperDash.Essentials.Core.Bridges;
 namespace PepperDash.Essentials.DM
 {
     using eVst = eX02VideoSourceType;
-    using eAst = eX02AudioSourceType;
-
-    public class DmTx4kz202CController : DmTxControllerBase, ITxRoutingWithFeedback,
+    using eAst = eX02AudioSourceType;
+
+    public class DmTx4kz202CController : DmTxControllerBase, ITxRouting,
         IIROutputPorts, IComPorts
     {
         public DmTx4kz202C Tx { get; private set; }
@@ -35,21 +33,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
 
         //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
-        //public override ushort HdcpSupportCapability { get; protected set; }
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
-
-
+        //public override ushort HdcpSupportCapability { get; protected set; }
 
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
@@ -89,21 +73,14 @@ namespace PepperDash.Essentials.DM
         public DmTx4kz202CController(string key, string name, DmTx4kz202C tx)
             : base(key, name, tx)
         {
-            Tx = tx;
-
-            HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]))
-            {
-                FeedbackMatchObject = eVst.Hdmi1
-            };
-            HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]))
-            {
-                FeedbackMatchObject = eVst.Hdmi2
-            };
-
+            Tx = tx;
+
+            HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]));
+            HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]));
             ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
                 () => ActualActiveVideoInput.ToString());
 
@@ -112,7 +89,6 @@ namespace PepperDash.Essentials.DM
             Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
             Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
             Tx.BaseEvent += Tx_BaseEvent;
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
 
             VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
 
@@ -306,44 +282,27 @@ namespace PepperDash.Essentials.DM
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
                     break;
             }
-        }
-
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
-        }
-
-
-        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            var id = args.EventId;
-            Debug.Console(2, this, "EventId {0}", args.EventId);
-
-            switch (id)
-            {
-                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
-                    VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-                    break;
-                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
-                    break;
-            }
+        }
+
+        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
+        {
+            var id = args.EventId;
+            Debug.Console(2, this, "EventId {0}", args.EventId);
+
+            switch (id)
+            {
+                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
+                    Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
+                    ActiveVideoInputFeedback.FireUpdate();
+                    VideoSourceNumericFeedback.FireUpdate();
+                    AudioSourceNumericFeedback.FireUpdate();
+                    ActiveVideoInputFeedback.FireUpdate();
+                    break;
+                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
+                    Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
+                    AudioSourceNumericFeedback.FireUpdate();
+                    break;
+            } 
         }
 
         /// <summary>

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

@@ -1,6 +1,4 @@
 using Crestron.SimplSharpPro;
-using System;
-using System.Linq;
 //using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -17,8 +15,8 @@ namespace PepperDash.Essentials.DM
     using eAst = eX02AudioSourceType;
 
 
-    [Description("Wrapper class for DM-TX-4K-Z-302-C")]
-    public class DmTx4kz302CController : DmTxControllerBase, ITxRoutingWithFeedback, IHasFeedback,
+    [Description("Wrapper class for DM-TX-4K-Z-302-C")]
+    public class DmTx4kz302CController : DmTxControllerBase, ITxRouting, IHasFeedback,
         IIROutputPorts, IComPorts
     {
         public DmTx4kz302C Tx { get; private set; }
@@ -39,20 +37,7 @@ namespace PepperDash.Essentials.DM
         public BoolFeedback DisplayPortVideoSyncFeedback { get; protected set; }
 
         //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
-        //public override ushort HdcpSupportCapability { get; protected set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
-        }
+        //public override ushort HdcpSupportCapability { get; protected set; }
 
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
@@ -98,22 +83,13 @@ namespace PepperDash.Essentials.DM
 
             HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi1, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]))
-            {
-                FeedbackMatchObject = eVst.Hdmi1
-            };
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[1]));
             HdmiIn2 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn2,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, eVst.Hdmi2, this,
-                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]))
-            {
-                FeedbackMatchObject = eVst.Hdmi2
-            };
-            DisplayPortIn = new RoutingInputPortWithVideoStatuses(DmPortName.DisplayPortIn,
+                VideoStatusHelper.GetHdmiInputStatusFuncs(tx.HdmiInputs[2]));
+            DisplayPortIn = new RoutingInputPortWithVideoStatuses(DmPortName.VgaIn,
                 eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DisplayPort, eVst.DisplayPort, this,
-                VideoStatusHelper.GetDisplayPortInputStatusFuncs(tx.DisplayPortInput))
-            {
-                FeedbackMatchObject = eVst.DisplayPort
-            };
+                VideoStatusHelper.GetDisplayPortInputStatusFuncs(tx.DisplayPortInput));
             ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
                 () => ActualActiveVideoInput.ToString());
 
@@ -121,7 +97,6 @@ namespace PepperDash.Essentials.DM
             Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
             Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
             Tx.BaseEvent += Tx_BaseEvent;
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
 
             VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
             AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
@@ -318,44 +293,23 @@ namespace PepperDash.Essentials.DM
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
                     break;
             }
-        }
-
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            var localVideoInputPort =
-                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-            var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
-        }
-
-
-        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
-        {
-            var id = args.EventId;
-            Debug.Console(2, this, "EventId {0}", args.EventId);
-
-            switch (id)
-            {
-                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
-                    var localVideoInputPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
-                    VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
-                    break;
-                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
-                    break;
-            }
+        }
+
+        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
+        {
+            var id = args.EventId;
+            switch (id)
+            {
+                case EndpointTransmitterBase.VideoSourceFeedbackEventId:
+                    Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
+                    VideoSourceNumericFeedback.FireUpdate();
+                    ActiveVideoInputFeedback.FireUpdate();
+                    break;
+                case EndpointTransmitterBase.AudioSourceFeedbackEventId:
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
+                    AudioSourceNumericFeedback.FireUpdate();
+                    break;
+            }
         }
 
         /// <summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs

@@ -92,8 +92,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraPanControl : IHasCameraControls
     {
-        // void PanLeft(bool pressRelease);
-        // void PanRight(bool pressRelease);
         void PanLeft();
         void PanRight();
         void PanStop();
@@ -104,8 +102,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraTiltControl : IHasCameraControls
     {
-        // void TiltDown(bool pressRelease);
-        // void TildUp(bool pressRelease);
         void TiltDown();
         void TiltUp();
         void TiltStop();
@@ -116,8 +112,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraZoomControl : IHasCameraControls
     {
-        // void ZoomIn(bool pressRelease);
-        // void ZoomOut(bool pressRelease);
         void ZoomIn();
         void ZoomOut();
         void ZoomStop();
@@ -135,6 +129,13 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         void TriggerAutoFocus();
     }
 
+    public interface IHasAutoFocusMode
+    {
+        void SetFocusModeAuto();
+        void SetFocusModeManual();
+        void ToggleFocusMode();
+    }
+
     public interface IHasCameraAutoMode : IHasCameraControls
     {
         void CameraAutoModeOn();

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraVisca.cs

@@ -12,29 +12,85 @@ using PepperDash.Essentials.Devices.Common.Codec;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp.Reflection;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
-	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IPower, IBridgeAdvanced
+	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IPower, IBridgeAdvanced, IHasCameraFocusControl, IHasAutoFocusMode
 	{
+        CameraViscaPropertiesConfig PropertiesConfig;
+
 		public IBasicCommunication Communication { get; private set; }
-		public CommunicationGather PortGather { get; private set; }
 
 		public StatusMonitorBase CommunicationMonitor { get; private set; }
 
-		public byte PanSpeed = 0x10;
-		public byte TiltSpeed = 0x10;
+        /// <summary>
+        /// Used to store the actions to parse inquiry responses as the inquiries are sent
+        /// </summary>
+        private CrestronQueue<Action<byte[]>> InquiryResponseQueue;
+
+        /// <summary>
+        /// Camera ID (Default 1)
+        /// </summary>
+        public byte ID = 0x01;
+        public byte ResponseID;
+
+
+		public byte PanSpeedSlow = 0x10;
+		public byte TiltSpeedSlow = 0x10;
+
+        public byte PanSpeedFast = 0x13;
+        public byte TiltSpeedFast = 0x13;
+
 		private bool IsMoving;
 		private bool IsZooming;
-		public bool PowerIsOn { get; private set; }
+
+        bool _powerIsOn;
+		public bool PowerIsOn 
+        {
+            get
+            {
+                return _powerIsOn;
+            }
+            private set
+            {
+                if (value != _powerIsOn)
+                {
+                    _powerIsOn = value;
+                    PowerIsOnFeedback.FireUpdate();
+                }
+            }
+        }
+
+        const byte ZoomInCmd = 0x02;
+        const byte ZoomOutCmd = 0x03;
+        const byte ZoomStopCmd = 0x00;
+
+        /// <summary>
+        /// Used to determine when to move the camera at a faster speed if a direction is held
+        /// </summary>
+        CTimer SpeedTimer;
+        // TODO: Implment speed timer for PTZ controls
+
+        long FastSpeedHoldTimeMs = 2000;
 
 		byte[] IncomingBuffer = new byte[] { };
 		public BoolFeedback PowerIsOnFeedback  { get; private set; }
 
-		public CameraVisca(string key, string name, IBasicCommunication comm, CameraPropertiesConfig props) :
+        public CameraVisca(string key, string name, IBasicCommunication comm, CameraViscaPropertiesConfig props) :
 			base(key, name)
 		{
+            InquiryResponseQueue = new CrestronQueue<Action<byte[]>>(15);
+
             Presets = props.Presets;
 
+            PropertiesConfig = props;
+
+            ID = (byte)(props.Id + 0x80);
+            ResponseID = (byte)((props.Id * 0x10) + 0x80);
+
+            SetupCameraSpeeds();
+
             OutputPorts.Add(new RoutingOutputPort("videoOut", eRoutingSignalType.Video, eRoutingPortConnectionType.None, null, this, true));
 
             // Default to all capabilties
@@ -51,8 +107,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 			{
 				// This instance uses RS-232 control
 			}
-			PortGather = new CommunicationGather(Communication, "\xFF");
-
 
 			Communication.BytesReceived += new EventHandler<GenericCommMethodReceiveBytesArgs>(Communication_BytesReceived);
 			PowerIsOnFeedback = new BoolFeedback(() => { return PowerIsOn; });
@@ -66,9 +120,38 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 				CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 20000, 120000, 300000, "\x81\x09\x04\x00\xFF");
 			}
 			DeviceManager.AddDevice(CommunicationMonitor);
-
-
 		}
+
+
+        /// <summary>
+        /// Sets up camera speed values based on config
+        /// </summary>
+        void SetupCameraSpeeds()
+        {
+            if (PropertiesConfig.FastSpeedHoldTimeMs > 0)
+            {
+                FastSpeedHoldTimeMs = PropertiesConfig.FastSpeedHoldTimeMs;
+            }
+
+            if (PropertiesConfig.PanSpeedSlow > 0)
+            {
+                PanSpeedSlow = (byte)PropertiesConfig.PanSpeedSlow;
+            }
+            if (PropertiesConfig.PanSpeedFast > 0)
+            {
+                PanSpeedFast = (byte)PropertiesConfig.PanSpeedFast;
+            }
+
+            if (PropertiesConfig.TiltSpeedSlow > 0)
+            {
+                TiltSpeedSlow = (byte)PropertiesConfig.TiltSpeedSlow;
+            }
+            if (PropertiesConfig.TiltSpeedFast > 0)
+            {
+                TiltSpeedFast = (byte)PropertiesConfig.TiltSpeedFast;
+            }
+        }
+
 		public override bool CustomActivate()
 		{
 			Communication.Connect();
@@ -110,40 +193,245 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
 			Communication.SendBytes(b);
 		}
+
 		void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
 		{
-			// This is probably not thread-safe buffering
-			// Append the incoming bytes with whatever is in the buffer
-			var newBytes = new byte[IncomingBuffer.Length + e.Bytes.Length];
-			IncomingBuffer.CopyTo(newBytes, 0);
-			e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);
-			if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-				Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
-		}
+            var newBytes = new byte[IncomingBuffer.Length + e.Bytes.Length];
 
+            try
+            {
+                // This is probably not thread-safe buffering
+                // Append the incoming bytes with whatever is in the buffer
+                IncomingBuffer.CopyTo(newBytes, 0);
+                e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);
+                if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
+                    Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
 
-		private void SendPanTiltCommand (byte[] cmd)
+                byte[] message = new byte[] { };
+
+                // Search for the delimiter 0xFF character
+                for (int i = 0; i < newBytes.Length; i++)
+                {
+                    if (newBytes[i] == 0xFF)
+                    {
+                        // i will be the index of the delmiter character
+                        message = newBytes.Take(i).ToArray();
+                        // Skip over what we just took and save the rest for next time
+                        newBytes = newBytes.Skip(i).ToArray();
+                    }
+                }
+
+                if (message.Length > 0)
+                {
+                    // Check for matching ID
+                    if (message[0] != ResponseID)
+                    {
+                        return;
+                    }
+
+                    switch (message[1])
+                    {
+                        case 0x40:
+                            {
+                                // ACK received
+                                Debug.Console(2, this, "ACK Received");
+                                break;
+                            }
+                        case 0x50:
+                            {
+
+                                if (message[2] == 0xFF)
+                                {
+                                    // Completion received
+                                    Debug.Console(2, this, "Completion Received");
+                                }
+                                else
+                                {
+                                    // Inquiry response received.  Dequeue the next response handler and invoke it
+                                    if (InquiryResponseQueue.Count > 0)
+                                    {
+                                        var inquiryAction = InquiryResponseQueue.Dequeue();
+
+                                        inquiryAction.Invoke(message.Skip(2).ToArray());
+                                    }
+                                    else
+                                    {
+                                        Debug.Console(2, this, "Response Queue is empty. Nothing to dequeue.");
+                                    }
+                                }
+
+                                break;
+                            }
+                        case 0x60:
+                            {
+                                // Error message
+
+                                switch (message[2])
+                                {
+                                    case 0x01:
+                                        {
+                                            // Message Length Error
+                                            Debug.Console(2, this, "Error from device: Message Length Error");
+                                            break;
+                                        }
+                                    case 0x02:
+                                        {
+                                            // Syntax Error
+                                            Debug.Console(2, this, "Error from device: Syntax Error");
+                                            break;
+                                        }
+                                    case 0x03:
+                                        {
+                                            // Command Buffer Full
+                                            Debug.Console(2, this, "Error from device: Command Buffer Full");
+                                            break;
+                                        }
+                                    case 0x04:
+                                        {
+                                            // Command Cancelled
+                                            Debug.Console(2, this, "Error from device: Command Cancelled");
+                                            break;
+                                        }
+                                    case 0x05:
+                                        {
+                                            // No Socket
+                                            Debug.Console(2, this, "Error from device: No Socket");
+                                            break;
+                                        }
+                                    case 0x41:
+                                        {
+                                            // Command not executable
+                                            Debug.Console(2, this, "Error from device: Command not executable");
+                                            break;
+                                        }
+                                }
+                                break;
+                            }
+                    }
+
+                    if (message == new byte[] { ResponseID, 0x50, 0x02, 0xFF })
+                    {
+                        PowerIsOn = true;
+                    }
+                    else if (message == new byte[] { ResponseID, 0x50, 0x03, 0xFF })
+                    {
+                        PowerIsOn = false;
+                    }
+
+                }
+
+            }
+            catch (Exception err)
+            {
+                Debug.Console(2, this, "Error parsing feedback: {0}", err);
+            }
+            finally
+            {
+                // Save whatever partial message is here
+                IncomingBuffer = newBytes;
+            }
+        }
+
+        /// <summary>
+        /// Sends a pan/tilt command. If the command is not for fastSpeed then it starts a timer to initiate fast speed.
+        /// </summary>
+        /// <param name="cmd"></param>
+        /// <param name="fastSpeed"></param>
+		private void SendPanTiltCommand (byte[] cmd, bool fastSpeedEnabled)
 		{
-			var temp = new Byte[] { 0x81, 0x01, 0x06, 0x01, PanSpeed, TiltSpeed };
-			int length = temp.Length + cmd.Length + 1;
-			
-			byte[] sum = new byte[length];
-			temp.CopyTo(sum, 0);
-			cmd.CopyTo(sum, temp.Length);
-			sum[length - 1] = 0xFF;
-			SendBytes(sum);			
+            SendBytes(GetPanTiltCommand(cmd, fastSpeedEnabled));
+
+            if (!fastSpeedEnabled)
+            {
+                if (SpeedTimer != null)
+                {
+                    StopSpeedTimer();
+                }
+
+                // Start the timer to send fast speed if still moving after FastSpeedHoldTime elapses
+                SpeedTimer = new CTimer((o) => SendPanTiltCommand(GetPanTiltCommand(cmd, true), true), FastSpeedHoldTimeMs);
+            }
+
 		}
 
+        private void StopSpeedTimer()
+        {
+            if (SpeedTimer != null)
+            {
+                SpeedTimer.Stop();
+                SpeedTimer.Dispose();
+                SpeedTimer = null;
+            }     
+        }
+
+        /// <summary>
+        /// Generates the pan/tilt command with either slow or fast speed
+        /// </summary>
+        /// <param name="cmd"></param>
+        /// <param name="fastSpeed"></param>
+        /// <returns></returns>
+        private byte[] GetPanTiltCommand(byte[] cmd, bool fastSpeed)
+        {
+            byte panSpeed;
+            byte tiltSpeed;
+
+            if (!fastSpeed)
+            {
+                panSpeed = PanSpeedSlow;
+                tiltSpeed = TiltSpeedSlow;
+            }
+            else
+            {
+                panSpeed = PanSpeedFast;
+                tiltSpeed = TiltSpeedFast;
+            }
+
+            var temp = new byte[] { ID, 0x01, 0x06, 0x01, panSpeed, tiltSpeed };
+            int length = temp.Length + cmd.Length + 1;
+
+            byte[] sum = new byte[length];
+            temp.CopyTo(sum, 0);
+            cmd.CopyTo(sum, temp.Length);
+            sum[length - 1] = 0xFF;
+
+            return sum;
+        }
+
+
+        void SendPowerQuery()
+        {
+            SendBytes(new byte[] { ID, 0x09, 0x04, 0x00, 0xFF });
+            InquiryResponseQueue.Enqueue(HandlePowerResponse);
+        }
+
 		public void PowerOn()
 		{
-
-			SendBytes(new Byte[] { 0x81, 0x01, 0x04, 0x00, 0x02, 0xFF });
+			SendBytes(new byte[] { ID, 0x01, 0x04, 0x00, 0x02, 0xFF });
+            SendPowerQuery();
 		}
 
+        void HandlePowerResponse(byte[] response)
+        {
+            switch (response[0])
+            {
+                case 0x02:
+                    {
+                        PowerIsOn = true;
+                        break;
+                    }
+                case 0x03:
+                    {
+                        PowerIsOn = false;
+                        break;
+                    }
+            }
+        }
+
 		public void PowerOff()
 		{
-			SendBytes(new Byte[] {0x81, 0x01, 0x04, 0x00, 0x03, 0xFF});
-		}
+			SendBytes(new byte[] {ID, 0x01, 0x04, 0x00, 0x03, 0xFF});
+            SendPowerQuery();
+        }
 
         public void PowerToggle()
         {
@@ -155,12 +443,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
 		public void PanLeft() 
 		{
-			SendPanTiltCommand(new byte[] {0x01, 0x03});
+			SendPanTiltCommand(new byte[] {0x01, 0x03}, false);
 			IsMoving = true;
 		}
 		public void PanRight() 
 		{
-			SendPanTiltCommand(new byte[] { 0x02, 0x03 });
+            SendPanTiltCommand(new byte[] { 0x02, 0x03 }, false);
 			IsMoving = true;
 		}
         public void PanStop()
@@ -169,12 +457,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         }
 		public void TiltDown() 
 		{
-			SendPanTiltCommand(new byte[] { 0x03, 0x02 });
+            SendPanTiltCommand(new byte[] { 0x03, 0x02 }, false);
 			IsMoving = true;
 		}
 		public void TiltUp() 
 		{
-			SendPanTiltCommand(new byte[] { 0x03, 0x01 });
+            SendPanTiltCommand(new byte[] { 0x03, 0x01 }, false);
 			IsMoving = true;
 		}
         public void TiltStop()
@@ -184,16 +472,18 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
 		private void SendZoomCommand (byte cmd)
 		{
-			SendBytes(new byte[] {0x81, 0x01, 0x04, 0x07, cmd, 0xFF} );
+			SendBytes(new byte[] {ID, 0x01, 0x04, 0x07, cmd, 0xFF} );
 		}
+
+
 		public void ZoomIn() 
 		{
-			SendZoomCommand(0x02);
+            SendZoomCommand(ZoomInCmd);
 			IsZooming = true;
 		}
 		public void ZoomOut() 
 		{
-			SendZoomCommand(0x03);
+            SendZoomCommand(ZoomOutCmd);
 			IsZooming = true;
 		}
         public void ZoomStop()
@@ -205,26 +495,28 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 		{
 			if (IsZooming)
 			{
-				SendZoomCommand(0x00);
+                SendZoomCommand(ZoomStopCmd);
 				IsZooming = false;
 			}
 			else
 			{
-				SendPanTiltCommand(new byte[] {0x03, 0x03});
+                StopSpeedTimer();
+                SendPanTiltCommand(new byte[] { 0x03, 0x03 }, false);
 				IsMoving = false;
 			}
 		}
         public void PositionHome()
         {
-            throw new NotImplementedException();
+            SendBytes(new byte[] { ID, 0x01, 0x06, 0x02, PanSpeedFast, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF });
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x47, 0x00, 0x00, 0x00, 0x00, 0xFF });
         }
 		public void RecallPreset(int presetNumber)
 		{
-			SendBytes(new byte[] {0x81, 0x01, 0x04, 0x3F, 0x02, (byte)presetNumber, 0xFF} );
+			SendBytes(new byte[] {ID, 0x01, 0x04, 0x3F, 0x02, (byte)presetNumber, 0xFF} );
 		}
 		public void SavePreset(int presetNumber)
 		{
-			SendBytes(new byte[] { 0x81, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
+			SendBytes(new byte[] { ID, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
 		}
 
         #region IHasCameraPresets Members
@@ -244,6 +536,78 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         }
 
         #endregion
+
+        #region IHasCameraFocusControl Members
+
+        public void FocusNear()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x08, 0x03, 0xFF });
+        }
+
+        public void FocusFar()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x08, 0x02, 0xFF });
+        }
+
+        public void FocusStop()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x08, 0x00, 0xFF });
+        }
+
+        public void TriggerAutoFocus()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x18, 0x01, 0xFF });
+            SendAutoFocusQuery();
+        }
+
+        #endregion
+
+        #region IHasAutoFocus Members
+
+        public void SetFocusModeAuto()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x38, 0x02, 0xFF });
+            SendAutoFocusQuery();
+        }
+
+        public void SetFocusModeManual()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x38, 0x03, 0xFF });
+            SendAutoFocusQuery();
+        }
+
+        public void ToggleFocusMode()
+        {
+            SendBytes(new byte[] { ID, 0x01, 0x04, 0x38, 0x10, 0xFF });
+            SendAutoFocusQuery();
+        }
+
+        #endregion
+
+        void SendAutoFocusQuery()
+        {
+            SendBytes(new byte[] { ID, 0x09, 0x04, 0x38, 0xFF });
+            InquiryResponseQueue.Enqueue(HandleAutoFocusResponse);
+        }
+
+        void HandleAutoFocusResponse(byte[] response)
+        {
+            switch (response[0])
+            {
+                case 0x02:
+                    {
+                        // Auto Mode
+                        PowerIsOn = true;
+                        break;
+                    }
+                case 0x03:
+                    {
+                        // Manual Mode
+                        PowerIsOn = false;
+                        break;
+                    }
+            }
+        }
     }
 
     public class CameraViscaFactory : EssentialsDeviceFactory<CameraVisca>
@@ -257,10 +621,51 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         {
             Debug.Console(1, "Factory Attempting to create new CameraVisca Device");
             var comm = CommFactory.CreateCommForDevice(dc);
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Cameras.CameraPropertiesConfig>(
+            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Cameras.CameraViscaPropertiesConfig>(
                 dc.Properties.ToString());
             return new Cameras.CameraVisca(dc.Key, dc.Name, comm, props);
         }
     }
 
+
+    public class CameraViscaPropertiesConfig : CameraPropertiesConfig
+    {
+        /// <summary>
+        /// Control ID of the camera (1-7)
+        /// </summary>
+        [JsonProperty("id")]
+        public uint Id { get; set; }
+
+        /// <summary>
+        /// Slow Pan speed (0-18)
+        /// </summary>
+        [JsonProperty("panSpeedSlow")]
+        public uint PanSpeedSlow { get; set; }
+
+        /// <summary>
+        /// Fast Pan speed (0-18)
+        /// </summary>
+        [JsonProperty("panSpeedFast")]
+        public uint PanSpeedFast { get; set; }
+
+        /// <summary>
+        /// Slow tilt speed (0-18)
+        /// </summary>
+        [JsonProperty("tiltSpeedSlow")] 
+        public uint TiltSpeedSlow { get; set; }
+
+        /// <summary>
+        /// Fast tilt speed (0-18)
+        /// </summary>
+        [JsonProperty("tiltSpeedFast")]
+        public uint TiltSpeedFast { get; set; }
+
+        /// <summary>
+        /// Time a button must be held before fast speed is engaged (Milliseconds)
+        /// </summary>
+        [JsonProperty("fastSpeedHoldTimeMs")]
+        public uint FastSpeedHoldTimeMs { get; set; }
+
+    }
+
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDsp.cs

@@ -6,398 +6,390 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using System.Text.RegularExpressions;
-
-
-namespace PepperDash.Essentials.Devices.Common.DSP
-{
-
-    // QUESTIONS:
-    // 
-    // When subscribing, just use the Instance ID for Custom Name?
-
-    // Verbose on subscriptions?
-
-    // Example subscription feedback responses
-    // ! "publishToken":"name" "value":-77.0
-    // ! "myLevelName" -77
-
-    public class BiampTesiraForteDsp : DspBase
-    {
-        public IBasicCommunication Communication { get; private set; }
-        public CommunicationGather PortGather { get; private set; }
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
-
-        public new Dictionary<string, TesiraForteLevelControl> LevelControlPoints { get; private set; }
-
-        public bool isSubscribed;
-
-        private CTimer SubscriptionTimer;
-
-        private CrestronQueue CommandQueue;
-
-        private bool CommandQueueInProgress = false;
-
-        //new public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
-
-        //new public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
-
-        /// <summary>
-        /// Shows received lines as hex
-        /// </summary>
-        public bool ShowHexResponse { get; set; }
-
-        public BiampTesiraForteDsp(string key, string name, IBasicCommunication comm,
-            BiampTesiraFortePropertiesConfig props) :
-                base(key, name)
-        {
-            CommandQueue = new CrestronQueue(100);
-
-            Communication = comm;
-            var socket = comm as ISocketStatus;
-            if (socket != null)
-            {
-                // This instance uses IP control
-
-                socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
-            }
-            else
-            {
-                // This instance uses RS-232 control
-            }
-            PortGather = new CommunicationGather(Communication, "\x0d\x0a");
-            PortGather.LineReceived += this.Port_LineReceived;
-            if (props.CommunicationMonitorProperties != null)
-            {
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication,
-                    props.CommunicationMonitorProperties);
-            }
-            else
-            {
-//#warning Need to deal with this poll string
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 120000, 120000, 300000,
-                    "SESSION get aliases\x0d\x0a");
-            }
-
-            LevelControlPoints = new Dictionary<string, TesiraForteLevelControl>();
-
-            foreach (KeyValuePair<string, BiampTesiraForteLevelControlBlockConfig> block in props.LevelControlBlocks)
-            {
-                this.LevelControlPoints.Add(block.Key, new TesiraForteLevelControl(block.Key, block.Value, this));
-            }
-
-        }
-
-        public override bool CustomActivate()
-        {
-            Communication.Connect();
-            CommunicationMonitor.StatusChange +=
-                (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
-            CommunicationMonitor.Start();
-
-            CrestronConsole.AddNewConsoleCommand(SendLine, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => Communication.Connect(), "con" + Key, "",
-                ConsoleAccessLevelEnum.AccessOperator);
-            return true;
-        }
-
-        private void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
-        {
-            Debug.Console(2, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
-
-            if (e.Client.IsConnected)
-            {
-                // Tasks on connect
-            }
-            else
-            {
-                // Cleanup items from this session
-
-                if (SubscriptionTimer != null)
-                {
-                    SubscriptionTimer.Stop();
-                    SubscriptionTimer = null;
-                }
-
-                isSubscribed = false;
-                CommandQueue.Clear();
-                CommandQueueInProgress = false;
-            }
-        }
-
-        /// <summary>
-        /// Initiates the subscription process to the DSP
-        /// </summary>
-        private void SubscribeToAttributes()
-        {
-            SendLine("SESSION set verbose true");
-
-            foreach (KeyValuePair<string, TesiraForteLevelControl> level in LevelControlPoints)
-            {
-                level.Value.Subscribe();
-            }
-
-            if (!CommandQueueInProgress)
-                SendNextQueuedCommand();
-
-            ResetSubscriptionTimer();
-        }
-
-        /// <summary>
-        /// Resets or Sets the subscription timer
-        /// </summary>
-        private void ResetSubscriptionTimer()
-        {
-            isSubscribed = true;
-
-            if (SubscriptionTimer != null)
-            {
-                SubscriptionTimer = new CTimer(o => SubscribeToAttributes(), 30000);
-                SubscriptionTimer.Reset();
-
-            }
-        }
-
-        /// <summary>
-        /// Handles a response message from the DSP
-        /// </summary>
-        /// <param name="dev"></param>
-        /// <param name="args"></param>
-        private void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
-        {
-            if (Debug.Level == 2)
-                Debug.Console(2, this, "RX: '{0}'",
-                    ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
-
-            Debug.Console(1, this, "RX: '{0}'", args.Text);
-
-            try
-            {
-                if (args.Text.IndexOf("Welcome to the Tesira Text Protocol Server...") > -1)
-                {
-                    // Indicates a new TTP session
-
-                    SubscribeToAttributes();
-                }
-                else if (args.Text.IndexOf("publishToken") > -1)
-                {
-                    // response is from a subscribed attribute
-
-                    string pattern = "! \"publishToken\":[\"](.*)[\"] \"value\":(.*)";
-
-                    Match match = Regex.Match(args.Text, pattern);
-
-                    if (match.Success)
-                    {
-
-                        string key;
-
-                        string customName;
-
-                        string value;
-
-                        customName = match.Groups[1].Value;
-
-                        // Finds the key (everything before the '~' character
-                        key = customName.Substring(0, customName.IndexOf("~", 0) - 1);
-
-                        value = match.Groups[2].Value;
-
-                        foreach (KeyValuePair<string, TesiraForteLevelControl> controlPoint in LevelControlPoints)
-                        {
-                            if (customName == controlPoint.Value.LevelCustomName ||
-                                customName == controlPoint.Value.MuteCustomName)
-                            {
-                                controlPoint.Value.ParseSubscriptionMessage(customName, value);
-                                return;
-                            }
-
-                        }
-                    }
-
-                    /// same for dialers
-                    /// same for switchers
-
-                }
-                else if (args.Text.IndexOf("+OK") > -1)
-                {
-                    if (args.Text == "+OK" || args.Text.IndexOf("list\":") > -1)
-                        // Check for a simple "+OK" only 'ack' repsonse or a list response and ignore
-                        return;
-
-                    // response is not from a subscribed attribute.  From a get/set/toggle/increment/decrement command
-
-                    if (!CommandQueue.IsEmpty)
-                    {
-                        if (CommandQueue.Peek() is QueuedCommand)
-                        {
-                            // Expected response belongs to a child class
-                            QueuedCommand tempCommand = (QueuedCommand) CommandQueue.TryToDequeue();
-                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
-
-                            tempCommand.ControlPoint.ParseGetMessage(tempCommand.AttributeCode, args.Text);
-                        }
-                        else
-                        {
-                            // Expected response belongs to this class
-                            string temp = (string) CommandQueue.TryToDequeue();
-                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
-
-                        }
-
-                        if (CommandQueue.IsEmpty)
-                            CommandQueueInProgress = false;
-                        else
-                            SendNextQueuedCommand();
-
-                    }
-
-
-                }
-                else if (args.Text.IndexOf("-ERR") > -1)
-                {
-                    // Error response
-
-                    switch (args.Text)
-                    {
-                        case "-ERR ALREADY_SUBSCRIBED":
-                        {
-                            ResetSubscriptionTimer();
-                            break;
-                        }
-                        default:
-                        {
-                            Debug.Console(0, this, "Error From DSP: '{0}'", args.Text);
-                            break;
-                        }
-                    }
-
-                }
-            }
-            catch (Exception e)
-            {
-                if (Debug.Level == 2)
-                    Debug.Console(2, this, "Error parsing response: '{0}'\n{1}", args.Text, e);
-            }
-
-        }
-
-        /// <summary>
-        /// Sends a command to the DSP (with delimiter appended)
-        /// </summary>
-        /// <param name="s">Command to send</param>
-        public void SendLine(string s)
-        {
-            Debug.Console(1, this, "TX: '{0}'", s);
-            Communication.SendText(s + "\x0a");
-        }
-
-        /// <summary>
-        /// Adds a command from a child module to the queue
-        /// </summary>
-        /// <param name="command">Command object from child module</param>
-        public void EnqueueCommand(QueuedCommand commandToEnqueue)
-        {
-            CommandQueue.Enqueue(commandToEnqueue);
-            //Debug.Console(1, this, "Command (QueuedCommand) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", commandToEnqueue.Command, CommandQueue.Count);
-
-            if (!CommandQueueInProgress)
-                SendNextQueuedCommand();
-        }
-
-
-        /// <summary>
-        /// Adds a raw string command to the queue
-        /// </summary>
-        /// <param name="command"></param>
-        public void EnqueueCommand(string command)
-        {
-            CommandQueue.Enqueue(command);
-            //Debug.Console(1, this, "Command (string) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", command, CommandQueue.Count);
-
-            if (!CommandQueueInProgress)
-                SendNextQueuedCommand();
-        }
-
-        /// <summary>
-        /// Sends the next queued command to the DSP
-        /// </summary>
-        private void SendNextQueuedCommand()
-        {
-            //Debug.Console(2, this, "Attempting to send next queued command. CommandQueueInProgress: {0}  Communication isConnected: {1}", CommandQueueInProgress, Communication.IsConnected);
-
-            //if (CommandQueue.IsEmpty)
-            //    CommandQueueInProgress = false;
-
-            //Debug.Console(1, this, "CommandQueue has {0} Elements:\n", CommandQueue.Count);
-
-            //foreach (object o in CommandQueue)
-            //{
-            //    if (o is string)
-            //        Debug.Console(1, this, "{0}", o);
-            //    else if(o is QueuedCommand)
-            //    {
-            //        var item = (QueuedCommand)o;
-            //        Debug.Console(1, this, "{0}", item.Command);
-            //    }
-            //}
-
-            //Debug.Console(1, this, "End of CommandQueue");
-
-            if (Communication.IsConnected && !CommandQueue.IsEmpty)
-            {
-                CommandQueueInProgress = true;
-
-                if (CommandQueue.Peek() is QueuedCommand)
-                {
-                    QueuedCommand nextCommand = new QueuedCommand();
-
-                    nextCommand = (QueuedCommand) CommandQueue.Peek();
-
-                    SendLine(nextCommand.Command);
-                }
-                else
-                {
-                    string nextCommand = (string) CommandQueue.Peek();
-
-                    SendLine(nextCommand);
-                }
-            }
-
-        }
-
-        /// <summary>
-        /// Sends a command to execute a preset
-        /// </summary>
-        /// <param name="name">Preset Name</param>
-        public void RunPreset(string name)
-        {
-            SendLine(string.Format("DEVICE recallPreset {0}", name));
-        }
-
-        public class QueuedCommand
-        {
-            public string Command { get; set; }
-            public string AttributeCode { get; set; }
-            public TesiraForteControlPoint ControlPoint { get; set; }
-        }
-    }
-
-    public class BiampTesiraForteDspFactory : EssentialsDeviceFactory<BiampTesiraForteDsp>
-    {
-        public BiampTesiraForteDspFactory()
-        {
-            TypeNames = new List<string>() {"biamptesira"};
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new BiampTesira Device");
-            var comm = CommFactory.CreateCommForDevice(dc);
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<BiampTesiraFortePropertiesConfig>(
-                dc.Properties.ToString());
-            return new BiampTesiraForteDsp(dc.Key, dc.Name, comm, props);
-        }
-    }
-
-}
+using System.Text.RegularExpressions;
+
+
+namespace PepperDash.Essentials.Devices.Common.DSP
+{
+
+	// QUESTIONS:
+	// 
+	// When subscribing, just use the Instance ID for Custom Name?
+	
+	// Verbose on subscriptions?
+
+    // Example subscription feedback responses
+	// ! "publishToken":"name" "value":-77.0
+	// ! "myLevelName" -77
+
+    public class BiampTesiraForteDsp : DspBase
+    {
+        public IBasicCommunication Communication { get; private set; }
+        public CommunicationGather PortGather { get; private set; }
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+        new public Dictionary<string, TesiraForteLevelControl> LevelControlPoints { get; private set; }
+
+        public bool isSubscribed;
+
+        private CTimer SubscriptionTimer;
+
+        CrestronQueue CommandQueue;
+
+        bool CommandQueueInProgress = false;
+
+        //new public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
+
+        //new public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
+
+        /// <summary>
+        /// Shows received lines as hex
+        /// </summary>
+        public bool ShowHexResponse { get; set; }
+
+        public BiampTesiraForteDsp(string key, string name, IBasicCommunication comm, BiampTesiraFortePropertiesConfig props) :
+            base(key, name)
+        {
+            CommandQueue = new CrestronQueue(100);
+
+            Communication = comm;
+            var socket = comm as ISocketStatus;
+            if (socket != null)
+            {
+                // This instance uses IP control
+				
+                socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
+            }
+            else
+            {
+                // This instance uses RS-232 control
+            }
+            PortGather = new CommunicationGather(Communication, "\x0d\x0a");
+            PortGather.LineReceived += this.Port_LineReceived;
+            if (props.CommunicationMonitorProperties != null)
+            {
+                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
+            }
+            else
+            {
+//#warning Need to deal with this poll string
+                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 120000, 120000, 300000, "SESSION get aliases\x0d\x0a");
+            }
+
+            LevelControlPoints = new Dictionary<string, TesiraForteLevelControl>();
+
+            foreach (KeyValuePair<string, BiampTesiraForteLevelControlBlockConfig> block in props.LevelControlBlocks)
+            {
+                this.LevelControlPoints.Add(block.Key, new TesiraForteLevelControl(block.Key, block.Value, this));
+            }
+
+        }
+
+        public override bool CustomActivate()
+        {
+            Communication.Connect();
+            CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+            CommunicationMonitor.Start();
+
+            CrestronConsole.AddNewConsoleCommand(SendLine, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => Communication.Connect(), "con" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
+            return true;
+        }
+
+        void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
+        {
+            Debug.Console(2, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
+
+            if (e.Client.IsConnected)
+            {
+                // Tasks on connect
+            }
+            else
+            {
+                // Cleanup items from this session
+
+                if (SubscriptionTimer != null)
+                {
+                    SubscriptionTimer.Stop();
+                    SubscriptionTimer = null;
+                }
+
+                isSubscribed = false;
+                CommandQueue.Clear();
+                CommandQueueInProgress = false;
+            }
+        }
+
+        /// <summary>
+        /// Initiates the subscription process to the DSP
+        /// </summary>
+        void SubscribeToAttributes()
+        {
+            SendLine("SESSION set verbose true");
+
+            foreach (KeyValuePair<string, TesiraForteLevelControl> level in LevelControlPoints)
+            {
+                level.Value.Subscribe();
+            }
+
+            if (!CommandQueueInProgress)
+                SendNextQueuedCommand();
+
+            ResetSubscriptionTimer();
+        }
+
+        /// <summary>
+        /// Resets or Sets the subscription timer
+        /// </summary>
+        void ResetSubscriptionTimer()
+        {
+            isSubscribed = true;
+
+            if (SubscriptionTimer != null)
+            {
+                SubscriptionTimer = new CTimer(o => SubscribeToAttributes(), 30000);
+                SubscriptionTimer.Reset();
+
+            }
+        }
+
+        /// <summary>
+        /// Handles a response message from the DSP
+        /// </summary>
+        /// <param name="dev"></param>
+        /// <param name="args"></param>
+        void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
+        {
+            if (Debug.Level == 2)
+                Debug.Console(2, this, "RX: '{0}'",
+                    ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
+
+            Debug.Console(1, this, "RX: '{0}'", args.Text);
+
+            try
+            {
+                if (args.Text.IndexOf("Welcome to the Tesira Text Protocol Server...") > -1)
+                {
+                    // Indicates a new TTP session
+
+                    SubscribeToAttributes();
+                }
+                else if (args.Text.IndexOf("publishToken") > -1)
+                {
+                    // response is from a subscribed attribute
+
+                    string pattern = "! \"publishToken\":[\"](.*)[\"] \"value\":(.*)";
+
+                    Match match = Regex.Match(args.Text, pattern);
+
+                    if (match.Success)
+                    {
+
+                        string key;
+
+                        string customName;
+
+                        string value;
+
+                        customName = match.Groups[1].Value;
+
+                        // Finds the key (everything before the '~' character
+                        key = customName.Substring(0, customName.IndexOf("~", 0) - 1);
+
+                        value = match.Groups[2].Value;
+
+                        foreach (KeyValuePair<string, TesiraForteLevelControl> controlPoint in LevelControlPoints)
+                        {
+                            if (customName == controlPoint.Value.LevelCustomName || customName == controlPoint.Value.MuteCustomName)
+                            {
+                                controlPoint.Value.ParseSubscriptionMessage(customName, value);
+                                return;
+                            }
+
+                        }
+                    }
+
+                    /// same for dialers
+                    /// same for switchers
+
+                }
+                else if (args.Text.IndexOf("+OK") > -1)
+                {
+                    if (args.Text == "+OK" || args.Text.IndexOf("list\":") > -1 )       // Check for a simple "+OK" only 'ack' repsonse or a list response and ignore
+                        return;
+
+                    // response is not from a subscribed attribute.  From a get/set/toggle/increment/decrement command
+                    
+                    if (!CommandQueue.IsEmpty)
+                    {
+                        if (CommandQueue.Peek() is QueuedCommand)
+                        {
+                            // Expected response belongs to a child class
+                            QueuedCommand tempCommand = (QueuedCommand)CommandQueue.TryToDequeue();
+                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
+
+                            tempCommand.ControlPoint.ParseGetMessage(tempCommand.AttributeCode, args.Text);
+                        }
+                        else
+                        {
+                            // Expected response belongs to this class
+                            string temp = (string)CommandQueue.TryToDequeue();
+                            //Debug.Console(1, this, "Command Dequeued. CommandQueue Size: {0}", CommandQueue.Count);
+
+                        }
+
+                        if (CommandQueue.IsEmpty)
+                            CommandQueueInProgress = false;
+                        else
+                            SendNextQueuedCommand();
+
+                    }
+
+
+                }
+                else if (args.Text.IndexOf("-ERR") > -1)
+                {
+                    // Error response
+
+                    switch (args.Text)
+                    {
+                        case "-ERR ALREADY_SUBSCRIBED":
+                            {
+                                ResetSubscriptionTimer();
+                                break;
+                            }
+                        default:
+                            {
+                                Debug.Console(0, this, "Error From DSP: '{0}'", args.Text);
+                                break;
+                            }
+                    }
+
+                }
+            }
+            catch (Exception e)
+            {
+                if (Debug.Level == 2)
+                    Debug.Console(2, this, "Error parsing response: '{0}'\n{1}", args.Text, e);
+            }
+
+        }
+
+        /// <summary>
+        /// Sends a command to the DSP (with delimiter appended)
+        /// </summary>
+        /// <param name="s">Command to send</param>
+        public void SendLine(string s)
+        {
+            Debug.Console(1, this, "TX: '{0}'", s);
+            Communication.SendText(s + "\x0a");
+        }
+
+        /// <summary>
+        /// Adds a command from a child module to the queue
+        /// </summary>
+        /// <param name="command">Command object from child module</param>
+        public void EnqueueCommand(QueuedCommand commandToEnqueue)
+        {
+            CommandQueue.Enqueue(commandToEnqueue);
+            //Debug.Console(1, this, "Command (QueuedCommand) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", commandToEnqueue.Command, CommandQueue.Count);
+
+            if(!CommandQueueInProgress)
+                SendNextQueuedCommand();
+        }
+
+        /// <summary>
+        /// Adds a raw string command to the queue
+        /// </summary>
+        /// <param name="command"></param>
+        public void EnqueueCommand(string command)
+        {
+            CommandQueue.Enqueue(command);
+            //Debug.Console(1, this, "Command (string) Enqueued '{0}'.  CommandQueue has '{1}' Elements.", command, CommandQueue.Count);
+
+            if (!CommandQueueInProgress)
+                SendNextQueuedCommand();
+        }
+
+        /// <summary>
+        /// Sends the next queued command to the DSP
+        /// </summary>
+        void SendNextQueuedCommand()
+        {
+            //Debug.Console(2, this, "Attempting to send next queued command. CommandQueueInProgress: {0}  Communication isConnected: {1}", CommandQueueInProgress, Communication.IsConnected);
+
+                //if (CommandQueue.IsEmpty)
+                //    CommandQueueInProgress = false;
+
+                //Debug.Console(1, this, "CommandQueue has {0} Elements:\n", CommandQueue.Count);
+
+                //foreach (object o in CommandQueue)
+                //{
+                //    if (o is string)
+                //        Debug.Console(1, this, "{0}", o);
+                //    else if(o is QueuedCommand)
+                //    {
+                //        var item = (QueuedCommand)o;
+                //        Debug.Console(1, this, "{0}", item.Command);
+                //    }
+                //}
+
+                //Debug.Console(1, this, "End of CommandQueue");
+
+                if (Communication.IsConnected && !CommandQueue.IsEmpty)
+                {
+                    CommandQueueInProgress = true;
+
+                    if (CommandQueue.Peek() is QueuedCommand)
+                    {
+                        QueuedCommand nextCommand = new QueuedCommand();
+
+                        nextCommand = (QueuedCommand)CommandQueue.Peek();
+
+                        SendLine(nextCommand.Command);
+                    }
+                    else
+                    {
+                        string nextCommand = (string)CommandQueue.Peek();
+
+                        SendLine(nextCommand);
+                    }
+                }
+            
+        }
+
+        /// <summary>
+        /// Sends a command to execute a preset
+        /// </summary>
+        /// <param name="name">Preset Name</param>
+        public override void RunPreset(string name)
+        {
+            SendLine(string.Format("DEVICE recallPreset {0}", name));
+        }
+
+        public class QueuedCommand
+        {
+            public string Command { get; set; }
+            public string AttributeCode { get; set; }
+            public TesiraForteControlPoint ControlPoint { get; set; }
+        }
+    }
+
+    public class BiampTesiraForteDspFactory : EssentialsDeviceFactory<BiampTesiraForteDsp>
+    {
+        public BiampTesiraForteDspFactory()
+        {
+            TypeNames = new List<string>() { "biamptesira" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new BiampTesira Device");
+            var comm = CommFactory.CreateCommForDevice(dc);
+            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<BiampTesiraFortePropertiesConfig>(
+                dc.Properties.ToString());
+            return new BiampTesiraForteDsp(dc.Key, dc.Name, comm, props);
+        }
+    }
+
+}

essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs

@@ -15,19 +15,18 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 
         public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
 
-        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
-
-	    public DspBase(string key, string name) :
-	        base(key, name)
-	    {
-	    }
+        public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
+
+		public abstract void RunPreset(string name);
+
+		public DspBase(string key, string name) :
+			base(key, name) { }
 
 
 		// in audio call feedback
 
 		// VOIP
-		// Phone dialer
-
+		// Phone dialer
 	}
 
 	// Fusion

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs

@@ -20,12 +20,10 @@ namespace PepperDash.Essentials.Devices.Displays
 	/// <summary>
 	/// 
 	/// </summary>
-    public class SamsungMDC : TwoWayDisplayBase, IBasicVolumeWithFeedback, ICommunicationMonitor, IInputDisplayPort1, IInputDisplayPort2,
+    public class SamsungMDC : TwoWayDisplayBase, IBasicVolumeWithFeedback, ICommunicationMonitor, IInputDisplayPort1, IInputDisplayPort2,
         IInputHdmi1, IInputHdmi2, IInputHdmi3, IInputHdmi4, IBridgeAdvanced
 	{
-		public IBasicCommunication Communication { get; private set; }
-
-
+		public IBasicCommunication Communication { get; private set; }
 				
         public StatusMonitorBase CommunicationMonitor { get; private set; }
 
@@ -326,10 +324,7 @@ namespace PepperDash.Essentials.Devices.Displays
                 _IsMuted = newMute;
                 MuteFeedback.FireUpdate();
             }
-        }
-
-        
-
+        }
 
         /// <summary>
         /// 
@@ -340,8 +335,7 @@ namespace PepperDash.Essentials.Devices.Displays
             if (newInput != null && newInput != _CurrentInputPort)
             {
                 _CurrentInputPort = newInput;
-                CurrentInputFeedback.FireUpdate();
-                OnSwitchChange(new RoutingNumericEventArgs(null, _CurrentInputPort, eRoutingSignalType.AudioVideo));
+                CurrentInputFeedback.FireUpdate();
             }
         }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -812,10 +812,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             CallStatusChange += (sender, args) =>
             {
                 trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
-                
-                Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
-                Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
-                trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status != eCodecCallStatus.Disconnected);
+
+                trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming);
 
                 if (args.CallItem.Direction == eCodecCallDirection.Incoming)
                 {

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -1605,12 +1605,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public override void AcceptCall(CodecActiveCallItem call)
         {
             SendText(string.Format("zCommand Call Accept callerJID: {0}", call.Id));
-
-            call.Status = eCodecCallStatus.Connected;
-
-            OnCallStatusChange(call);
-
-            UpdateCallStatus();
         }
 
         public void RejectCall()
@@ -1625,12 +1619,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public override void RejectCall(CodecActiveCallItem call)
         {
             SendText(string.Format("zCommand Call Reject callerJID: {0}", call.Id));
-
-            call.Status = eCodecCallStatus.Disconnected;
-
-            OnCallStatusChange(call);
-
-            UpdateCallStatus();
         }
 
         public override void Dial(Meeting meeting)