fix(CiscoSparkCodec): Solves exception when in SipUri getter

update MockVC and EssentialsVideoCodecUiDriver
updates to Cisco classes to address some exceptions at startup with EssentialsVideoCodecUiDriver

PepperDashEssentials/Properties/ControlSystem.cfg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ControlSystem>
-  <Name>192.168.10.1</Name>
-  <Address>auto 192.168.10.1</Address>
+  <Name>Test RMC3</Name>
+  <Address>auto 192.168.1.40;username crestron</Address>
   <ProgramSlot>Program01</ProgramSlot>
   <Storage>Internal Flash</Storage>
 </ControlSystem>

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -103,7 +103,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 1202
         /// </summary>
-        public const uint VCStagingInactivePopoverVisible = 1202;
+        public const uint VCStagingInactivePopoverWithRecentsVisible = 1202;
         /// <summary>
         /// 
         /// </summary>
@@ -121,6 +121,11 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCRecentsVisible = 1206;
 
+        /// <summary>
+        /// 1202
+        /// </summary>
+        public const uint VCStagingInactivePopoverWithoutRecentsVisible = 1207;
+
 		/// <summary>
 		/// 1208
 		/// </summary>
@@ -243,6 +248,10 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCCameraSelectBarWithoutModeVisible = 1261;
 
+        /// <summary>
+        /// 1262
+        /// </summary>
+        public const uint VCCameraAutoModeIsOnFb = 1262;
 
         /// <summary>
         /// 1271

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -448,10 +448,10 @@ namespace PepperDash.Essentials
 				// and the LastMeetingDismissed != this meeting
 
 				var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
-				Debug.Console(1, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
-					CurrentRoom.OnFeedback.BoolValue,
-					LastMeetingDismissedId,
-					lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
+                //Debug.Console(1, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
+                //    CurrentRoom.OnFeedback.BoolValue,
+                //    LastMeetingDismissedId,
+                //    lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
 
 				var meeting = meetings.LastOrDefault(m => m.Joinable);
 				if (CurrentRoom.OnFeedback.BoolValue

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -123,12 +123,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(Codec_CallStatusChange);
 
-                // If the codec is ready, then get the values we want, otherwise wait
-                if (Codec.IsReady)
-                    Codec_IsReady();
-                else
-                    codec.IsReadyChange += (o, a) => Codec_IsReady();
-
                 //InCall = new BoolFeedback(() => false);
                 LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
@@ -142,7 +136,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
 
                 StagingBarsInterlock = new JoinedSigInterlock(triList);
-                StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
+                if(Codec is IHasCallHistory)
+                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible);
+                else
+                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible);
 
                 StagingButtonsFeedbackInterlock = new JoinedSigInterlock(triList);
                 StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
@@ -196,6 +193,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
                     StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
 
+                // If the codec is ready, then get the values we want, otherwise wait
+                if (Codec.IsReady)
+                    Codec_IsReady();
+                else
+                    codec.IsReadyChange += (o, a) => Codec_IsReady();
+
+
+
             }
             catch (Exception e)
             {
@@ -351,10 +356,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
 			
 			uint stageJoin;
-			if (Codec.IsInCall)
-				stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
-			else
-				stageJoin = UIBoolJoin.VCStagingInactivePopoverVisible;
+            if (Codec.IsInCall)
+                stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
+            else
+            {
+                if (Codec is IHasCallHistory)
+                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible;
+                else
+                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible;
+            }
 			if (IsVisible)
 				StagingBarsInterlock.ShowInterlocked(stageJoin);
 			else
@@ -510,16 +520,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 VCControlsInterlock.StatusChanged += new EventHandler<StatusChangedEventArgs>(VCControlsInterlock_StatusChanged);
 
-
                 var codecOffCameras = Codec as IHasCameraOff;
 
+                var supportsCameraOffMode = Codec.SupportsCameraOff;
+
                 var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-                if (codecAutoCameras != null)
+                var supportsAutoCameraMode = Codec.SupportsCameraAutoMode;
+
+                if (codecAutoCameras != null && supportsAutoCameraMode)
                 {
+
                     CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
                     codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
+                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCCameraAutoModeIsOnFb]);
                     //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
                     //() => codecAutoCameras.CameraAutoModeOn());
 
@@ -545,6 +560,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             }
 
                         };
+
                 }
 
                 // Manual button always visible
@@ -554,8 +570,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
                 //    () => ShowCameraManualMode());
 
-                if (codecOffCameras != null)
+                if (codecOffCameras != null && supportsCameraOffMode)
                 {
+
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
                     codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
                     CameraModeList.SetItemButtonAction(3, (b) => codecOffCameras.CameraOff());
@@ -583,6 +600,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             }
 
                         };
+
                 }
             }
 
@@ -845,19 +863,32 @@ namespace PepperDash.Essentials.UIDrivers.VC
         // Determines if codec is in manual camera control mode and shows feedback
         void ShowCameraManualMode()
         {
+            Debug.Console(2, "ShowCameraManualMode");
+
             var inManualMode = true;
 
             var codecOffCameras = Codec as IHasCameraOff;
 
             var codecAutoCameras = Codec as IHasCameraAutoMode;
 
+            var supportsAutoCameras = codecAutoCameras != null && Codec.SupportsCameraAutoMode;
+
             if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
             {
                 inManualMode = false;
+
+                var codecCameraMute = Codec as IHasCameraMute;
+
+                if (codecCameraMute != null)
+                {
+                    codecCameraMute.CameraMuteOff();
+                    inManualMode = true;
+
+                }
             }
 
             // Clear auto mode
-            if (codecAutoCameras != null )
+            if (supportsAutoCameras)
             {
                 if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
                 {
@@ -1201,7 +1232,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 			var lc = Codec as IHasCodecLayouts;
 			if (lc != null)
 			{
-                TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
+
 				lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
 				lc.LocalLayoutFeedback.OutputChange += (o,a) => 
 				{
@@ -1214,14 +1245,24 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
 				if (cisco != null)
 				{
+                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 					// Cisco has min/max buttons that need special sauce
 					cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 					//cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 
 					TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle);
 				}
+
+                var zoomRoom = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom;
+                if (zoomRoom != null)
+                {
+                    TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = true;
+                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggle);
+                }
 				 
 			}
+
+            
 		}
 
 		/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -1,90 +1,90 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Core;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.Touchpanels;
-
-namespace PepperDash.Essentials.Core
-{
-    public class DeviceFactoryWrapper
-    {
-        public CType CType { get; set; }
-        public string Description { get; set; }
-        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
-
-        public DeviceFactoryWrapper()
-        {
-            CType = null;
-            Description = "Not Available";
-        }
-    }
-
-    public class DeviceFactory
-    {
-        public DeviceFactory()
-        {
-            var assy = Assembly.GetExecutingAssembly();
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
-            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-
-            if (types != null)
-            {
-                foreach (var type in types)
-                {
-                    try
-                    {
-                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                        factory.LoadTypeFactories();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
-                    }
-                }
-            }
-        }
-
-		/// <summary>
-		/// A dictionary of factory methods, keyed by config types, added by plugins.
-		/// These methods are looked up and called by GetDevice in this class.
-		/// </summary>
-		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
-            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Adds a plugin factory method
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
-		{
-			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
-		}
-
-        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
-        {
-            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-
-            if(FactoryMethods.ContainsKey(typeName))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
-                return;
-            }
-
-            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
-            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp.Reflection;
+using PepperDash.Core;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Touchpanels;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DeviceFactoryWrapper
+    {
+        public CType CType { get; set; }
+        public string Description { get; set; }
+        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
+
+        public DeviceFactoryWrapper()
+        {
+            CType = null;
+            Description = "Not Available";
+        }
+    }
+
+    public class DeviceFactory
+    {
+        public DeviceFactory()
+        {
+            var assy = Assembly.GetExecutingAssembly();
+            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
+
+            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
+
+            if (types != null)
+            {
+                foreach (var type in types)
+                {
+                    try
+                    {
+                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                        factory.LoadTypeFactories();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
+                    }
+                }
+            }
+        }
+
+		/// <summary>
+		/// A dictionary of factory methods, keyed by config types, added by plugins.
+		/// These methods are looked up and called by GetDevice in this class.
+		/// </summary>
+		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
+            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
+
+		/// <summary>
+		/// Adds a plugin factory method
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <returns></returns>
+		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
+		{
+			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
+		}
+
+        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
+        {
+            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+
+            if(FactoryMethods.ContainsKey(typeName))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
+                return;
+            }
+
+            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
+            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
         }
 
         private static void CheckForSecrets(IEnumerable<JProperty> obj)
@@ -156,44 +156,53 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
 
                 Debug.Console(2, "{0}", ex.StackTrace);
+
+                if (ex.InnerException == null)
+                {
+                    return null;
+                }
+
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Inner exception while creating device {0}: {1}", dc.Key,
+                    ex.InnerException.Message);
+                Debug.Console(2, "{0}", ex.InnerException.StackTrace);
                 return null;
             }
         }
 
-        /// <summary>
-        /// Prints the type names and associated metadata from the FactoryMethods collection.
-        /// </summary>
-        /// <param name="command"></param>
-        public static void GetDeviceFactoryTypes(string filter)
-        {
-            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
-
-            if (!string.IsNullOrEmpty(filter))
-            {
-                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
-            }
-            else
-            {
-                types = FactoryMethods;
-            }
-
-            Debug.Console(0, "Device Types:");
-
-            foreach (var type in types.OrderBy(t => t.Key))
-            {
-                var description = type.Value.Description;
-                var cType = "Not Specified by Plugin";
-
-                if(type.Value.CType != null)
-                {
-                    cType = type.Value.CType.FullName;
-                }
-
-                Debug.Console(0, 
-                    @"Type: '{0}' 
-                    CType: '{1}' 
-                    Description: {2}", type.Key, cType, description);
-            }
-        }
-    }
+        /// <summary>
+        /// Prints the type names and associated metadata from the FactoryMethods collection.
+        /// </summary>
+        /// <param name="command"></param>
+        public static void GetDeviceFactoryTypes(string filter)
+        {
+            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+
+            if (!string.IsNullOrEmpty(filter))
+            {
+                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
+            }
+            else
+            {
+                types = FactoryMethods;
+            }
+
+            Debug.Console(0, "Device Types:");
+
+            foreach (var type in types.OrderBy(t => t.Key))
+            {
+                var description = type.Value.Description;
+                var cType = "Not Specified by Plugin";
+
+                if(type.Value.CType != null)
+                {
+                    cType = type.Value.CType.FullName;
+                }
+
+                Debug.Console(0, 
+                    @"Type: '{0}' 
+                    CType: '{1}' 
+                    Description: {2}", type.Key, cType, description);
+            }
+        }
+    }
 }

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

@@ -16,7 +16,8 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.DM.Config;
 
-namespace PepperDash.Essentials.DM {
+namespace PepperDash.Essentials.DM
+{
     /// <summary>
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
@@ -75,8 +76,10 @@ namespace PepperDash.Essentials.DM {
         /// Factory method to create a new chassis controller from config data. Limited to 8x8 right now
         /// </summary>
         public static DmBladeChassisController GetDmChassisController(string key, string name,
-            string type, DMChassisPropertiesConfig properties) {
-            try {
+            string type, DMChassisPropertiesConfig properties)
+        {
+            try
+            {
                 type = type.ToLower();
                 uint ipid = properties.Control.IpIdInt;
 
@@ -85,7 +88,8 @@ namespace PepperDash.Essentials.DM {
                 else if (type == "dmmd128x128") { chassis = new DmMd128x128(ipid, Global.ControlSystem); }
 
 
-                if (chassis == null) {
+                if (chassis == null)
+                {
                     return null;
                 }
 
@@ -93,11 +97,13 @@ namespace PepperDash.Essentials.DM {
                 // add the cards and port names
                 foreach (var kvp in properties.InputSlots)
                     controller.AddInputBlade(kvp.Value, kvp.Key);
-                foreach (var kvp in properties.OutputSlots) {
+                foreach (var kvp in properties.OutputSlots)
+                {
                     controller.AddOutputBlade(kvp.Value, kvp.Key);
                 }
 
-                foreach (var kvp in properties.VolumeControls) {
+                foreach (var kvp in properties.VolumeControls)
+                {
                     // get the card
                     // check it for an audio-compatible type
                     // make a something-something that will make it work
@@ -123,7 +129,8 @@ namespace PepperDash.Essentials.DM {
                 controller.PropertiesConfig = properties;
                 return controller;
             }
-            catch (System.Exception e) {
+            catch (System.Exception e)
+            {
                 Debug.Console(0, "Error creating DM chassis:\r{0}", e);
             }
             return null;
@@ -137,7 +144,8 @@ namespace PepperDash.Essentials.DM {
         /// <param name="name"></param>
         /// <param name="chassis"></param>
         public DmBladeChassisController(string key, string name, BladeSwitch chassis)
-            : base(key, name, chassis) {
+            : base(key, name, chassis)
+        {
             Chassis = chassis;
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
@@ -161,68 +169,87 @@ namespace PepperDash.Essentials.DM {
             InputCardHdcpCapabilityFeedbacks = new Dictionary<uint, IntFeedback>();
             InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
 
-            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) {
+            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++)
+            {
                 var tempX = x;
 
-                if (Chassis.Outputs[tempX] != null) {
-                    VideoOutputFeedbacks[tempX] = new IntFeedback(() => {
+                if (Chassis.Outputs[tempX] != null)
+                {
+                    VideoOutputFeedbacks[tempX] = new IntFeedback(() =>
+                    {
                         if (Chassis.Outputs[tempX].VideoOutFeedback != null) { return (ushort)Chassis.Outputs[tempX].VideoOutFeedback.Number; }
                         else { return 0; };
                     });
 
-                    OutputNameFeedbacks[tempX] = new StringFeedback(() => {
-                        if (Chassis.Outputs[tempX].NameFeedback != null) {
+                    OutputNameFeedbacks[tempX] = new StringFeedback(() =>
+                    {
+                        if (Chassis.Outputs[tempX].NameFeedback != null)
+                        {
                             return Chassis.Outputs[tempX].NameFeedback.StringValue;
                         }
-                        else {
+                        else
+                        {
                             return "";
                         }
                     });
-                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() => {
-                        if (Chassis.Outputs[tempX].VideoOutFeedback != null) {
+                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() =>
+                    {
+                        if (Chassis.Outputs[tempX].VideoOutFeedback != null)
+                        {
                             return Chassis.Outputs[tempX].VideoOutFeedback.NameFeedback.StringValue;
                         }
-                        else {
+                        else
+                        {
                             return "";
                         }
                     });
 
-                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
+                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() =>
+                    {
                         //if (Chassis.Outputs[tempX].Endpoint != null)
                         //    return Chassis.Outputs[tempX].Endpoint.IsOnline;
                         //else
-                            return Chassis.Outputs[tempX].EndpointOnlineFeedback;
+                        return Chassis.Outputs[tempX].EndpointOnlineFeedback;
                     });
                 }
 
-                if (Chassis.Inputs[tempX] != null) {
-                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() => {
+                if (Chassis.Inputs[tempX] != null)
+                {
+                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() =>
+                    {
                         if (Chassis.Inputs[tempX].USBRoutedToFeedback != null) { return (ushort)Chassis.Inputs[tempX].USBRoutedToFeedback.Number; }
                         else { return 0; };
                     });
-                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() => {
+                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() =>
+                    {
                         if (Chassis.Inputs[tempX].VideoDetectedFeedback != null)
                             return Chassis.Inputs[tempX].VideoDetectedFeedback.BoolValue;
                         else
                             return false;
                     });
-                    InputNameFeedbacks[tempX] = new StringFeedback(() => {
-                        if (Chassis.Inputs[tempX].NameFeedback != null) {
+                    InputNameFeedbacks[tempX] = new StringFeedback(() =>
+                    {
+                        if (Chassis.Inputs[tempX].NameFeedback != null)
+                        {
                             return Chassis.Inputs[tempX].NameFeedback.StringValue;
                         }
-                        else {
+                        else
+                        {
                             return "";
                         }
                     });
 
-                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
+                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() =>
+                    {
                         return Chassis.Inputs[tempX].EndpointOnlineFeedback;
                     });
 
-                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() => {
+                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() =>
+                    {
                         var inputCard = Chassis.Inputs[tempX];
 
-                        if (inputCard.Card is DmHdmi4kInputBladeCard) {
+                        if (inputCard.Card is DmHdmi4kInputBladeCard)
+                        {
                             InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
 
                             if ((inputCard.Card as DmHdmi4kInputBladeCard).Hdmi4kInput.HdcpSupportOnFeedback.BoolValue)
@@ -231,7 +258,8 @@ namespace PepperDash.Essentials.DM {
                                 return 0;
                         }
 
-                        if (inputCard.Card is DmC4kInputBladeCard) {
+                        if (inputCard.Card is DmC4kInputBladeCard)
+                        {
                             InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
 
                             if ((inputCard.Card as DmC4kInputBladeCard).DmInput.HdcpCapabilityFeedback.Equals(eHdcpCapabilityType.HdcpSupportOff))
@@ -252,45 +280,56 @@ namespace PepperDash.Essentials.DM {
         /// </summary>
         /// <param name="type"></param>
         /// <param name="number"></param>
-        public void AddInputBlade(string type, uint number) {
+        public void AddInputBlade(string type, uint number)
+        {
             Debug.Console(2, this, "Adding input blade '{0}', slot {1}", type, number);
 
             type = type.ToLower();
 
-            if (type == "dmb4kihd") {
+            if (type == "dmb4kihd")
+            {
                 var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
+                foreach (var item in inputBlade.Inputs)
+                {
                     var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
                     var cecPort = card as ICec;
                     AddHdmiInBladePorts(item.Number, cecPort);
                 }
             }
 
-            else if (type == "dmb4kihddnt") {
+            else if (type == "dmb4kihddnt")
+            {
                 var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
+                foreach (var item in inputBlade.Inputs)
+                {
                     var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
                     var cecPort = card as ICec;
                     AddHdmiInBladePorts(item.Number, cecPort);
                 }
             }
 
-            else if (type == "dmb4kic") {
+            else if (type == "dmb4kic")
+            {
                 var inputBlade = new Dmb4kIC(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
+                foreach (var item in inputBlade.Inputs)
+                {
                     AddDmInBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmbis") {
+            else if (type == "dmbis")
+            {
                 var inputBlade = new DmbIS(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
+                foreach (var item in inputBlade.Inputs)
+                {
                     AddDmInMmFiberPorts(item.Number);
                 }
             }
-            else if (type == "dmbis2") {
+            else if (type == "dmbis2")
+            {
                 var inputBlade = new DmbIS2(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs) {
+                foreach (var item in inputBlade.Inputs)
+                {
                     AddDmInSmFiberPorts(item.Number);
                 }
             }
@@ -304,22 +343,26 @@ namespace PepperDash.Essentials.DM {
         {
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
-        }
+        }
 
 
-        void AddHdmiInBladePorts(uint number, ICec cecPort) {
+        void AddHdmiInBladePorts(uint number, ICec cecPort)
+        {
             AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort);
         }
 
-        void AddDmInBladePorts(uint number) {
+        void AddDmInBladePorts(uint number)
+        {
             AddInputPortWithDebug(number, "dmCIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat);
         }
 
-        void AddDmInMmFiberPorts(uint number) {
+        void AddDmInMmFiberPorts(uint number)
+        {
             AddInputPortWithDebug(number, "dmMmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
         }
 
-        void AddDmInSmFiberPorts(uint number) {
+        void AddDmInSmFiberPorts(uint number)
+        {
             AddInputPortWithDebug(number, "dmSmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
         }
 
@@ -328,64 +371,81 @@ namespace PepperDash.Essentials.DM {
         /// </summary>
         /// <param name="type"></param>
         /// <param name="number"></param>
-        public void AddOutputBlade(string type, uint number) {
+        public void AddOutputBlade(string type, uint number)
+        {
             type = type.ToLower();
 
             Debug.Console(2, this, "Adding output blade '{0}', slot {1}", type, number);
-            if (type == "dmb4kohd") {
+            if (type == "dmb4kohd")
+            {
                 var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
+                foreach (var item in outputBlade.Outputs)
+                {
                     AddHdmiOutBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmb4kohddnt") {
+            else if (type == "dmb4kohddnt")
+            {
                 var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
+                foreach (var item in outputBlade.Outputs)
+                {
                     AddHdmiOutBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmb4koc") {
+            else if (type == "dmb4koc")
+            {
                 var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
+                foreach (var item in outputBlade.Outputs)
+                {
                     AddDmOutBladePorts(item.Number);
                 }
             }
-            else if (type == "dmb4koc") {
+            else if (type == "dmb4koc")
+            {
                 var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
+                foreach (var item in outputBlade.Outputs)
+                {
                     AddDmOutBladePorts(item.Number);
                 }
             }
-            else if (type == "dmbos") {
+            else if (type == "dmbos")
+            {
                 var outputBlade = new DmbOS(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
+                foreach (var item in outputBlade.Outputs)
+                {
                     AddDmOutMmFiberBladePorts(item.Number);
                 }
             }
-            else if (type == "dmbos2") {
+            else if (type == "dmbos2")
+            {
                 var outputBlade = new DmbOS2(number, Chassis);
-                foreach (var item in outputBlade.Outputs) {
+                foreach (var item in outputBlade.Outputs)
+                {
                     AddDmOutSmFiberBladePorts(item.Number);
                 }
             }
         }
 
-        void AddHdmiOutBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("hdmiOut{0}", number) , eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, Chassis.Outputs[number]);
+        void AddHdmiOutBladePorts(uint number)
+        {
+            AddOutputPortWithDebug(number, "hdmiOut", eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, Chassis.Outputs[number]);
         }
 
-        void AddDmOutBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, Chassis.Outputs[number]);
+        void AddDmOutBladePorts(uint number)
+        {
+            AddOutputPortWithDebug(number, "dmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, Chassis.Outputs[number]);
         }
 
-        void AddDmOutMmFiberBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, Chassis.Outputs[number]);
+        void AddDmOutMmFiberBladePorts(uint number)
+        {
+            AddOutputPortWithDebug(number, "dmMmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, Chassis.Outputs[number]);
         }
 
-        void AddDmOutSmFiberBladePorts(uint number) {
-            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, Chassis.Outputs[number]);
+        void AddDmOutSmFiberBladePorts(uint number)
+        {
+            AddOutputPortWithDebug(number, "dmSmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, Chassis.Outputs[number]);
         }
 
 
@@ -417,23 +477,44 @@ namespace PepperDash.Essentials.DM {
         }
 
 
-        /// <summary>
-        /// Adds OutputPort
-        /// </summary>
-        void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
+        
+        /*void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
             var portKey = string.Format("{0}--{1}", cardName, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
             OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
             {
                 FeedbackMatchObject = Chassis.Outputs[(uint)selector]
             });
+        }*/
+
+        /// <summary>
+        /// Adds OutputPort
+        /// </summary>
+        void AddOutputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector)
+        {
+            try
+            {
+                var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
+                Debug.Console(2, this, "Adding output port '{0}'", portKey);
+                var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this)
+                {
+                    FeedbackMatchObject = Chassis.Outputs[cardNum]
+                };
+                OutputPorts.Add(outputPort);
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, "Exception : {0}", ex);
+            }
+
         }
 
 
         /// <summary>
         /// 
         /// </summary>
-        void AddVolumeControl(uint number, Audio.Output audio) {
+        void AddVolumeControl(uint number, Audio.Output audio)
+        {
             VolumeControls.Add(number, new DmCardAudioOutputController(audio));
         }
 
@@ -443,35 +524,43 @@ namespace PepperDash.Essentials.DM {
         //}
 
 
-        void Chassis_DMInputChange(Switch device, DMInputEventArgs args) {
+        void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
+        {
 
-            switch (args.EventId) {
-                case DMInputEventIds.EndpointOnlineEventId: {
+            switch (args.EventId)
+            {
+                case DMInputEventIds.EndpointOnlineEventId:
+                    {
                         Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
                         InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.OnlineFeedbackEventId: {
+                case DMInputEventIds.OnlineFeedbackEventId:
+                    {
                         Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
                         InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.VideoDetectedEventId: {
+                case DMInputEventIds.VideoDetectedEventId:
+                    {
                         Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
                         VideoInputSyncFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.InputNameEventId: {
+                case DMInputEventIds.InputNameEventId:
+                    {
                         Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
                         InputNameFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.HdcpCapabilityFeedbackEventId: {
+                case DMInputEventIds.HdcpCapabilityFeedbackEventId:
+                    {
                         Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
                         InputCardHdcpCapabilityFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                default: {
+                default:
+                    {
                         Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
                         break;
                     }
@@ -487,74 +576,74 @@ namespace PepperDash.Essentials.DM {
             switch (args.EventId)
             {
                 case DMOutputEventIds.VolumeEventId:
-                {
-                    if (VolumeControls.ContainsKey(output))
                     {
-                        VolumeControls[args.Number].VolumeEventFromChassis();
+                        if (VolumeControls.ContainsKey(output))
+                        {
+                            VolumeControls[args.Number].VolumeEventFromChassis();
+                        }
+                        break;
                     }
-                    break;
-                }
                 case DMOutputEventIds.EndpointOnlineEventId:
-                {
-                    Debug.Console(2, this,
-                        "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}",
-                        args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                    if (Chassis.Outputs[output].Endpoint != null)
+                    {
                         Debug.Console(2, this,
-                            "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}",
-                            args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
+                            "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}",
+                            args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
+                        if (Chassis.Outputs[output].Endpoint != null)
+                            Debug.Console(2, this,
+                                "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}",
+                                args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
 
-                    OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                    break;
-                }
+                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
+                        break;
+                    }
                 case DMOutputEventIds.OnlineFeedbackEventId:
-                {
-                    Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}",
-                        args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                    OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                    break;
-                }
+                    {
+                        Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}",
+                            args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
+                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
+                        break;
+                    }
                 case DMOutputEventIds.VideoOutEventId:
-                {
-
-                    var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.Outputs[output].VideoOutFeedback.Number;
-
-                    Debug.Console(2, this, "DMSwitchAudioVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
-                        inputNumber, output);
-
-                    if (VideoOutputFeedbacks.ContainsKey(output))
                     {
-                        var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].VideoOutFeedback);
-                        var localOutputPort =
-                            OutputPorts.FirstOrDefault(p => (DMOutput) p.FeedbackMatchObject == Chassis.Outputs[output]);
+
+                        var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.Outputs[output].VideoOutFeedback.Number;
+
+                        Debug.Console(2, this, "DMSwitchAudioVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
+                            inputNumber, output);
+
+                        if (VideoOutputFeedbacks.ContainsKey(output))
+                        {
+                            var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].VideoOutFeedback);
+                            var localOutputPort =
+                                OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == Chassis.Outputs[output]);
 
 
-                        VideoOutputFeedbacks[output].FireUpdate();
-                        OnSwitchChange(new RoutingNumericEventArgs(output,
-                            inputNumber,
-                            localOutputPort,
-                            localInputPort,
-                            eRoutingSignalType.AudioVideo));
+                            VideoOutputFeedbacks[output].FireUpdate();
+                            OnSwitchChange(new RoutingNumericEventArgs(output,
+                                inputNumber,
+                                localOutputPort,
+                                localInputPort,
+                                eRoutingSignalType.AudioVideo));
 
+                        }
+                        if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
+                        {
+                            OutputVideoRouteNameFeedbacks[output].FireUpdate();
+                        }
+                        break;
                     }
-                    if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
-                    {
-                        OutputVideoRouteNameFeedbacks[output].FireUpdate();
-                    }
-                    break;
-                }
                 case DMOutputEventIds.OutputNameEventId:
-                {
-                    Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                    OutputNameFeedbacks[output].FireUpdate();
-                    break;
-                }
+                    {
+                        Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
+                        OutputNameFeedbacks[output].FireUpdate();
+                        break;
+                    }
                 default:
-                {
-                    Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}",
-                        args.Number, args.EventId);
-                    break;
-                }
+                    {
+                        Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}",
+                            args.Number, args.EventId);
+                        break;
+                    }
             }
 
         }
@@ -564,7 +653,8 @@ namespace PepperDash.Essentials.DM {
         /// 
         /// </summary>
         /// <param name="pnt"></param>
-        void StartOffTimer(PortNumberType pnt) {
+        void StartOffTimer(PortNumberType pnt)
+        {
             if (RouteOffTimers.ContainsKey(pnt))
                 return;
             RouteOffTimers[pnt] = new CTimer(o => ExecuteSwitch(null, pnt.Selector, pnt.Type), RouteOffTime);
@@ -572,8 +662,10 @@ namespace PepperDash.Essentials.DM {
 
 
         // Send out sigs when coming online
-        void IsOnline_OutputChange(object sender, EventArgs e) {
-            if (IsOnline.BoolValue) {
+        void IsOnline_OutputChange(object sender, EventArgs e)
+        {
+            if (IsOnline.BoolValue)
+            {
                 Chassis.EnableUSBBreakaway.BoolValue = true;
 
                 if (InputNames != null)
@@ -587,12 +679,13 @@ namespace PepperDash.Essentials.DM {
 
         #region IRouting Members
 
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType) {
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType)
+        {
             Debug.Console(2, this, "Making an awesome DM route from {0} to {1} {2}", inputSelector, outputSelector, sigType);
 
             var input = inputSelector as DMInput; // Cast can sometimes fail
             var output = outputSelector as DMOutput;
-            
+
 
             if (output == null)
             {
@@ -605,11 +698,14 @@ namespace PepperDash.Essentials.DM {
             // Check to see if there's an off timer waiting on this and if so, cancel
             var key = new PortNumberType(output, sigType);
 
-            if (input == null) {
+            if (input == null)
+            {
                 StartOffTimer(key);
             }
-            else {
-                if (RouteOffTimers.ContainsKey(key)) {
+            else
+            {
+                if (RouteOffTimers.ContainsKey(key))
+                {
                     Debug.Console(2, this, "{0} cancelling route off due to new source", output);
                     RouteOffTimers[key].Stop();
                     RouteOffTimers.Remove(key);
@@ -671,7 +767,7 @@ namespace PepperDash.Essentials.DM {
                 var ioSlotJoin = ioSlot - 1;
 
                 // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort)ioSlot, eRoutingSignalType.Video));
 
                 if (TxDictionary.ContainsKey(ioSlot))
                 {

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -314,7 +314,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			FarEndIsSharingContentFeedback = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
             CameraIsOffFeedback = new BoolFeedback(() => CodecStatus.Status.Video.Input.MainVideoMute.BoolValue);
             CameraIsMutedFeedback = CameraIsOffFeedback;
-
+            SupportsCameraOff = true;
 
 			PresentationViewMaximizedFeedback = new BoolFeedback(() => CurrentPresentationView == "Maximized");
 
@@ -352,8 +352,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             CallHistory = new CodecCallHistory();
 
-			
-            if (props.Favorites != null)
+			if (props.Favorites != null)
             {
                 CallFavorites = new CodecCallFavorites();
                 CallFavorites.Favorites = props.Favorites;
@@ -369,9 +368,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             CodecSchedule = new CodecScheduleAwareness();
  
-            //Set Feedback Actions
-            SetFeedbackActions();
-
             CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 				eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
 			HdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
@@ -406,6 +402,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             BrandingEnabled = props.UiBranding.Enable;
 
             _brandingUrl = props.UiBranding.BrandingUrl;
+
+            //Set Feedback Actions
+            SetFeedbackActions();
         }
 
         private void SetFeedbackActions()
@@ -417,6 +416,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
             CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
             CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = CameraAutoModeIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Cameras.SpeakerTrack.Availability.ValueChangedAction = () => { SupportsCameraAutoMode = CodecStatus.Status.Cameras.SpeakerTrack.Availability.BoolValue; };
             CodecStatus.Status.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
             CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
             CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
@@ -428,11 +428,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
             catch (Exception ex)
             {
-                Debug.Console(0, this, "Error setting MainVideuMute Action: {0}", ex);
+                Debug.Console(0, this, "Error setting MainVideoMute Action: {0}", ex);
 
                 if (ex.InnerException != null)
                 {
-                    Debug.Console(0, this, "Error setting MainVideuMute Action: {0}", ex);
+                    Debug.Console(0, this, "Error setting MainVideoMute Action: {0}", ex);
                 }
             }
         }
@@ -1878,17 +1878,27 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 get
                 {
-                    if (CodecStatus.Status.SIP != null && CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value != null)
+                    try
                     {
-                        return CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value;
+                        if (CodecStatus.Status.SIP != null && !string.IsNullOrEmpty(CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value))
+                        {
+                            return CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value;
+                        }
+                        else if (CodecStatus.Status.UserInterface != null &&
+                                 CodecStatus.Status.UserInterface.ContactInfo != null && CodecStatus.Status.UserInterface.ContactInfo.ContactMethod != null)
+                        {
+                            return CodecStatus.Status.UserInterface.ContactInfo.ContactMethod[0].Number.Value;
+                        }
+                        else
+                        {
+                            return string.Empty;
+                        }
                     }
-                    else if (CodecStatus.Status.UserInterface != null &&
-                             CodecStatus.Status.UserInterface.ContactInfo.ContactMethod[0].Number.Value != null)
+                    catch (Exception e)
                     {
-                        return CodecStatus.Status.UserInterface.ContactInfo.ContactMethod[0].Number.Value;
-                    }
-                    else
+                        Debug.Console(2, "Error getting SipUri: {0}", e);
                         return string.Empty;
+                    }
                 }
             }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs

@@ -277,9 +277,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SoftwareID SoftwareID { get; set; }
         }
 
-        public class Availability
+        public class Availability : ValueProperty
         {
-            public string Value { get; set; }
+            string _Value;
+            public bool BoolValue { get; private set; }
+
+            public string Value
+            {
+                get
+                {
+                    return _Value;
+                }
+                set
+                {
+                    // If the incoming value is "Available" it sets the BoolValue true, otherwise sets it false
+                    _Value = value;
+                    BoolValue = value == "Available";
+                    OnValueChanged();
+                }
+            }
         }
 
         public class Status2 : ValueProperty
@@ -311,6 +327,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SpeakerTrack()
             {
                 Status = new Status2();
+                Availability = new Availability();
             }
         }
 

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

@@ -416,8 +416,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                         m.MinutesBeforeMeeting = 5;
                         m.Id = i.ToString();
                         m.Organizer = "Employee " + 1;
-						m.StartTime = DateTime.Now.AddMinutes(6).AddHours(i);
-						m.EndTime = DateTime.Now.AddHours(i).AddMinutes(16);
+						m.StartTime = DateTime.Now.AddMinutes(5).AddHours(i);
+						m.EndTime = DateTime.Now.AddHours(i).AddMinutes(50);
 						m.Title = "Meeting " + i;
                         m.Calls.Add(new Call() { Number = i + "meeting@fake.com"});
 						_CodecSchedule.Meetings.Add(m);
@@ -583,6 +583,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             CameraAutoModeIsOnFeedback = new BoolFeedback(() => _CameraAutoModeIsOn);
 
+            SupportsCameraAutoMode = true;
+
             CameraAutoModeIsOnFeedback.FireUpdate();
 
             DeviceManager.AddDevice(internalCamera);
@@ -590,7 +592,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             NearEndPresets = new List<CodecRoomPreset>(15); // Fix the capacity to emulate Cisco
 
-            NearEndPresets = PropertiesConfig.Presets;
+            if (PropertiesConfig.Presets != null && PropertiesConfig.Presets.Count > 0)
+            {
+                NearEndPresets = PropertiesConfig.Presets;
+            }
+            else
+            {
+                for (int i = 1; i <= NearEndPresets.Capacity; i++)
+                {
+                    var label = string.Format("Near End Preset {0}", i);
+                    NearEndPresets.Add(new CodecRoomPreset(i, label, true, false));
+                }
+            }
 
             FarEndRoomPresets = new List<CodecRoomPreset>(15); // Fix the capacity to emulate Cisco
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVcPropertiesConfig.cs

@@ -18,5 +18,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         [JsonProperty("presets")]
         public List<CodecRoomPreset> Presets { get; set; }
+
+        public MockVcPropertiesConfig()
+        {
+            Favorites = new List<CodecActiveCallItem>();
+            Presets = new List<CodecRoomPreset>();
+        }
     }
 }

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

@@ -65,8 +65,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		public bool ShowSelfViewByDefault { get; protected set; }
 
-		protected bool SupportsCameraOff;
-		protected bool SupportsCameraAutoMode;
+        public bool SupportsCameraOff { get; protected set; }
+        public bool SupportsCameraAutoMode { get; protected set; }
 
 		public bool IsReady { get; protected set; }
 

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

@@ -15,6 +15,7 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Core.Queues;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
@@ -30,10 +31,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private const long MeetingRefreshTimer = 60000;
 		private const uint DefaultMeetingDurationMin = 30;
 		private const string Delimiter = "\x0D\x0A";
-		private readonly CrestronQueue<string> _receiveQueue;
+
+        private readonly GenericQueue _receiveQueue;
+        //private readonly CrestronQueue<string> _receiveQueue;
 
 
-		private readonly Thread _receiveThread;
+        //private readonly Thread _receiveThread;
 
 		private readonly ZoomRoomSyncState _syncState;
 		public bool CommDebuggingIsOn;
@@ -51,11 +54,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			_props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
-			// The queue that will collect the repsonses in the order they are received
-			_receiveQueue = new CrestronQueue<string>(1024);
-
-			// The thread responsible for dequeuing and processing the messages
-			_receiveThread = new Thread(o => ProcessQueue(), null) { Priority = Thread.eThreadPriority.MediumPriority };
+            _receiveQueue = new GenericQueue(Key + "-rxQueue", Thread.eThreadPriority.MediumPriority, 512);
 
 			Communication = comm;
 
@@ -95,6 +94,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				eRoutingSignalType.Audio | eRoutingSignalType.Video,
 				eRoutingPortConnectionType.Hdmi, null, this);
 
+            Output2 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
+                eRoutingSignalType.Video,
+                eRoutingPortConnectionType.DisplayPort, null, this);
+
 			SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
 
 			CameraIsOffFeedback = new BoolFeedback(CameraIsOffFeedbackFunc);
@@ -120,7 +123,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			Participants = new CodecParticipants();
 
-			SupportsCameraOff = _props.SupportsCameraOff;
+			SupportsCameraOff = true;  // Always allow turning off the camera for zoom calls?
 			SupportsCameraAutoMode = _props.SupportsCameraAutoMode;
 
 			PhoneOffHookFeedback = new BoolFeedback(PhoneOffHookFeedbackFunc);
@@ -252,6 +255,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public RoutingInputPort CodecOsdIn { get; private set; }
 		public RoutingOutputPort Output1 { get; private set; }
+        public RoutingOutputPort Output2 { get; private set; }
 
 		#region ICommunicationMonitor Members
 
@@ -685,6 +689,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			// Set up output ports
 			OutputPorts.Add(Output1);
+            OutputPorts.Add(Output2);
 		}
 
 		/// <summary>
@@ -790,37 +795,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			//if (CommDebuggingIsOn)
 			//    Debug.Console(1, this, "Gathered: '{0}'", args.Text);
 
-			_receiveQueue.Enqueue(args.Text);
-
-			// If the receive thread has for some reason stopped, this will restart it
-			if (_receiveThread.ThreadState != Thread.eThreadStates.ThreadRunning)
-			{
-				_receiveThread.Start();
-			}
-		}
-
-
-		/// <summary>
-		/// Runs in it's own thread to dequeue messages in the order they were received to be processed
-		/// </summary>
-		/// <returns></returns>
-		private object ProcessQueue()
-		{
-			try
-			{
-				while (true)
-				{
-					var message = _receiveQueue.Dequeue();
-
-					ProcessMessage(message);
-				}
-			}
-			catch (Exception e)
-			{
-				Debug.Console(1, this, "Error Processing Queue: {0}", e);
-			}
-
-			return null;
+			_receiveQueue.Enqueue(new ProcessStringMessage(args.Text, ProcessMessage));
 		}
 
 
@@ -2480,9 +2455,51 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public void LocalLayoutToggle()
 		{
-			throw new NotImplementedException();
+            var currentLayout = LocalLayoutFeedback.StringValue;
+
+            var eCurrentLayout = (int)Enum.Parse(typeof(zConfiguration.eLayoutStyle), currentLayout, true);
+
+            var nextLayout = GetNextLayout(eCurrentLayout);
+
+            if (nextLayout != zConfiguration.eLayoutStyle.None)
+            {
+                SetLayout(nextLayout);
+            }
 		}
 
+        /// <summary>
+        /// Tries to get the next available layout
+        /// </summary>
+        /// <param name="currentLayout"></param>
+        /// <returns></returns>
+        private zConfiguration.eLayoutStyle GetNextLayout(int currentLayout)
+        {
+            if (AvailableLayouts == zConfiguration.eLayoutStyle.None)
+            {
+                return zConfiguration.eLayoutStyle.None;
+            }
+
+            zConfiguration.eLayoutStyle nextLayout;
+
+            if (((zConfiguration.eLayoutStyle)currentLayout & zConfiguration.eLayoutStyle.ShareAll) == zConfiguration.eLayoutStyle.ShareAll)
+            {
+                nextLayout = zConfiguration.eLayoutStyle.Gallery;
+            }
+            else
+            {
+                nextLayout = (zConfiguration.eLayoutStyle)(currentLayout << 1);
+            }
+
+            if ((AvailableLayouts & nextLayout) == nextLayout)
+            {
+                return nextLayout;
+            }
+            else
+            {
+                return GetNextLayout((int)nextLayout);
+            }
+        }
+
 		public void LocalLayoutToggleSingleProminent()
 		{
 			throw new NotImplementedException();