Merge pull request #498 from PepperDash/feature/mc-qr-code-checksum

#497 Add logic to set checksum value

.github/workflows/docker.yml

@@ -45,7 +45,6 @@ jobs:
       - name: Update AssemblyInfo.cs
         shell: powershell
         run: |
-          Write-Output ${{ env.VERSION }}
           ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
       - name: restore Nuget Packages
         run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion

.github/workflows/main.yml

@@ -31,12 +31,11 @@ jobs:
         shell: powershell
         env:
           TAG_NAME: ${{ github.event.release.tag_name }}
-        run: echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
         run: |
-          Write-Output ${{ env.VERSION }}
           ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
       - name: restore Nuget Packages
         run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion

PepperDashEssentials/ControlSystem.cs

@@ -16,7 +16,6 @@ using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM;
 using PepperDash.Essentials.Fusion;
 using PepperDash.Essentials.Room.Config;
-//using PepperDash.Essentials.Room.MobileControl;
 
 using Newtonsoft.Json;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
@@ -290,33 +289,14 @@ namespace PepperDash.Essentials
 
 			DeviceManager.ActivateAll();
 
-		    var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl;
+		    var mobileControl = GetMobileControlDevice();
 
 		    if (mobileControl == null) return;
 
             mobileControl.LinkSystemMonitorToAppServer();
-		    //LinkSystemMonitorToAppServer();
+		    
 		}
 
-        //void LinkSystemMonitorToAppServer()
-        //{
-        //    var sysMon = DeviceManager.GetDeviceForKey("systemMonitor") as PepperDash.Essentials.Core.Monitoring.SystemMonitorController;
-
-        //    var appServer = DeviceManager.GetDeviceForKey("appServer") as MobileControlSystemController;
-
-
-        //    if (sysMon != null && appServer != null)
-        //    {
-        //        var key = sysMon.Key + "-" + appServer.Key;
-        //        var messenger = new PepperDash.Essentials.AppServer.Messengers.SystemMonitorMessenger
-        //            (key, sysMon, "/device/systemMonitor");
-
-        //        messenger.RegisterWithAppServer(appServer);
-
-        //        DeviceManager.AddDevice(messenger);
-        //    }
-        //}
-
         /// <summary>
         /// Reads all devices from config and adds them to DeviceManager
         /// </summary>
@@ -394,11 +374,6 @@ namespace PepperDash.Essentials
                     if (newDev == null)
                         newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
 
-                    //
-                    //if (newDev == null)
-                    //    newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
-                    //
-
 					if (newDev != null)
 						DeviceManager.AddDevice(newDev);
 					else
@@ -465,10 +440,6 @@ namespace PepperDash.Essentials
 
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
-                        // Mobile Control bridge
-                        //var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
-                        //AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-                        //DeviceManager.AddDevice(bridge);
 
                         CreateMobileControlBridge(room);
                     }
@@ -480,10 +451,6 @@ namespace PepperDash.Essentials
                         DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
-                        // Mobile Control bridge
-                        //var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room);
-                        //AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-                        //DeviceManager.AddDevice(bridge);
 
                         CreateMobileControlBridge(room);
                     }
@@ -504,34 +471,35 @@ namespace PepperDash.Essentials
 
         private static void CreateMobileControlBridge(EssentialsRoomBase room)
         {
-            var mobileControl = DeviceManager.GetDeviceForKey("appServer") as IMobileControl;
+            var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            mobileControl.CreateMobileControlRoomBridge(room);
+            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }
 
-        /// <summary>
-        /// Helps add the post activation steps that link bridges to main controller
-        /// </summary>
-        /// <param name="bridge"></param>
-        //void AddBridgePostActivationHelper(MobileControlBridgeBase bridge)
-        //{
-        //    bridge.AddPostActivationAction(() =>
-        //    {
-        //        var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;
-        //        if (parent == null)
-        //        {
-        //            Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
-        //            return;
-        //        }
-        //        Debug.Console(0, bridge, "Linking to parent controller");
-        //        bridge.AddParent(parent);
-        //        parent.AddBridge(bridge);
-        //    });
-        //}
+        private static IMobileControl GetMobileControlDevice()
+        {
+            var mobileControlList = DeviceManager.AllDevices.OfType<IMobileControl>().ToList();
+
+            if (mobileControlList.Count > 1)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Warning,
+                    "Multiple instances of Mobile Control Server found.");
+
+                return null;
+            }
+
+            if (mobileControlList.Count > 0)
+            {
+                return mobileControlList[0];
+            }
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control not enabled for this system");
+            return null;
+        }
 
         /// <summary>
         /// Fires up a logo server if not already running

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -393,6 +393,8 @@ namespace PepperDash.Essentials
             Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Shutting down room");
 
             RunRouteAction("roomOff");
+            VideoCodec.StopSharing();
+            VideoCodec.StandbyActivate();
         }
 
         /// <summary>
@@ -590,6 +592,19 @@ namespace PepperDash.Essentials
 
                     OnFeedback.FireUpdate();
 
+                    if (OnFeedback.BoolValue)
+                    {
+                        if (VideoCodec.UsageTracker.InUseTracker.InUseFeedback.BoolValue)
+                        {
+                            Debug.Console(1, this, "Video Codec in use, deactivating standby on codec");
+                        }
+
+                        if (VideoCodec.StandbyIsOnFeedback.BoolValue)
+                        {
+                            VideoCodec.StandbyDeactivate();
+                        }
+                    }
+
                     // report back when done
                     if (successCallback != null)
                         successCallback();
@@ -652,6 +667,7 @@ namespace PepperDash.Essentials
 				dest.ReleaseRoute();
                 if (dest is IHasPowerControl)
                     (dest as IHasPowerControl).PowerOff();
+
 			}
 			else
 			{
@@ -703,37 +719,44 @@ namespace PepperDash.Essentials
 		}
 
 
-		/// <summary>
-		/// Setup the external sources for the Cisco Touch 10 devices that support IHasExternalSourceSwitch
-		/// </summary>
-		private void SetCodecExternalSources()
-		{
-			var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
+        /// <summary>
+        /// Setup the external sources for the Cisco Touch 10 devices that support IHasExternalSourceSwitch
+        /// </summary>
+        private void SetCodecExternalSources()
+        {
+            var videoCodecWithExternalSwitching = VideoCodec as IHasExternalSourceSwitching;
 
-			if (videoCodecWithExternalSwitching == null)
-			{
-				return;
-			}
+            if (videoCodecWithExternalSwitching == null || !videoCodecWithExternalSwitching.ExternalSourceListEnabled)
+            {
+                return;
+            }
 
-		    string codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
-		    videoCodecWithExternalSwitching.ClearExternalSources();
-		    videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
-		    var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
+            try
+            {
+                // Get the tie line that the external switcher is connected to
+                string codecInputConnectorName = ConfigReader.ConfigObject.TieLines.SingleOrDefault(
+                    x => x.DestinationKey == VideoCodec.Key && x.DestinationPort == videoCodecWithExternalSwitching.ExternalSourceInputPort).DestinationPort;
 
-		    foreach (var kvp in srcList)
-		    {
-		        var srcConfig = kvp.Value;
+                videoCodecWithExternalSwitching.ClearExternalSources();
+                videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
+                var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
-		        if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
-		        {
+                foreach (var kvp in srcList)
+                {
+                    var srcConfig = kvp.Value;
 
-		            videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
-		            videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
-
-
-		        }
-		    }
-		}
+                    if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
+                    {
+                        videoCodecWithExternalSwitching.AddExternalSource(codecInputConnectorName, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
+                        videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error setting codec external sources: {0}", e);
+            }
+        }
 
         private void SetCodecBranding()
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs

@@ -1,38 +1,39 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Core.CrestronIO
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+
+namespace PepperDash.Essentials.Core.CrestronIO
 {
     [Description("Wrapper class for Digital Input")]
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
-    {
-        public DigitalInput InputPort { get; private set; }
-
-        public BoolFeedback InputStateFeedback { get; private set; }
-
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.State;
-            }
-        }
+    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
+    {
+        public DigitalInput InputPort { get; private set; }
+
+        public BoolFeedback InputStateFeedback { get; private set; }
+
+        Func<bool> InputStateFeedbackFunc
+        {
+            get
+            {
+                return () => InputPort.State;
+            }
+        }
 
 
         public GenericDigitalInputDevice(string key, string name, Func<IOPortConfig, DigitalInput> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
         {
+            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
@@ -40,15 +41,15 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
                 InputPort.Register();
 
-                InputPort.StateChange += InputPort_StateChange;
+                InputPort.StateChange += InputPort_StateChange;
 
             });
         }
 
         #region Events
 
-        void InputPort_StateChange(DigitalInput digitalInput, DigitalInputEventArgs args)
-        {
+        void InputPort_StateChange(DigitalInput digitalInput, DigitalInputEventArgs args)
+        {
             InputStateFeedback.FireUpdate();
         }
 
@@ -81,7 +82,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             if (ioPortDevice == null)
             {
-                Debug.Console(0, "GetDigitalInput: Device '0' is not a valid IRelayPorts Device", dc.PortDeviceKey);
+                Debug.Console(0, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
@@ -99,13 +100,13 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Bridge Linking
 
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            var joinMap = new IDigitalInputJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            var joinMap = new IDigitalInputJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -115,19 +116,19 @@ namespace PepperDash.Essentials.Core.CrestronIO
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            try
-            {
-                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-                // Link feedback for input state
-                InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.Console(1, this, "Error: {0}", e);
+            }
+
+            try
+            {
+                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+                // Link feedback for input state
+                InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.Console(1, this, "Error: {0}", e);
             }
         }
 
@@ -144,7 +145,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new Generic Relay Device");
+                Debug.Console(1, "Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 
@@ -158,7 +159,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #endregion
 
-    }
-
-
+    }
+
+
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs

@@ -4,15 +4,21 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
+
+
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsDevice, IDigitalInput
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
     {
         public Versiport InputPort { get; private set; }
 
@@ -26,17 +32,29 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
         }
 
-        public GenericVersiportDigitalInputDevice(string key, Versiport inputPort, IOPortConfig props):
-            base(key)
+        public GenericVersiportDigitalInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
+            base(key, name)
         {
             InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
-            InputPort = inputPort;
-            InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
-            if (props.DisablePullUpResistor)
-                InputPort.DisablePullUpResistor = true;
-            InputPort.VersiportChange += new VersiportEventHandler(InputPort_VersiportChange);
 
-            Debug.Console(1, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", props.PortNumber, InputPort.DisablePullUpResistor);
+            AddPostActivationAction(() =>
+            {
+                InputPort = postActivationFunc(config);
+
+                InputPort.Register();
+
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
+                if (config.DisablePullUpResistor)
+                    InputPort.DisablePullUpResistor = true;
+
+                InputPort.VersiportChange += InputPort_VersiportChange;
+
+
+
+                Debug.Console(1, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+
+            });
+
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
@@ -46,5 +64,105 @@ namespace PepperDash.Essentials.Core.CrestronIO
             if(args.Event == eVersiportEvent.DigitalInChange)
                 InputStateFeedback.FireUpdate();
         }
+
+
+        #region Bridge Linking
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new IDigitalInputJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            }
+
+            try
+            {
+                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+                // Link feedback for input state
+                InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.Console(1, this, "Error: {0}", e);
+            }
+        }
+
+        #endregion
+
+
+        public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
+        {
+         
+            IIOPorts ioPortDevice;
+
+            if (dc.PortDeviceKey.Equals("processor"))
+            {
+                if (!Global.ControlSystem.SupportsVersiport)
+                {
+                    Debug.Console(0, "GetVersiportDigitalInput: Processor does not support Versiports");
+                    return null;
+                }
+                ioPortDevice = Global.ControlSystem;
+            }
+            else
+            {
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.Console(0, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.Console(0, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                return null;
+            }
+
+            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
+            {
+                Debug.Console(0, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+            }
+
+            return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
+        }
+    }
+
+
+    public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
+    {
+        public GenericVersiportDigitalInputDeviceFactory()
+        {
+            TypeNames = new List<string>() { "versiportinput" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+
+            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
+
+            if (props == null) return null;
+
+            var portDevice = new GenericVersiportDigitalInputDevice(dc.Key, dc.Name, GenericVersiportDigitalInputDevice.GetVersiportDigitalInput, props);
+
+            return portDevice;
+        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -1,25 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    /// <summary>
-    /// Represents a generic device controlled by relays
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    /// <summary>
+    /// Represents a generic device controlled by relays
     /// </summary>
     [Description("Wrapper class for a Relay")]
-    public class GenericRelayDevice : EssentialsBridgeableDevice, ISwitchedOutput
-    {
-        public Relay RelayOutput { get; private set; }
-
+    public class GenericRelayDevice : EssentialsBridgeableDevice, ISwitchedOutput
+    {
+        public Relay RelayOutput { get; private set; }
+
         public BoolFeedback OutputIsOnFeedback { get; private set; }
 
         //Maintained for compatibility with PepperDash.Essentials.Core.Devices.CrestronProcessor
@@ -94,11 +94,11 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Events
 
-        void RelayOutput_StateChange(Relay relay, RelayEventArgs args)
-        {
+        void RelayOutput_StateChange(Relay relay, RelayEventArgs args)
+        {
             OutputIsOnFeedback.FireUpdate();
-        }
-
+        }
+
         #endregion
 
         #region Methods
@@ -119,33 +119,33 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 OpenRelay();
             else
                 CloseRelay();
-        }
+        }
 
         #endregion
-
-        #region ISwitchedOutput Members
-
-        void ISwitchedOutput.On()
-        {
-            CloseRelay();
-        }
-
-        void ISwitchedOutput.Off()
-        {
-            OpenRelay();
-        }
-
+
+        #region ISwitchedOutput Members
+
+        void ISwitchedOutput.On()
+        {
+            CloseRelay();
+        }
+
+        void ISwitchedOutput.Off()
+        {
+            OpenRelay();
+        }
+
         #endregion
 
         #region Bridge Linking
 
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            var joinMap = new GenericRelayControllerJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            var joinMap = new GenericRelayControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -155,26 +155,26 @@ namespace PepperDash.Essentials.Core.CrestronIO
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            if (RelayOutput == null)
-            {
-                Debug.Console(1, this, "Unable to link device '{0}'.  Relay is null", Key);
-                return;
-            }
-
-            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            trilist.SetBoolSigAction(joinMap.Relay.JoinNumber, b =>
-            {
-                if (b)
-                    CloseRelay();
-                else
-                    OpenRelay();
-            });
-
-            // feedback for relay state
-
+            }
+
+            if (RelayOutput == null)
+            {
+                Debug.Console(1, this, "Unable to link device '{0}'.  Relay is null", Key);
+                return;
+            }
+
+            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            trilist.SetBoolSigAction(joinMap.Relay.JoinNumber, b =>
+            {
+                if (b)
+                    CloseRelay();
+                else
+                    OpenRelay();
+            });
+
+            // feedback for relay state
+
             OutputIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Relay.JoinNumber]);
         }
 
@@ -202,54 +202,54 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 return portDevice;
 
 
-                /*
-                if (props.PortDeviceKey == "processor")
-                    portDevice = Global.ControlSystem as IRelayPorts;
-                else
-                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
-
-                if (portDevice == null)
-                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
-                else
-                {
-                    var cs = (portDevice as CrestronControlSystem);
-
-                    if (cs != null)
-                    {
-                        // The relay is on a control system processor
-                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
-                        {
-                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
-                            return null;
-                        }
-                    }
-                    else
-                    {
-                        // The relay is on another device type
-
-                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
-                        {
-                            Debug.Console(0, "Port Device: {0} does not have enough relays");
-                            return null;
-                        }
-                    }
-
-                    Relay relay = portDevice.RelayPorts[props.PortNumber];
-
-                    if (!relay.Registered)
-                    {
-                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
-                            return new GenericRelayDevice(key, relay);
-                        else
-                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
-                    }
-                    else
-                    {
-                        return new GenericRelayDevice(key, relay);
-                    }
-
-                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
-                }
+                /*
+                if (props.PortDeviceKey == "processor")
+                    portDevice = Global.ControlSystem as IRelayPorts;
+                else
+                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
+
+                if (portDevice == null)
+                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
+                else
+                {
+                    var cs = (portDevice as CrestronControlSystem);
+
+                    if (cs != null)
+                    {
+                        // The relay is on a control system processor
+                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
+                        {
+                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        // The relay is on another device type
+
+                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
+                        {
+                            Debug.Console(0, "Port Device: {0} does not have enough relays");
+                            return null;
+                        }
+                    }
+
+                    Relay relay = portDevice.RelayPorts[props.PortNumber];
+
+                    if (!relay.Registered)
+                    {
+                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
+                            return new GenericRelayDevice(key, relay);
+                        else
+                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
+                    }
+                    else
+                    {
+                        return new GenericRelayDevice(key, relay);
+                    }
+
+                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
+                }
                 */
 
             }
@@ -258,7 +258,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #endregion
 
 
-    }
-
-
+    }
+
+
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -8,11 +8,9 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(EssentialsRoomBase room);
+        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
-
-
     }
 
     /// <summary>
@@ -26,6 +24,8 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 
         string QrCodeUrl { get; }
 
+        string QrCodeChecksum { get; }
+
         string McServerUrl { get; }
 
         string RoomName { get; }

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

@@ -1,342 +1,355 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public static class DeviceManager
-	{
-	    private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
-	    private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);
-		//public static List<Device> Devices { get { return _Devices; } }
-		//static List<Device> _Devices = new List<Device>();
-
-		static readonly Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Returns a copy of all the devices in a list
-		/// </summary>
-		public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }
-
-	    public static bool AddDeviceEnabled;
-
-		public static void Initialize(CrestronControlSystem cs)
-		{
-		    AddDeviceEnabled = true;
-			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
-                "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
-        }
-
-		/// <summary>
-		/// Calls activate steps on all Device class items
-		/// </summary>
-		public static void ActivateAll()
-		{
-		    try
-		    {
-		        DeviceCriticalSection.Enter();
-                AddDeviceEnabled = false;
-		        // PreActivate all devices
-		        foreach (var d in Devices.Values)
-		        {
-		            try
-		            {
-		                if (d is Device)
-		                    (d as Device).PreActivate();
-		            }
-		            catch (Exception e)
-		            {
-		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
-		            }
-		        }
-
-		        // Activate all devices
-		        foreach (var d in Devices.Values)
-		        {
-		            try
-		            {
-		                if (d is Device)
-		                    (d as Device).Activate();
-		            }
-		            catch (Exception e)
-		            {
-		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
-		            }
-		        }
-
-		        // PostActivate all devices
-		        foreach (var d in Devices.Values)
-		        {
-		            try
-		            {
-		                if (d is Device)
-		                    (d as Device).PostActivate();
-		            }
-		            catch (Exception e)
-		            {
-		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
-		            }
-		        }
-		    }
-		    finally
-		    {
-                DeviceCriticalSection.Leave();
-		    }
-		}
-
-		/// <summary>
-		/// Calls activate on all Device class items
-		/// </summary>
-		public static void DeactivateAll()
-		{
-		    try
-		    {
-		        DeviceCriticalSection.Enter();
-		        foreach (var d in Devices.Values.OfType<Device>())
-		        {
-		            d.Deactivate();
-		        }
-		    }
-		    finally
-		    {
-		        DeviceCriticalSection.Leave();
-		    }
-		}
-
-		//static void ListMethods(string devKey)
-		//{
-		//    var dev = GetDeviceForKey(devKey);
-		//    if(dev != null)
-		//    {
-		//        var type = dev.GetType().GetCType();
-		//        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
-		//        var sb = new StringBuilder();
-		//        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
-		//        foreach (var m in methods)
-		//        {
-		//            sb.Append(string.Format("{0}(", m.Name));
-		//            var pars = m.GetParameters();
-		//            foreach (var p in pars)
-		//                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
-		//            sb.AppendLine(")");
-		//        }
-		//        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-		//    }
-		//}
-
-	    private static void ListDevices(string s)
-	    {
-	        Debug.Console(0, "{0} Devices registered with Device Manager:", Devices.Count);
-	        var sorted = Devices.Values.ToList();
-	        sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
-
-	        foreach (var d in sorted)
-	        {
-	            var name = d is IKeyName ? (d as IKeyName).Name : "---";
-	            Debug.Console(0, "  [{0}] {1}", d.Key, name);
-	        }
-	    }
-
-	    private static void ListDeviceFeedbacks(string devKey)
-	    {
-	        var dev = GetDeviceForKey(devKey);
-	        if (dev == null)
-	        {
-	            Debug.Console(0, "Device '{0}' not found", devKey);
-	            return;
-	        }
-	        var statusDev = dev as IHasFeedback;
-	        if (statusDev == null)
-	        {
-	            Debug.Console(0, "Device '{0}' does not have visible feedbacks", devKey);
-	            return;
-	        }
-	        statusDev.DumpFeedbacksToConsole(true);
-	    }
-
-	    //static void ListDeviceCommands(string devKey)
-        //{
-        //    var dev = GetDeviceForKey(devKey);
-        //    if (dev == null)
-        //    {
-        //        Debug.Console(0, "Device '{0}' not found", devKey);
-        //        return;
-        //    }
-        //    Debug.Console(0, "This needs to be reworked.  Stay tuned.", devKey);
-        //}
-
-	    private static void ListDeviceCommStatuses(string input)
-	    {
-	        var sb = new StringBuilder();
-	        foreach (var dev in Devices.Values.OfType<ICommunicationMonitor>())
-	        {
-	            sb.Append(string.Format("{0}: {1}\r", dev,
-	                dev.CommunicationMonitor.Status));
-	        }
-	        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-	    }
-
-
-	    //static void DoDeviceCommand(string command)
-        //{
-        //    Debug.Console(0, "Not yet implemented.  Stay tuned");
-        //}
-
-		public static void AddDevice(IKeyed newDev)
-		{
-		    try
-		    {
-		        if (!DeviceCriticalSection.TryEnter())
-		        {
-		            Debug.Console(0, Debug.ErrorLogLevel.Error, "Currently unable to add devices to Device Manager. Please try again");
-		            return;
-		        }
-		        // Check for device with same key
-		        //var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
-		        ////// If it exists, remove or warn??
-		        //if (existingDevice != null)
-
-		        if (!AddDeviceEnabled)
-		        {
-		            Debug.Console(0, Debug.ErrorLogLevel.Error, "All devices have been activated. Adding new devices is not allowed.");
-		            return;
-		        }
-
-		        if (Devices.ContainsKey(newDev.Key))
-		        {
-		            Debug.Console(0, newDev, "WARNING: A device with this key already exists.  Not added to manager");
-		            return;
-		        }
-		        Devices.Add(newDev.Key, newDev);
-		        //if (!(_Devices.Contains(newDev)))
-		        //    _Devices.Add(newDev);
-		    }
-		    finally
-		    {
-		        DeviceCriticalSection.Leave();
-		    }
-		}
-
-	    public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
-	    {
-	        try
-	        {
-	            if (!DeviceCriticalSection.TryEnter())
-	            {
-	                Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                    "Currently unable to add devices to Device Manager. Please try again");
-	                return;
-	            }
-	            if (!AddDeviceEnabled)
-	            {
-	                Debug.Console(0, Debug.ErrorLogLevel.Error,
-	                    "All devices have been activated. Adding new devices is not allowed.");
-	                return;
-	            }
-
-	            foreach (var dev in devicesToAdd)
-	            {
-	                try
-	                {
-	                    Devices.Add(dev.Key, dev);
-	                }
-	                catch (ArgumentException ex)
-	                {
-	                    Debug.Console(0, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
-	                        dev.Key, ex.Message, ex.StackTrace);
-	                }
-	            }
-	        }
-	        finally
-	        {
-	            DeviceCriticalSection.Leave();
-	        }
-	    }
-
-		public static void RemoveDevice(IKeyed newDev)
-		{
-		    try
-		    {
-                DeviceCriticalSection.Enter();
-		        if (newDev == null)
-		            return;
-		        if (Devices.ContainsKey(newDev.Key))
-		            Devices.Remove(newDev.Key);
-		            //if (_Devices.Contains(newDev))
-		            //    _Devices.Remove(newDev);
-		        else
-		            Debug.Console(0, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
-		    }
-		    finally
-		    {
-		        DeviceCriticalSection.Leave();
-		    }
-		}
-
-		public static IEnumerable<string> GetDeviceKeys()
-		{
-		        //return _Devices.Select(d => d.Key).ToList();
-		        return Devices.Keys;
-		}
-
-		public static IEnumerable<IKeyed> GetDevices()
-		{
-		        //return _Devices.Select(d => d.Key).ToList();
-		        return Devices.Values;
-		}
-
-		public static IKeyed GetDeviceForKey(string key)
-		{
-		        //return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-		        if (key != null && Devices.ContainsKey(key))
-		            return Devices[key];
-
-		        return null;
-		}
-
-        /// <summary>
-        /// Console handler that simulates com port data receive 
-        /// </summary>
-        /// <param name="s"></param>
-        public static void SimulateComReceiveOnDevice(string s)
-        {
-            // devcomsim:1 xyzabc
-            var match = Regex.Match(s, @"(\S*)\s*(.*)");
-            if (match.Groups.Count < 3)
-            {
-                CrestronConsole.ConsoleCommandResponse("  Format: devsimreceive:P <device key> <string to send>");
-                return;
-            }
-            //Debug.Console(2, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
-
-            var com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
-            if (com == null)
-            {
-                CrestronConsole.ConsoleCommandResponse("'{0}' is not a comm port device", match.Groups[1].Value);
-                return;
-            }
-            com.SimulateReceive(match.Groups[2].Value);
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	public static class DeviceManager
+	{
+        public static event EventHandler<EventArgs> AllDevicesActivated;
+
+	    private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
+	    private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);
+		//public static List<Device> Devices { get { return _Devices; } }
+		//static List<Device> _Devices = new List<Device>();
+
+		static readonly Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);
+
+		/// <summary>
+		/// Returns a copy of all the devices in a list
+		/// </summary>
+		public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }
+
+	    public static bool AddDeviceEnabled;
+
+		public static void Initialize(CrestronControlSystem cs)
+		{
+		    AddDeviceEnabled = true;
+			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
+				ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
+				ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices", 
+				ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "", 
+				ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
+			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
+                "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
+        }
+
+		/// <summary>
+		/// Calls activate steps on all Device class items
+		/// </summary>
+		public static void ActivateAll()
+		{
+		    try
+		    {
+		        DeviceCriticalSection.Enter();
+                AddDeviceEnabled = false;
+		        // PreActivate all devices
+		        foreach (var d in Devices.Values)
+		        {
+		            try
+		            {
+		                if (d is Device)
+		                    (d as Device).PreActivate();
+		            }
+		            catch (Exception e)
+		            {
+		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
+		            }
+		        }
+
+		        // Activate all devices
+		        foreach (var d in Devices.Values)
+		        {
+		            try
+		            {
+		                if (d is Device)
+		                    (d as Device).Activate();
+		            }
+		            catch (Exception e)
+		            {
+		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
+		            }
+		        }
+
+		        // PostActivate all devices
+		        foreach (var d in Devices.Values)
+		        {
+		            try
+		            {
+		                if (d is Device)
+		                    (d as Device).PostActivate();
+		            }
+		            catch (Exception e)
+		            {
+		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
+		            }
+		        }
+
+                OnAllDevicesActivated();
+		    }
+		    finally
+		    {
+                DeviceCriticalSection.Leave();
+		    }
+		}
+
+        private static void OnAllDevicesActivated()
+        {
+            var handler = AllDevicesActivated;
+            if (handler != null)
+            {
+                handler(null, new EventArgs());
+            }
+        }
+
+		/// <summary>
+		/// Calls activate on all Device class items
+		/// </summary>
+		public static void DeactivateAll()
+		{
+		    try
+		    {
+		        DeviceCriticalSection.Enter();
+		        foreach (var d in Devices.Values.OfType<Device>())
+		        {
+		            d.Deactivate();
+		        }
+		    }
+		    finally
+		    {
+		        DeviceCriticalSection.Leave();
+		    }
+		}
+
+		//static void ListMethods(string devKey)
+		//{
+		//    var dev = GetDeviceForKey(devKey);
+		//    if(dev != null)
+		//    {
+		//        var type = dev.GetType().GetCType();
+		//        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
+		//        var sb = new StringBuilder();
+		//        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
+		//        foreach (var m in methods)
+		//        {
+		//            sb.Append(string.Format("{0}(", m.Name));
+		//            var pars = m.GetParameters();
+		//            foreach (var p in pars)
+		//                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
+		//            sb.AppendLine(")");
+		//        }
+		//        CrestronConsole.ConsoleCommandResponse(sb.ToString());
+		//    }
+		//}
+
+	    private static void ListDevices(string s)
+	    {
+	        Debug.Console(0, "{0} Devices registered with Device Manager:", Devices.Count);
+	        var sorted = Devices.Values.ToList();
+	        sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
+
+	        foreach (var d in sorted)
+	        {
+	            var name = d is IKeyName ? (d as IKeyName).Name : "---";
+	            Debug.Console(0, "  [{0}] {1}", d.Key, name);
+	        }
+	    }
+
+	    private static void ListDeviceFeedbacks(string devKey)
+	    {
+	        var dev = GetDeviceForKey(devKey);
+	        if (dev == null)
+	        {
+	            Debug.Console(0, "Device '{0}' not found", devKey);
+	            return;
+	        }
+	        var statusDev = dev as IHasFeedback;
+	        if (statusDev == null)
+	        {
+	            Debug.Console(0, "Device '{0}' does not have visible feedbacks", devKey);
+	            return;
+	        }
+	        statusDev.DumpFeedbacksToConsole(true);
+	    }
+
+	    //static void ListDeviceCommands(string devKey)
+        //{
+        //    var dev = GetDeviceForKey(devKey);
+        //    if (dev == null)
+        //    {
+        //        Debug.Console(0, "Device '{0}' not found", devKey);
+        //        return;
+        //    }
+        //    Debug.Console(0, "This needs to be reworked.  Stay tuned.", devKey);
+        //}
+
+	    private static void ListDeviceCommStatuses(string input)
+	    {
+	        var sb = new StringBuilder();
+	        foreach (var dev in Devices.Values.OfType<ICommunicationMonitor>())
+	        {
+	            sb.Append(string.Format("{0}: {1}\r", dev,
+	                dev.CommunicationMonitor.Status));
+	        }
+	        CrestronConsole.ConsoleCommandResponse(sb.ToString());
+	    }
+
+
+	    //static void DoDeviceCommand(string command)
+        //{
+        //    Debug.Console(0, "Not yet implemented.  Stay tuned");
+        //}
+
+		public static void AddDevice(IKeyed newDev)
+		{
+		    try
+		    {
+		        if (!DeviceCriticalSection.TryEnter())
+		        {
+		            Debug.Console(0, Debug.ErrorLogLevel.Error, "Currently unable to add devices to Device Manager. Please try again");
+		            return;
+		        }
+		        // Check for device with same key
+		        //var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
+		        ////// If it exists, remove or warn??
+		        //if (existingDevice != null)
+
+		        if (!AddDeviceEnabled)
+		        {
+		            Debug.Console(0, Debug.ErrorLogLevel.Error, "All devices have been activated. Adding new devices is not allowed.");
+		            return;
+		        }
+
+		        if (Devices.ContainsKey(newDev.Key))
+		        {
+		            Debug.Console(0, newDev, "WARNING: A device with this key already exists.  Not added to manager");
+		            return;
+		        }
+		        Devices.Add(newDev.Key, newDev);
+		        //if (!(_Devices.Contains(newDev)))
+		        //    _Devices.Add(newDev);
+		    }
+		    finally
+		    {
+		        DeviceCriticalSection.Leave();
+		    }
+		}
+
+	    public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
+	    {
+	        try
+	        {
+	            if (!DeviceCriticalSection.TryEnter())
+	            {
+	                Debug.Console(0, Debug.ErrorLogLevel.Error,
+	                    "Currently unable to add devices to Device Manager. Please try again");
+	                return;
+	            }
+	            if (!AddDeviceEnabled)
+	            {
+	                Debug.Console(0, Debug.ErrorLogLevel.Error,
+	                    "All devices have been activated. Adding new devices is not allowed.");
+	                return;
+	            }
+
+	            foreach (var dev in devicesToAdd)
+	            {
+	                try
+	                {
+	                    Devices.Add(dev.Key, dev);
+	                }
+	                catch (ArgumentException ex)
+	                {
+	                    Debug.Console(0, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
+	                        dev.Key, ex.Message, ex.StackTrace);
+	                }
+	            }
+	        }
+	        finally
+	        {
+	            DeviceCriticalSection.Leave();
+	        }
+	    }
+
+		public static void RemoveDevice(IKeyed newDev)
+		{
+		    try
+		    {
+                DeviceCriticalSection.Enter();
+		        if (newDev == null)
+		            return;
+		        if (Devices.ContainsKey(newDev.Key))
+		            Devices.Remove(newDev.Key);
+		            //if (_Devices.Contains(newDev))
+		            //    _Devices.Remove(newDev);
+		        else
+		            Debug.Console(0, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
+		    }
+		    finally
+		    {
+		        DeviceCriticalSection.Leave();
+		    }
+		}
+
+		public static IEnumerable<string> GetDeviceKeys()
+		{
+		        //return _Devices.Select(d => d.Key).ToList();
+		        return Devices.Keys;
+		}
+
+		public static IEnumerable<IKeyed> GetDevices()
+		{
+		        //return _Devices.Select(d => d.Key).ToList();
+		        return Devices.Values;
+		}
+
+		public static IKeyed GetDeviceForKey(string key)
+		{
+		        //return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+		        if (key != null && Devices.ContainsKey(key))
+		            return Devices[key];
+
+		        return null;
+		}
+
+        /// <summary>
+        /// Console handler that simulates com port data receive 
+        /// </summary>
+        /// <param name="s"></param>
+        public static void SimulateComReceiveOnDevice(string s)
+        {
+            // devcomsim:1 xyzabc
+            var match = Regex.Match(s, @"(\S*)\s*(.*)");
+            if (match.Groups.Count < 3)
+            {
+                CrestronConsole.ConsoleCommandResponse("  Format: devsimreceive:P <device key> <string to send>");
+                return;
+            }
+            //Debug.Console(2, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);
+
+            var com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
+            if (com == null)
+            {
+                CrestronConsole.ConsoleCommandResponse("'{0}' is not a comm port device", match.Groups[1].Value);
+                return;
+            }
+            com.SimulateReceive(match.Groups[2].Value);
         }
 
         /// <summary>
@@ -366,82 +379,82 @@ namespace PepperDash.Essentials.Core
 	                Debug.Console(0, "{0}", routingOutputPort.Key);
 	            }
 	        }
-	    }
-
-        /// <summary>
-        /// Attempts to set the debug level of a device
-        /// </summary>
-        /// <param name="s"></param>
-        public static void SetDeviceStreamDebugging(string s)
-        {
-            var args = s.Split(' ');
-
-            var deviceKey = args[0];
-            var setting = args[1];
-
-            var timeout= String.Empty;
-
-            if (args.Length >= 3)
-            {
-                timeout = args[2];
-            }
-
-            var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
-
-            if (device == null)
-            {
-                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
-                return;
-            }
-
-            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
-                {
-                    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);
-
-                }
-                catch (Exception e)
-                {
-                    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);
-            }
-        }
-
-        /// <summary>
-        /// Sets stream debugging settings to off for all devices
-        /// </summary>
-        public static void DisableAllDeviceStreamDebugging()
-        {
-            foreach (var device in AllDevices)
-            {
-                var streamDevice = device as IStreamDebugging;
-
-                if (streamDevice != null)
-                {
-                    streamDevice.StreamDebugging.SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting.Off);
-                }
-            }
-        }
-	}
+	    }
+
+        /// <summary>
+        /// Attempts to set the debug level of a device
+        /// </summary>
+        /// <param name="s"></param>
+        public static void SetDeviceStreamDebugging(string s)
+        {
+            var args = s.Split(' ');
+
+            var deviceKey = args[0];
+            var setting = args[1];
+
+            var timeout= String.Empty;
+
+            if (args.Length >= 3)
+            {
+                timeout = args[2];
+            }
+
+            var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
+
+            if (device == null)
+            {
+                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
+                return;
+            }
+
+            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
+                {
+                    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);
+
+                }
+                catch (Exception e)
+                {
+                    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);
+            }
+        }
+
+        /// <summary>
+        /// Sets stream debugging settings to off for all devices
+        /// </summary>
+        public static void DisableAllDeviceStreamDebugging()
+        {
+            foreach (var device in AllDevices)
+            {
+                var streamDevice = device as IStreamDebugging;
+
+                if (streamDevice != null)
+                {
+                    streamDevice.StreamDebugging.SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting.Off);
+                }
+            }
+        }
+	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs

@@ -88,8 +88,12 @@ namespace PepperDash.Essentials.Core.Privacy
             else
                 Debug.Console(0, this, "Unable to add Red LED device");
 
+            DeviceManager.AllDevicesActivated += (o, a) =>
+                {
+                    CheckPrivacyMode();
+                };
+
             AddPostActivationAction(() => {
-                CheckPrivacyMode();
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
             });

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

@@ -14,7 +14,7 @@
     <tags>crestron 3series 4series</tags>
     <repository type="git" url="https://github.com/PepperDash/Essentials"/>
     <dependencies>
-      <dependency id="PepperDashCore" version="[1.0, 1.1)"/>
+      <dependency id="PepperDashCore" version="[1.0.43, 1.1.0)"/>
     </dependencies>
   </metadata>
   <files>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs

@@ -1,58 +1,58 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Scheduler;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public abstract class EssentialsRoomBase : ReconfigurableDevice
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        public BoolFeedback OnFeedback { get; private set; }
-
-        /// <summary>
-        /// Fires when the RoomOccupancy object is set
-        /// </summary>
-        public event EventHandler<EventArgs> RoomOccupancyIsSet;
-
-        public BoolFeedback IsWarmingUpFeedback { get; private set; }
-        public BoolFeedback IsCoolingDownFeedback { get; private set; }
-
-        public IOccupancyStatusProvider RoomOccupancy { get; private set; }
-
-        public bool OccupancyStatusProviderIsRemote { get; private set; }
-
-        protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
-        protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
-
-        /// <summary>
-        /// Indicates if this room is Mobile Control Enabled
-        /// </summary>
-        public bool IsMobileControlEnabled { get; private set; }
-
-        /// <summary>
-        /// The bridge for this room if Mobile Control is enabled
-        /// </summary>
-        public IMobileControlRoomBridge MobileControlRoomBridge { get; private set; }
-
-        /// <summary>
-        /// The config name of the source list
-        /// </summary>
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Scheduler;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public abstract class EssentialsRoomBase : ReconfigurableDevice
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public BoolFeedback OnFeedback { get; private set; }
+
+        /// <summary>
+        /// Fires when the RoomOccupancy object is set
+        /// </summary>
+        public event EventHandler<EventArgs> RoomOccupancyIsSet;
+
+        public BoolFeedback IsWarmingUpFeedback { get; private set; }
+        public BoolFeedback IsCoolingDownFeedback { get; private set; }
+
+        public IOccupancyStatusProvider RoomOccupancy { get; private set; }
+
+        public bool OccupancyStatusProviderIsRemote { get; private set; }
+
+        protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
+        protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
+
+        /// <summary>
+        /// Indicates if this room is Mobile Control Enabled
+        /// </summary>
+        public bool IsMobileControlEnabled { get; private set; }
+
+        /// <summary>
+        /// The bridge for this room if Mobile Control is enabled
+        /// </summary>
+        public IMobileControlRoomBridge MobileControlRoomBridge { get; private set; }
+
+        /// <summary>
+        /// The config name of the source list
+        /// </summary>
 		/// 
-		protected string _SourceListKey;
+		protected string _SourceListKey;
         public virtual string SourceListKey {
 			get
 			{
@@ -63,306 +63,306 @@ namespace PepperDash.Essentials.Core
 				_SourceListKey = value; 
 
 			}
-		}
-
-        /// <summary>
-        /// Timer used for informing the UIs of a shutdown
-        /// </summary>        
-        public SecondsCountdownTimer ShutdownPromptTimer { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int ShutdownPromptSeconds { get; set; }
-        public int ShutdownVacancySeconds { get; set; }
-        public eShutdownType ShutdownType { get; private set; }
-
-        public EssentialsRoomEmergencyBase Emergency { get; set; }
-
-        public Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; set; }
-
-        public string LogoUrlLightBkgnd { get; set; }
-
-        public string LogoUrlDarkBkgnd { get; set; }
-
-        protected SecondsCountdownTimer RoomVacancyShutdownTimer { get; private set; }
-
-        public eVacancyMode VacancyMode { get; private set; }
-
-        /// <summary>
-        /// Seconds after vacancy prompt is displayed until shutdown
-        /// </summary>
-        protected int RoomVacancyShutdownSeconds;
-
-        /// <summary>
-        /// Seconds after vacancy detected until prompt is displayed
-        /// </summary>
-        protected int RoomVacancyShutdownPromptSeconds;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        protected abstract Func<bool> OnFeedbackFunc { get; }
-
-		protected Dictionary<IBasicVolumeWithFeedback, uint> SavedVolumeLevels = new Dictionary<IBasicVolumeWithFeedback, uint>();
-
-		/// <summary>
-		/// When volume control devices change, should we zero the one that we are leaving?
-		/// </summary>
-		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; private set; }
-
-
-        public EssentialsRoomBase(DeviceConfig config)
-            : base(config)
-        {
-            // Setup the ShutdownPromptTimer
-            ShutdownPromptTimer = new SecondsCountdownTimer(Key + "-offTimer");
-            ShutdownPromptTimer.IsRunningFeedback.OutputChange += (o, a) =>
-            {
-                if (!ShutdownPromptTimer.IsRunningFeedback.BoolValue)
-                    ShutdownType = eShutdownType.None;
-            };
-            ShutdownPromptTimer.HasFinished += (o, a) => Shutdown(); // Shutdown is triggered 
-
-            ShutdownPromptSeconds = 60;
-            ShutdownVacancySeconds = 120; 
-            
-            ShutdownType = eShutdownType.None;
-
-            RoomVacancyShutdownTimer = new SecondsCountdownTimer(Key + "-vacancyOffTimer");
-            //RoomVacancyShutdownTimer.IsRunningFeedback.OutputChange += (o, a) =>
-            //{
-            //    if (!RoomVacancyShutdownTimer.IsRunningFeedback.BoolValue)
-            //        ShutdownType = ShutdownType.Vacancy;
-            //};
-            RoomVacancyShutdownTimer.HasFinished += new EventHandler<EventArgs>(RoomVacancyShutdownPromptTimer_HasFinished); // Shutdown is triggered
-
-            RoomVacancyShutdownPromptSeconds = 1500;    //  25 min to prompt warning
-            RoomVacancyShutdownSeconds = 240;           //  4 min after prompt will trigger shutdown prompt
-            VacancyMode = eVacancyMode.None;
-
-            OnFeedback = new BoolFeedback(OnFeedbackFunc);
-
-            IsWarmingUpFeedback = new BoolFeedback(IsWarmingFeedbackFunc);
-            IsCoolingDownFeedback = new BoolFeedback(IsCoolingFeedbackFunc);
-
-            AddPostActivationAction(() =>
-            {
-                if (RoomOccupancy != null)
-                    OnRoomOccupancyIsSet();
-            });
-        }
-
-        public override bool CustomActivate()
-        {
-            SetUpMobileControl();
-
-            return base.CustomActivate();
-        }
-
-        /// <summary>
-        /// If mobile control is enabled, sets the appropriate properties
-        /// </summary>
-        void SetUpMobileControl()
-        {
-            var mcBridgeKey = string.Format("mobileControlBridge-{0}", Key);
-            var mcBridge = DeviceManager.GetDeviceForKey(mcBridgeKey);
-            if (mcBridge == null)
-            {
-                Debug.Console(1, this, "*********************Mobile Control Bridge Not found for this room.");
-                IsMobileControlEnabled = false;
-                return;
-            }
-            else
-            {
-                MobileControlRoomBridge = mcBridge as IMobileControlRoomBridge;
-                Debug.Console(1, this, "*********************Mobile Control Bridge found and enabled for this room");
-                IsMobileControlEnabled = true;
-            }
-        }
-
-        void RoomVacancyShutdownPromptTimer_HasFinished(object sender, EventArgs e)
-        {
-            switch (VacancyMode)
-            {
-                case eVacancyMode.None:
-                    StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
-                    break;
-                case eVacancyMode.InInitialVacancy:
-                    StartRoomVacancyTimer(eVacancyMode.InShutdownWarning);
-                    break;
-                case eVacancyMode.InShutdownWarning:
-                    {
-                        StartShutdown(eShutdownType.Vacancy);
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Shutting Down due to vacancy.");
-                        break;
-                    }
-                default:
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="type"></param>
-        public void StartShutdown(eShutdownType type)
-        {
-            // Check for shutdowns running. Manual should override other shutdowns
-
-            if (type == eShutdownType.Manual)
-                ShutdownPromptTimer.SecondsToCount = ShutdownPromptSeconds;
-            else if (type == eShutdownType.Vacancy)
-                ShutdownPromptTimer.SecondsToCount = ShutdownVacancySeconds;
-            ShutdownType = type;
-            ShutdownPromptTimer.Start();
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "ShutdownPromptTimer Started. Type: {0}.  Seconds: {1}", ShutdownType, ShutdownPromptTimer.SecondsToCount);
-        }
-
-        public void StartRoomVacancyTimer(eVacancyMode mode)
-        {
-            if (mode == eVacancyMode.None)
-                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownPromptSeconds;
-            else if (mode == eVacancyMode.InInitialVacancy)
-                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownSeconds;
-            else if (mode == eVacancyMode.InShutdownWarning)
-                RoomVacancyShutdownTimer.SecondsToCount = 60;
-            VacancyMode = mode;
-            RoomVacancyShutdownTimer.Start();
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Vacancy Timer Started. Mode: {0}.  Seconds: {1}", VacancyMode, RoomVacancyShutdownTimer.SecondsToCount);
-        }
-
-        /// <summary>
-        /// Resets the vacancy mode and shutsdwon the room
-        /// </summary>
-        public void Shutdown()
-        {
-            VacancyMode = eVacancyMode.None;
-            EndShutdown();
-        }
-
-        /// <summary>
-        /// This method is for the derived class to define it's specific shutdown
-        /// requirements but should not be called directly.  It is called by Shutdown()
-        /// </summary>
-        protected abstract void EndShutdown();
-
-
-        /// <summary>
-        /// Override this to implement a default volume level(s) method
-        /// </summary>
-        public abstract void SetDefaultLevels();
-
-        /// <summary>
-        /// Sets the object to be used as the IOccupancyStatusProvider for the room. Can be an Occupancy Aggregator or a specific device
-        /// </summary>
-        /// <param name="statusProvider"></param>
-        public void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes)
-        { 
-			if (statusProvider == null)
-			{
-				Debug.Console(0, this, "ERROR: Occupancy sensor device is null");
-				return;
-			}
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Room Occupancy set to device: '{0}'", (statusProvider as Device).Key);
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Timeout Minutes from Config is: {0}", timeoutMinutes);
-
-            // If status provider is fusion, set flag to remote
-            if (statusProvider is Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase)
-                OccupancyStatusProviderIsRemote = true;
-
-            if(timeoutMinutes > 0)
-                RoomVacancyShutdownSeconds = timeoutMinutes * 60;
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "RoomVacancyShutdownSeconds set to {0}", RoomVacancyShutdownSeconds);
-
-            RoomOccupancy = statusProvider;
-
-            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange -= RoomIsOccupiedFeedback_OutputChange;
-            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
-
-            OnRoomOccupancyIsSet();
-        }
-
-        void OnRoomOccupancyIsSet()
-        {
-            var handler = RoomOccupancyIsSet;
-            if (handler != null)
-                handler(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// To allow base class to power room on to last source
-        /// </summary>
-        public abstract void PowerOnToDefaultOrLastSource();
-
-        /// <summary>
-        /// To allow base class to power room on to default source
-        /// </summary>
-        /// <returns></returns>
-        public abstract bool RunDefaultPresentRoute();
-
-        void RoomIsOccupiedFeedback_OutputChange(object sender, EventArgs e)
-        {
-            if (RoomOccupancy.RoomIsOccupiedFeedback.BoolValue == false)
-            {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Notice: Vacancy Detected");
-                // Trigger the timer when the room is vacant
-                StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
-            }
-            else
-            {
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Notice: Occupancy Detected");
-                // Reset the timer when the room is occupied
-                RoomVacancyShutdownTimer.Cancel();
-            }
-        }
-
-        /// <summary>
-        /// Executes when RoomVacancyShutdownTimer expires.  Used to trigger specific room actions as needed.  Must nullify the timer object when executed
-        /// </summary>
-        /// <param name="o"></param>
-        public abstract void RoomVacatedForTimeoutPeriod(object o);
-    }
-        
-    /// <summary>
-    /// To describe the various ways a room may be shutting down
-    /// </summary>
-    public enum eShutdownType
-    {
-        None = 0,
-        External,
-        Manual,
-        Vacancy
-    }
-
-    public enum eVacancyMode
-    {
-        None = 0,
-        InInitialVacancy,
-        InShutdownWarning
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public enum eWarmingCoolingMode
-    {
-        None,
-        Warming,
-        Cooling
-    }
-
-    public abstract class EssentialsRoomEmergencyBase : IKeyed
-    {
-        public string Key { get; private set; }
-
-        public EssentialsRoomEmergencyBase(string key)
-        {
-            Key = key;
-        }
-    }
+		}
+
+        /// <summary>
+        /// Timer used for informing the UIs of a shutdown
+        /// </summary>        
+        public SecondsCountdownTimer ShutdownPromptTimer { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ShutdownPromptSeconds { get; set; }
+        public int ShutdownVacancySeconds { get; set; }
+        public eShutdownType ShutdownType { get; private set; }
+
+        public EssentialsRoomEmergencyBase Emergency { get; set; }
+
+        public Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; set; }
+
+        public string LogoUrlLightBkgnd { get; set; }
+
+        public string LogoUrlDarkBkgnd { get; set; }
+
+        protected SecondsCountdownTimer RoomVacancyShutdownTimer { get; private set; }
+
+        public eVacancyMode VacancyMode { get; private set; }
+
+        /// <summary>
+        /// Seconds after vacancy prompt is displayed until shutdown
+        /// </summary>
+        protected int RoomVacancyShutdownSeconds;
+
+        /// <summary>
+        /// Seconds after vacancy detected until prompt is displayed
+        /// </summary>
+        protected int RoomVacancyShutdownPromptSeconds;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected abstract Func<bool> OnFeedbackFunc { get; }
+
+		protected Dictionary<IBasicVolumeWithFeedback, uint> SavedVolumeLevels = new Dictionary<IBasicVolumeWithFeedback, uint>();
+
+		/// <summary>
+		/// When volume control devices change, should we zero the one that we are leaving?
+		/// </summary>
+		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; private set; }
+
+
+        public EssentialsRoomBase(DeviceConfig config)
+            : base(config)
+        {
+            // Setup the ShutdownPromptTimer
+            ShutdownPromptTimer = new SecondsCountdownTimer(Key + "-offTimer");
+            ShutdownPromptTimer.IsRunningFeedback.OutputChange += (o, a) =>
+            {
+                if (!ShutdownPromptTimer.IsRunningFeedback.BoolValue)
+                    ShutdownType = eShutdownType.None;
+            };
+            ShutdownPromptTimer.HasFinished += (o, a) => Shutdown(); // Shutdown is triggered 
+
+            ShutdownPromptSeconds = 60;
+            ShutdownVacancySeconds = 120; 
+            
+            ShutdownType = eShutdownType.None;
+
+            RoomVacancyShutdownTimer = new SecondsCountdownTimer(Key + "-vacancyOffTimer");
+            //RoomVacancyShutdownTimer.IsRunningFeedback.OutputChange += (o, a) =>
+            //{
+            //    if (!RoomVacancyShutdownTimer.IsRunningFeedback.BoolValue)
+            //        ShutdownType = ShutdownType.Vacancy;
+            //};
+            RoomVacancyShutdownTimer.HasFinished += new EventHandler<EventArgs>(RoomVacancyShutdownPromptTimer_HasFinished); // Shutdown is triggered
+
+            RoomVacancyShutdownPromptSeconds = 1500;    //  25 min to prompt warning
+            RoomVacancyShutdownSeconds = 240;           //  4 min after prompt will trigger shutdown prompt
+            VacancyMode = eVacancyMode.None;
+
+            OnFeedback = new BoolFeedback(OnFeedbackFunc);
+
+            IsWarmingUpFeedback = new BoolFeedback(IsWarmingFeedbackFunc);
+            IsCoolingDownFeedback = new BoolFeedback(IsCoolingFeedbackFunc);
+
+            AddPostActivationAction(() =>
+            {
+                if (RoomOccupancy != null)
+                    OnRoomOccupancyIsSet();
+            });
+        }
+
+        public override bool CustomActivate()
+        {
+            SetUpMobileControl();
+
+            return base.CustomActivate();
+        }
+
+        /// <summary>
+        /// If mobile control is enabled, sets the appropriate properties
+        /// </summary>
+        void SetUpMobileControl()
+        {
+            var mcBridgeKey = string.Format("mobileControlBridge-{0}", Key);
+            var mcBridge = DeviceManager.GetDeviceForKey(mcBridgeKey);
+            if (mcBridge == null)
+            {
+                Debug.Console(1, this, "*********************Mobile Control Bridge Not found for this room.");
+                IsMobileControlEnabled = false;
+                return;
+            }
+            else
+            {
+                MobileControlRoomBridge = mcBridge as IMobileControlRoomBridge;
+                Debug.Console(1, this, "*********************Mobile Control Bridge found and enabled for this room");
+                IsMobileControlEnabled = true;
+            }
+        }
+
+        void RoomVacancyShutdownPromptTimer_HasFinished(object sender, EventArgs e)
+        {
+            switch (VacancyMode)
+            {
+                case eVacancyMode.None:
+                    StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
+                    break;
+                case eVacancyMode.InInitialVacancy:
+                    StartRoomVacancyTimer(eVacancyMode.InShutdownWarning);
+                    break;
+                case eVacancyMode.InShutdownWarning:
+                    {
+                        StartShutdown(eShutdownType.Vacancy);
+                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Shutting Down due to vacancy.");
+                        break;
+                    }
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="type"></param>
+        public void StartShutdown(eShutdownType type)
+        {
+            // Check for shutdowns running. Manual should override other shutdowns
+
+            if (type == eShutdownType.Manual)
+                ShutdownPromptTimer.SecondsToCount = ShutdownPromptSeconds;
+            else if (type == eShutdownType.Vacancy)
+                ShutdownPromptTimer.SecondsToCount = ShutdownVacancySeconds;
+            ShutdownType = type;
+            ShutdownPromptTimer.Start();
+
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "ShutdownPromptTimer Started. Type: {0}.  Seconds: {1}", ShutdownType, ShutdownPromptTimer.SecondsToCount);
+        }
+
+        public void StartRoomVacancyTimer(eVacancyMode mode)
+        {
+            if (mode == eVacancyMode.None)
+                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownPromptSeconds;
+            else if (mode == eVacancyMode.InInitialVacancy)
+                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownSeconds;
+            else if (mode == eVacancyMode.InShutdownWarning)
+                RoomVacancyShutdownTimer.SecondsToCount = 60;
+            VacancyMode = mode;
+            RoomVacancyShutdownTimer.Start();
+
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Vacancy Timer Started. Mode: {0}.  Seconds: {1}", VacancyMode, RoomVacancyShutdownTimer.SecondsToCount);
+        }
+
+        /// <summary>
+        /// Resets the vacancy mode and shutsdwon the room
+        /// </summary>
+        public void Shutdown()
+        {
+            VacancyMode = eVacancyMode.None;
+            EndShutdown();
+        }
+
+        /// <summary>
+        /// This method is for the derived class to define it's specific shutdown
+        /// requirements but should not be called directly.  It is called by Shutdown()
+        /// </summary>
+        protected abstract void EndShutdown();
+
+
+        /// <summary>
+        /// Override this to implement a default volume level(s) method
+        /// </summary>
+        public abstract void SetDefaultLevels();
+
+        /// <summary>
+        /// Sets the object to be used as the IOccupancyStatusProvider for the room. Can be an Occupancy Aggregator or a specific device
+        /// </summary>
+        /// <param name="statusProvider"></param>
+        public void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes)
+        { 
+			if (statusProvider == null)
+			{
+				Debug.Console(0, this, "ERROR: Occupancy sensor device is null");
+				return;
+			}
+
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Room Occupancy set to device: '{0}'", (statusProvider as Device).Key);
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Timeout Minutes from Config is: {0}", timeoutMinutes);
+
+            // If status provider is fusion, set flag to remote
+            if (statusProvider is Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase)
+                OccupancyStatusProviderIsRemote = true;
+
+            if(timeoutMinutes > 0)
+                RoomVacancyShutdownSeconds = timeoutMinutes * 60;
+
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "RoomVacancyShutdownSeconds set to {0}", RoomVacancyShutdownSeconds);
+
+            RoomOccupancy = statusProvider;
+
+            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange -= RoomIsOccupiedFeedback_OutputChange;
+            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
+
+            OnRoomOccupancyIsSet();
+        }
+
+        void OnRoomOccupancyIsSet()
+        {
+            var handler = RoomOccupancyIsSet;
+            if (handler != null)
+                handler(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// To allow base class to power room on to last source
+        /// </summary>
+        public abstract void PowerOnToDefaultOrLastSource();
+
+        /// <summary>
+        /// To allow base class to power room on to default source
+        /// </summary>
+        /// <returns></returns>
+        public abstract bool RunDefaultPresentRoute();
+
+        void RoomIsOccupiedFeedback_OutputChange(object sender, EventArgs e)
+        {
+            if (RoomOccupancy.RoomIsOccupiedFeedback.BoolValue == false)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Notice: Vacancy Detected");
+                // Trigger the timer when the room is vacant
+                StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
+            }
+            else
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Notice: Occupancy Detected");
+                // Reset the timer when the room is occupied
+                RoomVacancyShutdownTimer.Cancel();
+            }
+        }
+
+        /// <summary>
+        /// Executes when RoomVacancyShutdownTimer expires.  Used to trigger specific room actions as needed.  Must nullify the timer object when executed
+        /// </summary>
+        /// <param name="o"></param>
+        public abstract void RoomVacatedForTimeoutPeriod(object o);
+    }
+        
+    /// <summary>
+    /// To describe the various ways a room may be shutting down
+    /// </summary>
+    public enum eShutdownType
+    {
+        None = 0,
+        External,
+        Manual,
+        Vacancy
+    }
+
+    public enum eVacancyMode
+    {
+        None = 0,
+        InInitialVacancy,
+        InShutdownWarning
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum eWarmingCoolingMode
+    {
+        None,
+        Warming,
+        Cooling
+    }
+
+    public abstract class EssentialsRoomEmergencyBase : IKeyed
+    {
+        public string Key { get; private set; }
+
+        public EssentialsRoomEmergencyBase(string key)
+        {
+            Key = key;
+        }
+    }
 }

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

@@ -59,7 +59,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// For fixed-source endpoint devices
 	/// </summary>
-    [Obsolete]
+    [Obsolete("Please switch to IRoutingSink")]
     public interface IRoutingSinkNoSwitching : IRoutingSink
 	{
 

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

@@ -18,14 +18,14 @@ using PepperDash.Essentials.DM.Config;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 
 namespace PepperDash.Essentials.DM
-{
+{
     public class DmpsRoutingController : EssentialsBridgeableDevice, IRoutingNumericWithFeedback, IHasFeedback
     {
         public CrestronControlSystem Dmps { get; set; }
-        public ISystemControl SystemControl { get; private set; }
-
-        //IroutingNumericEvent
-        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+        public ISystemControl SystemControl { get; private set; }
+
+        //IroutingNumericEvent
+        public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
 
         // Feedbacks for EssentialDM
         public Dictionary<uint, IntFeedback> VideoOutputFeedbacks { get; private set; }
@@ -57,16 +57,16 @@ namespace PepperDash.Essentials.DM
         /// <summary>
         /// Text that represents when an output has no source routed to it
         /// </summary>
-        public string NoRouteText = "";
-
-        /// <summary>
-        /// Raise an event when the status of a switch object changes.
-        /// </summary>
-        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
-        private void OnSwitchChange(RoutingNumericEventArgs e)
-        {
-            var newEvent = NumericSwitchChange;
-            if (newEvent != null) newEvent(this, e);
+        public string NoRouteText = "";
+
+        /// <summary>
+        /// Raise an event when the status of a switch object changes.
+        /// </summary>
+        /// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
+        private void OnSwitchChange(RoutingNumericEventArgs e)
+        {
+            var newEvent = NumericSwitchChange;
+            if (newEvent != null) newEvent(this, e);
         }
 
 
@@ -133,8 +133,8 @@ namespace PepperDash.Essentials.DM
             OutputEndpointOnlineFeedbacks = new Dictionary<uint, BoolFeedback>();
 
             Debug.Console(1, this, "{0} Switcher Inputs Present.", Dmps.SwitcherInputs.Count);
-            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
-
+            Debug.Console(1, this, "{0} Switcher Outputs Present.", Dmps.SwitcherOutputs.Count);
+
             Debug.Console(1, this, "{0} Inputs in ControlSystem", Dmps.NumberOfSwitcherInputs);
             Debug.Console(1, this, "{0} Outputs in ControlSystem", Dmps.NumberOfSwitcherOutputs);
 
@@ -155,57 +155,57 @@ namespace PepperDash.Essentials.DM
             Dmps.DMOutputChange += Dmps_DMOutputChange;
 
             return base.CustomActivate();
-        }
-
-        private void SetOutputNames()
-        {
-            if (OutputNames == null)
-            {
-                return;
-            }
-
-            foreach (var kvp in OutputNames)
-            {
-                var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
-                if (output != null && output.Name.Type != eSigType.NA)
-                {
-                    output.Name.StringValue = kvp.Value;
-                }
-            }
-        }
-
-        private void SetInputNames()
-        {
-            if (InputNames == null)
-            {
-                return;
-            }
-            foreach (var kvp in InputNames)
-            {
-                var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
-                if (input != null && input.Name.Type != eSigType.NA)
-                {
-                    input.Name.StringValue = kvp.Value;
-                }
-            }
-        }
-
+        }
+
+        private void SetOutputNames()
+        {
+            if (OutputNames == null)
+            {
+                return;
+            }
+
+            foreach (var kvp in OutputNames)
+            {
+                var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
+                if (output != null && output.Name.Type != eSigType.NA)
+                {
+                    output.Name.StringValue = kvp.Value;
+                }
+            }
+        }
+
+        private void SetInputNames()
+        {
+            if (InputNames == null)
+            {
+                return;
+            }
+            foreach (var kvp in InputNames)
+            {
+                var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
+                if (input != null && input.Name.Type != eSigType.NA)
+                {
+                    input.Name.StringValue = kvp.Value;
+                }
+            }
+        }
+
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
+        {
             var joinMap = new DmpsRoutingControllerJoinMap(joinStart);
 
             var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
@@ -214,194 +214,203 @@ namespace PepperDash.Essentials.DM
             LinkInputsToApi(trilist, joinMap);
 
             LinkOutputsToApi(trilist, joinMap);
-        }
-
-        private void LinkOutputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
-        {
-            for (uint i = 1; i <= Dmps.SwitcherOutputs.Count; i++)
-            {
-                Debug.Console(2, this, "Linking Output Card {0}", i);
-
-                var ioSlot = i;
-                var ioSlotJoin = ioSlot - 1;
-
-                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
-                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
-
-                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
-                {
-                    var outputCard = Dmps.SwitcherOutputs[ioSlot] as DMOutput;
-
-                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
-
-                    if (outputCard == null)
-                    {
-                        return;
-                    }
-                    //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
-
-                    if (outputCard is Card.Dmps3CodecOutput || outputCard.NameFeedback == null)
-                    {
-                        return;
-                    }
-                    if (string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
-                    {
-                        return;
-                    }
-                    //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
-
-                    if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
-                    {
-                        outputCard.Name.StringValue = s;
-                    }
-                });
-
-                // Feedback
-                if (VideoOutputFeedbacks[ioSlot] != null)
-                {
-                    VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
-                }
-                if (AudioOutputFeedbacks[ioSlot] != null)
-                {
-                    AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputNameFeedbacks[ioSlot] != null)
-                {
-                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputVideoRouteNameFeedbacks[ioSlot] != null)
-                {
-                    OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(
-                        trilist.StringInput[joinMap.OutputCurrentVideoInputNames.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputAudioRouteNameFeedbacks[ioSlot] != null)
-                {
-                    OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(
-                        trilist.StringInput[joinMap.OutputCurrentAudioInputNames.JoinNumber + ioSlotJoin]);
-                }
-                if (OutputEndpointOnlineFeedbacks[ioSlot] != null)
-                {
-                    OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
-                        trilist.BooleanInput[joinMap.OutputEndpointOnline.JoinNumber + ioSlotJoin]);
-                }
-            }
-        }
-
-        private void LinkInputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
-        {
-            for (uint i = 1; i <= Dmps.SwitcherInputs.Count; i++)
-            {
-                Debug.Console(2, this, "Linking Input Card {0}", i);
-
-                var ioSlot = i;
-                var ioSlotJoin = ioSlot - 1;
-
-                if (VideoInputSyncFeedbacks[ioSlot] != null)
-                {
-                    VideoInputSyncFeedbacks[ioSlot].LinkInputSig(
-                        trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
-                }
-
-                if (InputNameFeedbacks[ioSlot] != null)
-                {
-                    InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames.JoinNumber + ioSlotJoin]);
-                }
-
-                trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, s =>
-                {
-                    var inputCard = Dmps.SwitcherInputs[ioSlot] as DMInput;
-
-                    if (inputCard == null)
-                    {
-                        return;
-                    }
-
-                    if (inputCard.NameFeedback == null || string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) ||
-                        inputCard.NameFeedback.StringValue == s)
-                    {
-                        return;
-                    }
-
-                    if (inputCard.Name != null)
-                    {
-                        inputCard.Name.StringValue = s;
-                    }
-                });
-
-
-                if (InputEndpointOnlineFeedbacks[ioSlot] != null)
-                {
-                    InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
-                        trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
-                }
-            }
-        }
-
-
+        }
+
+        private void LinkOutputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
+        {
+            for (uint i = 1; i <= Dmps.SwitcherOutputs.Count; i++)
+            {
+                Debug.Console(2, this, "Linking Output Card {0}", i);
+
+                var ioSlot = i;
+                var ioSlotJoin = ioSlot - 1;
+
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
+                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
+                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
+
+                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
+                {
+                    var outputCard = Dmps.SwitcherOutputs[ioSlot] as DMOutput;
+
+                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
+
+                    if (outputCard == null)
+                    {
+                        return;
+                    }
+                    //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
+
+                    if (outputCard is Card.Dmps3CodecOutput || outputCard.NameFeedback == null)
+                    {
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                    {
+                        return;
+                    }
+                    //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
+
+                    if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
+                    {
+                        outputCard.Name.StringValue = s;
+                    }
+                });
+
+                // Feedback
+                if (VideoOutputFeedbacks[ioSlot] != null)
+                {
+                    VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
+                }
+                if (AudioOutputFeedbacks[ioSlot] != null)
+                {
+                    AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio.JoinNumber + ioSlotJoin]);
+                }
+                if (OutputNameFeedbacks[ioSlot] != null)
+                {
+                    OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames.JoinNumber + ioSlotJoin]);
+                }
+                if (OutputVideoRouteNameFeedbacks[ioSlot] != null)
+                {
+                    OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(
+                        trilist.StringInput[joinMap.OutputCurrentVideoInputNames.JoinNumber + ioSlotJoin]);
+                }
+                if (OutputAudioRouteNameFeedbacks[ioSlot] != null)
+                {
+                    OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(
+                        trilist.StringInput[joinMap.OutputCurrentAudioInputNames.JoinNumber + ioSlotJoin]);
+                }
+                if (OutputEndpointOnlineFeedbacks[ioSlot] != null)
+                {
+                    OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
+                        trilist.BooleanInput[joinMap.OutputEndpointOnline.JoinNumber + ioSlotJoin]);
+                }
+            }
+        }
+
+        private void LinkInputsToApi(BasicTriList trilist, DmpsRoutingControllerJoinMap joinMap)
+        {
+            for (uint i = 1; i <= Dmps.SwitcherInputs.Count; i++)
+            {
+                Debug.Console(2, this, "Linking Input Card {0}", i);
+
+                var ioSlot = i;
+                var ioSlotJoin = ioSlot - 1;
+
+                if (VideoInputSyncFeedbacks[ioSlot] != null)
+                {
+                    VideoInputSyncFeedbacks[ioSlot].LinkInputSig(
+                        trilist.BooleanInput[joinMap.VideoSyncStatus.JoinNumber + ioSlotJoin]);
+                }
+
+                if (InputNameFeedbacks[ioSlot] != null)
+                {
+                    InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames.JoinNumber + ioSlotJoin]);
+                }
+
+                trilist.SetStringSigAction(joinMap.InputNames.JoinNumber + ioSlotJoin, s =>
+                {
+                    var inputCard = Dmps.SwitcherInputs[ioSlot] as DMInput;
+
+                    if (inputCard == null)
+                    {
+                        return;
+                    }
+
+                    if (inputCard.NameFeedback == null || string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) ||
+                        inputCard.NameFeedback.StringValue == s)
+                    {
+                        return;
+                    }
+
+                    if (inputCard.Name != null)
+                    {
+                        inputCard.Name.StringValue = s;
+                    }
+                });
+
+
+                if (InputEndpointOnlineFeedbacks[ioSlot] != null)
+                {
+                    InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(
+                        trilist.BooleanInput[joinMap.InputEndpointOnline.JoinNumber + ioSlotJoin]);
+                }
+            }
+        }
+
+
         /// <summary>
         /// Iterate the SwitcherOutputs collection to setup feedbacks and add routing ports
         /// </summary>
         void SetupOutputCards()
         {
-            foreach (var card in Dmps.SwitcherOutputs)
-            {
+            foreach (var card in Dmps.SwitcherOutputs)
+            {
                 Debug.Console(1, this, "Output Card Type: {0}", card.CardInputOutputType);
 
-                var outputCard = card as DMOutput;
-
-                if (outputCard == null)
-                {
-                    Debug.Console(1, this, "Output card {0} is not a DMOutput", card.CardInputOutputType);
-                    continue;
-                }
-
+                var outputCard = card as DMOutput;
+
+                if (outputCard == null)
+                {
+                    Debug.Console(1, this, "Output card {0} is not a DMOutput", card.CardInputOutputType);
+                    continue;
+                }
+
                 Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
                 VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
                 {
-                    if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
-                    return 0;
+                    if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
+                    return 0;
                     ;
                 });
                 AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
                 {
-                    if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
-                    return 0;
-                    ;
+                    try
+                    {
+                        if (outputCard.AudioOutFeedback != null)
+                        {
+                            return (ushort) outputCard.AudioOutFeedback.Number;
+                        }
+                        return 0;
+                    }
+                    catch (NotSupportedException)
+                    {
+                        return (ushort) outputCard.AudioOutSourceFeedback;
+                    }
                 });
 
-                OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
+                OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                {
                     if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
                     {
                         Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
                         return outputCard.NameFeedback.StringValue;
-                    }
-                    return "";
+                    }
+                    return "";
                 });
 
-                OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
+                OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                {
                     if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
                     {
                         return outputCard.VideoOutFeedback.NameFeedback.StringValue;
-                    }
-                    return NoRouteText;
+                    }
+                    return NoRouteText;
                 });
-                OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
+                OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                {
                     if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
                     {
                         return outputCard.AudioOutFeedback.NameFeedback.StringValue;
-                    }
-                    return NoRouteText;
+                    }
+                    return NoRouteText;
                 });
 
                 OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => outputCard.EndpointOnlineFeedback);
 
-                AddOutputCard(outputCard.Number, outputCard);
+                AddOutputCard(outputCard.Number, outputCard);
             }
         }
 
@@ -513,26 +522,26 @@ namespace PepperDash.Essentials.DM
 
                 AddInputPortWithDebug(number, string.Format("AirMediaIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
             }
-        }
-
-
-        /// <summary>
-        /// Adds InputPort
-        /// </summary>
-        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
-            eRoutingPortConnectionType portType)
-        {
-            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
-            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherInputs[cardNum]
-            };
-            ;
-
-            InputPorts.Add(inputPort);
-        }
-
+        }
+
+
+        /// <summary>
+        /// Adds InputPort
+        /// </summary>
+        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
+            eRoutingPortConnectionType portType)
+        {
+            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
+            Debug.Console(2, this, "Adding input port '{0}'", portKey);
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
+            {
+                FeedbackMatchObject = Dmps.SwitcherInputs[cardNum]
+            };
+            ;
+
+            InputPorts.Add(inputPort);
+        }
+
         /// <summary>
         /// Adds InputPort and sets Port as ICec object
         /// </summary>
@@ -540,9 +549,9 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherInputs[cardNum]
+            var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this)
+            {
+                FeedbackMatchObject = Dmps.SwitcherInputs[cardNum]
             }; 
             ;
 
@@ -550,7 +559,7 @@ namespace PepperDash.Essentials.DM
                 inputPort.Port = cecPort;
 
             InputPorts.Add(inputPort);
-        }
+        }
 
 
         /// <summary>
@@ -566,23 +575,23 @@ namespace PepperDash.Essentials.DM
 
                 var cecPort = hdmiOutputCard.HdmiOutputPort;
 
-                AddHdmiOutputPort(number, cecPort);
+                AddHdmiOutputPort(number, cecPort);
             }
-            else if (outputCard is Card.Dmps3HdmiOutputBackend)
-            {
-                var hdmiOutputCard = outputCard as Card.Dmps3HdmiOutputBackend;
-
-                var cecPort = hdmiOutputCard.HdmiOutputPort;
-
-                AddHdmiOutputPort(number, cecPort);
+            else if (outputCard is Card.Dmps3HdmiOutputBackend)
+            {
+                var hdmiOutputCard = outputCard as Card.Dmps3HdmiOutputBackend;
+
+                var cecPort = hdmiOutputCard.HdmiOutputPort;
+
+                AddHdmiOutputPort(number, cecPort);
             }
             else if (outputCard is Card.Dmps3DmOutput)
-            {
-                AddDmOutputPort(number);
+            {
+                AddDmOutputPort(number);
             }
-            else if (outputCard is Card.Dmps3DmOutputBackend)
-            {
-                AddDmOutputPort(number);
+            else if (outputCard is Card.Dmps3DmOutputBackend)
+            {
+                AddDmOutputPort(number);
             }
             else if (outputCard is Card.Dmps3ProgramOutput)
             {
@@ -590,51 +599,51 @@ namespace PepperDash.Essentials.DM
 
                 var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
-                DeviceManager.AddDevice(programOutput);
+                DeviceManager.AddDevice(programOutput);
             }
-            else if (outputCard is Card.Dmps3AuxOutput)
-            {
-                switch (outputCard.CardInputOutputType)
-                {
-                    case eCardInputOutputType.Dmps3Aux1Output:
+            else if (outputCard is Card.Dmps3AuxOutput)
+            {
+                switch (outputCard.CardInputOutputType)
+                {
+                    case eCardInputOutputType.Dmps3Aux1Output:
                     {
                         AddAudioOnlyOutputPort(number, "Aux1");
 
                         var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
                         DeviceManager.AddDevice(aux1Output);
-                    }
-                        break;
-                    case eCardInputOutputType.Dmps3Aux2Output:
+                    }
+                        break;
+                    case eCardInputOutputType.Dmps3Aux2Output:
                     {
                         AddAudioOnlyOutputPort(number, "Aux2");
 
                         var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
 
                         DeviceManager.AddDevice(aux2Output);
-                    }
-                        break;
-                }
-            }
-            else if (outputCard is Card.Dmps3CodecOutput)
-            {
-                switch (number)
-                {
-                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1:
-                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1:
-                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1:
-                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
-                        break;
-                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2:
-                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2:
-                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2:
-                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
-                        break;
-                }
-            }
+                    }
+                        break;
+                }
+            }
+            else if (outputCard is Card.Dmps3CodecOutput)
+            {
+                switch (number)
+                {
+                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec1:
+                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec1:
+                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec1:
+                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec1.ToString());
+                        break;
+                    case (uint)CrestronControlSystem.eDmps34K350COutputs.Codec2:
+                    case (uint)CrestronControlSystem.eDmps34K250COutputs.Codec2:
+                    case (uint)CrestronControlSystem.eDmps3300cAecOutputs.Codec2:
+                        AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps300cOutputs.Codec2.ToString());
+                        break;
+                }
+            }
             else if (outputCard is Card.Dmps3DialerOutput)
             {
-                AddAudioOnlyOutputPort(number, "Dialer");
+                AddAudioOnlyOutputPort(number, "Dialer");
             }
             else if (outputCard is Card.Dmps3DigitalMixOutput)
             {
@@ -645,11 +654,11 @@ namespace PepperDash.Essentials.DM
                 if (number == (uint)CrestronControlSystem.eDmps34K250COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K300COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Mix2)
-                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
+                    AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
             }
             else if (outputCard is Card.Dmps3AecOutput)
             {
-                AddAudioOnlyOutputPort(number, "Aec");
+                AddAudioOnlyOutputPort(number, "Aec");
             }
             else
             {
@@ -692,9 +701,9 @@ namespace PepperDash.Essentials.DM
         {
             var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
-            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
-            {
-                FeedbackMatchObject = Dmps.SwitcherOutputs[cardNum]
+            OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
+            {
+                FeedbackMatchObject = Dmps.SwitcherOutputs[cardNum]
             });
         }
 
@@ -705,9 +714,9 @@ namespace PepperDash.Essentials.DM
         {
             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 = Dmps.SwitcherOutputs[cardNum]
+            var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this)
+            {
+                FeedbackMatchObject = Dmps.SwitcherOutputs[cardNum]
             };
 
             if (cecPort != null)
@@ -768,74 +777,55 @@ namespace PepperDash.Essentials.DM
             {
                 OutputEndpointOnlineFeedbacks[output].FireUpdate();
             }
-            else if (args.EventId == DMOutputEventIds.VideoOutEventId)
-            {
-                if (outputCard == null) return;
-
-                var outputFeedbackIndex = outputCard.VideoOutFeedback == null ? 0 : outputCard.VideoOutFeedback.Number;
-
-                Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputFeedbackIndex, output);
-
-                if (VideoOutputFeedbacks.ContainsKey(output))
-                {
-                    var localInputPort =
-                        InputPorts.FirstOrDefault(p => (DMInput) p.FeedbackMatchObject == outputCard.VideoOutFeedback);
-                    var localOutputPort = OutputPorts.FirstOrDefault(p => (DMOutput) p.FeedbackMatchObject == outputCard);
-
-                    VideoOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, VideoOutputFeedbacks[output].UShortValue,
-                        localOutputPort, localInputPort, eRoutingSignalType.Video));
-                }
-                if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
-                {
-                    OutputVideoRouteNameFeedbacks[output].FireUpdate();
-                }
-            }
-            else if (args.EventId == DMOutputEventIds.AudioOutEventId)
-            {
-                /*
-                if (outputCard == null || outputCard.AudioOutFeedback == null) return;
-                
-                Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputCard.AudioOutFeedback.Number, output);
-                
-                if (AudioOutputFeedbacks.ContainsKey(output))
-                {
-                    AudioOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, AudioOutputFeedbacks[output].UShortValue, eRoutingSignalType.Audio));
-                }
-                 */
-
-                if (outputCard == null) return;
-
-                var outputFeedbackIndex = outputCard.AudioOutFeedback == null ? 0 : outputCard.VideoOutFeedback.Number;
-
-                Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name,
-                    outputFeedbackIndex, output);
-
-                if (AudioOutputFeedbacks.ContainsKey(output))
-                {
-                    var localInputPort =
-                        InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == outputCard.AudioOutFeedback);
-                    var localOutputPort = OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == outputCard);
-
-                    AudioOutputFeedbacks[output].FireUpdate();
-                    OnSwitchChange(new RoutingNumericEventArgs(output, AudioOutputFeedbacks[output].UShortValue,
-                        localOutputPort, localInputPort, eRoutingSignalType.Audio));
-                }
-                if (OutputAudioRouteNameFeedbacks.ContainsKey(output))
-                {
-                    OutputAudioRouteNameFeedbacks[output].FireUpdate();
-                }
-            }
-            else if (args.EventId == DMOutputEventIds.OutputNameEventId
-                     && OutputNameFeedbacks.ContainsKey(output))
-            {
-                Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                OutputNameFeedbacks[output].FireUpdate();
-            }
-
+            else if (args.EventId == DMOutputEventIds.VideoOutEventId)
+            {
+                if (outputCard != null && outputCard.VideoOutFeedback != null)
+                {
+                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, outputCard.VideoOutFeedback.Number, output);
+                }
+                if (VideoOutputFeedbacks.ContainsKey(output))
+                {
+                    VideoOutputFeedbacks[output].FireUpdate();
+                }
+                if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
+                {
+                    OutputVideoRouteNameFeedbacks[output].FireUpdate();
+                }
+            }
+            else if (args.EventId == DMOutputEventIds.AudioOutEventId)
+            {
+                try
+                {
+                    if (outputCard != null && outputCard.AudioOutFeedback != null)
+                    {
+                        Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name,
+                            outputCard.AudioOutFeedback.Number, output);
+                    }
+                    if (AudioOutputFeedbacks.ContainsKey(output))
+                    {
+                        AudioOutputFeedbacks[output].FireUpdate();
+                    }
+                }
+                catch (NotSupportedException)
+                {
+                    if (outputCard != null)
+                    {
+                        Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", Name,
+                            outputCard.AudioOutSourceFeedback, output);
+                    }
+                    if (AudioOutputFeedbacks.ContainsKey(output))
+                    {
+                        AudioOutputFeedbacks[output].FireUpdate();
+                    }
+                }
+            }
+            else if (args.EventId == DMOutputEventIds.OutputNameEventId
+                && OutputNameFeedbacks.ContainsKey(output))
+            {
+                Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
+                OutputNameFeedbacks[output].FireUpdate();
+            }
+
         }
 
         /// <summary>
@@ -861,7 +851,14 @@ namespace PepperDash.Essentials.DM
                 var input = Convert.ToUInt32(inputSelector); // Cast can sometimes fail
                 var output = Convert.ToUInt32(outputSelector);
 
-                if (input <= Dmps.NumberOfSwitcherInputs && output <= Dmps.NumberOfSwitcherOutputs)
+                var sigTypeIsUsbOrVideo = ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video) ||
+                                          ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput) ||
+                                          ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput);
+
+                if ((input <= Dmps.NumberOfSwitcherInputs && output <= Dmps.NumberOfSwitcherOutputs &&
+                     sigTypeIsUsbOrVideo) ||
+                    (input <= Dmps.NumberOfSwitcherInputs + 5 && output <= Dmps.NumberOfSwitcherOutputs &&
+                     (sigType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio))
                 {
                     // Check to see if there's an off timer waiting on this and if so, cancel
                     var key = new PortNumberType(output, sigType);
@@ -879,37 +876,55 @@ namespace PepperDash.Essentials.DM
                         }
                     }
 
-                    DMInput inCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
-                    DMOutput outCard = output == 0 ? null : Dmps.SwitcherOutputs[output] as DMOutput;
+                    
+                    DMOutput dmOutputCard = output == 0 ? null : Dmps.SwitcherOutputs[output] as DMOutput;
 
                     //if (inCard != null)
                     //{
-                        // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
-                        if ((sigType | eRoutingSignalType.Video) == eRoutingSignalType.Video)
-                        {
+                    // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES 
+                    if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
+                    {
+                        DMInput dmInputCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
+                        //SystemControl.VideoEnter.BoolValue = true;
+                        if (dmOutputCard != null)
+                            dmOutputCard.VideoOut = dmInputCard;
+                    }
 
-                            //SystemControl.VideoEnter.BoolValue = true;
-                            if (outCard != null)
-                                outCard.VideoOut = inCard;
+                    if ((sigType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
+                    {
+                        DMInput dmInputCard = null;
+                        if (input <= Dmps.NumberOfSwitcherInputs)
+                        {
+                            dmInputCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
                         }
 
-                        if ((sigType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
-                        {
-                            if (outCard != null)
-                                outCard.AudioOut = inCard;
-                        }
+                        if (dmOutputCard != null)
+                            try
+                            {
+                                dmOutputCard.AudioOut = dmInputCard;
+                            }
+                            catch (NotSupportedException)
+                            {
+                                Debug.Console(1, this, "Routing input {0} audio to output {1}",
+                                    (eDmps34KAudioOutSource) input, (CrestronControlSystem.eDmps34K350COutputs) output);
 
-                        if ((sigType | eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
-                        {
-                            if (outCard != null)
-                                outCard.USBRoutedTo = inCard;
-                        }
+                                dmOutputCard.AudioOutSource = (eDmps34KAudioOutSource) input;
+                            }
+                    }
 
-                        if ((sigType | eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
-                        {
-                            if (inCard != null)
-                                inCard.USBRoutedTo = outCard;
-                        }
+                    if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
+                    {
+                        DMInput dmInputCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
+                        if (dmOutputCard != null)
+                            dmOutputCard.USBRoutedTo = dmInputCard;
+                    }
+
+                    if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
+                    {
+                        DMInput dmInputCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
+                        if (dmInputCard != null)
+                            dmInputCard.USBRoutedTo = dmOutputCard;
+                    }
                     //}
                     //else
                     //{
@@ -919,7 +934,8 @@ namespace PepperDash.Essentials.DM
                 }
                 else
                 {
-                    Debug.Console(1, this, "Unable to execute route from input {0} to output {1}", inputSelector, outputSelector);
+                    Debug.Console(1, this, "Unable to execute route from input {0} to output {1}", inputSelector,
+                        outputSelector);
                 }
             }
             catch (Exception e)
@@ -928,15 +944,15 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        #endregion
-
-        #region IRoutingNumeric Members
-
-        public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType sigType)
-        {
-            ExecuteSwitch(inputSelector, outputSelector, sigType);
-        }
-
-        #endregion
+        #endregion
+
+        #region IRoutingNumeric Members
+
+        public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType sigType)
+        {
+            ExecuteSwitch(inputSelector, outputSelector, sigType);
+        }
+
+        #endregion
     }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasExternalSourceSwitching.cs

@@ -11,6 +11,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 	public interface IHasExternalSourceSwitching
 	{
 		bool ExternalSourceListEnabled { get; }
+        string ExternalSourceInputPort { get; }
 		void AddExternalSource(string connectorId, string key, string name, eExternalSourceType type);
 		void SetExternalSourceState(string key, eExternalSourceMode mode);
 		void ClearExternalSources();

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

@@ -407,6 +407,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			CreateOsdSource();
 
             ExternalSourceListEnabled = props.ExternalSourceListEnabled;
+            ExternalSourceInputPort = props.ExternalSourceInputPort;
 
             if (props.UiBranding == null)
             {
@@ -416,6 +417,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 props.UiBranding.BrandingUrl);
 
             BrandingEnabled = props.UiBranding.Enable;
+
             _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
@@ -514,12 +516,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xconfiguration userinterface custommessage: \"Scan the QR code with a mobile phone to get started\"");
             SendText("xconfiguration userinterface osd halfwakemessage: \"Tap the touch panel or scan the QR code with a mobile phone to get started\"");
 
+            var checksum = !String.IsNullOrEmpty(mcBridge.QrCodeChecksum)
+                ? String.Format("checksum: {0} ", mcBridge.QrCodeChecksum)
+                : String.Empty;
+
             SendText(String.Format(
-                            "xcommand userinterface branding fetch type: branding url: {0}",
-                            mcBridge.QrCodeUrl));
+                "xcommand userinterface branding fetch {1}type: branding url: {0}",
+                mcBridge.QrCodeUrl, checksum));
             SendText(String.Format(
-                "xcommand userinterface branding fetch type: halfwakebranding url: {0}",
-                mcBridge.QrCodeUrl));
+                "xcommand userinterface branding fetch {1}type: halfwakebranding url: {0}",
+                mcBridge.QrCodeUrl, checksum));
         }
 
         private void SendBrandingUrl()
@@ -1917,7 +1923,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		#region IHasExternalSourceSwitching Members
 
 		/// <summary>
-		/// Weather the Cisco supports External Source Lists or not 
+		/// Wheather the Cisco supports External Source Lists or not 
 		/// </summary>
 		public bool ExternalSourceListEnabled
 		{
@@ -1925,6 +1931,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			private set; 
 		}
 
+        /// <summary>
+        /// The name of the RoutingInputPort to which the upstream external switcher is connected
+        /// </summary>
+        public string ExternalSourceInputPort { get;  private set; }
+
         public bool BrandingEnabled { get; private set; }
         private string _brandingUrl;
         private bool _sendMcUrl;
@@ -2102,7 +2113,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
     {
         public CiscoSparkCodecFactory()
         {
-            TypeNames = new List<string>() { "ciscospark", "ciscowebex", "ciscowebexpro", "ciscoroomkit" };
+            TypeNames = new List<string>() { "ciscospark", "ciscowebex", "ciscowebexpro", "ciscoroomkit", "ciscosparkpluscodec" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)

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

@@ -31,9 +31,18 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("sharing")]
         public SharingProperties Sharing { get; set; }
 
+        /// <summary>
+        /// Enables external source switching capability
+        /// </summary>
 		[JsonProperty("externalSourceListEnabled")]
 		public bool ExternalSourceListEnabled { get; set; }
 
+        /// <summary>
+        /// The name of the routing input port on the codec to which the external switch is connected
+        /// </summary>
+        [JsonProperty("externalSourceInputPort")]
+        public string ExternalSourceInputPort { get; set; }
+
         /// <summary>
         /// Optionsal property to set the limit of any phonebook queries for directory or searching
         /// </summary>

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

@@ -1,131 +1,131 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
-{
-    /// <summary>
-    /// This class exists to capture serialized data sent back by a Cisco codec in JSON output mode
-    /// </summary>
-    public class CiscoCodecEvents
-    {
-        public class CauseValue
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CauseType
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CauseString
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class OrigCallDirection
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class RemoteURI
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class DisplayName
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CallId
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CauseCode
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CauseOrigin
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class Protocol
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class Duration
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CallType
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CallRate
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class Encryption
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class RequestedURI
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class PeopleCountAverage
-        {
-            public string id { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class CallDisconnect
-        {
-            public string id { get; set; }
-            public CauseValue CauseValue { get; set; }
-            public CauseType CauseType { get; set; }
-            public CauseString CauseString { get; set; }
-            public OrigCallDirection OrigCallDirection { get; set; }
-            public RemoteURI RemoteURI { get; set; }
-            public DisplayName DisplayName { get; set; }
-            public CallId CallId { get; set; }
-            public CauseCode CauseCode { get; set; }
-            public CauseOrigin CauseOrigin { get; set; }
-            public Protocol Protocol { get; set; }
-            public Duration Duration { get; set; }
-            public CallType CallType { get; set; }
-            public CallRate CallRate { get; set; }
-            public Encryption Encryption { get; set; }
-            public RequestedURI RequestedURI { get; set; }
-            public PeopleCountAverage PeopleCountAverage { get; set; }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
+{
+    /// <summary>
+    /// This class exists to capture serialized data sent back by a Cisco codec in JSON output mode
+    /// </summary>
+    public class CiscoCodecEvents
+    {
+        public class CauseValue
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CauseType
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CauseString
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class OrigCallDirection
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class RemoteURI
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class DisplayName
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CallId
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CauseCode
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CauseOrigin
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Protocol
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Duration
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CallType
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CallRate
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Encryption
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class RequestedURI
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class PeopleCountAverage
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class CallDisconnect
+        {
+            public string id { get; set; }
+            public CauseValue CauseValue { get; set; }
+            public CauseType CauseType { get; set; }
+            public CauseString CauseString { get; set; }
+            public OrigCallDirection OrigCallDirection { get; set; }
+            public RemoteURI RemoteURI { get; set; }
+            public DisplayName DisplayName { get; set; }
+            public CallId CallId { get; set; }
+            public CauseCode CauseCode { get; set; }
+            public CauseOrigin CauseOrigin { get; set; }
+            public Protocol Protocol { get; set; }
+            public Duration Duration { get; set; }
+            public CallType CallType { get; set; }
+            public CallRate CallRate { get; set; }
+            public Encryption Encryption { get; set; }
+            public RequestedURI RequestedURI { get; set; }
+            public PeopleCountAverage PeopleCountAverage { get; set; }
         }
 		public class UserInterface
 		{
@@ -151,16 +151,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		{
 			public string id { get; set; }
 			public string Value { get; set; }
-		}
-        public class Event
-        {
+		}
+        public class Event
+        {
             public CallDisconnect CallDisconnect { get; set; }
-			public UserInterface UserInterface { get; set; }
-        }
-
-        public class RootObject
-        {
-            public Event Event { get; set; }
-        }
-    }
+			public UserInterface UserInterface { get; set; }
+        }
+
+        public class RootObject
+        {
+            public Event Event { get; set; }
+        }
+    }
 }

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

@@ -1368,8 +1368,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 set
                 {
-                    // If the incoming value is "Of" it sets the BoolValue true, otherwise sets it false
-                    BoolValue = value == "Off";
+                    // If the incoming value is "On" it sets the BoolValue true, otherwise sets it false
+                    BoolValue = value == "On";
                     OnValueChanged();
                 }
             }

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

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.Ssh;
 using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Core.Intersystem;
 using PepperDash.Core.Intersystem.Tokens;
@@ -231,12 +232,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         /// </summary>
         protected void SetIsReady()
         {
-            IsReady = true;
-            var h = IsReadyChange;
-            if (h != null)
-            {
-                h(this, new EventArgs());
-            }
+            CrestronInvoke.BeginInvoke( (o) =>
+                {
+                    try
+                    {
+                        IsReady = true;
+                        var h = IsReadyChange;
+                        if (h != null)
+                        {
+                            h(this, new EventArgs());
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(2, this, "Error in SetIsReady() : {0}", e);
+                    }
+                });
         }
 
         // **** DEBUGGING THINGS ****

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.42" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.43" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>