remove submodule step and udpate set-env

.github/workflows/docker.yml

@@ -32,7 +32,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          submodules: true
         # Fetch all tags
       - name: Fetch tags
         run: git fetch --tags
@@ -41,7 +40,7 @@ jobs:
         shell: powershell
         run: |
           $version = ./.github/scripts/GenerateVersionNumber.ps1
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
@@ -123,7 +122,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       - name: Download Build output
@@ -180,7 +179,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch
@@ -259,7 +258,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch

.github/workflows/main.yml

@@ -24,20 +24,14 @@ jobs:
       # First we checkout the source repo
       - name: Checkout repo
         uses: actions/checkout@v2
-      # 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
+        with:
+          fetch-depth: 0
       # Generate the appropriate version number
       - name: Set Version Number
         shell: powershell
         env:
           TAG_NAME: ${{ github.event.release.tag_name }}
-        run: Write-Output "::set-env name=VERSION::$($Env:TAG_NAME)"
+        run: echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
@@ -101,7 +95,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       - name: Download Build output
@@ -155,7 +149,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch
@@ -228,7 +222,7 @@ jobs:
           Get-ChildItem "./Version"
           $version = Get-Content -Path ./Version/version.txt
           Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout main branch

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

@@ -111,70 +111,10 @@ namespace PepperDash.Essentials.Core
         IntFeedback AudioVideoSourceNumericFeedback { get; }
     }
 
-
-    /// <summary>
-    /// Defines an IRmcRouting with a feedback event 
-    /// </summary>
-    public interface ITxRoutingWithFeedback : ITxRouting, IRoutingNumericFeedback
-    {
-    }
-
-    /// <summary>
-    /// Defines an IRmcRouting with a feedback event 
-    /// </summary>
-    public interface IRmcRoutingWithFeedback : IRmcRouting, IRoutingNumericFeedback
-    {
-    }
-
-    /// <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 IRoutingNumericFeedback : IKeyName
-    {
-        event EventHandler NumericSwitchChange;
-        void OnSwitchChange(RoutingNumericEventArgs e);
-    }
-
-    /// <summary>
-    /// Defines an IRoutingNumeric with a feedback event 
-    /// </summary>
-    public interface IRoutingNumericWithFeedback : IRoutingNumeric, IRoutingNumericFeedback
-    {
-    }
-
-    public class RoutingNumericEventArgs : EventArgs
-    {
-        private readonly uint _output;
-        private readonly uint _input;
-        private readonly eRoutingSignalType _sigType;
-
-        public uint Output
-        {
-            get { return _output; }
-        }
-
-        public uint Input
-        {
-            get { return _input; }
-        }
-
-        public eRoutingSignalType SigType
-        {
-            get { return _sigType; }
-        }
-
-        public RoutingNumericEventArgs(uint output, uint input, eRoutingSignalType sigType)
-        {
-            _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,9 +29,6 @@ namespace PepperDash.Essentials.DM.AirMedia
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
 
-        //IroutingNumericEvent
-        public event EventHandler NumericSwitchChange;
-
         public BoolFeedback IsInSessionFeedback { get; private set; }
         public IntFeedback ErrorFeedback { get; private set; }
         public IntFeedback NumberOfUsersConnectedFeedback { get; set; }
@@ -156,16 +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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
-
         void AirMedia_AirMediaChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args)
         {
             if (args.EventId == AirMediaInputSlot.AirMediaStatusFeedbackEventId)
@@ -185,10 +172,7 @@ namespace PepperDash.Essentials.DM.AirMedia
         void DisplayControl_DisplayControlChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args)
         {
             if (args.EventId == AmX00.VideoOutFeedbackEventId)
-            {
                 VideoOutFeedback.FireUpdate();
-                OnSwitchChange(new RoutingNumericEventArgs(1, VideoOutFeedback.UShortValue, eRoutingSignalType.AudioVideo));
-            }
             else if (args.EventId == AmX00.EnableAutomaticRoutingFeedbackEventId)
                 AutomaticInputRoutingEnabledFeedback.FireUpdate();
         }

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

@@ -20,16 +20,13 @@ 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 NumericSwitchChange;
-
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
         public Dictionary<uint, IntFeedback> AudioOutputFeedbacks { get; private set; }
@@ -908,15 +905,6 @@ namespace PepperDash.Essentials.DM
             {
                 Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Error in Chassis_DMInputChange: {0}", ex);
             }
-        }
-
-        /// <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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
         }
 
         /// 
@@ -950,35 +938,27 @@ namespace PepperDash.Essentials.DM
                     OutputEndpointOnlineFeedbacks[output].FireUpdate();
                     break;
                 }
-                case DMOutputEventIds.VideoOutEventId:
-                {
-                    if (Chassis.Outputs[output].VideoOutFeedback == null) return;
+                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();
 
-                    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();
-                        OnSwitchChange(new RoutingNumericEventArgs(output, Chassis.Outputs[output].VideoOutFeedback.Number, eRoutingSignalType.Video));
-                    }
-
                     if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
                         OutputVideoRouteNameFeedbacks[output].FireUpdate();
 
                     break;
                 }
-                case DMOutputEventIds.AudioOutEventId:
-                {
-                    if (Chassis.Outputs[output].AudioOutFeedback == null) return;
+                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();
 
-                    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();
-                        OnSwitchChange(new RoutingNumericEventArgs(output, Chassis.Outputs[output].VideoOutFeedback.Number, eRoutingSignalType.Audio));
-                    }
-
                     if (OutputAudioRouteNameFeedbacks.ContainsKey(output))
                         OutputAudioRouteNameFeedbacks[output].FireUpdate();
 

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 NumericSwitchChange;
+        public ISystemControl SystemControl { get; private set; }
 
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
@@ -57,17 +54,7 @@ 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
+        public string NoRouteText = "";
 
         public static DmpsRoutingController GetDmpsRoutingController(string key, string name,
             DmpsRoutingPropertiesConfig properties)
@@ -750,43 +737,39 @@ namespace PepperDash.Essentials.DM
             {
                 OutputEndpointOnlineFeedbacks[output].FireUpdate();
             }
-            else if (args.EventId == DMOutputEventIds.VideoOutEventId)
-            {
-                if (outputCard == null || outputCard.VideoOutFeedback == null) return;
-
-                Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputCard.VideoOutFeedback.Number, output);
-
-                if (VideoOutputFeedbacks.ContainsKey(output))
-                {
-                    VideoOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, VideoOutputFeedbacks[output].UShortValue, 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));
-                }
-            }
-            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 NumericSwitchChange;
-
         public Dictionary<uint, string> InputNames { get; set; }
         public Dictionary<uint, string> OutputNames { get; set; }
 
@@ -105,15 +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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
         public void EnableHdcp(uint port)
         {
             if (port > _Chassis.NumberOfInputs) return;
@@ -340,39 +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)
             {
-                VideoOutputRouteFeedbacks[i].FireUpdate();
-                OnSwitchChange(new RoutingNumericEventArgs((ushort)i, VideoOutputRouteFeedbacks[i].UShortValue, 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/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,19 +31,6 @@ namespace PepperDash.Essentials.DM
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
 
-        //IroutingNumericEvent
-        public event EventHandler 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
-
         public DmRmc4kZScalerCController(string key, string name, DmRmc4kzScalerC rmc)
             : base(key, name, rmc)
         {
@@ -68,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 ||
@@ -93,7 +72,6 @@ namespace PepperDash.Essentials.DM
             if (args.EventId == EndpointOutputStreamEventIds.SelectedSourceFeedbackEventId)
             {
                 AudioVideoSourceNumericFeedback.FireUpdate();
-                OnSwitchChange(new RoutingNumericEventArgs(1, AudioVideoSourceNumericFeedback.UShortValue, eRoutingSignalType.AudioVideo));
             }
         }
 

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

@@ -17,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; }
 
@@ -35,20 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
@@ -212,10 +199,7 @@ namespace PepperDash.Essentials.DM
         {
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
-
+            AudioSourceNumericFeedback.FireUpdate();
 
         }
 
@@ -322,13 +306,11 @@ namespace PepperDash.Essentials.DM
                 case EndpointTransmitterBase.VideoSourceFeedbackEventId:
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
+                    ActiveVideoInputFeedback.FireUpdate();
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
+                    AudioSourceNumericFeedback.FireUpdate();
                     break;
             }
         }

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

@@ -14,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; }
 
@@ -34,19 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
 		/// <summary>
 		/// Helps get the "real" inputs, including when in Auto
@@ -208,9 +196,8 @@ namespace PepperDash.Essentials.DM
         {
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
+            AudioSourceNumericFeedback.FireUpdate();
+            
         }
 
         private void VgaInputOnInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
@@ -336,12 +323,10 @@ namespace PepperDash.Essentials.DM
                     ActiveVideoInputFeedback.FireUpdate();	                    
                     VideoSourceNumericFeedback.FireUpdate();
             	    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
                     break;
             }          
 		}

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

@@ -15,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; } 
 
@@ -36,19 +36,6 @@ namespace PepperDash.Essentials.DM
         public IntFeedback VgaBrightnessFeedback { get; protected set; }
         public IntFeedback VgaContrastFeedback { get; protected set; }
 
-        //IroutingNumericEvent
-        public event EventHandler 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
-
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
         /// </summary>
@@ -210,8 +197,7 @@ namespace PepperDash.Essentials.DM
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
             AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
+
         }
 
         private void VgaInputOnInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
@@ -337,12 +323,10 @@ namespace PepperDash.Essentials.DM
                     ActiveVideoInputFeedback.FireUpdate();
                     VideoSourceNumericFeedback.FireUpdate();
                     ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
                     break;
             }
         }

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,20 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
 		/// <summary>
 		/// Helps get the "real" inputs, including when in Auto
@@ -131,7 +118,6 @@ namespace PepperDash.Essentials.DM
             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;
 
@@ -300,17 +286,6 @@ namespace PepperDash.Essentials.DM
                 Tx.AudioSource = (eVst)inputSelector;
         }
 
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Audio));
-        }
-
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
         {
             var id = args.EventId;
@@ -322,12 +297,10 @@ namespace PepperDash.Essentials.DM
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
                     ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
                     break;
             }
         }

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,20 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
+        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
 
         //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
         //public override ushort HdcpSupportCapability { get; protected set; }
@@ -115,8 +102,6 @@ namespace PepperDash.Essentials.DM
 
             Tx.BaseEvent += Tx_BaseEvent;
 
-            Tx.OnlineStatusChange +=Tx_OnlineStatusChange;
-
             VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
 
             AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.AudioSourceFeedback);
@@ -309,17 +294,6 @@ namespace PepperDash.Essentials.DM
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
                     break;
             }
-        }
-
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Audio));
         }
 
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
@@ -333,13 +307,11 @@ namespace PepperDash.Essentials.DM
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     ActiveVideoInputFeedback.FireUpdate();
                     VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
+                    ActiveVideoInputFeedback.FireUpdate();
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
+                    AudioSourceNumericFeedback.FireUpdate();
                     break;
             } 
         }

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,20 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
+        public IntFeedback VgaContrastFeedback { get; protected set; }
 
 		/// <summary>
 		/// Helps get the "real" inputs, including when in Auto
@@ -123,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);
 
@@ -402,16 +387,6 @@ namespace PepperDash.Essentials.DM
                     break;
             }
         }
-        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Audio));
-        }
 
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
         {
@@ -422,12 +397,10 @@ namespace PepperDash.Essentials.DM
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
                     ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
                     break;
             }
         }

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

@@ -1,5 +1,4 @@
 using Crestron.SimplSharpPro;
-using System;
 //using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -13,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; }
@@ -34,20 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
-
-
+        //public override ushort HdcpSupportCapability { get; protected set; }
 
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
@@ -103,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);
 
@@ -297,20 +282,8 @@ namespace PepperDash.Essentials.DM
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
                     break;
             }
-        }
-
-        private void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Audio));
-        }
-
-
+        }
+
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
         {
             var id = args.EventId;
@@ -323,13 +296,11 @@ namespace PepperDash.Essentials.DM
                     ActiveVideoInputFeedback.FireUpdate();
                     VideoSourceNumericFeedback.FireUpdate();
                     AudioSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
+                    ActiveVideoInputFeedback.FireUpdate();
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, " Audio Source : {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
+                    AudioSourceNumericFeedback.FireUpdate();
                     break;
             } 
         }

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

@@ -1,5 +1,4 @@
 using Crestron.SimplSharpPro;
-using System;
 //using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -16,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; }
@@ -38,19 +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 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>
-        public void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            if (NumericSwitchChange != null) NumericSwitchChange(this, e);
-        }
+        //public override ushort HdcpSupportCapability { get; protected set; }
 
         /// <summary>
         /// Helps get the "real" inputs, including when in Auto
@@ -110,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);
@@ -307,19 +293,7 @@ namespace PepperDash.Essentials.DM
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
                     break;
             }
-        }
-
-        private void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
-            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Video));
-            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue,
-                eRoutingSignalType.Audio));
-        }
-
+        }
 
         void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
         {
@@ -329,13 +303,11 @@ namespace PepperDash.Essentials.DM
                 case EndpointTransmitterBase.VideoSourceFeedbackEventId:
                     Debug.Console(2, this, "  Video Source: {0}", Tx.VideoSourceFeedback);
                     VideoSourceNumericFeedback.FireUpdate();
-                    ActiveVideoInputFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Video));
+                    ActiveVideoInputFeedback.FireUpdate();
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
                     Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
-                    AudioSourceNumericFeedback.FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, eRoutingSignalType.Audio));
+                    AudioSourceNumericFeedback.FireUpdate();
                     break;
             }
         }