Merge tag '1.13.3-hotfix-2154' into feature/ConsoleImprovements

.github/workflows/add-issues-to-project.yml

@@ -0,0 +1,37 @@
+name: Add bugs to bugs project
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+      
+jobs:
+  check-secret:
+    runs-on: ubuntu-latest
+    outputs:
+      my-key: ${{ steps.my-key.outputs.defined }}
+    steps:
+        - id: my-key
+          if: "${{ env.MY_KEY != '' }}"
+          run: echo "::set-output name=defined::true"
+          env:
+              MY_KEY: ${{ secrets.PROJECT_URL }}
+  throw-error: 
+    name: Check
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key != 'true'
+    steps:
+      - run: echo "The Project URL Repo Secret is empty"
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key == 'true'
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: ${{ secrets.PROJECT_URL }}
+          github-token: ${{ secrets.GH_PROJECTS_PASSWORD }}
+

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -36,28 +36,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port1HdcpState")]
-        public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port2HdcpState")]
-        public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdmiInputSync")]
-        public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-
-
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>
@@ -72,8 +50,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="joinStart">Join this join map will start at</param>
         /// <param name="type">Type of the child join map</param>
-        protected DmRmcControllerJoinMap(uint joinStart, Type type)
+        protected DmRmcControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-            : base(joinStart, type)
         {
         }
     }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -68,11 +68,6 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete Port3HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 3 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-
 
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
@@ -88,8 +83,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="joinStart">Join this join map will start at</param>
         /// <param name="type">Type of the child join map</param>
-        protected DmTxControllerJoinMap(uint joinStart, Type type)
+        protected DmTxControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-            : base(joinStart, type)
         {
         }
     }

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

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.Net.Http;
-using Crestron.SimplSharp.Ssh;
-using Crestron.SimplSharpPro.EthernetCommunication;
 using PepperDash.Core;
+using PepperDash.Core.DebugThings;
 
 namespace PepperDash.Essentials.Core
 {
@@ -16,130 +17,52 @@ namespace PepperDash.Essentials.Core
 		public GenericHttpClient(string key, string name, string hostname)
 			: base(key, name)
 		{
-			Client = new HttpClient {HostName = hostname};
+			Client = new HttpClient();
-		}
+			Client.HostName = hostname;
+			
 			
-	    public GenericHttpClient(string key, string name, string hostname, GenericHttpClientConnectionOptions options)
-	        : base(key, name)
-	    {
-	        Client = new HttpClient
-	        {
-	            HostName = hostname,
-	            Accept = options.Accept,
-	            KeepAlive = options.KeepAlive,
-	            Password = options.Password,
-	            Timeout = options.Timeout,
-	            TimeoutEnabled = options.TimeoutEnabled,
-	            UserAgent = options.UserAgent,
-	            UserName = options.UserName,
-	            Version = options.Version
-	        };
-	        if (options.Port > 0) Client.Port = options.Port;
 		}
 
 		/// <summary>
-		/// Send a HTTP Get Request to a client
+		/// 
 		/// </summary>
-		/// <param name="path">Path to request node</param>
+		/// <param name="path"></param>
 		public void SendText(string path)
 		{
-            var url = string.Format("http://{0}/{1}", Client.HostName, path);
+			HttpClientRequest request = new HttpClientRequest();
-            var request = new HttpClientRequest()
+			string url = string.Format("http://{0}/{1}", Client.HostName, path);
-            {
+			request.Url = new UrlParser(url);
-                Url = new UrlParser(url)
+			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
-            };
-            var error = Client.DispatchAsyncEx(request, Response, request);
 		}
-
-        /// <summary>
-        /// Send a HTTP Get Request to a client using a formatted string
-        /// </summary>
-        /// <param name="format">Path</param>
-        /// <param name="items">Parameters for Path String Formatting</param>
 		public void SendText(string format, params object[] items)
 		{
-            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+			HttpClientRequest request = new HttpClientRequest();
-            var request = new HttpClientRequest()
+			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-            {
+			request.Url = new UrlParser(url);
-                Url = new UrlParser(url)
+			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
-            };
-            var error = Client.DispatchAsyncEx(request, Response, request);
 		}
 
-        /// <summary>
-        /// Send a unidirectional HTTP Get Request to a client using a formatted string
-        /// </summary>
-        /// <param name="format">Path</param>
-        /// <param name="items">Parameters for Path String Formatting</param>
 		public void SendTextNoResponse(string format, params object[] items)
 		{
-            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+			HttpClientRequest request = new HttpClientRequest();
-            var request = new HttpClientRequest()
+			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-            {
+			request.Url = new UrlParser(url);
-                Url = new UrlParser(url)
-            };
-            Client.Dispatch(request);
-        }
-
-        /// <summary>
-        /// Send an HTTP Request of a specific request type
-        /// </summary>
-        /// <param name="requestType">HTTP Request Type</param>
-        /// <param name="path">Path to request node</param>
-        public void SendText(RequestType requestType, string path)
-        {
-            var url = string.Format("http://{0}/{1}", Client.HostName, path);
-            var request = new HttpClientRequest()
-            {
-                Url = new UrlParser(url),
-                RequestType = requestType
-            };
-            var error = Client.DispatchAsyncEx(request, Response, request);
-        }
-
-        /// <summary>
-        /// Send an HTTP Request of a specific request type using a formatted string
-        /// </summary>
-        /// <param name="requestType">HTTP Request Type</param>
-        /// <param name="format">Path</param>
-        /// <param name="items">Parameters for Path String Formatting</param>
-        public void SendText(RequestType requestType, string format, params object[] items)
-        {
-            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-            var request = new HttpClientRequest()
-            {
-                Url = new UrlParser(url),
-                RequestType = requestType
-            };
-            var error = Client.DispatchAsyncEx(request, Response, request);
-        }
-
-        /// <summary>
-        /// Send a unidirectional HTTP Request of a specific request type using a formatted string
-        /// </summary>
-        /// <param name="requestType">HTTP Request Type</param>
-        /// <param name="format">Path</param>
-        /// <param name="items">Parameters for Path String Formatting</param>
-        public void SendTextNoResponse(RequestType requestType, string format, params object[] items)
-        {
-            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-            var request = new HttpClientRequest()
-            {
-                Url = new UrlParser(url)
-            };
 			Client.Dispatch(request);
 		}
 
 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
 		{
-		    if (error != HTTP_CALLBACK_ERROR.COMPLETED) return;
+			if (error == HTTP_CALLBACK_ERROR.COMPLETED)
+			{
 				var responseReceived = response;
 
-		    if (responseReceived.ContentString.Length <= 0) return;
+				if (responseReceived.ContentString.Length > 0)
-		    if (ResponseRecived == null) return;
+				{
-		    var httpClientRequest = request as HttpClientRequest;
+					if (ResponseRecived != null)
-		    if (httpClientRequest != null)
+						ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
-		        ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, httpClientRequest.Url.ToString(), error));
+				}
+			}
+
 		}
 
 
@@ -177,8 +100,6 @@ namespace PepperDash.Essentials.Core
 
 		#endregion
 	}
-
-
 	public class GenericHttpClientEventArgs : EventArgs
 	{
 		public string ResponseText { get; private set; }
@@ -191,84 +112,4 @@ namespace PepperDash.Essentials.Core
 			Error = error;
 		}
 	}
-
-    /// <summary>
-    /// Objedct to set parameters for HTTP Requests
-    /// </summary>
-    public class GenericHttpClientConnectionOptions
-    {
-        /// <summary>
-        ///     Gets or sets content types that are acceptable for the response. The default
-        ///     value is "text/html, image/gif, image/jpeg, image/png, */*".
-        /// </summary>
-        [DefaultValue("text/html, image/gif, image/jpeg, image/png")]
-        public string Accept { get; set; }
-
-        /// <summary>
-        ///     Controls whether to use HTTP Keep-Alive to keep the connection alive between
-        ///     requests. If enabled (true) , once a request is made and a connection is
-        ///     established, this connection is kept open and used for future requests. If
-        ///     disabled, the connection is closed, and a new connection is created for future
-        ///     requests.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool KeepAlive { get; set; }
-
-        /// <summary>
-        ///     This property controls whether the request operation will do an automatic
-        ///     timeout checking. If timeout handling is turned on (i.e. this property is
-        ///     set to true) and a request takes longer than Timeout, it will be terminated.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool TimeoutEnabled { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the maximum amount of time (in seconds) that a client will wait
-        ///     for a server response within a single request. The default value is 60 seconds
-        ///     (1 minute).  The timeout handling can be activated via the TimeoutEnabled
-        ///     property.
-        /// </summary>
-        [DefaultValue(60)]
-        public int Timeout { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the version identifier of the UserAgent. Can be used to mimic
-        ///     particular browsers like Internet Explorer 6.0
-        /// </summary>
-        [DefaultValue("1.1")]
-        public string Version { get; set; }
-
-        /// <summary>
-        ///     Gets or sets the identifier of the software being used to retrieve data via
-        ///     the URL. Some custom HTTP servers check this HTTP header to provide content
-        ///     optimized for particular HTTP browsers.
-        /// </summary>
-        [DefaultValue("Crestron SimplSharp HTTP Client")]
-        public string UserAgent { get; set; }
-
-        /// <summary>
-        ///    Name that will be inserted into the Authorization HTTP header in the request
-        ///    to the server.
-        /// </summary>
-        public string UserName { get; set; }
-
-        /// <summary>
-        ///     Password that will be inserted into the Authorization HTTP header in the
-        ///     request to the server.
-        /// </summary>
-        public string Password { get; set; }
-
-        /// <summary>
-        ///     The server Port that you intend the client to connect to.  If you do not
-        ///     assign a port number on this property, the port number in the parsed URL
-        ///     will be used. If a port number is assigned in the parsed URL, it will take
-        ///     precedence over this property.
-        /// </summary>
-        /// <remarks>
-        ///     If you do not assign a port number on this property, the port number in the
-        ///     parsed URL will be used.
-        /// </remarks>
-        /// 
-        public int Port { get; set; }
-    }
 }

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

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -9,7 +8,6 @@ namespace PepperDash_Essentials_Core.Devices
     /// <summary>
     /// Interface for any device that is able to control it'spower and has a configurable reboot time
     /// </summary>
-    [Obsolete("PepperDash_Essentials_Core.Devices is Deprecated - use PepperDash.Essentials.Core")]
     public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
     {
         /// <summary>
@@ -26,7 +24,6 @@ namespace PepperDash_Essentials_Core.Devices
     /// <summary>
     /// Interface for any device that contains a collection of IHasPowerReboot Devices
     /// </summary>
-    [Obsolete("PepperDash_Essentials_Core.Devices is Deprecated - use PepperDash.Essentials.Core")]
     public interface IHasControlledPowerOutlets : IKeyName
     {
         /// <summary>

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

@@ -1,87 +0,0 @@
-using Crestron.SimplSharp;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Interface for any device that has a battery that can be monitored
-    /// </summary>
-    public interface IHasBatteryStats : IKeyName
-    {
-        int BatteryPercentage { get; }
-        int BatteryCautionThresholdPercentage { get;  }
-        int BatteryWarningThresholdPercentage { get; }
-        BoolFeedback BatteryIsWarningFeedback { get; }
-        BoolFeedback BatteryIsCautionFeedback { get; }
-        BoolFeedback BatteryIsOkFeedback { get; }
-        IntFeedback BatteryPercentageFeedback { get; }
-    }
-
-    /// <summary>
-    /// Interface for any device that has a battery that can be monitored and the ability to charge and discharge
-    /// </summary>
-    public interface IHasBatteryCharging : IHasBatteryStats
-    {
-        BoolFeedback BatteryIsCharging { get; }
-    }
-
-    /// <summary>
-    /// Interface for any device that has multiple batteries that can be monitored
-    /// </summary>
-    public interface IHasBatteries : IKeyName
-    {
-        ReadOnlyDictionary<string, IHasBatteryStats> Batteries { get; }   
-    }
-
-    public interface IHasBatteryStatsExtended : IHasBatteryStats
-    {
-        int InputVoltage { get; }
-        int OutputVoltage { get; }
-        int InptuCurrent { get; }
-        int OutputCurrent { get; }
-
-        IntFeedback InputVoltageFeedback { get; }
-        IntFeedback OutputVoltageFeedback { get; }
-        IntFeedback InputCurrentFeedback { get; }
-        IntFeedback OutputCurrentFeedback { get; }
-    }
-
-    /// <summary>
-    /// Interface for any device that is able to control its power, has a configurable reboot time, and has batteries that can be monitored
-    /// </summary>
-    public interface IHasPowerCycleWithBattery : IHasPowerCycle, IHasBatteryStats
-    {
-        
-    }
-
-    /// <summary>
-    /// Interface for any device that is able to control it's power and has a configurable reboot time
-    /// </summary>
-    public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
-    {
-        /// <summary>
-        /// Delay between power off and power on for reboot
-        /// </summary>
-        int PowerCycleTimeMs { get; }
-
-        /// <summary>
-        /// Reboot outlet
-        /// </summary>
-        void PowerCycle();
-    }
-
-    /// <summary>
-    /// Interface for any device that contains a collection of IHasPowerReboot Devices
-    /// </summary>
-    public interface IHasControlledPowerOutlets : IKeyName
-    {
-        /// <summary>
-        /// Collection of IPduOutlets
-        /// </summary>
-        ReadOnlyDictionary<int, IHasPowerCycle> PduOutlets { get; }
-
-    }
-
-
-
-}

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

@@ -200,7 +200,6 @@
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
-    <Compile Include="Devices\PowerInterfaces.cs" />
     <Compile Include="Web\RequestHandlers\AppDebugRequestHandler.cs" />
     <Compile Include="Web\RequestHandlers\GetFeedbacksForDeviceRequestHandler.cs" />
     <Compile Include="Web\EssentialsWebApiHelpers.cs" />

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

@@ -22,7 +22,7 @@ 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, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
+    public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
     {
         private const string NonePortKey = "inputCard0--None";
 

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

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.DM
     /// 
     /// </summary>
     [Description("Wrapper class for all DM-MD chassis variants from 8x8 to 32x32")]
-    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
+    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
     {
         private const string NonePortKey = "inputCard0--None";
         public DMChassisPropertiesConfig PropertiesConfig { get; set; }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/EndpointInterfaces.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_DM
-{
-    public interface IHasDmInHdcpSet
-    {
-        void SetDmInHdcpState(eHdcpCapabilityType hdcpState);
-    }
-
-    public interface IHasDmInHdcpGet
-    {
-        IntFeedback DmInHdcpStateFeedback { get; }
-    }
-
-    public interface IHasDmInHdcp : IHasDmInHdcpGet, IHasDmInHdcpSet
-    {
-        eHdcpCapabilityType DmInHdcpCapability { get; }
-    }
-
-
-    public interface IHasHdmiInHdcpSet
-    {
-        void SetHdmiInHdcpState(eHdcpCapabilityType hdcpState);
-    }
-
-    public interface IHasHdmiInHdcpGet
-    {
-        IntFeedback HdmiInHdcpStateFeedback { get; }
-    }
-
-    public interface IHasHdmiInHdcp : IHasHdmiInHdcpGet, IHasHdmiInHdcpSet
-    {
-        eHdcpCapabilityType HdmiInHdcpCapability { get; }
-    }
-
-
-    public interface IHasHdmiIn1HdcpSet
-    {
-        void SetHdmiIn1HdcpState(eHdcpCapabilityType hdcpState);
-    }
-
-    public interface IHasHdmiIn1HdcpGet
-    {
-        IntFeedback HdmiIn1HdcpStateFeedback { get; }
-    }
-
-    public interface IHasHdmiIn1Hdcp : IHasHdmiIn1HdcpGet, IHasHdmiIn1HdcpSet
-    {
-        eHdcpCapabilityType HdmiIn1HdcpCapability { get; }
-    }
-
-
-    public interface IHasHdmiIn2HdcpSet
-    {
-        void SetHdmiIn2HdcpState(eHdcpCapabilityType hdcpState);
-    }
-
-    public interface IHasHdmiIn2HdcpGet
-    {
-        IntFeedback HdmiInIn2HdcpStateFeedback { get; }
-    }
-
-    public interface IHasHdmi2InHdcp : IHasHdmiIn2HdcpGet, IHasHdmiIn2HdcpSet
-    {
-        eHdcpCapabilityType Hdmi2InHdcpCapability { get; }
-    }
-
-
-
-    public interface IHasDisplayPortInHdcpGet
-    {
-        IntFeedback DisplayPortInHdcpStateFeedback { get; }
-    }
-
-    public interface IHasDisplayPortInHdcpSet
-    {
-        void SetDisplayPortInHdcpState(eHdcpCapabilityType hdcpState);
-    }
-
-    public interface IHasDisplayPortInHdcp : IHasDisplayPortInHdcpGet, IHasDisplayPortInHdcpSet
-    {
-        eHdcpCapabilityType DisplayPortInHdcpCapability { get; }
-    }
-}

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

@@ -6,7 +6,6 @@ using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash_Essentials_DM;
 
 namespace PepperDash.Essentials.DM
 {
@@ -16,7 +15,7 @@ namespace PepperDash.Essentials.DM
 	/// </summary>
     [Description("Wrapper Class for DM-RMC-4K-SCALER-C")]
     public class DmRmc4kScalerCController : DmRmcControllerBase, IRoutingInputsOutputs, IBasicVolumeWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp
+		IIROutputPorts, IComPorts, ICec, IRelayPorts
 	{
 	    private readonly DmRmc4kScalerC _rmc;
 
@@ -28,12 +27,6 @@ namespace PepperDash.Essentials.DM
 
 		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
 
-        public EndpointDmInputStreamWithCec DmInput { get; private set; }
-
-        public IntFeedback DmInHdcpStateFeedback { get; private set; }
-
-
-
 		/// <summary>
 		///  Make a Crestron RMC and put it in here
 		/// </summary>
@@ -63,11 +56,6 @@ namespace PepperDash.Essentials.DM
 		    OutputPorts = new RoutingPortCollection<RoutingOutputPort> {HdmiOut, BalancedAudioOut};
 
             VideoOutputResolutionFeedback = new StringFeedback(() => _rmc.HdmiOutput.GetVideoResolutionString());
-            DmInHdcpStateFeedback = new IntFeedback("DmInHdcpCapability",
-                () => (int)_rmc.DmInput.HdcpCapabilityFeedback);
-
-            AddToFeedbackList(DmInHdcpStateFeedback);
-
 
             _rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
             _rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
@@ -204,17 +192,5 @@ namespace PepperDash.Essentials.DM
 		}
 
 		#endregion
-
-        public eHdcpCapabilityType DmInHdcpCapability
-        {
-            get { return eHdcpCapabilityType.Hdcp2_2Support; }
-        }
-
-        public void SetDmInHdcpState(eHdcpCapabilityType hdcpState)
-        {
-            if (_rmc == null) return;
-            _rmc.DmInput.HdcpCapability = hdcpState;
-        }
-
 	}
 }

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

@@ -6,7 +6,6 @@ using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash_Essentials_DM;
 
 namespace PepperDash.Essentials.DM
 {
@@ -16,7 +15,7 @@ namespace PepperDash.Essentials.DM
     /// </summary>
     [Description("Wrapper Class for DM-RMC-4K-SCALER-C-DSP")]
     public class DmRmc4kScalerCDspController : DmRmcControllerBase, IRoutingInputsOutputs, IBasicVolumeWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp
+        IIROutputPorts, IComPorts, ICec, IRelayPorts
     {
         private readonly DmRmc4kScalerCDsp _rmc;
 
@@ -28,11 +27,6 @@ namespace PepperDash.Essentials.DM
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
 
-        public EndpointDmInputStreamWithCec DmInput { get; private set; }
-
-        public IntFeedback DmInHdcpStateFeedback { get; private set; }
-
-
         /// <summary>
         ///  Make a Crestron RMC and put it in here
         /// </summary>
@@ -59,12 +53,6 @@ namespace PepperDash.Essentials.DM
 
             VideoOutputResolutionFeedback = new StringFeedback(() => _rmc.HdmiOutput.GetVideoResolutionString());
 
-            DmInHdcpStateFeedback = new IntFeedback("DmInHdcpCapability",
-                () => (int) _rmc.DmInput.HdcpCapabilityFeedback);
-
-            AddToFeedbackList(DmInHdcpStateFeedback);
-
-
             InputPorts = new RoutingPortCollection<RoutingInputPort> {DmIn};
             OutputPorts = new RoutingPortCollection<RoutingOutputPort> {HdmiOut, BalancedAudioOut};
 
@@ -203,17 +191,5 @@ namespace PepperDash.Essentials.DM
         }
 
         #endregion
-
-        public eHdcpCapabilityType DmInHdcpCapability
-        {
-            get { return eHdcpCapabilityType.Hdcp2_2Support; }
-        }
-
-        public void SetDmInHdcpState(eHdcpCapabilityType hdcpState)
-        {
-            if (_rmc == null) return;
-            _rmc.DmInput.HdcpCapability = hdcpState;
-        }
-
     }
 }

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

@@ -9,13 +9,12 @@ using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Core;
-using PepperDash_Essentials_DM;
 
 namespace PepperDash.Essentials.DM
 {
     [Description("Wrapper Class for DM-RMC-4K-Z-SCALER-C")]
     public class DmRmc4kZScalerCController : DmRmcControllerBase, IRmcRoutingWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp, IHasHdmiInHdcp
+        IIROutputPorts, IComPorts, ICec, IRelayPorts
     {
         private readonly DmRmc4kzScalerC _rmc;
 
@@ -23,13 +22,6 @@ namespace PepperDash.Essentials.DM
         public RoutingInputPort HdmiIn { get; private set; }
         public RoutingOutputPort HdmiOut { get; private set; }
 
-        public IntFeedback DmInHdcpStateFeedback { get; private set; }
-        public IntFeedback HdmiInHdcpStateFeedback { get; private set; }
-
-        public BoolFeedback HdmiVideoSyncFeedback { get; private set; }
-
-
-
         /// <summary>
         /// The value of the current video source for the HDMI output on the receiver
         /// </summary>
@@ -52,11 +44,11 @@ namespace PepperDash.Essentials.DM
             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)
             {
@@ -70,16 +62,6 @@ namespace PepperDash.Essentials.DM
             HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo,
                 eRoutingPortConnectionType.Hdmi, null, this);
 
-            HdmiInHdcpStateFeedback = new IntFeedback("HdmiInHdcpCapability",
-                () => (int)_rmc.HdmiIn.HdcpCapabilityFeedback);
-            DmInHdcpStateFeedback = new IntFeedback("DmInHdcpCapability",
-                () => (int)_rmc.DmInput.HdcpCapabilityFeedback);
-            HdmiVideoSyncFeedback = new BoolFeedback("HdmiInVideoSync",
-                () => _rmc.HdmiIn.SyncDetectedFeedback.BoolValue);
-
-            AddToFeedbackList(HdmiInHdcpStateFeedback, DmInHdcpStateFeedback, HdmiVideoSyncFeedback);
-
-
             EdidManufacturerFeedback = new StringFeedback(() => _rmc.HdmiOutput.ConnectedDevice.Manufacturer.StringValue);
             EdidNameFeedback = new StringFeedback(() => _rmc.HdmiOutput.ConnectedDevice.Name.StringValue);
             EdidPreferredTimingFeedback = new StringFeedback(() => _rmc.HdmiOutput.ConnectedDevice.PreferredTiming.StringValue);
@@ -92,8 +74,6 @@ namespace PepperDash.Essentials.DM
 
             _rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
             _rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
-            _rmc.HdmiIn.InputStreamChange += InputStreamChangeEvent;
-            _rmc.DmInput.InputStreamChange += InputStreamChangeEvent;
 
             _rmc.OnlineStatusChange += _rmc_OnlineStatusChange;
 
@@ -103,20 +83,6 @@ namespace PepperDash.Essentials.DM
             AudioVideoSourceNumericFeedback = new IntFeedback(() => (ushort)(_rmc.SelectedSourceFeedback));
         }
 
-        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
-                    if (inputStream == _rmc.HdmiIn) HdmiInHdcpStateFeedback.FireUpdate();
-                    if (inputStream == _rmc.DmInput) DmInHdcpStateFeedback.FireUpdate();
-                    break;
-                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
-                    if (inputStream == _rmc.HdmiIn) HdmiVideoSyncFeedback.FireUpdate();
-                    break;
-            }
-        }
-
         private void _rmc_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
         {
             AudioVideoSourceNumericFeedback.FireUpdate();
@@ -215,31 +181,5 @@ namespace PepperDash.Essentials.DM
         }
 
         #endregion
-
-
-        public eHdcpCapabilityType DmInHdcpCapability
-        {
-            get { return eHdcpCapabilityType.Hdcp2_2Support; }
-        }
-
-        public void SetDmInHdcpState(eHdcpCapabilityType hdcpState)
-        {
-
-            if (_rmc == null) return;
-            _rmc.DmInput.HdcpCapability = hdcpState;
-        }
-
-
-        public eHdcpCapabilityType HdmiInHdcpCapability
-        {
-            get { return eHdcpCapabilityType.Hdcp2_2Support; }
-        }
-
-        public void SetHdmiInHdcpState(eHdcpCapabilityType hdcpState)
-        {
-            if (_rmc == null) return;
-            _rmc.HdmiIn.HdcpCapability = hdcpState;
-        }
-
     }
 }

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

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Cards;
@@ -12,7 +11,6 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.DeviceInfo;
 using PepperDash.Essentials.DM.Config;
 using PepperDash.Essentials.Core.Config;
-using PepperDash_Essentials_DM;
 
 namespace PepperDash.Essentials.DM
 {
@@ -76,79 +74,18 @@ namespace PepperDash.Essentials.DM
             if (rmc.EdidSerialNumberFeedback != null)
                 rmc.EdidSerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidSerialNumber.JoinNumber]);
             
-
             //If the device is an DM-RMC-4K-Z-SCALER-C
-            var routing = rmc as IRoutingInputsOutputs;
+            var routing = rmc as IRmcRouting;
-
-            trilist.UShortInput[joinMap.HdcpInputPortCount.JoinNumber].UShortValue = (ushort)(routing == null
-                ? 1
-                : routing.InputPorts.Count);
 
             if (routing == null)
             {
                 return;
             }
-            var hdcpCapability = eHdcpCapabilityType.HdcpSupportOff;
-            if (routing.InputPorts[DmPortName.HdmiIn] != null)
-            {
-                var hdmiInHdcp = routing as IHasHdmiInHdcp;
-                if (hdmiInHdcp != null)
-                {
-                    if (rmc.Feedbacks["HdmiInHdcpCapability"] != null)
-                    {
-                        var intFeedback = rmc.Feedbacks["HdmiInHdcpCapability"] as IntFeedback;
-                        if (intFeedback != null)
-                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState.JoinNumber]);
-                    }
-                    if (rmc.Feedbacks["HdmiInVideoSync"] != null)
-                    {
-                        var boolFeedback = rmc.Feedbacks["HdmiInVideoSync"] as BoolFeedback;
-                        if (boolFeedback != null)
-                            boolFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInputSync.JoinNumber]);
-                    }
-                    hdcpCapability = hdmiInHdcp.HdmiInHdcpCapability > hdcpCapability
-                        ? hdmiInHdcp.HdmiInHdcpCapability
-                        : hdcpCapability;
 
-                    trilist.SetUShortSigAction(joinMap.Port1HdcpState.JoinNumber, a => hdmiInHdcp.SetHdmiInHdcpState((eHdcpCapabilityType)a));
+            if (routing.AudioVideoSourceNumericFeedback != null)
-                }
+                routing.AudioVideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioVideoSource.JoinNumber]);
-            }
-            if (routing.InputPorts[DmPortName.DmIn] != null)
-            {
-                var dmInHdcp = rmc as IHasDmInHdcp;
 
-                if (dmInHdcp != null)
+            trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber, a => routing.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
-                {
-                    if (rmc.Feedbacks["DmInHdcpCapability"] != null)
-                    {
-                        var intFeedback = rmc.Feedbacks["DmInHdcpCapability"] as IntFeedback;
-                        if (intFeedback != null)
-                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port2HdcpState.JoinNumber]);
-                    }
-
-                    hdcpCapability = dmInHdcp.DmInHdcpCapability > hdcpCapability
-                        ? dmInHdcp.DmInHdcpCapability
-                        : hdcpCapability;
-
-
-                    trilist.SetUShortSigAction(joinMap.Port2HdcpState.JoinNumber, a => dmInHdcp.SetDmInHdcpState((eHdcpCapabilityType)a));
-                }
-            }
-
-            trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)hdcpCapability;
-
-            trilist.UShortInput[joinMap.HdcpInputPortCount.JoinNumber].UShortValue = (ushort)routing.InputPorts.Count;
-
-            var routingWithFeedback = routing as IRmcRouting;
-            if (routingWithFeedback == null) return;
-
-            if (routingWithFeedback.AudioVideoSourceNumericFeedback != null)
-                routingWithFeedback.AudioVideoSourceNumericFeedback.LinkInputSig(
-                    trilist.UShortInput[joinMap.AudioVideoSource.JoinNumber]);
-
-
-            trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber,
-                a => routingWithFeedback.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
         }
 
         #region Implementation of IDeviceInfoProvider
@@ -436,9 +373,9 @@ namespace PepperDash.Essentials.DM
                 }
                 return rx;
 	        }
-            else if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
+            else if (parentDev is DmChassisController)
             {
-                var controller = parentDev as IDmSwitchWithEndpointOnlineFeedback;
+                var controller = parentDev as DmChassisController;
                 var chassis = controller.Chassis;
                 var num = props.ParentOutputNumber;
                 Debug.Console(1, "Creating DM Chassis device '{0}'. Output number '{1}'.", key, num);

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

@@ -137,9 +137,14 @@ namespace PepperDash.Essentials.DM
             HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability",
                 () => (int) tx.HdmiInputs[2].HdcpCapabilityFeedback);
 
-            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
+            HdcpStateFeedback =
+                new IntFeedback(
+                    () =>
+                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
+                            ? (int) tx.HdmiInputs[1].HdcpCapabilityFeedback
+                            : (int) tx.HdmiInputs[2].HdcpCapabilityFeedback);
 
-            HdcpStateFeedback = new IntFeedback(() => (int)HdcpSupportCapability);
+            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
 
             Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool) tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
 

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

@@ -145,9 +145,14 @@ namespace PepperDash.Essentials.DM
 
             HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
 
-            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
+            HdcpStateFeedback =
+                new IntFeedback(
+                    () =>
+                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
+                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
+                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
 
-            HdcpStateFeedback = new IntFeedback(() => (int)HdcpSupportCapability);
+            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
 
             Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
 

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

@@ -121,7 +121,7 @@ namespace PepperDash.Essentials.DM
 
             Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
             Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.DisplayPortInput.InputStreamChange += InputStreamChangeEvent;
+            Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
             Tx.BaseEvent += Tx_BaseEvent;
             Tx.OnlineStatusChange += Tx_OnlineStatusChange;
 
@@ -131,7 +131,8 @@ namespace PepperDash.Essentials.DM
             HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
 
             HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortInHdcpCapability",
+
+            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortHdcpCapability",
                 () => (int) tx.DisplayPortInput.HdcpCapabilityFeedback);
 
             
@@ -145,18 +146,13 @@ namespace PepperDash.Essentials.DM
              */
 
             //yeah this is gross - but it's the quickest way to do this...
-            /*
             HdcpStateFeedback = new IntFeedback(() => {
                 var states = new[] {(int) tx.DisplayPortInput.HdcpCapabilityFeedback, (int) tx.HdmiInputs[1].HdcpCapabilityFeedback, (int) tx.HdmiInputs[2].HdcpCapabilityFeedback};
 
                 return states.Max();
             });
-             */
 
             HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
-            // I feel like we have had this as a misnomer for so long, that it really needed to be fixed 
-            // All we were doing was reporting the best of the current statuses - not the actual capability of the device.
-            HdcpStateFeedback = new IntFeedback(() => (int)HdcpSupportCapability);
 
             Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
 
@@ -170,19 +166,13 @@ namespace PepperDash.Essentials.DM
                     (ActualActiveVideoInput == eVst.Hdmi1
                     && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-                    || (ActualActiveVideoInput == eVst.DisplayPort
-                    && tx.DisplayPortInput.VideoAttributes.HdcpActiveFeedback.BoolValue),
 
                 HdcpStateFeedbackFunc = () =>
                 {
                     if (ActualActiveVideoInput == eVst.Hdmi1)
                         return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                    return ActualActiveVideoInput == eVst.Hdmi2 ? tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString() : "";
-                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-                    return ActualActiveVideoInput == eVst.DisplayPort
-                        ? tx.DisplayPortInput.VideoAttributes.HdcpStateFeedback.ToString()
-                        : "";
                 },
 
                 VideoResolutionFeedbackFunc = () =>
@@ -191,8 +181,6 @@ namespace PepperDash.Essentials.DM
                         return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
                     if (ActualActiveVideoInput == eVst.Hdmi2)
                         return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.DisplayPort)
-                        return tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString();
                     return ActualActiveVideoInput == eVst.Vga ? tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString() : "";
                 },
                 VideoSyncFeedbackFunc = () =>
@@ -200,8 +188,6 @@ namespace PepperDash.Essentials.DM
                     && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Hdmi2
                     && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.DisplayPort
-                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Vga
                     && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
 
@@ -220,15 +206,28 @@ namespace PepperDash.Essentials.DM
                 AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
                 AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
                 AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback, DisplayPortInHdcpCapabilityFeedback);
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback);
 
+            // Set Ports for CEC
             HdmiIn1.Port = Tx.HdmiInputs[1];
             HdmiIn2.Port = Tx.HdmiInputs[2];
-            DisplayPortIn.Port = Tx.DisplayPortInput;
             HdmiLoopOut.Port = Tx.HdmiOutput;
             DmOut.Port = Tx.DmOutput;
         }
 
+        void DisplayPortInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        {
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+
+            switch (args.EventId)
+            {
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                    DisplayPortVideoSyncFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+
 
         public override bool CustomActivate()
         {
@@ -340,17 +339,11 @@ namespace PepperDash.Essentials.DM
                 case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
                     if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
                     if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
-                    if (inputStream == Tx.DisplayPortInput) DisplayPortInHdcpCapabilityFeedback.FireUpdate();
-
-                    Debug.Console(2, this, "DisplayPortHDCP Mode Trigger = {0}",
-                        DisplayPortInHdcpCapabilityFeedback.IntValue);
-
                     HdcpStateFeedback.FireUpdate();
                     break;
                 case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
                     if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
-                    if (inputStream == Tx.DisplayPortInput) DisplayPortVideoSyncFeedback.FireUpdate();
                     break;
             }
         }

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

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -42,7 +44,7 @@ namespace PepperDash.Essentials.DM
             if (typeName.StartsWith("dmtx401"))
                 return new DmTx401CController(key, name, new DmTx401C(dmInput), true);
             if (typeName.StartsWith("hdbasettx"))
-                return new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
+                new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
 
             return null;
         }
@@ -81,7 +83,6 @@ namespace PepperDash.Essentials.DM
 		/// <param name="key"></param>
 		/// <param name="name"></param>
 		/// <param name="props"></param>
-        /// <param name="typeName"></param>
 		/// <returns></returns>
         public static BasicDmTxControllerBase GetDmTxController(string key, string name, string typeName, DmTxPropertiesConfig props)
 		{
@@ -127,10 +128,10 @@ namespace PepperDash.Essentials.DM
             BasicDmTxControllerBase tx;
             bool useChassisForOfflineFeedback = false;
 
-            if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
+		    if (parentDev is DmChassisController)
             {
                 // Get the Crestron chassis and link stuff up
-                var switchDev = (parentDev as IDmSwitchWithEndpointOnlineFeedback);
+			    var switchDev = (parentDev as DmChassisController);
 			    var chassis = switchDev.Chassis;
 
                 //Check that the input is within range of this chassis' possible inputs
@@ -179,8 +180,7 @@ namespace PepperDash.Essentials.DM
                     return null;
                 }
             }
-
+            else if(parentDev is DmpsRoutingController)
-            if (parentDev is DmpsRoutingController)
             {
                 // Get the DMPS chassis and link stuff up
                 var dmpsDev = (parentDev as DmpsRoutingController);
@@ -237,10 +237,13 @@ namespace PepperDash.Essentials.DM
                 }                
             }
 
+            else
+            {
 			    Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
 			    return null;
 			}
 		}
+	}
 
     public abstract class BasicDmTxControllerBase : CrestronGenericBridgeableBaseDevice
     {
@@ -278,8 +281,7 @@ namespace PepperDash.Essentials.DM
             };
 		}
 
-        protected DmTxControllerBase(string key, string name, DmHDBasedTEndPoint hardware)
+	    protected DmTxControllerBase(string key, string name, DmHDBasedTEndPoint hardware) : base(key, name, hardware)
-            : base(key, name, hardware)
 	    {
 	    }
 
@@ -333,6 +335,8 @@ namespace PepperDash.Essentials.DM
                 txR.VideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoInput.JoinNumber]);
                 txR.AudioSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioInput.JoinNumber]);
 
+                trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)tx.HdcpSupportCapability;
+
                 if (txR.InputPorts[DmPortName.HdmiIn] != null)
                 {
                     var inputPort = txR.InputPorts[DmPortName.HdmiIn];
@@ -379,7 +383,7 @@ namespace PepperDash.Essentials.DM
                     {
                         var intFeedback = tx.Feedbacks["HdmiIn2HdcpCapability"] as IntFeedback;
                         if (intFeedback != null)
-                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port2HdcpState.JoinNumber]);
+                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState.JoinNumber]);
                     }
 
                     if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
@@ -396,33 +400,19 @@ namespace PepperDash.Essentials.DM
 
                     if (tx.Feedbacks["DisplayPortInHdcpCapability"] != null)
                     {
-
                         var intFeedback = tx.Feedbacks["DisplayPortInHdcpCapability"] as IntFeedback;
                         if (intFeedback != null)
-
                             intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port3HdcpState.JoinNumber]);
+                    }
 
-                        if (inputPort.ConnectionType == eRoutingPortConnectionType.DisplayPort && inputPort.Port != null)
+                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
                     {
                         var port = inputPort.Port as EndpointDisplayPortInput;
-                            SetHdcpCapabilityAction(port, joinMap.Port3HdcpState.JoinNumber, trilist);
+
-                        }
+                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port3HdcpState.JoinNumber, trilist);
-                    }
                     }
 
-
+                }
-                var hdcpInputPortCount =
-                    (ushort)
-                        txR.InputPorts.Where(
-                            x => (x.Type == eRoutingSignalType.Video) || (x.Type == eRoutingSignalType.AudioVideo))
-                            .Where(
-                                x =>
-                                    (x.ConnectionType == eRoutingPortConnectionType.DmCat) ||
-                                    (x.ConnectionType == eRoutingPortConnectionType.Hdmi) ||
-                                    (x.ConnectionType == eRoutingPortConnectionType.DisplayPort))
-                            .ToList().Count();
-
-                trilist.SetUshort(joinMap.HdcpInputPortCount.JoinNumber, hdcpInputPortCount);
 
             }
 
@@ -472,15 +462,17 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        private void SetHdcpCapabilityAction(EndpointDisplayPortInput port, uint join,
+	    private void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointDisplayPortInput port, uint join,
 	        BasicTriList trilist)
 	    {
+
+
 	        trilist.SetUShortSigAction(join,
 	            s =>
 	            {
-                    Debug.Console(0, this, "Trying to set HDCP to {0} on port {1}", s, port.ToString());
 	                port.HdcpCapability = (eHdcpCapabilityType) s;
 	            });
+
 	    }
 
 	}
@@ -489,22 +481,8 @@ namespace PepperDash.Essentials.DM
     {
         public DmTxControllerFactory()
         {
-            TypeNames = new List<string>
+            TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-            {
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
-                "dmtx200c",
-                "dmtx201c",
-                "dmtx201s",
-                "dmtx4k100c",
-                "dmtx4k202c",
-                "dmtx4kz202c",
-                "dmtx4k302c",
-                "dmtx4kz302c",
-                "dmtx401c",
-                "dmtx401s",
-                "dmtx4k100c1g",
-                "dmtx4kz100c1g",
-                "hdbasettx"
-            };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -514,8 +492,8 @@ namespace PepperDash.Essentials.DM
             Debug.Console(1, "Factory Attempting to create new DM-TX Device");
 
             var props = JsonConvert.DeserializeObject
-                <DmTxPropertiesConfig>(dc.Properties.ToString());
+                <PepperDash.Essentials.DM.Config.DmTxPropertiesConfig>(dc.Properties.ToString());
-            return DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
+            return PepperDash.Essentials.DM.DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
         }
     }
 

essentials-framework/Essentials DM/Essentials_DM/IDmSwitch.cs

@@ -16,17 +16,10 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM.Config;
 
 namespace PepperDash.Essentials.DM {
-    public interface IDmSwitch
+    public interface IDmSwitch {
-	{
         Switch Chassis { get; }
 
         Dictionary<uint, string> TxDictionary { get; }
         Dictionary<uint, string> RxDictionary { get; }
     }
-
-	public interface IDmSwitchWithEndpointOnlineFeedback : IDmSwitch
-	{
-		Dictionary<uint, BoolFeedback> InputEndpointOnlineFeedbacks { get; }
-		Dictionary<uint, BoolFeedback> OutputEndpointOnlineFeedbacks { get; }
-	}
 }

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

@@ -105,7 +105,6 @@
     <Compile Include="Chassis\HdMdNxM4kEBridgeableController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEController.cs" />
     <Compile Include="Config\InputPropertiesConfig.cs" />
-    <Compile Include="Endpoints\EndpointInterfaces.cs" />
     <Compile Include="Endpoints\DGEs\DgeJoinMap.cs" />
     <Compile Include="Endpoints\DGEs\DmDge200CController.cs" />
     <Compile Include="Endpoints\Receivers\DmRmc4kZ100CController.cs" />