Merge pull request #990 from PepperDash/hotfix/essentials-cooling-routing

Magic Routing holds last requested route until cooling is complete

PepperDashEssentials/ControlSystem.cs

@@ -490,17 +490,21 @@ namespace PepperDash.Essentials
                         }
                     }
 
-                    AddRoomAndBuildMC(room);
-
                     if (room is IEssentialsHuddleSpaceRoom)
                     {
+                        DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
                         DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, fusionIpId, fusionJoinMapKey));
 
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
+
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is IEssentialsHuddleVtc1Room)
                     {
+                        DeviceManager.AddDevice(room);
 
                         if (!(room is EssentialsCombinedHuddleVtc1Room))
                         {
@@ -508,15 +512,28 @@ namespace PepperDash.Essentials
                             DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
                         }
 
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
+
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is EssentialsTechRoom)
                     {
+                        DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice,
                             "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
                         DeviceManager.AddDevice(new EssentialsTechRoomFusionSystemController((EssentialsTechRoom)room, fusionIpId, fusionJoinMapKey));
 
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
+
+                        CreateMobileControlBridge(room);
                     }
+                    else
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion");
+                        DeviceManager.AddDevice(room);
+                    }
+
                     fusionIpId += 1;
                 }
                 else
@@ -530,15 +547,6 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void AddRoomAndBuildMC(IEssentialsRoom room)
-        {
-            DeviceManager.AddDevice(room);
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
-
-            CreateMobileControlBridge(room);
-        }
-
         private static void CreateMobileControlBridge(object room)
         {
             var mobileControl = GetMobileControlDevice();

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -19,41 +19,32 @@ namespace PepperDash.Essentials.Room.Config
 		/// Returns a room object from this config data
 		/// </summary>
 		/// <returns></returns>
-		public static IKeyed GetRoomObject(DeviceConfig roomConfig)
+		public static Device GetRoomObject(DeviceConfig roomConfig)
 		{
 			var typeName = roomConfig.Type.ToLower();
 
-		    switch (typeName)
+			if (typeName == "huddle")
+			{
+                return new EssentialsHuddleSpaceRoom(roomConfig);
+			}
+		    if (typeName == "huddlevtc1")
 		    {
-		        case "huddle" : 
-		        {
-                    return new EssentialsHuddleSpaceRoom(roomConfig);
-		        }
-                case "huddlevtc1" :
-		        {
-                    return new EssentialsHuddleVtc1Room(roomConfig);
-		        }
-                case "ddvc01bridge" :
-		        {
-                    return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
-                }
-                case "dualdisplay" :
-		        {
-                    return new EssentialsDualDisplayRoom(roomConfig);
-		        }
-                case "combinedhuddlevtc1" :
-		        {
-                    return new EssentialsCombinedHuddleVtc1Room(roomConfig);
-		        }
-                case "techroom" :
-		        {
-                    return new EssentialsTechRoom(roomConfig);
-		        }
-                default :
-		        {
-		  		    return Core.DeviceFactory.GetDevice(roomConfig);
-		        }
+		        return new EssentialsHuddleVtc1Room(roomConfig);
 		    }
+		    if (typeName == "ddvc01bridge")
+		    {
+		        return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
+		    }
+		    if (typeName == "dualdisplay")
+		    {
+		        return new EssentialsDualDisplayRoom(roomConfig);
+		    }
+            if (typeName == "combinedhuddlevtc1")
+            {
+                return new EssentialsCombinedHuddleVtc1Room(roomConfig);
+            }
+
+		    return typeName != "techroom" ? null : new EssentialsTechRoom(roomConfig);
 		}
 
         /// <summary>
@@ -211,6 +202,9 @@ namespace PepperDash.Essentials.Room.Config
         [JsonProperty("fusion")]
         public EssentialsRoomFusionConfig Fusion { get; set; }
 
+        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling=NullValueHandling.Ignore)]
+        public EssentialsRoomUiBehaviorConfig UiBehavior { get; set; }
+
 		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
@@ -227,6 +221,12 @@ namespace PepperDash.Essentials.Room.Config
         }
 	}
 
+    public class EssentialsRoomUiBehaviorConfig
+    {
+        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
+        public bool DisableActivityButtonsWhileWarmingCooling { get; set; }
+    }
+
     public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
     {
         [JsonProperty("defaultAudioKey")]

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -708,11 +708,12 @@ namespace PepperDash.Essentials
 			IRoutingSink dest = null;
 
 			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
+                dest = DefaultAudioDevice as IRoutingSink;
 			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
 				dest = DefaultDisplay;
 			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
+				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSink;
+            
 
 			if (dest == null)
 			{

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs

@@ -7,7 +7,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay
+    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay, IHasCurrentVolumeControls
     {
         bool ExcludeFromGlobalFunctions { get; }
 

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

@@ -1,60 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class PduJoinMapBase : JoinMapBaseAdvanced
-    {
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("Online")]
-        public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutletCount")]
-        public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of COntrolled Outlets", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutletName")]
-        public JoinDataComplete OutletName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutletEnabled")]
-        public JoinDataComplete OutletEnabled = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Enabled", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutletPowerCycle")]
-        public JoinDataComplete OutletPowerCycle = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Power Cycle", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutletPowerOn")]
-        public JoinDataComplete OutletPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        [JoinName("OutletPowerOff")]
-        public JoinDataComplete OutletPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public PduJoinMapBase(uint joinStart)
-            :base(joinStart, typeof(PduJoinMapBase))
-        {   
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        public PduJoinMapBase(uint joinStart, Type type)
-            : base(joinStart, type)
-        {            
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using PepperDash.Essentials.Core;
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
@@ -3111,4 +3111,4 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 		{
 		}
 	}
-}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/DinCenCn/DinCenCnController.cs

@@ -34,7 +34,7 @@ namespace PepperDash.Essentials.Core
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new C2N-RTHS Device");
+                Debug.Console(1, "Factory Attempting to create new DIN-CEN-CN2 Device");
 
                 var control = CommFactory.GetControlPropertiesConfig(dc);
                 var ipid = control.IpIdInt;

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

@@ -16,7 +16,7 @@ namespace PepperDash.Essentials.Core
     /// Wrapper class for CEN-IO-DIGIN-104 digital input module
     /// </summary>
     [Description("Wrapper class for the CEN-IO-DIGIN-104 diginal input module")]
-    public class CenIoDigIn104Controller : EssentialsDevice, IDigitalInputPorts
+    public class CenIoDigIn104Controller : CrestronGenericBaseDevice, IDigitalInputPorts
     {
         public CenIoDi104 Di104 { get; private set; }
 
@@ -52,10 +52,17 @@ namespace PepperDash.Essentials.Core
         {
             Debug.Console(1, "Factory Attempting to create new CEN-DIGIN-104 Device");
 
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var ipid = control.IpIdInt;
-
-            return new CenIoDigIn104Controller(dc.Key, dc.Name, new Crestron.SimplSharpPro.GeneralIO.CenIoDi104(ipid, Global.ControlSystem));
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+	        if (control == null)
+	        {
+				Debug.Console(1, "Factory failed to create a new CEN-DIGIN-104 Device, control properties not found");
+				return null;
+	        }
+            var ipid = control.IpIdInt;
+			if (ipid != 0) return new CenIoDigIn104Controller(dc.Key, dc.Name, new CenIoDi104(ipid, Global.ControlSystem));
+
+			Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device using IP-ID-{0}", ipid);
+			return null;
         }
     }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Ir/CenIoIr104Controller.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Essentials.Core.Config;
+
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Wrapper class for CEN-IO-IR-104 module
+    /// </summary>
+    [Description("Wrapper class for the CEN-IO-IR-104 module")]
+    public class CenIoIr104Controller : CrestronGenericBaseDevice, IIROutputPorts
+    {
+	    private readonly CenIoIr104 _ir104;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="name"></param>
+		/// <param name="ir104"></param>
+        public CenIoIr104Controller(string key, string name, CenIoIr104 ir104)
+            : base(key, name, ir104)
+        {
+            _ir104 = ir104;
+        }
+
+        #region IDigitalInputPorts Members
+
+		/// <summary>
+		/// IR port collection
+		/// </summary>
+		public CrestronCollection<IROutputPort> IROutputPorts
+        {
+            get { return _ir104.IROutputPorts; }
+        }
+
+		/// <summary>
+		/// Number of relay ports property
+		/// </summary>
+		public int NumberOfIROutputPorts
+        {
+            get { return _ir104.NumberOfIROutputPorts; }
+        }
+
+        #endregion
+    }
+
+	/// <summary>
+	/// CEN-IO-IR-104 controller fatory
+	/// </summary>
+    public class CenIoIr104ControllerFactory : EssentialsDeviceFactory<CenIoIr104Controller>
+    {
+		/// <summary>
+		/// Constructor
+		/// </summary>
+        public CenIoIr104ControllerFactory()
+        {
+            TypeNames = new List<string>() { "cenioir104" };
+        }
+
+		/// <summary>
+		/// Build device CEN-IO-IR-104
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <returns></returns>
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new CEN-IO-IR-104 Device");
+
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+			if (control == null)
+			{
+				Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device, control properties not found");
+				return null;
+			}
+
+            var ipid = control.IpIdInt;
+			if(ipid != 0) return new CenIoIr104Controller(dc.Key, dc.Name, new CenIoIr104(ipid, Global.ControlSystem));
+
+			Debug.Console(1, "Factory failed to create a new CEN-IO-IR-104 Device using IP-ID-{0}", ipid);
+			return null;
+        }
+    }
+
+}

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

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core
     /// Wrapper class for CEN-IO-RY-104 relay module
     /// </summary>
     [Description("Wrapper class for the CEN-IO-RY-104 relay module")]
-    public class CenIoRy104Controller : EssentialsDevice, IRelayPorts
+    public class CenIoRy104Controller : CrestronGenericBaseDevice, IRelayPorts
     {
         private readonly CenIoRy104 _ry104;
 
@@ -21,7 +21,7 @@ namespace PepperDash.Essentials.Core
         /// <param name="name"></param>
         /// <param name="ry104"></param>
         public CenIoRy104Controller(string key, string name, CenIoRy104 ry104)
-            : base(key, name)
+            : base(key, name, ry104)
         {
             _ry104 = ry104;
         }
@@ -62,8 +62,8 @@ namespace PepperDash.Essentials.Core
 
             var controlPropertiesConfig = CommFactory.GetControlPropertiesConfig(dc);
             if (controlPropertiesConfig == null)
-            {
-                Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device");
+            {
+				Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device, control properties not found");
                 return null;
             }
 

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

@@ -7,53 +7,25 @@ using Crestron.SimplSharp;
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
-	/// Defines minimal volume and mute control methods
+	/// Defines minimal volume control methods
 	/// </summary>
-    public interface IBasicVolumeControls : IHasVolumeControl, IHasMuteControl
+	public interface IBasicVolumeControls
 	{
+		void VolumeUp(bool pressRelease);
+		void VolumeDown(bool pressRelease);
+		void MuteToggle();
 	}
 
-    /// <summary>
-    /// Defines basic volume control methods
-    /// </summary>
-    public interface IHasVolumeControl
-    {
-        void VolumeUp(bool pressRelease);
-        void VolumeDown(bool pressRelease);
-    }
-
-    /// <summary>
-    /// Defines volume control methods and properties with feedback
-    /// </summary>
-    public interface IHasVolumeControlWithFeedback : IHasVolumeControl
-    {
-        void SetVolume(ushort level);
-        IntFeedback VolumeLevelFeedback { get; }
-    }
-
-    /// <summary>
-    /// Defines basic mute control methods
-    /// </summary>
-    public interface IHasMuteControl
-    {
-        void MuteToggle();
-    }
-
-    /// <summary>
-    /// Defines mute control methods and properties with feedback
-    /// </summary>
-    public interface IHasMuteControlWithFeedback : IHasMuteControl
-    {
-        BoolFeedback MuteFeedback { get; }
-        void MuteOn();
-        void MuteOff();
-    }
-
 	/// <summary>
 	/// Adds feedback and direct volume level set to IBasicVolumeControls
 	/// </summary>
-    public interface IBasicVolumeWithFeedback : IBasicVolumeControls, IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
+	public interface IBasicVolumeWithFeedback : IBasicVolumeControls
 	{
+		void SetVolume(ushort level);
+		void MuteOn();
+		void MuteOff();
+		IntFeedback VolumeLevelFeedback { get; }
+		BoolFeedback MuteFeedback { get; }
 	}
 
     /// <summary>

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

@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_Core.Devices
-{
-    /// <summary>
-    /// Interface for any device that is able to control it'spower and has a configurable reboot time
-    /// </summary>
-    public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
-    {
-        /// <summary>
-        /// Delay between power off and power on for reboot
-        /// </summary>
-        int PowerCycleTimeMs { get;}
-
-        /// <summary>
-        /// Reboot outlet
-        /// </summary>
-        void PowerCycle();
-    }
-
-    /// <summary>
-    /// Interface for any device that contains a collection of IHasPowerReboot Devices
-    /// </summary>
-    public interface IHasControlledPowerOutlets : IKeyName
-    {
-        /// <summary>
-        /// Collection of IPduOutlets
-        /// </summary>
-        ReadOnlyDictionary<int, IHasPowerCycle> PduOutlets { get; }
-
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -105,9 +105,6 @@ namespace PepperDash.Essentials.Core
 	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
 	        EiscApiAdvanced bridge)
 	    {
-            var inputNumber = 0;
-	        var inputKeys = new List<string>();
-
             var joinMap = new DisplayControllerJoinMap(joinStart);
 
             var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
@@ -124,133 +121,141 @@ namespace PepperDash.Essentials.Core
 	            Debug.Console(0,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
 	        }
 
-	        Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-            Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
-
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
-
-            var commMonitor = displayDevice as ICommunicationMonitor;
-            if (commMonitor != null)
-            {
-                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            }
-
-            var inputNumberFeedback = new IntFeedback(() => inputNumber);
-
-            // Two way feedbacks
-            var twoWayDisplay = displayDevice as TwoWayDisplayBase;
-
-            if (twoWayDisplay != null)
-            {
-                trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
-
-                twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
-
-
-                inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
-            }
-
-            // Power Off
-            trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
-            {
-                inputNumber = 102;
-                inputNumberFeedback.FireUpdate();
-                displayDevice.PowerOff();
-            });
-
-            var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
-            if (twoWayDisplayDevice != null)
-            {
-                twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
-                {
-                    if (!a.BoolValue)
-                    {
-                        inputNumber = 102;
-                        inputNumberFeedback.FireUpdate();
-
-                    }
-                    else
-                    {
-                        inputNumber = 0;
-                        inputNumberFeedback.FireUpdate();
-                    }
-                };
-
-                twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
-                twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
-            }
-
-            // PowerOn
-            trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
-            {
-                inputNumber = 0;
-                inputNumberFeedback.FireUpdate();
-                displayDevice.PowerOn();
-            });
-
-
-
-            for (int i = 0; i < displayDevice.InputPorts.Count; i++)
-            {
-                if (i < joinMap.InputNamesOffset.JoinSpan)
-                {
-                    inputKeys.Add(displayDevice.InputPorts[i].Key);
-                    var tempKey = inputKeys.ElementAt(i);
-                    trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
-                        () => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
-                    Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
-                        joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
-                    trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
-                }
-                else
-                    Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
-                        displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
-            }
-
-            Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
-            trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
-            {
-                if (a == 0)
-                {
-                    displayDevice.PowerOff();
-                    inputNumber = 0;
-                }
-                else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
-                {
-                    displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-                    inputNumber = a;
-                }
-                else if (a == 102)
-                {
-                    displayDevice.PowerToggle();
-
-                }
-                if (twoWayDisplay != null)
-                    inputNumberFeedback.FireUpdate();
-            });
-
-
-            var volumeDisplay = displayDevice as IBasicVolumeControls;
-	        if (volumeDisplay == null) return;
-
-	        trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
-            trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
-            trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
-
-	        var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
-
-	        if (volumeDisplayWithFeedback == null) return;
-            trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
-            trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
-
-
-            trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
-            volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
-            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
-            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
-            volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
+			LinkDisplayToApi(displayDevice, trilist, joinMap);
 	    }
 
+		protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
+		{
+			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
+
+			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
+
+			var commMonitor = displayDevice as ICommunicationMonitor;
+			if (commMonitor != null)
+			{
+				commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+			}
+
+			var inputNumber = 0;
+			var inputKeys = new List<string>();
+
+			var inputNumberFeedback = new IntFeedback(() => inputNumber);
+
+			// Two way feedbacks
+			var twoWayDisplay = displayDevice as TwoWayDisplayBase;
+
+			if (twoWayDisplay != null)
+			{
+				trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
+
+				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
+
+
+				inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
+			}
+
+			// Power Off
+			trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
+			{
+				inputNumber = 102;
+				inputNumberFeedback.FireUpdate();
+				displayDevice.PowerOff();
+			});
+
+			var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
+			if (twoWayDisplayDevice != null)
+			{
+				twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
+				{
+					if (!a.BoolValue)
+					{
+						inputNumber = 102;
+						inputNumberFeedback.FireUpdate();
+
+					}
+					else
+					{
+						inputNumber = 0;
+						inputNumberFeedback.FireUpdate();
+					}
+				};
+
+				twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
+				twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
+			}
+
+			// PowerOn
+			trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
+			{
+				inputNumber = 0;
+				inputNumberFeedback.FireUpdate();
+				displayDevice.PowerOn();
+			});
+
+
+
+			for (int i = 0; i < displayDevice.InputPorts.Count; i++)
+			{
+				if (i < joinMap.InputNamesOffset.JoinSpan)
+				{
+					inputKeys.Add(displayDevice.InputPorts[i].Key);
+					var tempKey = inputKeys.ElementAt(i);
+					trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
+						() => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
+					Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
+						joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
+					trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
+				}
+				else
+					Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
+						displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
+			}
+
+			Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
+			trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
+			{
+				if (a == 0)
+				{
+					displayDevice.PowerOff();
+					inputNumber = 0;
+				}
+				else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
+				{
+					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
+					inputNumber = a;
+				}
+				else if (a == 102)
+				{
+					displayDevice.PowerToggle();
+
+				}
+				if (twoWayDisplay != null)
+					inputNumberFeedback.FireUpdate();
+			});
+
+
+			var volumeDisplay = displayDevice as IBasicVolumeControls;
+			if (volumeDisplay == null) return;
+
+			trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
+			trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
+			trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
+
+			var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
+
+			if (volumeDisplayWithFeedback == null) return;
+			trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
+			trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
+
+
+			trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
+			volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
+			volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
+			volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
+			volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
+		}
+
     }
 
 	/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/MockDisplay.cs

@@ -30,11 +30,40 @@ namespace PepperDash.Essentials.Core
 
 		bool _PowerIsOn;
 		bool _IsWarmingUp;
-		bool _IsCoolingDown;
-
-		protected override Func<bool> PowerIsOnFeedbackFunc { get { return () => _PowerIsOn; } }
-		protected override Func<bool> IsCoolingDownFeedbackFunc { get { return () => _IsCoolingDown; } }
-		protected override Func<bool> IsWarmingUpFeedbackFunc { get { return () => _IsWarmingUp; } }
+		bool _IsCoolingDown;
+
+        protected override Func<bool> PowerIsOnFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                    {
+                        Debug.Console(2, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
+                        return _PowerIsOn;
+                    };
+        } }
+		protected override Func<bool> IsCoolingDownFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    Debug.Console(2, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
+                    return _IsCoolingDown;
+                };
+            }
+        }
+		protected override Func<bool> IsWarmingUpFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    Debug.Console(2, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
+                    return _IsWarmingUp;
+                };
+            }
+        }
         protected override Func<string> CurrentInputFeedbackFunc { get { return () => "Not Implemented"; } }
 
         int VolumeHeldRepeatInterval = 200;
@@ -61,7 +90,7 @@ namespace PepperDash.Essentials.Core
 			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
 
             WarmupTime = 10000;
-            CooldownTime = 5000;
+            CooldownTime = 10000;
 		}
 
 		public override void PowerOn()
@@ -88,15 +117,15 @@ namespace PepperDash.Essentials.Core
 			if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
 			{
 				_IsCoolingDown = true;
-				_PowerIsOn = false;
-				PowerIsOnFeedback.InvokeFireUpdate();
 				IsCoolingDownFeedback.InvokeFireUpdate();
 				// Fake cool-down cycle
 				CooldownTimer = new CTimer(o =>
 					{
 						Debug.Console(2, this, "Cooldown timer ending");
 						_IsCoolingDown = false;
-						IsCoolingDownFeedback.InvokeFireUpdate();
+						IsCoolingDownFeedback.InvokeFireUpdate();
+                        _PowerIsOn = false;
+                        PowerIsOnFeedback.InvokeFireUpdate();
 					}, CooldownTime);
 			}
 		}		

essentials-framework/Essentials Core/PepperDashEssentialsBase/File/FileIO.cs

@@ -1,278 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using PepperDash.Core;
-using Crestron.SimplSharpPro.CrestronThread;
-
-namespace PepperDash.Essentials.Core
-{
-	public static class FileIO
-	{
-
-		static CCriticalSection fileLock = new CCriticalSection();
-		public delegate void GotFileEventHandler(object sender, FileEventArgs e);
-		public static event GotFileEventHandler GotFileEvent;
-
-		/// <summary>
-		/// Get the full file info from a path/filename, can include wildcards.
-		/// </summary>
-		/// <param name="fileName"></param>
-		/// <returns></returns>
-		public static FileInfo[] GetFiles(string fileName)
-		{
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
-			if (files.Count() > 0)
-			{
-				return files;
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		public static FileInfo GetFile(string fileName)
-		{
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
-			if (files.Count() > 0)
-			{
-				return files.FirstOrDefault();
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-
-		/// <summary>
-		/// Get the data from string path/filename
-		/// </summary>
-		/// <param name="fileName"></param>
-		/// <returns></returns>
-		public static string ReadDataFromFile(string fileName)
-		{
-			try
-			{
-				return ReadDataFromFile(GetFile(fileName));
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-				return "";
-			}
-		}
-
-		/// <summary>
-		/// Get the data with fileInfo object 
-		/// </summary>
-		/// <param name="fileName"></param>
-		/// <returns></returns>
-		public static string ReadDataFromFile(FileInfo file)
-		{
-			try
-			{
-				if (fileLock.TryEnter())
-				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
-					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
-
-					if (File.Exists(file.FullName))
-					{
-						using (StreamReader r = new StreamReader(file.FullName))
-						{
-							return r.ReadToEnd();
-						}
-					}
-					else
-					{
-						Debug.Console(2, "File {0} does not exsist", file.FullName);
-						return "";
-					}
-				}
-				else
-				{
-					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-					return "";
-				}
-				
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-				return "";
-			}
-			finally
-			{
-				if (fileLock != null && !fileLock.Disposed)
-					fileLock.Leave();
-
-			}
-		}
-
-
-		public static void ReadDataFromFileASync(string fileName)
-		{
-			try
-			{
-				ReadDataFromFileASync(GetFile(fileName));
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-			}
-		}
-
-		public static void ReadDataFromFileASync(FileInfo file)
-		{
-			try
-			{
-				CrestronInvoke.BeginInvoke(o => _ReadDataFromFileASync(file));
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-			}
-		}
-
-		private static void _ReadDataFromFileASync(FileInfo file)
-		{
-			string data;
-			try
-			{
-				if (fileLock.TryEnter())
-				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
-					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
-
-
-					if (File.Exists(file.FullName))
-					{
-						using (StreamReader r = new StreamReader(file.FullName))
-						{
-							data = r.ReadToEnd();
-						}
-					}
-					else
-					{
-						Debug.Console(2, "File {0} Does not exsist", file.FullName);
-						data = "";
-					}
-					GotFileEvent.Invoke(null, new FileEventArgs(data));
-				}
-				else
-				{
-					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-				}
-
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-				data = "";
-			}
-			finally
-			{
-				if (fileLock != null && !fileLock.Disposed)
-					fileLock.Leave();
-
-			}
-
-
-
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="data"></param>
-		/// <param name="filePath"></param>
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="data"></param>
-		/// <param name="filePath"></param>
-		public static void WriteDataToFile(string data, string filePath)
-		{
-			Thread _WriteFileThread;
-			_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
-			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
-			_WriteFileThread.Start();
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
-
-		}
-
-		static object _WriteFileMethod(string data, string filePath)
-		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write file: '{0}'", filePath);
-
-			try
-			{
-				if (fileLock.TryEnter())
-				{
-					using (StreamWriter sw = new StreamWriter(filePath))
-					{
-						sw.Write(data);
-						sw.Flush();
-					}
-
-				}
-				else
-				{
-					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-				}
-
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO write failed: \r{0}", e);
-			}
-			finally
-			{
-				if (fileLock != null && !fileLock.Disposed)
-					fileLock.Leave();
-
-			}
-			return null;
-
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <returns></returns>
-		public static bool FileIoUnitTest()
-		{
-			var testData = "Testing FileIO";
-			FileIO.WriteDataToFile(testData, "\\user\\FileIOTest.pdt");
-
-			var file = FileIO.GetFile("\\user\\*FileIOTest*");
-			
-			var readData = FileIO.ReadDataFromFile(file);
-			Debug.Console(0, "Returned {0}", readData);
-			File.Delete(file.FullName);
-			if (testData == readData)
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-	}
-	public class FileEventArgs
-	{
-		public FileEventArgs(string data) { Data = data; }
-		public string Data { get; private set; } // readonly
-
-	}
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs

@@ -70,49 +70,71 @@ namespace PepperDash.Essentials.Core.Lighting
             }
         }
 
-        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
-            string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new GenericLightingJoinMap(joinStart);
+	    protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
+		    string joinMapKey, EiscApiAdvanced bridge)
+	    {
+			var joinMap = new GenericLightingJoinMap(joinStart);
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+			var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
+			if (!string.IsNullOrEmpty(joinMapSerialized))
+				joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(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.");
-            }
+			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, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+		    return LinkLightingToApi(lightingDevice, trilist, joinMap);
+	    }
 
-            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+		protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, GenericLightingJoinMap joinMap)
+		{
 
-            // GenericLighitng Actions & FeedBack
-            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
 
-            var sceneIndex = 0;
-            foreach (var scene in lightingDevice.LightingScenes)
-            {
-                var index1 = sceneIndex;
-                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () =>
-                {
-                    var index = index1;
-                    Debug.Console(2, this, "LightingDevice: sceneIndex: {0} index: {1} > inside action", index1, index);
-                    lightingDevice.SelectScene(lightingDevice.LightingScenes[index]);
-                });
-                scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)]);
-                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
-                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
-                sceneIndex++;
-            }
-            return joinMap;
-        }
+			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+			Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+
+			// GenericLighitng Actions & FeedBack
+			trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+			var sceneIndex = 0;
+			foreach (var scene in lightingDevice.LightingScenes)
+			{
+				var index = sceneIndex;
+
+				trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + index), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[index]));
+				scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)]);
+				trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
+				trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
+
+				sceneIndex++;
+			}
+
+			trilist.OnlineStatusChange += (sender, args) =>
+			{
+				if (!args.DeviceOnLine) return;
+
+				sceneIndex = 0;
+				foreach (var scene in lightingDevice.LightingScenes)
+				{
+					var index = sceneIndex;
+
+					trilist.StringInput[(uint) (joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
+					trilist.BooleanInput[(uint) (joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
+					scene.IsActiveFeedback.FireUpdate();
+
+					sceneIndex++;
+				}
+			};
+
+			return joinMap;
+		}
 
     }
 

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

@@ -123,7 +123,6 @@
     <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />
     <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\CenOdtOccupancySensorBaseJoinMap.cs" />
@@ -184,6 +183,7 @@
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
     <Compile Include="Crestron IO\IOPortConfig.cs" />
+    <Compile Include="Crestron IO\Ir\CenIoIr104Controller.cs" />
     <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
@@ -204,7 +204,6 @@
     <Compile Include="Devices\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
-    <Compile Include="Devices\PduInterfaces.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
     <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
@@ -226,7 +225,6 @@
     <Compile Include="Feedbacks\IntFeedback.cs" />
     <Compile Include="Feedbacks\SerialFeedback.cs" />
     <Compile Include="Feedbacks\StringFeedback.cs" />
-    <Compile Include="File\FileIO.cs" />
     <Compile Include="Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
     <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
     <Compile Include="Fusion\FusionEventHandlers.cs" />

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

@@ -11,12 +11,34 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
+    public class RouteRequest
+    {
+        public IRoutingSink Destination {get; set;}
+        public IRoutingOutputs Source {get; set;}
+        public eRoutingSignalType SignalType {get; set;}
+
+        public void HandleCooldown(object sender, FeedbackEventArgs args)
+        {
+            var coolingDevice = sender as IWarmingCooling;
+            
+            if(args.BoolValue == false)
+            {
+                Destination.ReleaseAndMakeRoute(Source, SignalType);
+                
+                if(sender == null) return;
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
+            }
+        }
+    }
+
 	/// <summary>
 	/// Extensions added to any IRoutingInputs classes to provide discovery-based routing
 	/// on those destinations.
 	/// </summary>
 	public static class IRoutingInputsExtensions
 	{
+        private static Dictionary<string, RouteRequest> RouteRequests = new Dictionary<string, RouteRequest>();
 		/// <summary>
 		/// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
 		/// and then attempts a new Route and if sucessful, stores that RouteDescriptor
@@ -24,16 +46,64 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public static void ReleaseAndMakeRoute(this IRoutingSink destination, IRoutingOutputs source, eRoutingSignalType signalType)
 		{
-			destination.ReleaseRoute();
+            var routeRequest = new RouteRequest { 
+                        Destination = destination,
+                        Source = source,
+                        SignalType = signalType
+                    };
 
-			if (source == null) return;
-			var newRoute = destination.GetRouteToSource(source, signalType);
-			if (newRoute == null) return;
-			RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(newRoute);
-			Debug.Console(2, destination, "Executing full route");
-			newRoute.ExecuteRoutes();
+            var coolingDevice = destination as IWarmingCooling;
+
+            RouteRequest existingRouteRequest;
+
+            //We already have a route request for this device, and it's a cooling device and is cooling
+            if (RouteRequests.TryGetValue(destination.Key, out existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
+            {     
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
+
+                RouteRequests[destination.Key] = routeRequest;
+
+                Debug.Console(2, "******************************************************** Device: {0} is cooling down and already has a routing request stored.  Storing new route request to route to source key: {1}", destination.Key, routeRequest.Source.Key);
+
+                return;
+            }            
+            
+            //New Request
+            if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
+            {
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= routeRequest.HandleCooldown;
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
+
+                RouteRequests.Add(destination.Key, routeRequest);
+
+                Debug.Console(2, "******************************************************** Device: {0} is cooling down.  Storing route request to route to source key: {1}", destination.Key, routeRequest.Source.Key);
+                return;
+            }
+
+            if (RouteRequests.ContainsKey(destination.Key) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
+            {
+                RouteRequests.Remove(destination.Key);
+                Debug.Console(2, "******************************************************** Device: {0} is NOT cooling down.  Removing stored route request and routing to source key: {1}", destination.Key, routeRequest.Source.Key);
+            }
+
+            destination.ReleaseRoute();
+
+			RunRouteRequest(routeRequest);
 		}
 
+        public static void RunRouteRequest(RouteRequest request)
+        {
+            if (request.Source == null) return;
+            var newRoute = request.Destination.GetRouteToSource(request.Source, request.SignalType);
+            if (newRoute == null) return;
+            RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(newRoute);
+            Debug.Console(2, request.Destination, "Executing full route");
+            newRoute.ExecuteRoutes();
+        }
+
 		/// <summary>
 		/// Will release the existing route on the destination, if it is found in 
 		/// RouteDescriptorCollection.DefaultCollection
@@ -41,6 +111,17 @@ namespace PepperDash.Essentials.Core
 		/// <param name="destination"></param>
         public static void ReleaseRoute(this IRoutingSink destination)
 		{
+            RouteRequest existingRequest;
+
+            if (RouteRequests.TryGetValue(destination.Key, out existingRequest) && destination is IWarmingCooling)
+            {
+                var coolingDevice = destination as IWarmingCooling;
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRequest.HandleCooldown;
+            }
+
+            RouteRequests.Remove(destination.Key);
+
 			var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
 			if (current != null)
 			{

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

@@ -25,7 +25,7 @@ namespace PepperDash.Essentials.Core
 			Type = type;
 			ConnectionType = connType;
 			Selector = selector;
-			IsInternal = IsInternal;
+			IsInternal = isInternal;
 		}
 	}
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/NECPSXMDisplay.cs

@@ -308,7 +308,7 @@ namespace PepperDash.Essentials.Devices.Displays
 			//Send((string)selector);
 		}
 
-		public void SetVolume(ushort level)
+		void SetVolume(ushort level)
 		{
 			var levelString = string.Format("{0}{1:X4}\x03", VolumeLevelPartialCmd, level);
 			AppendChecksumAndSend(levelString);
@@ -333,13 +333,10 @@ namespace PepperDash.Essentials.Devices.Displays
 			Send(MuteOnCmd);
 		}
 
-
-        /*
-		public void IBasicVolumeWithFeedback.SetVolume(ushort level)
+		void IBasicVolumeWithFeedback.SetVolume(ushort level)
 		{
 			SetVolume(level);
 		}
-       */
 
 		#endregion
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/PanasonicThDisplay.cs

@@ -290,7 +290,7 @@ namespace PepperDash.Essentials.Devices.Displays
 			//Send((string)selector);
 		}
 
-		public void SetVolume(ushort level)
+		void SetVolume(ushort level)
 		{
 			var levelString = string.Format("{0}{1:X3}\x03", VolumeLevelPartialCmd, level);
 			
@@ -315,12 +315,11 @@ namespace PepperDash.Essentials.Devices.Displays
 			Send(MuteOnCmd);
 		}
 
-        /*
 		void IBasicVolumeWithFeedback.SetVolume(ushort level)
 		{
 			SetVolume(level);
 		}
-        */
+
 		#endregion
 
 		#region IBasicVolumeControls Members

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharp.Ssh;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharp;
@@ -1010,7 +1011,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
                 trilist.SetString(joinMap.DirectoryEntries.JoinNumber,
                     Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
-                var directoryXSig = UpdateDirectoryXSig(codec.DirectoryRoot, !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+                var directoryXSig = UpdateDirectoryXSig(codec.DirectoryRoot, codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false);
 
                 Debug.Console(2, this, "Directory XSig Length: {0}", directoryXSig.Length);
 
@@ -1025,7 +1026,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 				trilist.SetString(joinMap.DirectoryEntries.JoinNumber,
 					Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
-				var directoryXSig = UpdateDirectoryXSig(args.Directory, !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+				var directoryXSig = UpdateDirectoryXSig(args.Directory, codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false);
 
                 Debug.Console(2, this, "Directory XSig Length: {0}", directoryXSig.Length);
 
@@ -1036,10 +1037,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             {
                 if (!args.DeviceOnLine) return;
 
-                // TODO [ ] Issue #868
                 trilist.SetString(joinMap.DirectoryEntries.JoinNumber, "\xFC");
                 UpdateDirectoryXSig(codec.CurrentDirectoryResult,
-                    !codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+                    codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false);
             };
 		}
 
@@ -1180,31 +1180,44 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		private string UpdateDirectoryXSig(CodecDirectory directory, bool isRoot)
 		{
-			var contactIndex = 1;
-			var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count];
+			var xSigMaxIndex = 1023;
+			var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count > xSigMaxIndex
+				? xSigMaxIndex 
+				: directory.CurrentDirectoryResults.Count];
 
-            Debug.Console(2, this, "Is root {0} Directory Count: {1}", isRoot, directory.CurrentDirectoryResults.Count);
+            Debug.Console(2, this, "IsRoot: {0}, Directory Count: {1}, TokenArray.Length: {2}", isRoot, directory.CurrentDirectoryResults.Count, tokenArray.Length);
 
-			foreach (var entry in directory.CurrentDirectoryResults)
+			var contacts = directory.CurrentDirectoryResults.Count > xSigMaxIndex
+				? directory.CurrentDirectoryResults.Take(xSigMaxIndex)
+				: directory.CurrentDirectoryResults;
+			
+			var contactsToDisplay = isRoot
+				? contacts.Where(c => c.ParentFolderId == "root")
+				: contacts.Where(c => c.ParentFolderId != "root");
+
+			var counterIndex = 1;
+			foreach (var entry in contactsToDisplay)
 			{
-				var arrayIndex = contactIndex - 1;
+				var arrayIndex = counterIndex - 1;
+				var entryIndex = counterIndex;
 
-                Debug.Console(2, this, "Entry Name: {0}, Folder ID: {1}", entry.Name, entry.FolderId);
+                Debug.Console(2, this, "Entry{2:0000} Name: {0}, Folder ID: {1}, Type: {3}, ParentFolderId: {4}", 
+					entry.Name, entry.FolderId, entryIndex, entry.GetType().GetCType().FullName, entry.ParentFolderId);
 
-				if (entry is DirectoryFolder && entry.ParentFolderId == "root")
+				if (entry is DirectoryFolder)
 				{
-					tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, String.Format("[+] {0}", entry.Name));
+					tokenArray[arrayIndex] = new XSigSerialToken(entryIndex, String.Format("[+] {0}", entry.Name));
 
-					contactIndex++;
+					counterIndex++;
 
 					continue;
 				}
 
-				tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, entry.Name);
+				tokenArray[arrayIndex] = new XSigSerialToken(entryIndex, entry.Name);
 
-				contactIndex++;
+				counterIndex++;
 			}
-
+			
 			return GetXSigString(tokenArray);
 		}
 

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

@@ -2729,7 +2729,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				Debug.Console(2, this, "OnDirectoryResultReturned.  Result has {0} contacts", result.Contacts.Count);
 
+				CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
+
                 var directoryResult = result;
+				var directoryIsRoot = CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false;
 
 				// If result is Root, create a copy and filter out contacts whose parent folder is not root
                 //if (!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
@@ -2747,7 +2750,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 //}
 
 				Debug.Console(2, this, "Updating directoryResult. IsOnRoot: {0} Contact Count: {1}",
-					!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue, directoryResult.Contacts.Count);
+					directoryIsRoot, directoryResult.Contacts.Count);
 
 				// This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
 				var handler = DirectoryResultReturned;
@@ -2756,11 +2759,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					handler(this, new DirectoryEventArgs
 					{
 						Directory = directoryResult,
-						DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
+						DirectoryIsOnRoot = directoryIsRoot
 					});
 				}
 
-                CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
+                
 			}
 			catch (Exception e)
 			{