feat: adds sdi in/out port names

src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs

@@ -84,18 +84,7 @@ namespace PepperDash.Essentials.Core
                                     .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
                                     .ToArray();
 
-                Task.Run(() =>
-					{
-						try
-						{
-							Debug.LogMessage(LogEventLevel.Verbose, "Calling method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
-							method.Invoke(obj, convertedParams);
-						}
-						catch(Exception e)
-						{
-							Debug.LogMessage(e, "Error invoking method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
-						}
-					});                
+                Task.Run(() => method.Invoke(obj, convertedParams));                
 
 		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
 		            action.DeviceKey);

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -1,6 +1,5 @@
 using PepperDash.Core;
 using Serilog.Events;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -13,37 +12,20 @@ namespace PepperDash.Essentials.Core
     /// on those destinations.
     /// </summary>
     public static class Extensions
-    {
+	{
         private static readonly Dictionary<string, RouteRequest> RouteRequests = new Dictionary<string, RouteRequest>();
-
-        /// <summary>
-        /// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
-        /// and then attempts a new Route and if sucessful, stores that RouteDescriptor
-        /// in RouteDescriptorCollection.DefaultCollection
-        /// </summary>
-        public static void ReleaseAndMakeRoute(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, string destinationPortKey = "", string sourcePortKey = "")
-        {
-            var inputPort = string.IsNullOrEmpty(destinationPortKey) ? null : destination.InputPorts.FirstOrDefault(p => p.Key == destinationPortKey);
-            var outputPort = string.IsNullOrEmpty(sourcePortKey) ? null : source.OutputPorts.FirstOrDefault(p => p.Key == sourcePortKey);
-
-            ReleaseAndMakeRoute(destination, source, signalType, inputPort, outputPort);
-        }
-
-        private static void ReleaseAndMakeRoute(IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort = null, RoutingOutputPort sourcePort = null)
-        {
-            if(destination == null) throw new ArgumentNullException(nameof(destination));
-            if(source == null) throw new ArgumentNullException(nameof(source));
-            if(destinationPort == null) Debug.LogMessage(LogEventLevel.Verbose, "Destination port is null");
-            if(sourcePort == null) Debug.LogMessage(LogEventLevel.Verbose, "Source port is null");
-
-            var routeRequest = new RouteRequest
-            {
-                Destination = destination,
-                DestinationPort = destinationPort,
-                Source = source,
-                SourcePort = sourcePort,
-                SignalType = signalType
-            };
+		/// <summary>
+		/// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
+		/// and then attempts a new Route and if sucessful, stores that RouteDescriptor
+		/// in RouteDescriptorCollection.DefaultCollection
+		/// </summary>
+		public static void ReleaseAndMakeRoute(this IRoutingSink destination, IRoutingOutputs source, eRoutingSignalType signalType)
+		{
+            var routeRequest = new RouteRequest { 
+                        Destination = destination,
+                        Source = source,
+                        SignalType = signalType
+                    };
 
             var coolingDevice = destination as IWarmingCooling;
 
@@ -83,15 +65,15 @@ namespace PepperDash.Essentials.Core
 
             destination.ReleaseRoute();
 
-            RunRouteRequest(routeRequest);
-        }
+			RunRouteRequest(routeRequest);
+		}
 
         private static void RunRouteRequest(RouteRequest request)
         {
             if (request.Source == null)
                 return;
-
-            var newRoute = request.Destination.GetRouteToSource(request.Source, request.SignalType, request.DestinationPort, request.SourcePort);
+            
+            var newRoute = request.Destination.GetRouteToSource(request.Source, request.SignalType);
 
             if (newRoute == null)
                 return;
@@ -103,13 +85,13 @@ namespace PepperDash.Essentials.Core
             newRoute.ExecuteRoutes();
         }
 
-        /// <summary>
-        /// Will release the existing route on the destination, if it is found in 
-        /// RouteDescriptorCollection.DefaultCollection
-        /// </summary>
-        /// <param name="destination"></param>
-        public static void ReleaseRoute(this IRoutingInputs destination)
-        {
+		/// <summary>
+		/// Will release the existing route on the destination, if it is found in 
+		/// RouteDescriptorCollection.DefaultCollection
+		/// </summary>
+		/// <param name="destination"></param>
+        public static void ReleaseRoute(this IRoutingSink destination)
+		{
 
             if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRequest) && destination is IWarmingCooling)
             {
@@ -120,201 +102,138 @@ namespace PepperDash.Essentials.Core
 
             RouteRequests.Remove(destination.Key);
 
-            var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
-            if (current != null)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, "Releasing current route: {0}", destination, current.Source.Key);
-                current.ReleaseRoutes();
-            }
-        }
+			var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
+			if (current != null)
+			{
+				Debug.LogMessage(LogEventLevel.Debug, "Releasing current route: {0}", destination, current.Source.Key);
+				current.ReleaseRoutes();
+			}
+		}
 
-        /// <summary>
-        /// Builds a RouteDescriptor that contains the steps necessary to make a route between devices.  
-        /// Routes of type AudioVideo will be built as two separate routes, audio and video. If
-        /// a route is discovered, a new RouteDescriptor is returned.  If one or both parts
-        /// of an audio/video route are discovered a route descriptor is returned.  If no route is 
-        /// discovered, then null is returned
-        /// </summary>
-        public static RouteDescriptor GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort, RoutingOutputPort sourcePort)
-        {
-            var routeDescriptor = new RouteDescriptor(source, destination, signalType);
+		/// <summary>
+		/// Builds a RouteDescriptor that contains the steps necessary to make a route between devices.  
+		/// Routes of type AudioVideo will be built as two separate routes, audio and video. If
+		/// a route is discovered, a new RouteDescriptor is returned.  If one or both parts
+		/// of an audio/video route are discovered a route descriptor is returned.  If no route is 
+		/// discovered, then null is returned
+		/// </summary>
+        public static RouteDescriptor GetRouteToSource(this IRoutingSink destination, IRoutingOutputs source, eRoutingSignalType signalType)
+		{
+			var routeDescriptor = new RouteDescriptor(source, destination, signalType);
 
-            // if it's a single signal type, find the route
-            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo))
-            {
-                Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {0}", null, source.Key);
+			// if it's a single signal type, find the route
+			if (!signalType.HasFlag(eRoutingSignalType.AudioVideo))
+			{
+				Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {0}", null, source.Key);
 
-                if (!destination.GetRouteToSource(source, null, null, signalType, 0, routeDescriptor, destinationPort, sourcePort))
-                    routeDescriptor = null;
-
-                foreach (var route in routeDescriptor.Routes)
-                {
-                    Debug.LogMessage(LogEventLevel.Verbose,
-    @"Route for device: {route}
-InputPort: {InputPort}
-OutputPort: {OutputPort}",
-    destination,
-    route.SwitchingDevice.Key,
-    route.InputPort,
-    route.OutputPort);
-                }
+				if (!destination.GetRouteToSource(source, null, null, signalType, 0, routeDescriptor))
+					routeDescriptor = null;
 
                 return routeDescriptor;
-            }
-            // otherwise, audioVideo needs to be handled as two steps.
+			}
+			// otherwise, audioVideo needs to be handled as two steps.
+			
+			Debug.LogMessage(LogEventLevel.Debug, "Attempting to build audio and video routes from {0}", destination, source.Key);
 
-            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build audio and video routes from {0}", destination, source.Key);
+			var audioSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Audio, 0, routeDescriptor);
 
-            var audioSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Audio, 0, routeDescriptor, destinationPort, sourcePort);
+			if (!audioSuccess)
+				Debug.LogMessage(LogEventLevel.Debug, "Cannot find audio route to {0}", destination, source.Key);
 
-            if (!audioSuccess)
-                Debug.LogMessage(LogEventLevel.Debug, "Cannot find audio route to {0}", destination, source.Key);
+			var videoSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Video, 0, routeDescriptor);
 
-            var videoSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Video, 0, routeDescriptor, destinationPort, sourcePort);
+			if (!videoSuccess)
+				Debug.LogMessage(LogEventLevel.Debug, "Cannot find video route to {0}", destination, source.Key);
 
-            if (!videoSuccess)
-                Debug.LogMessage(LogEventLevel.Debug, "Cannot find video route to {0}", destination, source.Key);
+			if (!audioSuccess && !videoSuccess)
+				routeDescriptor = null;
+			
+            
+			return routeDescriptor;
+		}
 
-            foreach (var route in routeDescriptor.Routes)
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, 
-@"Route for device: {route}
-InputPort: {InputPort}
-OutputPort: {OutputPort}", 
-destination, 
-route.SwitchingDevice.Key, 
-route.InputPort, 
-route.OutputPort);
-            }
+		/// <summary>
+		/// The recursive part of this.  Will stop on each device, search its inputs for the 
+		/// desired source and if not found, invoke this function for the each input port
+		/// hoping to find the source.
+		/// </summary>
+		/// <param name="destination"></param>
+		/// <param name="source"></param>
+		/// <param name="outputPortToUse">The RoutingOutputPort whose link is being checked for a route</param>
+		/// <param name="alreadyCheckedDevices">Prevents Devices from being twice-checked</param>
+		/// <param name="signalType">This recursive function should not be called with AudioVideo</param>
+		/// <param name="cycle">Just an informational counter</param>
+		/// <param name="routeTable">The RouteDescriptor being populated as the route is discovered</param>
+		/// <returns>true if source is hit</returns>
+		static bool GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source,
+			RoutingOutputPort outputPortToUse, List<IRoutingInputsOutputs> alreadyCheckedDevices, 
+				eRoutingSignalType signalType, int cycle, RouteDescriptor routeTable)
+		{
+			cycle++;
 
+			Debug.LogMessage(LogEventLevel.Verbose, "GetRouteToSource: {0} {1}--> {2}", null, cycle, source.Key, destination.Key);
 
-            if (!audioSuccess && !videoSuccess)
-                routeDescriptor = null;
+			RoutingInputPort goodInputPort = null;
 
+			var destinationTieLines = TieLineCollection.Default.Where(t =>
+                t.DestinationPort.ParentDevice == destination && (t.Type == signalType || t.Type.HasFlag(eRoutingSignalType.AudioVideo)));
 
-            return routeDescriptor;
-        }
+			// find a direct tie
+			var directTie = destinationTieLines.FirstOrDefault(
+				t => t.DestinationPort.ParentDevice == destination 
+					&& t.SourcePort.ParentDevice == source);
+			if (directTie != null) // Found a tie directly to the source
+			{
+				goodInputPort = directTie.DestinationPort;
+			}
+			else // no direct-connect.  Walk back devices.
+			{
+				Debug.LogMessage(LogEventLevel.Verbose, "is not directly connected to {0}. Walking down tie lines", destination, source.Key);
 
-        /// <summary>
-        /// The recursive part of this.  Will stop on each device, search its inputs for the 
-        /// desired source and if not found, invoke this function for the each input port
-        /// hoping to find the source.
-        /// </summary>
-        /// <param name="destination"></param>
-        /// <param name="source"></param>
-        /// <param name="destinationPort">The RoutingOutputPort whose link is being checked for a route</param>
-        /// <param name="alreadyCheckedDevices">Prevents Devices from being twice-checked</param>
-        /// <param name="signalType">This recursive function should not be called with AudioVideo</param>
-        /// <param name="cycle">Just an informational counter</param>
-        /// <param name="routeTable">The RouteDescriptor being populated as the route is discovered</param>
-        /// <returns>true if source is hit</returns>
-        private static bool GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source,
-            RoutingOutputPort outputPortToUse, List<IRoutingInputsOutputs> alreadyCheckedDevices,
-                eRoutingSignalType signalType, int cycle, RouteDescriptor routeTable, RoutingInputPort destinationPort, RoutingOutputPort sourcePort)
-        {
-            cycle++;
-
-            Debug.LogMessage(LogEventLevel.Verbose, "GetRouteToSource: {0} {1}--> {2}", null, cycle, source.Key, destination.Key);
-
-            RoutingInputPort goodInputPort = null;
-
-            IEnumerable<TieLine> destinationTieLines;
-            TieLine directTie = null;
-
-            if (destinationPort == null)
-            {
-
-                destinationTieLines = TieLineCollection.Default.Where(t =>
-                    t.DestinationPort.ParentDevice.Key == destination.Key && (t.Type == signalType || t.Type.HasFlag(eRoutingSignalType.AudioVideo)));
-            }
-            else
-            {
-                destinationTieLines = TieLineCollection.Default.Where(t => t.DestinationPort.ParentDevice.Key == destination.Key && t.DestinationPort.Key == destinationPort.Key && (t.Type == signalType || t.Type.HasFlag(eRoutingSignalType.AudioVideo)));
-            }
-
-            // find the TieLine without a port
-            if (destinationPort == null && sourcePort == null)
-            {
-                directTie = destinationTieLines.FirstOrDefault(t => t.DestinationPort.ParentDevice.Key == destination.Key && t.SourcePort.ParentDevice.Key == source.Key);
-            }
-            // find a tieLine to a specific destination port without a specific source port
-            else if (destinationPort != null && sourcePort == null)
-            {
-                directTie = destinationTieLines.FirstOrDefault(t => t.DestinationPort.ParentDevice.Key == destination.Key && t.DestinationPort.Key == destinationPort.Key && t.SourcePort.ParentDevice.Key == source.Key);
-            }
-            // find a tieline to a specific source port without a specific destination port
-            else if (destinationPort == null & sourcePort != null)
-            {
-                directTie = destinationTieLines.FirstOrDefault(t => t.DestinationPort.ParentDevice.Key == destination.Key && t.SourcePort.ParentDevice.Key == source.Key && t.SourcePort.Key == sourcePort.Key);
-            }
-            // find a tieline to a specific source port and destination port
-            else if (destinationPort != null && sourcePort != null)
-            {
-                directTie = destinationTieLines.FirstOrDefault(t => t.DestinationPort.ParentDevice.Key == destination.Key && t.DestinationPort.Key == destinationPort.Key && t.SourcePort.ParentDevice.Key == source.Key && t.SourcePort.Key == sourcePort.Key);
-            }
-
-            if (directTie != null) // Found a tie directly to the source
-            {
-                goodInputPort = directTie.DestinationPort;
-            }
-            else // no direct-connect.  Walk back devices.
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, "is not directly connected to {0}. Walking down tie lines", destination, source.Key);
-
-                // No direct tie? Run back out on the inputs' attached devices... 
-                // Only the ones that are routing devices
-                var midpointTieLines = destinationTieLines.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
+				// No direct tie? Run back out on the inputs' attached devices... 
+				// Only the ones that are routing devices
+				var attachedMidpoints = destinationTieLines.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
 
                 //Create a list for tracking already checked devices to avoid loops, if it doesn't already exist from previous iteration
                 if (alreadyCheckedDevices == null)
                     alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
                 alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs);
 
-                foreach (var tieLine in midpointTieLines)
-                {
-                    var midpointDevice = tieLine.SourcePort.ParentDevice as IRoutingInputsOutputs;
+				foreach (var inputTieToTry in attachedMidpoints)
+				{
+					var upstreamDeviceOutputPort = inputTieToTry.SourcePort;
+					var upstreamRoutingDevice = upstreamDeviceOutputPort.ParentDevice as IRoutingInputsOutputs;
+                    Debug.LogMessage(LogEventLevel.Verbose,  "Trying to find route on {0}", destination, upstreamRoutingDevice.Key);
 
-                    // Check if this previous device has already been walked
-                    if (alreadyCheckedDevices.Contains(midpointDevice))
+					// Check if this previous device has already been walked
+                    if (alreadyCheckedDevices.Contains(upstreamRoutingDevice))
                     {
-                        Debug.LogMessage(LogEventLevel.Verbose, "Skipping input {0} on {1}, this was already checked", destination, midpointDevice.Key, destination.Key);
+                        Debug.LogMessage(LogEventLevel.Verbose, "Skipping input {0} on {1}, this was already checked", destination, upstreamRoutingDevice.Key, destination.Key);
                         continue;
                     }
-
-                    var midpointOutputPort = tieLine.SourcePort;
-
-                    Debug.LogMessage(LogEventLevel.Verbose, "Trying to find route on {0}", destination, midpointDevice.Key);
-
                     // haven't seen this device yet.  Do it.  Pass the output port to the next
                     // level to enable switching on success
-                    var upstreamRoutingSuccess = midpointDevice.GetRouteToSource(source, midpointOutputPort,
-                        alreadyCheckedDevices, signalType, cycle, routeTable, null, sourcePort);
-
+                    var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort,
+                        alreadyCheckedDevices, signalType, cycle, routeTable);
                     if (upstreamRoutingSuccess)
                     {
                         Debug.LogMessage(LogEventLevel.Verbose, "Upstream device route found", destination);
-                        Debug.LogMessage(LogEventLevel.Verbose, "Route found on {0}", destination, midpointDevice.Key);
-                        Debug.LogMessage(LogEventLevel.Verbose, 
-@"TieLine:\n
-SourcePort: {SourcePort}\n
-DestinationPort: {DestinationPort}\n"
-, destination, tieLine.SourcePort, tieLine.DestinationPort);
-                        goodInputPort = tieLine.DestinationPort;
+                        goodInputPort = inputTieToTry.DestinationPort;
                         break; // Stop looping the inputs in this cycle
                     }
-                }
-            }
+				}
+			}
 
-
-            if (goodInputPort == null)
-            {
+			
+			if (goodInputPort == null) 
+			{
                 Debug.LogMessage(LogEventLevel.Verbose, "No route found to {0}", destination, source.Key);
                 return false;
-            }
+			}
 
             // we have a route on corresponding inputPort. *** Do the route ***
 
-            if (destination is IRoutingSink)
+            if (outputPortToUse == null)
             {
                 // it's a sink device
                 routeTable.Routes.Add(new RouteSwitchDescriptor(goodInputPort));
@@ -325,8 +244,8 @@ DestinationPort: {DestinationPort}\n"
             }
             else // device is merely IRoutingInputOutputs
                 Debug.LogMessage(LogEventLevel.Verbose, "No routing. Passthrough device", destination);
-
+            
             return true;
         }
-    }
+	}	
 }

src/PepperDash.Essentials.Core/Routing/IRoutingSource.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Defines an IRoutingOutputs devices as being a source - the start of the chain
     /// </summary>
-    public interface IRoutingSource : IRoutingOutputs
-    {
-    }
+    public interface IRoutingSource
+    { 
+	}
 }

src/PepperDash.Essentials.Core/Routing/RouteRequest.cs

@@ -2,22 +2,19 @@
 {
     public class RouteRequest
     {
-        public RoutingInputPort DestinationPort { get; set; }
-
-        public RoutingOutputPort SourcePort { get; set; }
-        public IRoutingInputs Destination { get; set; }
-        public IRoutingOutputs Source { get; set; }
-        public eRoutingSignalType SignalType { get; set; }
+        public IRoutingSink Destination {get; set;}
+        public IRoutingOutputs Source {get; set;}
+        public eRoutingSignalType SignalType {get; set;}
 
         public void HandleCooldown(object sender, FeedbackEventArgs args)
         {
             var coolingDevice = sender as IWarmingCooling;
-
-            if (args.BoolValue == false)
+            
+            if(args.BoolValue == false)
             {
                 Destination.ReleaseAndMakeRoute(Source, SignalType);
-
-                if (sender == null) return;
+                
+                if(sender == null) return;
 
                 coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
             }

src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs

@@ -13,7 +13,7 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common
 {
-	public class GenericSource : EssentialsDevice, IUiDisplayInfo, IRoutingSource, IUsageTracking
+	public class GenericSource : EssentialsDevice, IUiDisplayInfo, IRoutingSource, IRoutingOutputs, IUsageTracking
 	{
 
 		public uint DisplayUiType { get { return DisplayUiConstants.TypeNoControls; } }