Adds seperate Video and Audio IO names to DmChassisControllerJoinMap

InputVideoNames = 500; //501-699
   InputAudioNames = 700; //701-899
   OutputVideoNames = 900; //901-1099
   OutputAudioNames = 1100; //1101-1299

PepperDashEssentials/Bridges/IBridge.cs

@@ -1,5 +1,4 @@
 using System;
-using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Bridges
 {
@@ -7,8 +6,7 @@ namespace PepperDash.Essentials.Bridges
     /// Defines a device that uses the legacy JoinMapBase for its join map
     /// </summary>
     [Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")]
-    public interface IBridge
+    public interface IBridge:Core.Bridges.IBridge
     {
-        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
     }
 }

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -76,11 +76,27 @@ namespace PepperDash.Essentials.Bridges
         /// <summary>
         /// Range sets and reports the name for the corresponding input card
         /// </summary>
-        public uint InputNames { get; set; }
+        public uint InputNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding input card
+		/// </summary>
+		public uint InputVideoNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding input card
+		/// </summary>
+		public uint InputAudioNames { get; set; }
         /// <summary>
         /// Range sets and reports the name for the corresponding output card
         /// </summary>
-        public uint OutputNames { get; set; }
+        public uint OutputNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding output card
+		/// </summary>
+		public uint OutputVideoNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding output card
+		/// </summary>
+		public uint OutputAudioNames { get; set; }
         /// <summary>
         /// Range reports the name of the current video source for the corresponding output card
         /// </summary>
@@ -119,7 +135,11 @@ namespace PepperDash.Essentials.Bridges
 
             //Serial
             InputNames = 100; //101-299
-            OutputNames = 300; //301-499
+            OutputNames = 300; //301-499
+			InputVideoNames = 500; //501-699
+			InputAudioNames = 700; //701-899
+			OutputVideoNames = 900; //901-1099
+			OutputAudioNames = 1100; //1101-1299
             OutputCurrentVideoInputNames = 2000; //2001-2199
             OutputCurrentAudioInputNames = 2200; //2201-2399
             InputCurrentResolution = 2400; // 2401-2599
@@ -131,7 +151,11 @@ namespace PepperDash.Essentials.Bridges
 
             SystemId = SystemId + joinOffset;
             IsOnline = IsOnline + joinOffset;
-            OutputVideo = OutputVideo + joinOffset;
+            OutputVideo = OutputVideo + joinOffset;
+			InputVideoNames = InputVideoNames + joinOffset;
+			InputAudioNames = InputAudioNames + joinOffset;
+			OutputVideoNames = OutputVideoNames + joinOffset;
+			OutputAudioNames = OutputAudioNames + joinOffset; 
             OutputAudio = OutputAudio + joinOffset;
             OutputUsb = OutputUsb + joinOffset;
             InputUsb = InputUsb + joinOffset;

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

@@ -110,15 +110,24 @@ namespace PepperDash.Essentials.Core.Bridges
                     if (device == null) continue;
 
                     Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
-                    //if (device is IBridge)      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
-                    //{
-                    //    Debug.Console(2, this, "'{0}' is IBridge", device.Key);
-                    //}
+
+                    if (typeof (IBridge).IsAssignableFrom(device.GetType().GetCType()))
+                    {
+                        var basicBridge = device as IBridge;
+                        if (basicBridge != null)
+                        {
+                            Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                                "Linking EiscApiAdvanced {0} to device {1} using obsolete join map. Please update the device's join map.",
+                                Key, device.Key);
+                            basicBridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                        }
+                        continue;
+                    }
+
                     if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                     {
                         continue;
                     }
-
                     var bridge = device as IBridgeAdvanced;
                     if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                 }

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

@@ -1,13 +1,19 @@
 using System;
 using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
     /// Defines a device that uses JoinMapBaseAdvanced for its join map
     /// </summary>
-    public interface IBridgeAdvanced
+    public interface IBridgeAdvanced:IKeyed
     {
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
+
+    public interface IBridge:IKeyed
+    {
+        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
+    }   
 }

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

@@ -313,7 +313,13 @@ namespace PepperDash.Essentials.Core
 
             var deviceKey = args[0];
             var setting = args[1];
-            var timeout = args[2];
+
+            var timeout= String.Empty;
+
+            if (args.Length >= 3)
+            {
+                timeout = args[2];
+            }
 
             var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
 
@@ -322,42 +328,38 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
                 return;
             }
-            else
-            {
-                eStreamDebuggingSetting debugSetting = eStreamDebuggingSetting.Off;
 
+            eStreamDebuggingSetting debugSetting;
+
+            try
+            {
+                debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
+            }
+            catch
+            {
+                Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
+                return;
+            }
+
+            if (!string.IsNullOrEmpty(timeout))
+            {
                 try
                 {
-                    debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
-                }
-                catch
-                {
-                    Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
-                    return;
-                }
+                    var min = Convert.ToUInt32(timeout);
 
-                if (!string.IsNullOrEmpty(timeout))
-                {
-                    try
-                    {
-                        var min = Convert.ToUInt32(timeout);
+                    device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
 
-                        device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                        Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
-
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
-                        return;
-                    }
                 }
-                else
+                catch (Exception e)
                 {
-                    device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
+                    Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
                 }
-                
+            }
+            else
+            {
+                device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
+                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

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

@@ -64,7 +64,7 @@
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

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

@@ -173,22 +173,22 @@ namespace PepperDash.Essentials.DM
 	            {"dmrmcscalers", (k, n,i, d) => new DmRmcScalerSController(k, n, new DmRmcScalerS(i,d))},
 	            {
 	                "dmrmcscalers2",
-	                (k, n,i, d) => new DmRmcScalerS2Controller(k, n, new DmRmcScalerS2(d))
+	                (k, n,i, d) => new DmRmcScalerS2Controller(k, n, new DmRmcScalerS2(i, d))
 	            },
 	            {
 	                "dmrmc4kscalerc",
-	                (k, n,i, d) => new DmRmc4kScalerCController(k, n, new DmRmc4kScalerC(d))
+	                (k, n,i, d) => new DmRmc4kScalerCController(k, n, new DmRmc4kScalerC(i, d))
 	            },
 	            {
 	                "dmrmc4kscalercdsp",
-	                (k, n,i, d) => new DmRmc4kScalerCDspController(k, n, new DmRmc4kScalerCDsp(d))
+	                (k, n,i, d) => new DmRmc4kScalerCDspController(k, n, new DmRmc4kScalerCDsp(i, d))
 	            },
 	            {
 	                "dmrmc4kzscalerc",
-	                (k, n,i, d) => new DmRmc4kZScalerCController(k, n, new DmRmc4kzScalerC(d))
+	                (k, n,i, d) => new DmRmc4kZScalerCController(k, n, new DmRmc4kzScalerC(i, d))
 	            },
-                {"hdbasetrx", (k,n,i,d) => new HDBaseTRxController(k,n, new HDRx3CB(d))},
-                {"dmrmc4k100c1g", (k,n,i,d) => new DmRmc4k100C1GController(k,n, new DmRmc4K100C1G(d))}
+                {"hdbasetrx", (k,n,i,d) => new HDBaseTRxController(k,n, new HDRx3CB(i, d))},
+                {"dmrmc4k100c1g", (k,n,i,d) => new DmRmc4k100C1GController(k,n, new DmRmc4K100C1G(i, d))}
 	        };
         }
 	    /// <summary>

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

@@ -68,8 +68,9 @@ namespace PepperDash.Essentials.DM
 
             // Set Ports for CEC
             HdmiIn.Port = Tx;
-        }
 
+            PreventRegistration = true;
+        }
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {