Fixes timer from executing immediately on construction. Adds some helpful debug statements

#609 #610 Adds new RetriggerableTimer and ActionSequence devices
Merge pull request #607 from PepperDash/hotfix/fusion-static-asset-fixes
2026-02-17 21:54:54 +00:00 · 2021-02-11 15:56:43 -07:00 · 2021-02-11 15:43:22 -07:00 · 2021-02-10 15:56:59 -07:00 · 2021-02-10 15:39:37 -07:00 · 2021-02-10 15:01:40 -07:00
36 changed files with 2653 additions and 1562 deletions
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -130,7 +130,7 @@ namespace PepperDash.Essentials

                if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", Global.AssemblyVersion);
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, Global.ProcessorSeries.ToString());

                    // Check if User/ProgramX exists
                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
@@ -323,7 +323,12 @@ namespace PepperDash.Essentials
                    // Skip this to prevent unnecessary warnings
                    if (devConf.Key == "processor")
                    {
-                        if (devConf.Type.ToLower() != Global.ControlSystem.ControllerPrompt.ToLower())
+                        var prompt = Global.ControlSystem.ControllerPrompt;
+
+                        var typeMatch = String.Equals(devConf.Type, prompt, StringComparison.OrdinalIgnoreCase) &&
+                                        String.Equals(devConf.Type, prompt.Replace("-", ""), StringComparison.OrdinalIgnoreCase);
+
+                        if (!typeMatch)
                            Debug.Console(0,
                                "WARNING: Config file defines processor type as '{0}' but actual processor is '{1}'!  Some ports may not be available",
                                devConf.Type.ToUpper(), Global.ControlSystem.ControllerPrompt.ToUpper());
--- a/PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs
+++ b/PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs
@@ -30,27 +30,29 @@ namespace PepperDash.Essentials.Fusion

                foreach (var display in displays.Values.Cast<DisplayBase>())
                {
-                    Debug.Console(2, this, "Setting up Static Asset for {0}", display.Key);
+                    var disp = display; // Local scope variable

-                    display.UsageTracker = new UsageTracking(display) { UsageIsTracked = true };
-                    display.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
+                    Debug.Console(2, this, "Setting up Static Asset for {0}", disp.Key);
+
+                    disp.UsageTracker = new UsageTracking(disp) { UsageIsTracked = true };
+                    disp.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;

                    var dispPowerOnAction = new Action<bool>(b =>
                    {
                        if (!b)
                        {
-                            display.PowerOn();
+                            disp.PowerOn();
                        }
                    });
                    var dispPowerOffAction = new Action<bool>(b =>
                    {
                        if (!b)
                        {
-                            display.PowerOff();
+                            disp.PowerOff();
                        }
                    });

-                    var deviceConfig = ConfigReader.ConfigObject.GetDeviceForKey(display.Key);
+                    var deviceConfig = ConfigReader.ConfigObject.GetDeviceForKey(disp.Key);

                    FusionAsset tempAsset;

@@ -63,30 +65,36 @@ namespace PepperDash.Essentials.Fusion
                    {
                        // Create a new asset
                        tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom),
-                            display.Name, "Display", "");
+                            disp.Name, "Display", "");
                        FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
                    }

                    var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
                        tempAsset.InstanceId);
+
+                    if (dispAsset != null)
+                    {
                        dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
                        dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;

-                    var defaultTwoWayDisplay = display as IHasPowerControlWithFeedback;
+                        // Use extension methods
+                        dispAsset.TrySetMakeModel(disp);
+                        dispAsset.TryLinkAssetErrorToCommunication(disp);
+                    }
+
+                    var defaultTwoWayDisplay = disp as IHasPowerControlWithFeedback;
                    if (defaultTwoWayDisplay != null)
                    {
                        defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-                        if (display is IDisplayUsage)
+                        if (disp is IDisplayUsage)
                        {
-                            (display as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
+                            (disp as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
                        }

+                        if(dispAsset != null)
                            defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
                    }

-                    // Use extension methods
-                    dispAsset.TrySetMakeModel(display);
-                    dispAsset.TryLinkAssetErrorToCommunication(display);
                }
            }
            catch (Exception e)
--- a/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
@@ -274,10 +274,23 @@ namespace PepperDash.Essentials

            CallTypeFeedback = new IntFeedback(() => 0);

-            SourceListKey = "default";
+            SetSourceListKey();
            EnablePowerOnToLastSource = true;
        }

+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+        }
+
        void InitializeDisplay(DisplayBase disp)
        {
            if (disp != null)
@@ -333,7 +346,6 @@ namespace PepperDash.Essentials

            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-            this.SourceListKey = PropertiesConfig.SourceListKey;
            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);

--- a/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
@@ -202,10 +202,24 @@ namespace PepperDash.Essentials
                };
            }

-			SourceListKey = "default";
+            SetSourceListKey();
+          
 			EnablePowerOnToLastSource = true;
   		}

+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+        }
+
        protected override void CustomSetConfig(DeviceConfig config)
        {
            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleRoomPropertiesConfig>(config.Properties.ToString());
@@ -256,7 +270,6 @@ namespace PepperDash.Essentials

            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-            this.SourceListKey = PropertiesConfig.SourceListKey;
            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);

--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -51,20 +51,6 @@ namespace PepperDash.Essentials

        //************************

-		public override string SourceListKey
-		{
-			get
-			{
-				return _SourceListKey;
-			}
-			set
-			{
-				_SourceListKey = value;
-				SetCodecExternalSources();
-				
-			}
-		}
-
        protected override Func<bool> OnFeedbackFunc
        {
            get
@@ -338,7 +324,8 @@ namespace PepperDash.Essentials

                CallTypeFeedback = new IntFeedback(() => 0);

-                SourceListKey = "default";
+                SetSourceListKey();
+
                EnablePowerOnToLastSource = true;
            }
            catch (Exception e)
@@ -347,6 +334,21 @@ namespace PepperDash.Essentials
            }
   		}

+
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+			SetCodecExternalSources();
+        }
+
        protected override void CustomSetConfig(DeviceConfig config)
        {
            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
@@ -370,13 +372,14 @@ namespace PepperDash.Essentials
            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();

-            this.SourceListKey = PropertiesConfig.SourceListKey;
            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 			
            return base.CustomActivate();
        }

+        
+
        /// <summary>
        /// 
        /// </summary>
@@ -597,12 +600,21 @@ namespace PepperDash.Essentials
                        if (VideoCodec.UsageTracker.InUseTracker.InUseFeedback.BoolValue)
                        {
                            Debug.Console(1, this, "Video Codec in use, deactivating standby on codec");
+                            VideoCodec.StandbyDeactivate();
                        }

                        if (VideoCodec.StandbyIsOnFeedback.BoolValue)
                        {
                            VideoCodec.StandbyDeactivate();
                        }
+                        else
+                        {
+                            Debug.Console(1, this, "Video codec not in standby. No need to wake.");
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Room OnFeedback state: {0}", OnFeedback.BoolValue);
                    }

                    // report back when done
--- a/Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs
+++ b/Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs
@@ -130,6 +130,12 @@ namespace PepperDash.Essentials.Core
 		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
 		{
            Debug.Console(2, this, "OnlineStatusChange Event.  Online = {0}", args.DeviceOnLine);
+
+            if (!Hardware.Registered)
+            {
+                return;  // protects in cases where device has been unregistered and feedbacks would attempt to access null sigs.
+            }
+
            foreach (var feedback in Feedbacks)
            {
                if (feedback != null)
--- a/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs
+++ b/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ISetTopBoxControls.cs
@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		bool HasDpad { get; }

-		PepperDash.Essentials.Core.Presets.DevicePresetsModel PresetsModel { get; }
+		PepperDash.Essentials.Core.Presets.DevicePresetsModel TvPresets { get; }
 		void LoadPresets(string filePath);

 		void DvrList(bool pressRelease);
--- a/Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs
@@ -83,13 +83,13 @@ namespace PepperDash.Essentials.Core
        /// <returns></returns>
        public static object GetPropertyByName(string deviceObjectPath, string propertyName)
        {
-            var obj = FindObjectOnPath(deviceObjectPath);
-            if(obj == null)
+            var dev = FindObjectOnPath(deviceObjectPath);
+            if(dev == null)
                return "{ \"error\":\"No Device\"}";
 	
-            CType t = obj.GetType();
+            object prop = dev.GetType().GetCType().GetProperty(propertyName).GetValue(dev, null);

-            var prop = t.GetProperty(propertyName);
+            // var prop = t.GetProperty(propertyName);
            if (prop != null)
            {
                return prop;
--- a/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
@@ -361,8 +361,8 @@ namespace PepperDash.Essentials.Core
 	        var device = GetDeviceForKey(s);

            if (device == null) return;
-	        var inputPorts = (device as IRoutingInputsOutputs).InputPorts;
-	        var outputPorts = (device as IRoutingInputsOutputs).OutputPorts;
+            var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
+            var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
 	        if (inputPorts != null)
 	        {
 	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
--- a/Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
+++ b/Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
@@ -1675,15 +1675,30 @@ namespace PepperDash.Essentials.Core.Fusion
        /// <returns>the new asset</returns>
        public static FusionStaticAsset CreateStaticAsset(this FusionRoom fr, uint number, string name, string type,
            string instanceId)
+        {
+            try
            {
                Debug.Console(0, "Adding Fusion Static Asset '{0}' to slot {1} with GUID: '{2}'", name, number, instanceId);

                fr.AddAsset(eAssetType.StaticAsset, number, name, type, instanceId);
                return fr.UserConfigurableAssetDetails[number].Asset as FusionStaticAsset;
            }
+            catch (InvalidOperationException ex)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Error creating Static Asset for device: '{0}'.  Check that multiple devices don't have missing or duplicate uid properties in configuration. /r/nError: {1}", name, ex);
+                return null;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, Debug.ErrorLogLevel.Error, "Error creating Static Asset: {0}", e);
+                return null;
+            }
+        }

        public static FusionOccupancySensor CreateOccupancySensorAsset(this FusionRoom fr, uint number, string name,
            string type, string instanceId)
+        {
+            try
            {
                Debug.Console(0, "Adding Fusion Occupancy Sensor Asset '{0}' to slot {1} with GUID: '{2}'", name, number,
                    instanceId);
@@ -1691,6 +1706,17 @@ namespace PepperDash.Essentials.Core.Fusion
                fr.AddAsset(eAssetType.OccupancySensor, number, name, type, instanceId);
                return fr.UserConfigurableAssetDetails[number].Asset as FusionOccupancySensor;
            }
+            catch (InvalidOperationException ex)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Error creating Static Asset for device: '{0}'.  Check that multiple devices don't have missing or duplicate uid properties in configuration.  Error: {1}", name, ex);
+                return null;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, Debug.ErrorLogLevel.Error, "Error creating Static Asset: {0}", e);
+                return null;
+            }
+        }
    }

    //************************************************************************************************
--- a/Core/PepperDashEssentialsBase/Global/Global.cs
+++ b/Core/PepperDashEssentialsBase/Global/Global.cs
@@ -26,6 +26,8 @@ namespace PepperDash.Essentials.Core

 		public static LicenseManager LicenseManager { get; set; }

+        public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
+
        /// <summary>
        /// The file path prefix to the folder containing configuration files
        /// </summary>
--- a/Core/PepperDashEssentialsBase/Interfaces/ILogStrings.cs
+++ b/Core/PepperDashEssentialsBase/Interfaces/ILogStrings.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStrings : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string
+		/// </summary>
+		void SendToLog(IKeyed device, string logMessage);
+	}
+}
--- a/Core/PepperDashEssentialsBase/Interfaces/ILogStringsWithLevel.cs
+++ b/Core/PepperDashEssentialsBase/Interfaces/ILogStringsWithLevel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStringsWithLevel : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string with an int level
+		/// </summary>
+		void SendToLog(IKeyed device, Debug.ErrorLogLevel level,string logMessage);
+	}
+
+}
--- a/Core/PepperDashEssentialsBase/Monitoring/StatusMonitorCollection.cs
+++ b/Core/PepperDashEssentialsBase/Monitoring/StatusMonitorCollection.cs
@@ -64,7 +64,7 @@ namespace PepperDash.Essentials.Core
 				initialStatus = MonitorStatus.InWarning;
 				prefix = "2:";
 			}
-			else if (InWarning.Count() > 0)
+			else if (IsOk.Count() > 0)
 				initialStatus = MonitorStatus.IsOk;
 			else
 				initialStatus = MonitorStatus.StatusUnknown;
@@ -88,6 +88,10 @@ namespace PepperDash.Essentials.Core
                }
                Message = sb.ToString();
            }
+            else
+            {
+                Message = "Room Ok.";
+            }

 			// Want to fire even if status doesn't change because the message may.
 			Status = initialStatus;
--- a/Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs
+++ b/Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs
@@ -14,10 +14,13 @@ using PepperDash.Essentials.Core.Bridges;
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for CEN-ODT-C-POE")]
+    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0,\"enableUsA\": true,\"enableUsB\": true,\"orWhenVacatedState\": true}")]
 	public class CenOdtOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
 	{
 		public CenOdtCPoe OccSensor { get; private set; }

+        public GlsOccupancySensorPropertiesConfig PropertiesConfig { get; private set; }
+
 		public BoolFeedback RoomIsOccupiedFeedback { get; private set; }

 		public BoolFeedback GraceOccupancyDetectedFeedback { get; private set; }
@@ -71,9 +74,11 @@ namespace PepperDash.Essentials.Core
 			}
 		}

-        public CenOdtOccupancySensorBaseController(string key, string name, CenOdtCPoe sensor)
+		public CenOdtOccupancySensorBaseController(string key, string name, CenOdtCPoe sensor, GlsOccupancySensorPropertiesConfig config)
 			: base(key, name, sensor)
 		{
+            PropertiesConfig = config;
+
 			OccSensor = sensor;

 			RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
@@ -120,12 +125,81 @@ namespace PepperDash.Essentials.Core

 			OccSensor.CenOccupancySensorChange += new GenericEventHandler(OccSensor_CenOccupancySensorChange);

+            AddPostActivationAction(() =>
+            {
+                OccSensor.OnlineStatusChange += (o, a) =>
+                {
+                    if (a.DeviceOnLine)
+                    {
+                        ApplySettingsToSensorFromConfig();
+                    }
+                };
+
+                if (OccSensor.IsOnline)
+                {
+                    ApplySettingsToSensorFromConfig();
+
+                }
+            }); 
 		}

+        /// <summary>
+        /// Applies any sensor settings defined in config 
+        /// </summary>
+        protected virtual void ApplySettingsToSensorFromConfig()
+        {
+            Debug.Console(1, this, "Checking config for settings to apply");

+            if (PropertiesConfig.EnablePir != null)
+            {
+                SetPirEnable((bool)PropertiesConfig.EnablePir);
+            }

+            if (PropertiesConfig.EnableLedFlash != null)
+            {
+                SetLedFlashEnable((bool)PropertiesConfig.EnableLedFlash);
+            }

+            if (PropertiesConfig.RemoteTimeout != null)
+            {
+                SetRemoteTimeout((ushort)PropertiesConfig.RemoteTimeout);
+            }

+            if (PropertiesConfig.ShortTimeoutState != null)
+            {
+                SetShortTimeoutState((bool)PropertiesConfig.ShortTimeoutState);
+            }
+
+            if (PropertiesConfig.EnableRawStates != null)
+            {
+                EnableRawStates((bool)PropertiesConfig.EnableRawStates);
+            }
+
+            if (PropertiesConfig.InternalPhotoSensorMinChange != null)
+            {
+                SetInternalPhotoSensorMinChange((ushort)PropertiesConfig.InternalPhotoSensorMinChange);
+            }
+
+            if (PropertiesConfig.EnableUsA != null)
+            {
+                SetUsAEnable((bool)PropertiesConfig.EnableUsA);
+            }
+
+            if (PropertiesConfig.EnableUsB != null)
+            {
+                SetUsBEnable((bool)PropertiesConfig.EnableUsB);
+            }
+
+            if (PropertiesConfig.OrWhenVacatedState != null)
+            {
+                SetOrWhenVacatedState((bool)PropertiesConfig.OrWhenVacatedState);
+            }
+
+            if (PropertiesConfig.AndWhenVacatedState != null)
+            {
+                SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
+            }
+        }

 		/// <summary>
 		/// Catches events for feedbacks on the base class.  Any extending wrapper class should call this delegate after it checks for it's own event IDs.
@@ -432,6 +506,41 @@ namespace PepperDash.Essentials.Core
 			}
 		}

+		/// <summary>
+		/// Method to print current settings to console
+		/// </summary>
+		public void GetSettings()
+		{
+			var dash = new string('*', 50);
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+
+            Debug.Console(0, this, "Vacancy Detected: {0}",
+                OccSensor.VacancyDetectedFeedback.BoolValue);
+
+			Debug.Console(0, Key, "Timeout Current: {0} | Remote: {1}",
+				OccSensor.CurrentTimeoutFeedback.UShortValue,
+				OccSensor.RemoteTimeout.UShortValue);
+
+			Debug.Console(0, Key, "Short Timeout Enabled: {0}",
+				OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
+
+			Debug.Console(0, Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", 
+				OccSensor.PassiveInfraredSensorEnabledFeedback.BoolValue,
+				OccSensor.PassiveInfraredSensorSensitivityInOccupiedStateFeedback,
+				OccSensor.PassiveInfraredSensorSensitivityInVacantStateFeedback);
+
+			Debug.Console(0, Key, "Ultrasonic Enabled A: {0} | B: {1}", 
+				OccSensor.UltrasonicSensorSideAEnabledFeedback.BoolValue,
+				OccSensor.UltrasonicSensorSideBEnabledFeedback.BoolValue);
+
+			Debug.Console(0, Key, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}",
+				OccSensor.UltrasonicSensorSensitivityInOccupiedStateFeedback,
+				OccSensor.UltrasonicSensorSensitivityInVacantStateFeedback);
+
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+		}
+
+
 		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
 		{
 			LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
@@ -558,6 +667,8 @@ namespace PepperDash.Essentials.Core
 				var name = dc.Name;
 				var comm = CommFactory.GetControlPropertiesConfig(dc);

+                var props = dc.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();
+
 				var occSensor = new CenOdtCPoe(comm.IpIdInt, Global.ControlSystem);

 				if (occSensor == null)
@@ -566,7 +677,7 @@ namespace PepperDash.Essentials.Core
 					return null;
 				}

-                return new CenOdtOccupancySensorBaseController(key, name, occSensor);
+				return new CenOdtOccupancySensorBaseController(key, name, occSensor, props);
 			}
 		}
 	}
--- a/Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs
+++ b/Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs
@@ -14,8 +14,11 @@ using PepperDash.Essentials.Core.Bridges;
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
+    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0}")]
 	public class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
 	{
+        public GlsOccupancySensorPropertiesConfig PropertiesConfig { get; private set; }
+
 		public GlsOccupancySensorBase OccSensor { get; private set; }

 		public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
@@ -59,7 +62,16 @@ namespace PepperDash.Essentials.Core
 			DeviceConfig config)
 			: base(key, config.Name)
 		{
+            var props = config.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();

+            if (props != null)
+            {
+                PropertiesConfig = props;
+            }
+            else
+            {
+                Debug.Console(1, this, "props are null.  Unable to deserialize into GlsOccupancySensorPropertiesConfig");
+            }

 			AddPreActivationAction(() =>
 			{
@@ -70,9 +82,106 @@ namespace PepperDash.Essentials.Core
 				RegisterGlsOdtSensorBaseController(OccSensor);

 			});
+
+            AddPostActivationAction(() =>
+            {
+                OccSensor.OnlineStatusChange += (o, a) =>
+                {
+                    if (a.DeviceOnLine)
+                    {
+                        ApplySettingsToSensorFromConfig();
+                    }
+                };
+            });            
 		}

-        public GlsOccupancySensorBaseController(string key, string name) : base(key, name) {}
+		public GlsOccupancySensorBaseController(string key, string name, DeviceConfig config)
+            : base(key, name) 
+        {
+
+            var props = config.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();
+
+            if (props != null)
+            {
+                PropertiesConfig = props;
+            }
+            else
+            {
+                Debug.Console(1, this, "props are null.  Unable to deserialize into GlsOccupancySensorPropertiesConfig");
+            }
+
+            AddPostActivationAction(() =>
+                {
+                    OccSensor.OnlineStatusChange += (o, a) =>
+                    {
+                        if (a.DeviceOnLine)
+                        {
+                            ApplySettingsToSensorFromConfig();
+                        }
+                    };
+
+                    if (OccSensor.IsOnline)
+                    {
+                        ApplySettingsToSensorFromConfig();
+
+                    }
+                });
+        }
+
+
+        /// <summary>
+        /// Applies any sensor settings defined in config 
+        /// </summary>
+        protected virtual void ApplySettingsToSensorFromConfig()
+        {
+            Debug.Console(1, this, "Attempting to apply settings to sensor from config");
+
+            if (PropertiesConfig.EnablePir != null)
+            {
+                Debug.Console(1, this, "EnablePir found, attempting to set value from config");
+                SetPirEnable((bool)PropertiesConfig.EnablePir);
+            }
+            else
+            {
+                Debug.Console(1, this, "EnablePir null, no value specified in config");
+            }
+
+            if (PropertiesConfig.EnableLedFlash != null)
+            {
+                Debug.Console(1, this, "EnableLedFlash found, attempting to set value from config");
+                SetLedFlashEnable((bool)PropertiesConfig.EnableLedFlash);
+            }
+
+            if (PropertiesConfig.RemoteTimeout != null)
+            {
+                Debug.Console(1, this, "RemoteTimeout found, attempting to set value from config");
+                SetRemoteTimeout((ushort)PropertiesConfig.RemoteTimeout);
+            }
+            else
+            {
+                Debug.Console(1, this, "RemoteTimeout null, no value specified in config");
+            }
+
+            if (PropertiesConfig.ShortTimeoutState != null)
+            {
+                SetShortTimeoutState((bool)PropertiesConfig.ShortTimeoutState);
+            }
+
+            if (PropertiesConfig.EnableRawStates != null)
+            {
+                EnableRawStates((bool)PropertiesConfig.EnableRawStates);
+            }
+
+            if (PropertiesConfig.InternalPhotoSensorMinChange != null)
+            {
+                SetInternalPhotoSensorMinChange((ushort)PropertiesConfig.InternalPhotoSensorMinChange);
+            }
+
+            if (PropertiesConfig.ExternalPhotoSensorMinChange != null)
+            {
+                SetExternalPhotoSensorMinChange((ushort)PropertiesConfig.ExternalPhotoSensorMinChange);
+            }
+        }

 		protected void RegisterGlsOdtSensorBaseController(GlsOccupancySensorBase occSensor)
 		{
@@ -195,6 +304,8 @@ namespace PepperDash.Essentials.Core
 		/// <param name="state"></param>
 		public void SetPirEnable(bool state)
 		{
+            Debug.Console(1, this, "Setting EnablePir to: {0}", state);
+
 			if (state)
 			{
 				OccSensor.EnablePir.BoolValue = state;
@@ -280,6 +391,8 @@ namespace PepperDash.Essentials.Core

 		public void SetRemoteTimeout(ushort time)
 		{
+            Debug.Console(1, this, "Setting RemoteTimout to: {0}", time);
+
 			OccSensor.RemoteTimeout.UShortValue = time;
 		}

@@ -293,7 +406,32 @@ namespace PepperDash.Essentials.Core
 			OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value;
 		}

+		/// <summary>
+		/// Method to print current occ settings to console.
+		/// </summary>
+		/// <param name="key"></param>
+		public virtual void GetSettings()
+		{
+			var dash = new string('*', 50);
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));

+            Debug.Console(0, this, "Vacancy Detected: {0}",
+                OccSensor.VacancyDetectedFeedback.BoolValue);
+
+			Debug.Console(0, this, "Timeout Current: {0} | Local: {1}",
+				OccSensor.CurrentTimeoutFeedback.UShortValue,
+				OccSensor.LocalTimeoutFeedback.UShortValue);
+
+			Debug.Console(0, this, "Short Timeout Enabled: {0}",
+				OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
+
+			Debug.Console(0, this, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}",
+				OccSensor.PirEnabledFeedback.BoolValue,
+				OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue,
+				OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
+
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+		}

 		protected void LinkOccSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
 			uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
--- a/Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorPropertiesConfig.cs
+++ b/Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorPropertiesConfig.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Defines configuration properties for Crestron GLS series occupancy sensors
+    /// </summary>
+    public class GlsOccupancySensorPropertiesConfig
+    {
+        // Single Technology Sensors (PIR): GlsOccupancySensorBase
+        [JsonProperty("enablePir")]
+        public bool? EnablePir { get; set; }
+
+        [JsonProperty("enableLedFlash")]
+        public bool? EnableLedFlash { get; set; }
+
+        [JsonProperty("shortTimeoutState")]
+        public bool? ShortTimeoutState { get; set; }
+
+        [JsonProperty("enableRawStates")]
+        public bool? EnableRawStates { get; set; }
+
+        [JsonProperty("remoteTimeout")]
+        public ushort? RemoteTimeout { get; set; }
+
+        [JsonProperty("internalPhotoSensorMinChange")]
+        public ushort? InternalPhotoSensorMinChange { get; set; }
+
+        [JsonProperty("externalPhotoSensorMinChange")]
+        public ushort? ExternalPhotoSensorMinChange { get; set; }
+
+        // Dual Technology Sensors: GlsOdtCCn
+        [JsonProperty("enableUsA")]
+        public bool? EnableUsA { get; set; }
+
+        [JsonProperty("enableUsB")]
+        public bool? EnableUsB { get; set; }
+
+        [JsonProperty("orWhenVacatedState")]
+        public bool? OrWhenVacatedState { get; set; }
+
+        [JsonProperty("andWhenVacatedState")]
+        public bool? AndWhenVacatedState { get; set; }
+    }
+}
--- a/Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs
+++ b/Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs
@@ -14,6 +14,7 @@ using PepperDash.Essentials.Core.Bridges;
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for Dual Technology GLS Occupancy Sensors")]
+    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0,\"enableUsA\": true,\"enableUsB\": true,\"orWhenVacatedState\": true}")]
    public class GlsOdtOccupancySensorController : GlsOccupancySensorBaseController
 	{
 		public new GlsOdtCCn OccSensor { get; private set; }
@@ -37,7 +38,7 @@ namespace PepperDash.Essentials.Core

 		public GlsOdtOccupancySensorController(string key, Func<DeviceConfig, GlsOdtCCn> preActivationFunc,
 			DeviceConfig config)
-            : base(key, config.Name)
+			: base(key, config.Name, config)
 		{
 			AddPreActivationAction(() =>
 			{
@@ -64,6 +65,45 @@ namespace PepperDash.Essentials.Core
 				UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);

 			});		
+
+
+		}
+
+        protected override void ApplySettingsToSensorFromConfig()
+        {
+            base.ApplySettingsToSensorFromConfig();
+
+            if (PropertiesConfig.EnableUsA != null)
+            {
+                Debug.Console(1, this, "EnableUsA found, attempting to set value from config");
+                SetUsAEnable((bool)PropertiesConfig.EnableUsA);   
+            }
+            else
+            {
+                Debug.Console(1, this, "EnableUsA null, no value specified in config");
+            }
+
+
+            if (PropertiesConfig.EnableUsB != null)
+            {
+                Debug.Console(1, this, "EnableUsB found, attempting to set value from config");
+                SetUsBEnable((bool)PropertiesConfig.EnableUsB);
+            }
+            else
+            {
+                Debug.Console(1, this, "EnablePir null, no value specified in config");
+            }
+
+
+            if (PropertiesConfig.OrWhenVacatedState != null)
+            {
+                SetOrWhenVacatedState((bool)PropertiesConfig.OrWhenVacatedState);
+            }
+
+            if (PropertiesConfig.AndWhenVacatedState != null)
+            {
+                SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
+            }
        }

 		/// <summary>
@@ -170,6 +210,26 @@ namespace PepperDash.Essentials.Core
 			LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
 		}

+		/// <summary>
+		/// Method to print occ sensor settings to console.
+		/// </summary>
+		public override void GetSettings()
+		{
+            base.GetSettings();
+
+			Debug.Console(0, this, "Ultrasonic Enabled A: {0} | B: {1}",
+				OccSensor.UsAEnabledFeedback.BoolValue,
+				OccSensor.UsBEnabledFeedback.BoolValue);
+
+			Debug.Console(0, this, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}",
+				OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue,
+				OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
+
+            var dash = new string('*', 50);
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+		}
+
+
 		#region PreActivation

 		private static GlsOdtCCn GetGlsOdtCCn(DeviceConfig dc)
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -225,6 +225,9 @@
    <Compile Include="Gateways\CenRfgwController.cs" />
    <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
    <Compile Include="Global\EthernetAdapterInfo.cs" />
+    <Compile Include="Interfaces\ILogStrings.cs" />
+    <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
+    <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
    <Compile Include="Queues\ComsMessage.cs" />
    <Compile Include="Queues\ProcessStringMessage.cs" />
    <Compile Include="Queues\GenericQueue.cs" />
@@ -324,6 +327,7 @@
    <Compile Include="Routing\TieLine.cs" />
    <Compile Include="Queues\StringResponseProcessor.cs" />
    <Compile Include="Timers\CountdownTimer.cs" />
+    <Compile Include="Timers\RetriggerableTimer.cs" />
    <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
    <Compile Include="Touchpanels\Interfaces.cs" />
    <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
@@ -334,6 +338,7 @@
    <Compile Include="UI PageManagers\SinglePageManager.cs" />
    <Compile Include="UI PageManagers\PageManager.cs" />
    <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
+    <Compile Include="Utilities\ActionSequence.cs" />
    <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
    <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
    <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.nuspec
+++ b/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.44, 1.1.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.45, 1.1.0)"/>
    </dependencies>
  </metadata>
  <files>
--- a/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
+++ b/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
@@ -15,23 +15,138 @@ namespace PepperDash_Essentials_Core.Queues
        protected readonly Thread _worker;
        protected readonly CEvent _waitHandle = new CEvent();
        
-        private readonly bool _delayEnabled;
-        private readonly int _delayTime;
+        private bool _delayEnabled;
+        private int _delayTime;
+
+        private const Thread.eThreadPriority _defaultPriority = Thread.eThreadPriority.MediumPriority;

        /// <summary>
        /// If the instance has been disposed.
        /// </summary>
        public bool Disposed { get; private set; }

+        /// <summary>
+        /// Returns the capacity of the CrestronQueue (fixed Size property)
+        /// </summary>
+        public int QueueCapacity
+        {
+            get
+            {
+                return _queue.Size;
+            }
+        }
+
+        /// <summary>
+        /// Returns the number of elements currently in the CrestronQueue
+        /// </summary>    
+        public int QueueCount
+        {
+            get
+            {
+                return _queue.Count;
+            }
+        }
+
+        /// <summary>
+        /// Constructor with no thread priority
+        /// </summary>
+        /// <param name="key"></param>
+        public GenericQueue(string key)
+            : this(key, _defaultPriority, 0, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with queue size
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="capacity">Fixed size for the queue to hold</param>
+        public GenericQueue(string key, int capacity)
+            : this(key, _defaultPriority, capacity, 0)
+        {
+        }
+
        /// <summary>
        /// Constructor for generic queue with no pacing
        /// </summary>
        /// <param name="key">Key</param>
-        public GenericQueue(string key)
+        /// <param name="pacing">Pacing in ms between actions</param>
+        public GenericQueue(int pacing, string key)
+            : this(key, _defaultPriority, 0, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, int pacing, int capacity)
+            : this(key, _defaultPriority, capacity, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing and priority
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="priority"></param>
+        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority)
+            : this(key, priority, 0, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing, priority and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, Thread.eThreadPriority priority, int capacity)
+            : this(key, priority, capacity, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing, priority and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority, int capacity)
+            : this(key, priority, capacity, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="priority"></param>
+        private GenericQueue(string key, Thread.eThreadPriority priority, int capacity, int pacing)
        {
            _key = key;
-            _queue = new CrestronQueue<IQueueMessage>();
-            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running);
+            int cap = 25; // sets default
+            if (capacity > 0)
+            {
+                cap = capacity; // overrides default
+            }
+            _queue = new CrestronQueue<IQueueMessage>(cap);
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
+            {
+                Priority = priority
+            };
+
+            SetDelayValues(pacing);
+        }
+
+        private void SetDelayValues(int pacing)
+        {
+            _delayEnabled = pacing > 0;
+            _delayTime = pacing;

            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
            {
@@ -42,18 +157,6 @@ namespace PepperDash_Essentials_Core.Queues
            };
        }
        
-        /// <summary>
-        /// Constructor for generic queue with no pacing
-        /// </summary>
-        /// <param name="key">Key</param>
-        /// <param name="pacing">Pacing in ms between actions</param>
-        public GenericQueue(string key, int pacing)
-            : this(key)
-        {
-            _delayEnabled = pacing > 0;
-            _delayTime = pacing;
-        }
-
        /// <summary>
        /// Thread callback
        /// </summary>
@@ -83,7 +186,7 @@ namespace PepperDash_Essentials_Core.Queues
                    }
                    catch (Exception ex)
                    {
-                        Debug.ConsoleWithLog(0, this, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
+                        Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
                    }
                }
                else _waitHandle.Wait();
--- a/Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs
+++ b/Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs
@@ -53,17 +53,21 @@ namespace PepperDash.Essentials.Core
        /// </summary>
 		/// 
 		protected string _SourceListKey;
-        public virtual string SourceListKey {
+        public string SourceListKey {
 			get
 			{
 				return _SourceListKey;
 			}
-			set
+			private set
+			{
+                if (value != _SourceListKey)
                {
                    _SourceListKey = value;
+                }
+			}
+		}

-			}
-		}
+        protected const string _defaultSourceListKey = "default";

        /// <summary>
        /// Timer used for informing the UIs of a shutdown
@@ -160,6 +164,22 @@ namespace PepperDash.Essentials.Core
            return base.CustomActivate();
        }

+        /// <summary>
+        /// Sets the SourceListKey property to the passed in value or the default if no value passed in
+        /// </summary>
+        /// <param name="sourceListKey"></param>
+        protected void SetSourceListKey(string sourceListKey)
+        {
+            if (!string.IsNullOrEmpty(sourceListKey))
+            {
+                SourceListKey = sourceListKey;
+            }
+            else
+            {
+                sourceListKey = _defaultSourceListKey;
+            }
+        }
+
        /// <summary>
        /// If mobile control is enabled, sets the appropriate properties
        /// </summary>
--- a/Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs
+++ b/Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs
@@ -92,6 +92,16 @@ namespace PepperDash.Essentials.Core
 		void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType);
    }

+    public interface IRoutingWithClear : IRouting
+    {
+        /// <summary>
+        /// Clears a route to an output, however a device needs to do that
+        /// </summary>
+        /// <param name="outputSelector">Output to clear</param>
+        /// <param name="signalType">signal type to clear</param>
+        void ClearRoute(object outputSelector, eRoutingSignalType signalType);
+    }
+
    public interface IRoutingNumeric : IRouting
    {
        void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type);
--- a/Core/PepperDashEssentialsBase/Timers/RetriggerableTimer.cs
+++ b/Core/PepperDashEssentialsBase/Timers/RetriggerableTimer.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+
+using Newtonsoft.Json;
+
+
+namespace PepperDash.Essentials.Core.Timers
+{
+    /// <summary>
+    /// A device that runs a retriggerable timer and can execute actions specified in config 
+    /// </summary>
+    [Description("A retriggerable timer device")]
+    public class RetriggerableTimer : EssentialsDevice
+    {
+        private RetriggerableTimerPropertiesConfig _propertiesConfig;
+
+        private CTimer _timer;
+        private long _timerIntervalMs;
+
+        public RetriggerableTimer(string key, DeviceConfig config)
+            : base(key, config.Name)
+        {
+            var props = config.Properties.ToObject<RetriggerableTimerPropertiesConfig>();
+            _propertiesConfig = props;
+
+            if (_propertiesConfig != null)
+            {
+                _timerIntervalMs = _propertiesConfig.TimerIntervalMs;
+            }
+        }
+
+        public override bool CustomActivate()
+        {
+            if (_propertiesConfig.StartTimerOnActivation)
+            {
+                StartTimer();
+            }
+
+            return base.CustomActivate();
+        }
+
+        private void CleanUpTimer()
+        {
+            if (_timer != null)
+            {
+                _timer.Stop();
+                _timer.Dispose();
+            }
+
+            _timer = null;
+        }
+
+        public void StartTimer()
+        {
+             CleanUpTimer();
+             Debug.Console(0, this, "Starting Timer");
+
+             _timer = new CTimer(TimerElapsedCallback, GetActionFromConfig(eRetriggerableTimerEvents.Elapsed), _timerIntervalMs, _timerIntervalMs);
+        }
+
+        public void StopTimer()
+        {
+            Debug.Console(0, this, "Stopping Timer");
+            _timer.Stop();
+
+            ExecuteAction(GetActionFromConfig(eRetriggerableTimerEvents.Stopped));
+        }
+
+        private DeviceActionWrapper GetActionFromConfig(eRetriggerableTimerEvents eventType)
+        {
+            var action = _propertiesConfig.Events[eRetriggerableTimerEvents.Elapsed];
+
+            if (action != null)
+                return action;
+            else return null;
+        }
+
+        /// <summary>
+        /// Executes the Elapsed action from confing when the timer elapses
+        /// </summary>
+        /// <param name="o"></param>
+        private void TimerElapsedCallback(object action)
+        {
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Timer Elapsed. Executing Action");
+
+            if (action == null)
+            {
+                Debug.Console(1, this, "Timer elapsed but unable to execute action. Action is null.");
+                return;
+            }
+
+            var devAction = action as DeviceActionWrapper;
+            if (devAction != null)
+                ExecuteAction(devAction);
+            else
+            {
+                Debug.Console(2, this, "Unable to cast action as DeviceActionWrapper. Cannot Execute");
+            }
+
+        }
+
+        private void ExecuteAction(DeviceActionWrapper action)
+        {
+            if (action == null)
+                return;
+
+            try
+            {
+                DeviceJsonApi.DoDeviceAction(action);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error Executing Action: {0}", e);
+            }
+            //finally  // Not sure this is needed
+            //{
+            //    _Timer.Reset(0, _TimerIntervalMs);
+            //}
+        }
+    }
+
+    /// <summary>
+    /// Configuration Properties for RetriggerableTimer
+    /// </summary>
+    public class RetriggerableTimerPropertiesConfig
+    {
+        [JsonProperty("startTimerOnActivation")]
+        public bool StartTimerOnActivation { get; set; }
+
+        [JsonProperty("timerIntervalMs")]
+        public long TimerIntervalMs { get; set; }
+
+        [JsonProperty("events")]
+        public Dictionary<eRetriggerableTimerEvents, DeviceActionWrapper> Events { get; set; }
+
+        public RetriggerableTimerPropertiesConfig()
+        {
+            Events = new Dictionary<eRetriggerableTimerEvents, DeviceActionWrapper>();
+        }
+    }
+
+    /// <summary>
+    /// The set of values describing events on the timer
+    /// </summary>
+    public enum eRetriggerableTimerEvents
+    {
+        Elapsed,
+        Stopped,
+    }
+
+    /// <summary>
+    /// Factory class
+    /// </summary>
+    public class RetriggerableTimerFactory : EssentialsDeviceFactory<RetriggerableTimer>
+    {
+        public RetriggerableTimerFactory()
+        {
+            TypeNames = new List<string>() { "retriggerabletimer" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new RetriggerableTimer Device");
+
+            return new RetriggerableTimer(dc.Key, dc);
+        }
+    }
+
+
+}
--- a/PageManagers/SetTopBoxThreePanelPageManager.cs
+++ b/PageManagers/SetTopBoxThreePanelPageManager.cs
@@ -169,9 +169,9 @@ namespace PepperDash.Essentials.Core.PageManagers
            }

 			// Build presets
-            if (stb.HasPresets && stb.PresetsModel != null)
+            if (stb.HasPresets && stb.TvPresets != null)
 			{
-				PresetsView = new DevicePresetsView(trilist, stb.PresetsModel);
+				PresetsView = new DevicePresetsView(trilist, stb.TvPresets);
 			}
 		}

--- a/PageManagers/SetTopBoxTwoPanelPageManager.cs
+++ b/PageManagers/SetTopBoxTwoPanelPageManager.cs
@@ -18,8 +18,8 @@ namespace PepperDash.Essentials.Core.PageManagers
 		{
 			SetTopBox = stb;
 			TriList = trilist;
-			if(stb.PresetsModel != null)
-				PresetsView = new DevicePresetsView(trilist, stb.PresetsModel);
+			if(stb.TvPresets != null)
+				PresetsView = new DevicePresetsView(trilist, stb.TvPresets);
 		}

 		public override void Show()
--- a/Core/PepperDashEssentialsBase/Utilities/ActionSequence.cs
+++ b/Core/PepperDashEssentialsBase/Utilities/ActionSequence.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.CrestronThread;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Utilities
+{
+    /// <summary>
+    /// A device that executes a sequence of actions with optional delays between actions
+    /// </summary>
+    [Description("A device that exectues a sequence of actions with optional delays between actions")]
+    public class ActionSequence : EssentialsDevice
+    {
+        private ActionSequencePropertiesConfig _propertiesConfig;
+
+        private CrestronQueue<SequencedDeviceActionWrapper> _actionQueue;
+
+        private Thread _worker;
+
+        private bool _allowActionsToExecute;
+
+        public ActionSequence(string key, DeviceConfig config)
+            : base(key, config.Name)
+        {
+            var props = config.Properties.ToObject<ActionSequencePropertiesConfig>();
+            _propertiesConfig = props;
+
+            if (_propertiesConfig != null)
+            {
+                if (_propertiesConfig.ActionSequence.Count > 0)
+                {
+                    _actionQueue = new CrestronQueue<SequencedDeviceActionWrapper>(_propertiesConfig.ActionSequence.Count);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Starts executing the sequenced actions
+        /// </summary>
+        public void StartSequence()
+        {
+            Debug.Console(1, this, "Starting Action Sequence");
+            _allowActionsToExecute = true;
+            AddActionsToQueue();
+            _worker = new Thread(ProcessActions, null, Thread.eThreadStartOptions.Running);
+        }
+
+        /// <summary>
+        /// Stops executing the sequenced actions
+        /// </summary>
+        public void StopSequence()
+        {
+            Debug.Console(1, this, "Stopping Action Sequence");
+            _allowActionsToExecute = false;
+            _worker.Abort();
+        }
+
+        /// <summary>
+        /// Populates the queue from the configuration information
+        /// </summary>
+        private void AddActionsToQueue()
+        {
+            Debug.Console(1, this, "Adding {0} actions to queue", _propertiesConfig.ActionSequence.Count);
+
+            for (int i = 0; i < _propertiesConfig.ActionSequence.Count; i++)
+            {
+                _actionQueue.Enqueue(_propertiesConfig.ActionSequence[i]);
+            }
+        }
+
+        private object ProcessActions(object obj)
+        {
+            while (_allowActionsToExecute && _actionQueue.Count > 0)
+            {
+                SequencedDeviceActionWrapper action = null;
+
+                action = _actionQueue.Dequeue();
+                if (action == null)
+                    break;
+
+                // Delay before executing
+                if (action.DelayMs > 0)
+                    Thread.Sleep(action.DelayMs);
+
+                ExecuteAction(action);
+            }
+
+            return null;
+        }
+
+        private void ExecuteAction(DeviceActionWrapper action)
+        {
+            if (action == null)
+                return;
+
+            try
+            {
+                DeviceJsonApi.DoDeviceAction(action);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error Executing Action: {0}", e);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Configuration Properties for ActionSequence
+    /// </summary>
+    public class ActionSequencePropertiesConfig
+    {
+        [JsonProperty("actionSequence")]
+        public List<SequencedDeviceActionWrapper> ActionSequence { get; set; }
+
+        public ActionSequencePropertiesConfig()
+        {
+            ActionSequence = new List<SequencedDeviceActionWrapper>();
+        }
+    }
+
+    public class SequencedDeviceActionWrapper : DeviceActionWrapper
+    {
+        [JsonProperty("delayMs")]
+        public int DelayMs { get; set; }
+    }
+
+    /// <summary>
+    /// Factory class
+    /// </summary>
+    public class ActionSequenceFactory : EssentialsDeviceFactory<ActionSequence>
+    {
+        public ActionSequenceFactory()
+        {
+            TypeNames = new List<string>() { "actionsequence" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new ActionSequence Device");
+
+            return new ActionSequence(dc.Key, dc);
+        }
+    }
+
+}
--- a/DM/Essentials_DM/Endpoints/DGEs/Dge100Controller.cs
+++ b/DM/Essentials_DM/Endpoints/DGEs/Dge100Controller.cs
@@ -44,7 +44,7 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs

            DeviceInfo = new DeviceInfo();

-            //_dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
+            _dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };

            _dc = dc;

@@ -123,29 +123,56 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs

            gather.LineReceived += (sender, args) =>
            {
+                try
+                {
+                    Debug.Console(1, this, "{0}", args.Text);
+
                    if (args.Text.ToLower().Contains("host"))
                    {
-                    DeviceInfo.HostName = args.Text.Split(';')[1].Trim();
+                        DeviceInfo.HostName = args.Text.Split(':')[1].Trim();

+                        Debug.Console(1, this, "hostname: {0}", DeviceInfo.HostName);
                        tcpClient.Disconnect();
                        return;
                    }

                    //ignore console prompt
-                if (args.Text.ToLower().Contains(">"))
+                    /*if (args.Text.ToLower().Contains(">"))
                    {
+                        Debug.Console(1, this, "Ignoring console");
                        return;
                    }

-                if (!args.Text.ToLower().Contains("dge"))
+                    if (args.Text.ToLower().Contains("dge"))
+                    {
+                        Debug.Console(1, this, "Ignoring DGE");
+                        return;
+                    }*/
+
+                    if (!args.Text.Contains('['))
                    {
                        return;
                    }
+                    var splitResponse = args.Text.Split('[');

-                DeviceInfo.SerialNumber = args.Text.Split('[')[1].Split(' ')[4].Replace("#", "");
-                DeviceInfo.FirmwareVersion = args.Text.Split('[')[1].Split(' ')[1];
+                    foreach (string t in splitResponse)
+                    {
+                        Debug.Console(1, this, "{0}", t);
+                    }
+
+                    DeviceInfo.SerialNumber = splitResponse[1].Split(' ')[4].Replace("#", "");
+                    DeviceInfo.FirmwareVersion = splitResponse[1].Split(' ')[0];
+
+                    Debug.Console(1, this, "Firmware: {0} SerialNumber: {1}", DeviceInfo.FirmwareVersion,
+                        DeviceInfo.SerialNumber);

                    tcpClient.SendText("host\r\n");
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Exception getting data: {0}", ex.Message);
+                    Debug.Console(0, this, "response: {0}", args.Text);
+                }
            };

            tcpClient.Connect();
--- a/DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs
@@ -315,16 +315,15 @@ namespace PepperDash.Essentials.DM

        void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
        {
+
            var localVideoInputPort =
                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
            var localAudioInputPort =
                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.AudioSourceFeedback);

-            ActiveVideoInputFeedback.FireUpdate();
-            VideoSourceNumericFeedback.FireUpdate();
-            AudioSourceNumericFeedback.FireUpdate();
            OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
            OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localAudioInputPort, eRoutingSignalType.Audio));
+            
        }

        void Tx_BaseEvent(GenericBase device, BaseEventArgs args)
--- a/DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
@@ -122,6 +122,8 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(chassis.Inputs[num]));
                    }
 					else
 					{
@@ -145,6 +147,8 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(ipid, chassis.Inputs[num]));
                    }
 				}
 				catch (Exception e)
@@ -355,7 +359,7 @@ namespace PepperDash.Essentials.DM
        public DmTxControllerFactory()
        {
            TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g"  };
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
        }

        public override EssentialsDevice BuildDevice(DeviceConfig dc)
--- a/DM/Essentials_DM/Endpoints/Transmitters/HDBaseTTxController.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/HDBaseTTxController.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.DM
+{
+    /// <summary>
+    /// Controller class for suitable for HDBaseT transmitters
+    /// </summary>
+    [Description("Wrapper Class for HDBaseT devices based on HDTx3CB class")]
+    public class HDBaseTTxController: BasicDmTxControllerBase, IRoutingInputsOutputs, IComPorts
+    {
+        public RoutingInputPort HdmiIn { get; private set; }
+        public RoutingOutputPort DmOut { get; private set; }
+
+        public HDBaseTTxController(string key, string name, HDTx3CB tx)
+            : base(key, name, tx)
+        {
+            HdmiIn = new RoutingInputPort(DmPortName.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this) { Port = tx };
+
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.DmCat, null, this);
+
+            InputPorts = new RoutingPortCollection<RoutingInputPort> { HdmiIn };
+            OutputPorts = new RoutingPortCollection<RoutingOutputPort> { DmOut };
+        }
+
+        #region IRoutingInputs Members
+
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+        #endregion
+
+        #region IRoutingOutputs Members
+
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+
+        #endregion
+        
+        #region IComPorts Members
+
+        public CrestronCollection<ComPort> ComPorts { get { return (Hardware as HDTx3CB).ComPorts; } }
+        public int NumberOfComPorts { get { return (Hardware as HDTx3CB).NumberOfComPorts; } }
+
+        #endregion
+
+        #region CrestronBridgeableBaseDevice abstract overrides
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new HDBaseTTxControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<HDBaseTTxControllerJoinMap>(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"));
+
+            this.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+
+        }
+
+        #endregion
+    }
+
+    public class HDBaseTTxControllerJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "HDBaseT device online feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+	
+        /// <summary>
+		/// Plugin device BridgeJoinMap constructor
+		/// </summary>
+		/// <param name="joinStart">This will be the join it starts on the EISC bridge</param>
+        public HDBaseTTxControllerJoinMap(uint joinStart)
+            : base(joinStart, typeof(HDBaseTTxControllerJoinMap))
+		{
+		}
+    }
+}
--- a/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
+++ b/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
@@ -65,12 +65,12 @@
    </Reference>
    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -79,7 +79,7 @@
    </Reference>
    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -108,6 +108,7 @@
    <Compile Include="Endpoints\Transmitters\DmTx4kz202CController.cs" />
    <Compile Include="Endpoints\Transmitters\DmTx201SController.cs" />
    <Compile Include="Endpoints\Transmitters\DmTx4kz100Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\HDBaseTTxController.cs" />
    <Compile Include="Endpoints\Transmitters\TxInterfaces.cs" />
    <Compile Include="IDmSwitch.cs" />
    <Compile Include="Config\DmpsRoutingConfig.cs" />
--- a/Common/Display/SamsungMDCDisplay.cs
+++ b/Common/Display/SamsungMDCDisplay.cs
@@ -149,7 +149,7 @@ namespace PepperDash.Essentials.Devices.Displays
 		public override bool CustomActivate()
 		{
 			Communication.Connect();
-			CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+			CommunicationMonitor.StatusChange += (o, a) => Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status);
 			CommunicationMonitor.Start();
 			return true;
 		}
@@ -188,9 +188,6 @@ namespace PepperDash.Essentials.Devices.Displays
                IncomingBuffer.CopyTo(newBytes, 0);
                e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);

-                if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-                    Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
-
                // Need to find AA FF and have 
                for (int i = 0; i < newBytes.Length; i++)
                {
@@ -364,8 +361,6 @@ namespace PepperDash.Essentials.Devices.Displays
            }
            checksum = checksum & 0x000000FF; // mask off MSBs
            b[b.Length - 1] = (byte)checksum;
-            if(Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-                Debug.Console(2, this, "Sending:{0}", ComTextHelper.GetEscapedText(b));

            if (b[1] == 0x12)
                LastCommandSentWasVolume = true;
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -69,12 +69,12 @@
    </Reference>
    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
@@ -83,7 +83,7 @@
    </Reference>
    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
--- a/Common/SetTopBox/IRSetTopBoxBase.cs
+++ b/Common/SetTopBox/IRSetTopBoxBase.cs
@@ -12,11 +12,12 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;

 namespace PepperDash.Essentials.Devices.Common
 {
    [Description("Wrapper class for an IR Set Top Box")]
-    public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl
+    public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl, ITvPresetsProvider
 	{
 		public IrOutputPortController IrPort { get; private set; }

@@ -28,7 +29,7 @@ namespace PepperDash.Essentials.Devices.Common
        public bool HasDpad { get; set; }
        public bool HasNumeric { get; set; }

-        public DevicePresetsModel PresetsModel { get; private set; }
+        public DevicePresetsModel TvPresets { get; private set; }

 		public IRSetTopBoxBase(string key, string name, IrOutputPortController portCont,
            SetTopBoxPropertiesConfig props)
@@ -66,8 +67,8 @@ namespace PepperDash.Essentials.Devices.Common

 		public void LoadPresets(string filePath)
 		{
-			PresetsModel = new DevicePresetsModel(Key + "-presets", this, filePath);
-			DeviceManager.AddDevice(PresetsModel);
+			TvPresets = new DevicePresetsModel(Key + "-presets", this, filePath);
+			DeviceManager.AddDevice(TvPresets);
 		}


--- a/Common/VideoCodec/CiscoCodec/xStatus.cs
+++ b/Common/VideoCodec/CiscoCodec/xStatus.cs
@@ -1369,7 +1369,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                set
                {
                    // If the incoming value is "On" it sets the BoolValue true, otherwise sets it false
-                    BoolValue = value == "On";
+                    BoolValue = value == "On" || value == "Standby";
                    OnValueChanged();
                }
            }
Author	SHA1	Message	Date
Neil Dorin	2fc1f45161	Fixes timer from executing immediately on construction. Adds some helpful debug statements	2021-02-11 15:56:43 -07:00
Neil Dorin	ef7eae50e4	#609 #610 Adds new RetriggerableTimer and ActionSequence devices	2021-02-11 15:43:22 -07:00
Andrew Welker	2c50efd4c5	Merge pull request #607 from PepperDash/hotfix/fusion-static-asset-fixes Hotfix/fusion static asset fixes	2021-02-10 15:56:59 -07:00
Andrew Welker	e7b322c303	add error log for some exceptions	2021-02-10 15:39:37 -07:00
Neil Dorin	08491bdf2a	Adds null checks if asset creation fails and returns null	2021-02-10 15:01:40 -07:00
Neil Dorin	f1fa3c07fd	#605 Adds try/catch and more meaningful messages when adding static assets fails	2021-02-10 14:15:00 -07:00
Neil Dorin	b19b4ae26e	Updated to latest DBs to expose new eCrestronSeries property and adds new property to Global to reflect. Updates startup message to print series	2021-02-09 15:27:32 -07:00
Andrew Welker	7f8215199d	update processor type comparisons	2021-02-08 17:29:35 -07:00
Andrew Welker	dd060c4442	Merge pull request #602 from PepperDash/hotfix/various-bugs Hotfix/various bugs	2021-02-08 16:33:21 -07:00
Andrew Welker	e782339dcc	Merge pull request #601 from PepperDash/hotfix/various-bugs Hotfix/various bugs	2021-02-08 16:32:51 -07:00
Neil Dorin	766ed3ab51	#588 Updates all room classes to properly set SourceListKey based on precedence	2021-02-08 16:15:17 -07:00
Neil Dorin	cd0e3f7001	#599 Updates how feedbacks are fired in Tx_OnlineStatusChange	2021-02-08 16:11:49 -07:00
Neil Dorin	29d5ecb13f	#588 Updates how EssentialsHuddleVtc1Room sets SourceListKey	2021-02-08 16:11:04 -07:00
Neil Dorin	2987f600bb	#588 Update to how SourceListKey gets set in EssentialsRoomBase	2021-02-08 16:10:39 -07:00
Neil Dorin	5c23aeca48	Adds missing constructor to take both pacing and capacity arguments	2021-02-08 16:10:08 -07:00
Neil Dorin	6ef8ba3639	Removes redundant .FireUpdate() calls in Tx_OnlineStatusChange	2021-02-08 16:09:50 -07:00
Neil Dorin	4f7ad4ccb9	fixes #599 by checking for registration status before updating feedbacks	2021-02-08 15:43:04 -07:00
Neil Dorin	e03b0dc1bb	#600 Adds additional properties and constructors to GenericQueue	2021-02-08 15:06:05 -07:00
Andrew Welker	b75153b848	Merge pull request #598 from PepperDash/hotfix/dge-device-info Hotfix/dge device info	2021-02-04 14:04:49 -07:00
Andrew Welker	d70d33c5e3	Merge pull request #597 from PepperDash/hotfix/occupancy-sensor-debug Hotfix/occupancy sensor debug	2021-02-04 14:04:25 -07:00
Andrew Welker	7eb6748682	Merge pull request #596 from PepperDash/hotfix/dge-device-info Hotfix/dge device info	2021-02-04 11:41:31 -07:00
Andrew Welker	c92c750e55	Merge branch 'development' into hotfix/occupancy-sensor-debug	2021-02-04 11:27:01 -07:00
Andrew Welker	225c6281b9	Merge branch 'main' into hotfix/dge-device-info	2021-02-04 11:25:10 -07:00
Andrew Welker	249e9f372e	Merge pull request #593 from PepperDash/hotfix/occupancy-sensor-debug Hotfix/occupancy sensor debug	2021-02-04 11:22:30 -07:00
Andrew Welker	4dfab9a287	got DeviceInfo Parsing working correctly	2021-02-04 11:17:49 -07:00
Neil Dorin	ec43749ba4	Tested working with GLS-ODT-C-CN hardware	2021-02-04 11:01:21 -07:00
Neil Dorin	2e4202ccce	adjustments made based on testing with hardware	2021-02-04 10:52:02 -07:00
Neil Dorin	4c16dd07b5	fixes #594 with standby state in CiscoSparkCodec	2021-02-04 10:39:29 -07:00
Neil Dorin	0c4ad1c4df	Merge branch 'hotfix/occupancy-sensor-debug' of https://github.com/PepperDash/Essentials into hotfix/occupancy-sensor-debug	2021-02-04 09:31:06 -07:00
Neil Dorin	eb90fb343d	adds missing condition to set remoteTimeout from config value	2021-02-04 09:30:45 -07:00
Andrew Welker	2967a0f968	turn on dev info and stream debugging for temp client	2021-02-04 08:50:50 -07:00
Andrew Welker	7b2a8b17b7	Merge branch 'main' into hotfix/occupancy-sensor-debug	2021-02-03 21:32:15 -07:00
Neil Dorin	89ca614d3d	Minor updates after testing at runtime.	2021-02-03 21:17:27 -07:00
Neil Dorin	355df1341e	#592 Adds properties config class for occ sensors	2021-02-03 16:01:24 -07:00
Andrew Welker	78c17cd729	Merge pull request #591 from PepperDash/hotfix/add-routing-interface Hotfix/add routing interface	2021-02-03 09:45:43 -07:00
Andrew Welker	504c21204f	Merge pull request #590 from PepperDash/hotfix/add-routing-interface Update RoutingInterfaces.cs	2021-02-03 09:45:24 -07:00
Andrew Welker	8dba5a335b	Merge branch 'main' into hotfix/add-routing-interface	2021-02-03 09:15:19 -07:00
Neil Dorin	3d6d578663	Merge pull request #582 from PepperDash/hotfix/stop-internal-samsung-comms-debug Remove unnecessary debug statements	2021-02-02 16:11:27 -07:00
Neil Dorin	a5e9d7ba55	Merge pull request #585 from PepperDash/hotfix/stop-internal-samsung-comms-debug Hotfix/stop internal samsung comms debug	2021-02-02 16:10:58 -07:00
Andrew Welker	5eb65fd723	Update RoutingInterfaces.cs	2021-02-02 15:30:43 -07:00
jkdevito	e0dcde5c35	Reviewed with AW, decided best to remove console commands and create a public method that can be called using DEVJSON to print current settiings.	2021-02-01 11:10:33 -06:00
jkdevito	c6cfecdbbb	Added console command to print occupancy sensor settings in console.	2021-02-01 08:24:54 -06:00
Andrew Welker	30bdac93ee	Merge branch 'main' into hotfix/stop-internal-samsung-comms-debug	2021-01-29 16:00:22 -07:00
Andrew Welker	1228431bc2	remove unnecessary debug statements	2021-01-29 14:18:48 -07:00
Andrew Welker	5a2070de3f	Merge pull request #580 from PepperDash/hotfix/IrSetTopBoxBase-must-implement-ITvPresetsProvider Hotfix/ir set top box base must implement i tv presets provider	2021-01-28 16:13:08 -07:00
Andrew Welker	bc1645065c	Merge pull request #579 from PepperDash/hotfix/IrSetTopBoxBase-must-implement-ITvPresetsProvider Implements ITvPresetsProvider on IrSetTopBoxBase	2021-01-28 16:12:22 -07:00
Neil Dorin	21f9795bcd	Implements ITvPresetsProvider on IrSetTopBoxBase	2021-01-28 14:05:59 -07:00
Neil Dorin	a69bc94945	Merge pull request #576 from PepperDash/hotfix/fix-queue-priority Hotfix/fix queue priority	2021-01-27 12:08:04 -07:00
Andrew Welker	864c8ddf77	Merge pull request #575 from PepperDash/hotfix/fix-queue-priority Set default queue thread priority to medium	2021-01-27 12:04:29 -07:00
Andrew Welker	5764149306	#560 set default queue thread priority to medium	2021-01-27 10:48:23 -07:00
Andrew Welker	9abd911a95	Merge pull request #573 from PepperDash/release/1.7.3 Release/1.7.3	2021-01-26 15:46:35 -07:00
Andrew Welker	968f85b04e	Merge pull request #566 from PepperDash/hotfix/nuspec-core-version Hotfix/nuspec core version	2021-01-26 14:02:17 -07:00
Andrew Welker	6e09ef35ab	Merge branch 'development' into hotfix/nuspec-core-version	2021-01-26 13:39:41 -07:00
Andrew Welker	a36bce4d5e	Merge pull request #571 from PepperDash/hotfix/ComsMessageQueue-throws-exception Hotfix/coms message queue throws exception	2021-01-26 13:39:29 -07:00
Andrew Welker	5374e58197	Merge pull request #565 from PepperDash/hotfix/nuspec-core-version Update PD Core version in Essentials nuspec	2021-01-26 13:39:03 -07:00
Andrew Welker	cbfa7d869b	Merge branch 'main' into hotfix/nuspec-core-version	2021-01-26 13:23:37 -07:00
Andrew Welker	434fb1be59	Merge branch 'development' into hotfix/ComsMessageQueue-throws-exception	2021-01-26 13:12:05 -07:00
Andrew Welker	dbec078dae	Merge pull request #568 from PepperDash/hotfix/ComsMessageQueue-throws-exception Validate method now checks the parameter	2021-01-26 13:11:52 -07:00
Andrew Welker	e9a8e42525	Merge pull request #572 from PepperDash/feature/genericqueue-upgrades Sets the queue size to 25	2021-01-26 13:11:37 -07:00
Andrew Welker	8ad7b429a2	Merge branch 'development' into feature/genericqueue-upgrades	2021-01-26 12:49:48 -07:00
Andrew Welker	a1c27d64ad	Merge pull request #570 from PepperDash/hotfix/fusion-error-rollup Hotfix/fusion error rollup	2021-01-26 12:47:43 -07:00
Andrew Welker	4814d0f769	Merge branch 'main' into hotfix/ComsMessageQueue-throws-exception	2021-01-26 12:45:14 -07:00
Neil Dorin	b7d7196071	Sets the queue size to 25	2021-01-26 12:32:04 -07:00
Andrew Welker	d8225a80b6	Merge branch 'development' into hotfix/fusion-error-rollup	2021-01-26 12:31:33 -07:00
Andrew Welker	1b0d9ae904	Merge branch 'main' into hotfix/nuspec-core-version	2021-01-26 11:47:09 -07:00
Andrew Welker	7228733aad	Merge pull request #569 from PepperDash/hotfix/fusion-error-rollup Updates to properly clear errors when there are none and set message …	2021-01-26 11:46:49 -07:00
Andrew Welker	24e59e1474	Update PepperDash_Essentials_Core.nuspec	2021-01-26 11:05:42 -07:00
Neil Dorin	42c483f581	Updates to properly clear errors when there are none and set message to "Room Ok."	2021-01-25 17:56:20 -07:00
Andrew Welker	7ba0ecdf5c	Merge pull request #556 from PepperDash/feature/add-hdbasettx-support Feature/add hdbasettx support	2021-01-25 16:56:23 -07:00
Andrew Welker	ece36b4042	Merge branch 'development' into feature/add-hdbasettx-support	2021-01-25 15:19:34 -07:00
Andrew Welker	ca5b35b39c	Merge pull request #558 from PepperDash/feature/add-fusion-joinmaps Feature/add fusion joinmaps	2021-01-25 15:19:17 -07:00
Andrew Welker	8f804766e5	Merge branch 'development' into feature/add-fusion-joinmaps	2021-01-25 12:34:02 -07:00
Neil Dorin	00207d1570	Merge pull request #561 from PepperDash/feature/genericqueue-upgrades #560 Adds constructors with priority and fixed debug statments to use…	2021-01-25 11:18:46 -07:00
Neil Dorin	65747b6ad2	#560 Adds constructors with priority and fixed debug statments to use error log	2021-01-25 10:55:27 -07:00
Andrew Welker	f7174e2492	Merge branch 'development' into feature/add-fusion-joinmaps	2021-01-22 13:09:08 -07:00
Andrew Welker	55cbd094be	Merge branch 'development' into feature/add-hdbasettx-support	2021-01-20 17:06:20 -07:00
Andrew Welker	da5fd7e743	Merge pull request #555 from PepperDash/hotfix/videocodecbase-incoming-call-popup Hotfix/videocodecbase incoming call popup	2021-01-20 14:52:05 -07:00
Neil Dorin	8545622c79	Merge branch 'development' into hotfix/videocodecbase-incoming-call-popup	2021-01-20 14:33:01 -07:00
Neil Dorin	2f172c998a	Merge pull request #552 from batourin/development Add hdbasettx device to Essentials DM	2021-01-18 15:28:09 -07:00
Maxim Batourine	6d66c5adee	add HDBaseTTxController to project file	2021-01-18 13:16:19 -05:00
Maxim Batourine	8ccbed6d81	Add hdbasettx device	2021-01-16 22:57:45 -05:00
Andrew Welker	c3c58e3201	Merge pull request #551 from PepperDash/hotfix/zoomroom-obtp-dialing Hotfix/zoomroom obtp dialing	2021-01-15 12:08:45 -07:00
Andrew Welker	f547eb3a09	Merge branch 'development' into hotfix/zoomroom-obtp-dialing	2021-01-15 11:50:35 -07:00
Andrew Welker	6dbe1b6f31	Merge pull request #547 from PepperDash/feature/merge-into-dev Feature/merge into dev	2021-01-13 09:14:23 -07:00
Andrew Welker	e15ed3c77f	Merge branch 'development' into feature/merge-into-dev	2021-01-13 08:28:15 -07:00
Neil Dorin	435879e19b	Merge pull request #541 from batourin/development [BUG] Add safety check for casting device into interface	2021-01-12 16:57:43 -07:00
Neil Dorin	17ccaecf5e	Merge pull request #534 from PepperDash/feature/get-prop-by-name-fixes Feature/get prop by name fixes	2021-01-12 16:56:12 -07:00
Neil Dorin	684b8db546	Merge branch 'development' into feature/get-prop-by-name-fixes	2021-01-12 15:49:18 -07:00
Neil Dorin	14991bce95	Merge pull request #544 from PepperDash/release/1.7.0 Release/1.7.0	2021-01-12 11:04:50 -07:00
Maxim Batourine	08fe408dc1	Add safety check for casting device into interface (device as IRoutingInputsOutputs).InputPorts will throw Exception on accessing InputPorts property if device do not implement such interface.	2021-01-07 19:31:24 -05:00
Jason Alborough	0a34f48e0a	Fixes for the static GetPropertyByName method in DeviceJsonApi...now returns a property object rather than a PropertyInfo object	2020-12-18 17:07:20 -05:00
Jason Alborough	fc91ba7c1e	Fixes Namespace and Implements IKeyed in both interfaces.	2020-12-16 15:00:30 -05:00
Jason Alborough	1cad1976ee	#499 Adds interfaces ILogStrings and ILogStringsWithLevel to PepperDash_Essentials_Core.Interfaces	2020-12-16 14:39:53 -05:00