#671 Calls the private dispose method on program stop

Merge branch 'development' into feature/multi-display-adds
Merge pull request #670 from PepperDash/hotfix/dm-routing-issues
2026-01-25 10:24:55 +00:00 · 2021-03-30 15:53:10 -06:00 · 2021-03-29 13:31:10 -06:00 · 2021-03-29 13:29:46 -06:00 · 2021-03-29 13:18:00 -06:00 · 2021-03-29 12:54:54 -06:00
29 changed files with 295 additions and 132 deletions
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/PepperDashEssentials/PepperDashEssentials.csproj
@@ -137,7 +137,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
    <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\SimplRoomPropertiesConfig.cs" />
    <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
    <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
    <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
--- a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
+++ b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
@@ -196,9 +196,20 @@ namespace PepperDash.Essentials.Room.Config
        public string DefaultAudioKey { get; set; }
        [JsonProperty("sourceListKey")]
        public string SourceListKey { get; set; }
+        [JsonProperty("destinationListKey")]
+        public string DestinationListKey { get; set; }
        [JsonProperty("defaultSourceItem")]
        public string DefaultSourceItem { get; set; }
-
+        /// <summary>
+        /// Indicates if the room supports advanced sharing
+        /// </summary>
+        [JsonProperty("supportsAdvancedSharing")]
+        public bool SupportsAdvancedSharing { get; set; }
+        /// <summary>
+        /// Indicates if non-tech users can change the share mode
+        /// </summary>
+        [JsonProperty("userCanChangeShareMode")]
+        public bool UserCanChangeShareMode { get; set; }
    }

    public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
--- a/PepperDashEssentials/Room/Config/DDVC01RoomPropertiesConfig.cs
+++ b/PepperDashEssentials/Room/Config/DDVC01RoomPropertiesConfig.cs
@@ -8,19 +8,19 @@ using Newtonsoft.Json;

 namespace PepperDash.Essentials.Room.Config
 {
-	public class DDVC01RoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
+	public class SimplRoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
 	{
 		[JsonProperty("roomPhoneNumber")]
 		public string RoomPhoneNumber { get; set; }
 		[JsonProperty("roomURI")]
 		public string RoomURI { get; set; }
 		[JsonProperty("speedDials")]
-		public List<DDVC01SpeedDial> SpeedDials { get; set; }
+		public List<SimplSpeedDial> SpeedDials { get; set; }
 		[JsonProperty("volumeSliderNames")]
 		public List<string> VolumeSliderNames { get; set; }
 	}

-	public class DDVC01SpeedDial
+	public class SimplSpeedDial
 	{
 		[JsonProperty("name")]
 		public string Name { get; set; }
--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -11,8 +11,10 @@ using PepperDash.Core;

 namespace PepperDash.Essentials.Core
 {
-    public class CecPortController : Device, IBasicCommunication
+	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
    {
+		public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;

@@ -23,6 +25,8 @@ namespace PepperDash.Essentials.Core
        public CecPortController(string key, Func<EssentialsControlPropertiesConfig, ICec> postActivationFunc,
            EssentialsControlPropertiesConfig config):base(key)
        {
+			StreamDebugging = new CommunicationStreamDebugging(key);
+
            AddPostActivationAction(() =>
            {
                Port = postActivationFunc(config);
@@ -50,15 +54,21 @@ namespace PepperDash.Essentials.Core

        void OnDataReceived(string s)
        {
-            var bytesHandler = BytesReceived;
+			var bytesHandler = BytesReceived;
            if (bytesHandler != null)
            {
                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
            }
            var textHandler = TextReceived;
-            if (textHandler != null)
-                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			if (textHandler != null)
+			{
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", s);
+				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			}
        }

        #region IBasicCommunication Members
@@ -67,6 +77,8 @@ namespace PepperDash.Essentials.Core
        {
            if (Port == null)
                return;
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
            Port.StreamCec.Send.StringValue = text;
        }

@@ -75,6 +87,8 @@ namespace PepperDash.Essentials.Core
            if (Port == null)
                return;
            var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
            Port.StreamCec.Send.StringValue = text;
        }

--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -92,18 +92,20 @@ namespace PepperDash.Essentials.Core

        void OnDataReceived(string s)
        {
+
            var bytesHandler = BytesReceived;
            if (bytesHandler != null)
            {
                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
            }
            var textHandler = TextReceived;
            if (textHandler != null)
            {
-                if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    Debug.Console(0, this, "Recevied: '{0}'", s);
-
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", s);
                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
            }
        }
--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core
 		{
 			Communication = comm;
 			PortGather = new CommunicationGather(Communication, '\x0d');
-			PortGather.LineReceived += this.Port_LineReceived;
+			//PortGather.LineReceived += this.Port_LineReceived;
 			CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
 			LineEnding = props.LineEnding;
 		}
@@ -47,13 +47,6 @@ namespace PepperDash.Essentials.Core
 			return true;
 		}

-		void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
-		{
-			if (Debug.Level == 2)
-				Debug.Console(2, this, "RX: '{0}'", 
-					ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
-		}
-
 		void SendLine(string s)
 		{
 			//if (Debug.Level == 2)
--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -96,7 +96,6 @@ namespace PepperDash.Essentials.Core
            // this is a permanent event handler. This cannot be -= from event
            CommPort.TextReceived += (s, a) =>
            {
-                Debug.Console(2, this, "RX: {0}", a.Text);
                trilist.SetString(joinMap.TextReceived.JoinNumber, a.Text);
            };
            trilist.SetStringSigAction(joinMap.SendText.JoinNumber, s => CommPort.SendText(s));
--- a/Core/PepperDashEssentialsBase/Comm
+++ b/Core/PepperDashEssentialsBase/Comm
@@ -33,7 +33,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, path);
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 		public void SendText(string format, params object[] items)
 		{
@@ -41,7 +40,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}

 		public void SendTextNoResponse(string format, params object[] items)
@@ -50,7 +48,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
 			request.Url = new UrlParser(url);
 			Client.Dispatch(request);
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}

 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
@@ -63,10 +60,6 @@ namespace PepperDash.Essentials.Core
 				{
 					if (ResponseRecived != null)
 						ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
-
-					Debug.Console(2, this, "GenericHttpClient ResponseReceived");
-					Debug.Console(2, this, "RX:{0}", responseReceived.ContentString);
-					Debug.Console(2, this, "TX:{0}", (request as HttpClientRequest).Url.ToString());
 				}
 			}

--- a/Core/PepperDashEssentialsBase/Config/BasicConfig.cs
+++ b/Core/PepperDashEssentialsBase/Config/BasicConfig.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;

 using Newtonsoft.Json.Linq;

@@ -25,12 +20,25 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }

-		[JsonProperty("tieLines")]
+        [JsonProperty("destinationLists")]
+        public Dictionary<string, Dictionary<string,DestinationListItem>> DestinationLists { get; set; }
+
+        [JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }

        [JsonProperty("joinMaps")]
        public Dictionary<string, JObject> JoinMaps { get; set; }

+        public BasicConfig()
+        {
+            Info = new InfoConfig();
+            Devices = new List<DeviceConfig>();
+            SourceLists = new Dictionary<string, Dictionary<string, SourceListItem>>();
+            DestinationLists = new Dictionary<string, Dictionary<string, DestinationListItem>>();
+            TieLines = new List<TieLineConfig>();
+            JoinMaps = new Dictionary<string, JObject>();
+        }
+
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
 		/// </summary>
@@ -42,6 +50,21 @@ namespace PepperDash.Essentials.Core.Config
 			return SourceLists[key];
 		}

+        /// <summary>
+        /// Retrieves a DestinationListItem based on the key
+        /// </summary>
+        /// <param name="key">key of the item to retrieve</param>
+        /// <returns>DestinationListItem if the key exists, null otherwise</returns>
+	    public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
+	    {
+	        if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
+	        {
+	            return null;
+	        }
+
+	        return DestinationLists[key];
+	    } 
+
        /// <summary>
        /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
        /// </summary>
--- a/Core/PepperDashEssentialsBase/Config/Essentials/EssentialsConfig.cs
+++ b/Core/PepperDashEssentialsBase/Config/Essentials/EssentialsConfig.cs
@@ -51,6 +51,13 @@ namespace PepperDash.Essentials.Core.Config

 		[JsonProperty("rooms")]
        public List<DeviceConfig> Rooms { get; set; }
+
+
+        public EssentialsConfig()
+            : base()
+        {
+            Rooms = new List<DeviceConfig>();
+        }
 	}
 		
 	/// <summary>
--- a/Core/PepperDashEssentialsBase/Devices/DestinationListItem.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DestinationListItem.cs
@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DestinationListItem
+    {
+        [JsonProperty("sinkKey")]
+        public string SinkKey { get; set; }
+
+        private EssentialsDevice _sinkDevice;
+
+        [JsonIgnore]
+        public EssentialsDevice SinkDevice
+        {
+            get { return _sinkDevice ?? (_sinkDevice = DeviceManager.GetDeviceForKey(SinkKey) as EssentialsDevice); }
+        }
+
+        [JsonProperty("preferredName")]
+        public string PreferredName
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(Name))
+                {
+                    return Name;
+                }
+
+                return SinkDevice == null ? "---" : SinkDevice.Name;
+            }
+        }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("includeInDestinationList")]
+        public bool IncludeInDestinationList { get; set; }
+
+        [JsonProperty("order")]
+        public int Order { get; set; }
+
+        [JsonProperty("surfaceLocation")]
+        public int SurfaceLocation { get; set; }
+
+        [JsonProperty("verticalLocation")]
+        public int VerticalLocation { get; set; }
+        
+        [JsonProperty("horizontalLocation")]
+        public int HorizontalLocation { get; set; }
+
+        [JsonProperty("sinkType")]
+        public eRoutingSignalType SinkType { get; set; }
+    }
+}
--- a/Core/PepperDashEssentialsBase/Devices/SourceListItem.cs
+++ b/Core/PepperDashEssentialsBase/Devices/SourceListItem.cs
@@ -130,10 +130,24 @@ namespace PepperDash.Essentials.Core
        [JsonProperty("sourceListKey")]
        public string SourceListKey { get; set; }

+        /// <summary>
+        /// Indicates if the device associated with this source is controllable
+        /// </summary>
+        [JsonProperty("isControllable")]
+        public bool IsControllable { get; set; }
+
+        /// <summary>
+        /// Indicates that the device associated with this source has audio available
+        /// </summary>
+        [JsonProperty("isAudioSource")]
+        public bool IsAudioSource { get; set; }
+
 		public SourceListItem()
 		{
 			Icon = "Blank";
 		}
+
+        
 	}

 	public class SourceRouteListItem
--- a/Core/PepperDashEssentialsBase/Global/Scheduler.cs
+++ b/Core/PepperDashEssentialsBase/Global/Scheduler.cs
@@ -24,6 +24,10 @@ namespace PepperDash.Essentials.Core
            CrestronConsole.AddNewConsoleCommand(ClearEventsFromGroup, "ClearAllEvents", "Clears all scheduled events for this group", ConsoleAccessLevelEnum.AccessOperator);

            CrestronConsole.AddNewConsoleCommand(ListAllEventGroups, "ListAllEventGroups", "Lists all the event groups by key", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(ListAllEventsForGroup, "ListEventsForGroup",
+                "Lists all events for the given group", ConsoleAccessLevelEnum.AccessOperator);
+
        }

        /// <summary>
@@ -32,12 +36,26 @@ namespace PepperDash.Essentials.Core
        /// <param name="groupName"></param>
        static void ClearEventsFromGroup(string groupName)
        {
+            if (!EventGroups.ContainsKey(groupName))
+            {
+                Debug.Console(0,
+                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
+                    groupName);
+                return;
+            }
+
            var group = EventGroups[groupName];

            if (group != null)
+            {
                group.ClearAllEvents();
+
+                Debug.Console(0, "[Scheduler]: All events deleted from group '{0}'", groupName);
+            }
            else
-                Debug.Console(0, "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.", groupName);
+                Debug.Console(0,
+                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
+                    groupName);
        }

        static void ListAllEventGroups(string command)
@@ -49,6 +67,33 @@ namespace PepperDash.Essentials.Core
            }
        }

+        static void ListAllEventsForGroup(string args)
+        {
+            Debug.Console(0, "Getting events for group {0}...", args);
+
+            ScheduledEventGroup group;
+
+            if (!EventGroups.TryGetValue(args, out group))
+            {
+                Debug.Console(0, "Unabled to get event group for key {0}", args);
+                return;
+            }
+
+            foreach (var evt in group.ScheduledEvents)
+            {
+                Debug.Console(0,
+                    @"
+****Event key {0}****
+Event date/time: {1}
+Persistent: {2}
+Acknowlegable: {3}
+Recurrence: {4}
+Recurrence Days: {5}
+********************", evt.Key, evt.Value.DateAndTime, evt.Value.Persistent, evt.Value.Acknowledgeable,
+                    evt.Value.Recurrence.Recurrence, evt.Value.Recurrence.RecurrenceDays);
+            }
+        }
+
        /// <summary>
        /// Adds the event group to the global list
        /// </summary>
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -48,39 +48,39 @@
  <ItemGroup>
    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
@@ -89,30 +89,30 @@
    </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">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
    </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">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
    </Reference>
    <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -189,6 +189,7 @@
    <Compile Include="Device Info\IDeviceInfoProvider.cs" />
    <Compile Include="Devices\CodecInterfaces.cs" />
    <Compile Include="Devices\CrestronProcessor.cs" />
+    <Compile Include="Devices\DestinationListItem.cs" />
    <Compile Include="Devices\DeviceApiBase.cs" />
    <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
    <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
--- a/Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
+++ b/Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
@@ -381,7 +381,7 @@ namespace PepperDash.Essentials
                        catch (Exception e)
                        {
                            Debug.Console(2, "Load Plugin not found. {0}.{2} is not a plugin factory. Exception: {1}",
-                                loadedAssembly.Name, e, type.Name);
+                                loadedAssembly.Name, e.Message, type.Name);
                            continue;
                        }

--- a/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
+++ b/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
@@ -155,7 +155,7 @@ namespace PepperDash.Essentials.Core.Queues
                if (programEvent != eProgramStatusEventType.Stopping)
                    return;

-                Dispose();
+                Dispose(true);
            };
        }
        
@@ -199,6 +199,12 @@ namespace PepperDash.Essentials.Core.Queues

        public void Enqueue(IQueueMessage item)
        {
+            if (Disposed)
+            {
+                Debug.Console(1, this, "I've been disposed so you can't enqueue any messages.  Are you trying to dispatch a message while the program is stopping?");
+                return;
+            }
+
            _queue.Enqueue(item);
            _waitHandle.Set();
        }
@@ -401,7 +407,7 @@ namespace PepperDash_Essentials_Core.Queues
                if (programEvent != eProgramStatusEventType.Stopping)
                    return;

-                Dispose();
+                Dispose(true);
            };
        }

--- a/Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
+++ b/Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
@@ -169,10 +169,15 @@ namespace PepperDash.Essentials.Core

        void FeatureEventGroup_UserGroupCallBack(ScheduledEvent SchEvent, ScheduledEventCommon.eCallbackReason type)
        {
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "{0}:{1} @ {2}", SchEvent.Name, type, DateTime.Now);
+
            if (type == ScheduledEventCommon.eCallbackReason.NormalExpiration)
            {
+                SchEvent.Acknowledge();
+
                if (SchEvent.Name == FeatureEnableEventName)
                {
+                    
                    if (PropertiesConfig.EnableRoomOnWhenOccupied)
                        FeatureEnabled = true;

@@ -248,9 +253,8 @@ namespace PepperDash.Essentials.Core
                schEvent = new ScheduledEvent(name, FeatureEventGroup);

            // Set up its initial properties
-
-            if(!schEvent.Acknowledgeable)
-                schEvent.Acknowledgeable = true;
+            
+            schEvent.Acknowledgeable = false;

            if(!schEvent.Persistent)
                schEvent.Persistent = true;
@@ -287,7 +291,7 @@ namespace PepperDash.Essentials.Core

                Debug.Console(1, this, "Event '{0}' Absolute time set to {1}", schEvent.Name, schEvent.DateAndTime.ToString());

-                CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);
+                //CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);

                schEvent.Recurrence.Weekly(eventRecurrennce);

--- a/DM/Essentials_DM/Chassis/DmBladeChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmBladeChassisController.cs
@@ -671,7 +671,7 @@ namespace PepperDash.Essentials.DM {
                var ioSlotJoin = ioSlot - 1;

                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));

                if (TxDictionary.ContainsKey(ioSlot))
                {
--- a/DM/Essentials_DM/Chassis/DmChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmChassisController.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -1184,7 +1185,6 @@ namespace PepperDash.Essentials.DM
                    "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
                    outputSelector);
                return;
-
            }

            // Check to see if there's an off timer waiting on this and if so, cancel
@@ -1643,13 +1643,13 @@ namespace PepperDash.Essentials.DM
        {
            // Routing Control
            trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
-            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
-            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbOutput));
-            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbInput));
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
+            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));
+            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbOutput));
+            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbInput));

            //Routing Feedbacks
            VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);
--- a/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
+++ b/DM/Essentials_DM/Chassis/DmpsRoutingController.cs
@@ -228,9 +228,9 @@ namespace PepperDash.Essentials.DM

                // Control
                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
                trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
+                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));

                trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
                {
--- a/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
+++ b/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
@@ -48,15 +48,15 @@
  <ItemGroup>
    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
@@ -65,26 +65,26 @@
    </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">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
    </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">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/Common/DSP/BiampTesira/BiampTesiraForteDsp.cs
+++ b/Common/DSP/BiampTesira/BiampTesiraForteDsp.cs
@@ -165,12 +165,6 @@ namespace PepperDash.Essentials.Devices.Common.DSP
        /// <param name="args"></param>
        private void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
        {
-            if (Debug.Level == 2)
-                Debug.Console(2, this, "RX: '{0}'",
-                    ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
-
-            Debug.Console(1, this, "RX: '{0}'", args.Text);
-
            try
            {
                if (args.Text.IndexOf("Welcome to the Tesira Text Protocol Server...") > -1)
@@ -288,7 +282,6 @@ namespace PepperDash.Essentials.Devices.Common.DSP
        /// <param name="s">Command to send</param>
        public void SendLine(string s)
        {
-            Debug.Console(1, this, "TX: '{0}'", s);
            Communication.SendText(s + "\x0a");
        }

--- a/Common/Environment/Lutron/LutronQuantum.cs
+++ b/Common/Environment/Lutron/LutronQuantum.cs
@@ -232,7 +232,6 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Lutron
        /// <param name="s"></param>
        public void SendLine(string s)
        {
-            Debug.Console(2, this, "TX: '{0}'", s);
            Communication.SendText(s + Delimiter);
        }
    }
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -48,19 +48,19 @@
  <ItemGroup>
    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
    </Reference>
    <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
@@ -69,26 +69,26 @@
    </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">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
    </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">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/Common/ImageProcessors/AnalogWay/AnalongWayLiveCore.cs
+++ b/Common/ImageProcessors/AnalogWay/AnalongWayLiveCore.cs
@@ -133,7 +133,6 @@ namespace PepperDash.Essentials.Devices.Common
        /// <param name="args"></param>
        void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
        {
-            Debug.Console(2, this, "TVOneCurio RX: '{0}'", args.Text);
            try
            {
                if (args.Text.IndexOf("login") > -1)
@@ -142,24 +141,18 @@ namespace PepperDash.Essentials.Devices.Common
                }
 				else if (args.Text.IndexOf("!Done Preset.Take =") > -1)
                {
-
 					string presetNumberParse = args.Text.Remove(0, args.Text.IndexOf("=") + 2);

 					Debug.Console(1, this, "Preset Parse: {0}", presetNumberParse);
 					CurrentPreset = ushort.Parse(presetNumberParse);
 					PresetFeedback.FireUpdate();
-
-
-                }
-
-                
+                } 
            }
            catch (Exception e)
            {
                if (Debug.Level == 2)
                    Debug.Console(2, this, "Error parsing response: '{0}'\n{1}", args.Text, e);
            }
-
        }

        /// <summary>
@@ -168,7 +161,6 @@ namespace PepperDash.Essentials.Devices.Common
        /// <param name="s">Command to send</param>
        public void SendLine(string s)
        {
-            Debug.Console(1, this, "TVOne Cusio TX: '{0}'", s);
            Communication.SendText(s + "\x0d\x0a");
        }

--- a/Common/ImageProcessors/TVOneCorio.cs
+++ b/Common/ImageProcessors/TVOneCorio.cs
@@ -133,7 +133,6 @@ namespace PepperDash.Essentials.Devices.Common
        /// <param name="args"></param>
        void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
        {
-            Debug.Console(2, this, "TVOneCurio RX: '{0}'", args.Text);
            try
            {
                if (args.Text.IndexOf("login") > -1)
@@ -148,11 +147,7 @@ namespace PepperDash.Essentials.Devices.Common
 					Debug.Console(1, this, "Preset Parse: {0}", presetNumberParse);
 					CurrentPreset = ushort.Parse(presetNumberParse);
 					PresetFeedback.FireUpdate();
-
-
-                }
-
-                
+                }     
            }
            catch (Exception e)
            {
@@ -168,7 +163,6 @@ namespace PepperDash.Essentials.Devices.Common
        /// <param name="s">Command to send</param>
        public void SendLine(string s)
        {
-            Debug.Console(1, this, "TVOne Cusio TX: '{0}'", s);
            Communication.SendText(s + "\x0d\x0a");
        }

--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -219,8 +219,6 @@ namespace PepperDash.Essentials.Devices.Common
 			string url = string.Format("http://{0}{1}", this.address, s);
 			request.Url = new UrlParser(url);
 			HttpClientResponse response = WebClient.Dispatch(request);
-			
-			Debug.Console(2, this, "DigitalLogger TX:\n'{0}'\nRX:\n'{1}'", url, response.ContentString);
 			return response.ContentString;
 		}
        /// <summary>
@@ -236,9 +234,6 @@ namespace PepperDash.Essentials.Devices.Common
 			request.Url = new UrlParser(url);
 			
 			HttpClientResponse response = WebClient.Dispatch(request);
-			
-			Debug.Console(2, this, "DigitalLogger TX:\n'{0}'\nRX:\n'{1}'", url, response.ContentString);
-			
        }

 		public void CycleCircuit(uint circuit)
--- a/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
+++ b/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
@@ -368,21 +368,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
            CodecSchedule = new CodecScheduleAwareness();
 
            //Set Feedback Actions
-            CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
-            CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
-            CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
-            CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
-            CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
-            CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = CameraAutoModeIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
-            CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = SharingContentIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
-            CodecStatus.Status.Video.Input.MainVideoMute.ValueChangedAction = CameraIsOffFeedback.FireUpdate;
+            SetFeedbackActions();

-			CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+            CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 				eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
 			HdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 				eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this);
@@ -418,7 +406,36 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
            _brandingUrl = props.UiBranding.BrandingUrl;
        }

-		/// <summary>
+        private void SetFeedbackActions()
+        {
+            CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
+            CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
+            CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
+            CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
+            CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
+            CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = CameraAutoModeIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
+            CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = SharingContentIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
+            try
+            {
+                CodecStatus.Status.Video.Input.MainVideoMute.ValueChangedAction = CameraIsOffFeedback.FireUpdate;
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, "Error setting MainVideuMute Action: {0}", ex);
+
+                if (ex.InnerException != null)
+                {
+                    Debug.Console(0, this, "Error setting MainVideuMute Action: {0}", ex);
+                }
+            }
+        }
+
+        /// <summary>
 		/// Creates the fake OSD source, and connects it's AudioVideo output to the CodecOsdIn input
 		/// to enable routing 
 		/// </summary>
@@ -637,7 +654,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
        {
            if (CommDebuggingIsOn)
            {
-                if(!JsonFeedbackMessageIsIncoming)
+                if (!JsonFeedbackMessageIsIncoming)
                    Debug.Console(1, this, "RX: '{0}'", args.Text);
            }

--- a/Common/VideoCodec/CiscoCodec/xStatus.cs
+++ b/Common/VideoCodec/CiscoCodec/xStatus.cs
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

 using PepperDash.Core;
+using PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec;

 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
@@ -1680,6 +1681,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
            public MainVideoSource MainVideoSource { get; set; }
            public MainVideoMute MainVideoMute { get; set; }
            public List<Source> Source { get; set; }
+
+            public Input2()
+            {
+                MainVideoMute = new MainVideoMute();
+            }
        }

        public class Local : ValueProperty
@@ -1875,6 +1881,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
            {
                Selfview = new Selfview();
                Layout = new Layout();
+                Input = new Input2();
            }
        }
Author	SHA1	Message	Date
Neil Dorin	0f28d46f34	#671 Calls the private dispose method on program stop	2021-03-30 15:53:10 -06:00
Andrew Welker	275759143b	Merge branch 'development' into feature/multi-display-adds	2021-03-29 13:31:10 -06:00
Andrew Welker	3a4737b6f6	Merge pull request #670 from PepperDash/hotfix/dm-routing-issues Hotfix/dm routing issues	2021-03-29 13:29:46 -06:00
Andrew Welker	2b2308d5c2	Merge branch 'development' into hotfix/dm-routing-issues	2021-03-29 13:18:00 -06:00
Andrew Welker	3803263598	Merge branch 'development' into feature/multi-display-adds	2021-03-29 12:54:54 -06:00
Andrew Welker	358fa1a9c0	Merge pull request #667 from PepperDash/hotfix/generic-queue-disposed-check Hotfix/generic queue disposed check	2021-03-29 12:53:43 -06:00
Andrew Welker	7fbbc9f2b8	Fix LinkToApi methods for chassis to use ExecuteNumericSwitch	2021-03-29 12:50:43 -06:00
Andrew Welker	f4f400f9b6	Merge branch 'development' into hotfix/generic-queue-disposed-check	2021-03-29 09:55:40 -06:00
Andrew Welker	d3383db890	Merge pull request #666 from PepperDash/hotfix/generic-queue-disposed-check added a Disposed check and Debug Message to prevent enqueing messages…	2021-03-29 07:55:29 -06:00
Nick Genovese	139e5370ea	added a Disposed check and Debug Message to prevent enqueing messages after the Generic Queue has been disposed; typically happens at program stop	2021-03-29 09:42:31 -04:00
Andrew Welker	4f9fa05e3f	Merge branch 'development' into feature/multi-display-adds	2021-03-25 16:06:48 -06:00
Andrew Welker	7ab2574912	Merge pull request #662 from PepperDash/hotfix/scheduler-fixes Hotfix/scheduler fixes	2021-03-25 16:05:25 -06:00
Andrew Welker	35167d77f9	Merge branch 'development' into hotfix/scheduler-fixes	2021-03-25 15:48:59 -06:00
Andrew Welker	bdd17dfa27	Merge pull request #661 from PepperDash/hotfix/scheduler-fixes Hotfix/scheduler fixes	2021-03-25 15:48:45 -06:00
Andrew Welker	6443e00428	update back to latest builder image	2021-03-22 09:48:23 -06:00
Andrew Welker	008279e867	Initialize some properties that were causing a nullRef	2021-03-22 09:39:08 -06:00
Andrew Welker	c4a6d20791	fixing a nullref issue with cisco spark	2021-03-22 09:23:07 -06:00
Andrew Welker	61b4002e5a	Fix to test build image again	2021-03-19 09:22:21 -06:00
Andrew Welker	da63d0917e	Updates to test new builder image this build WILL fail	2021-03-19 09:03:05 -06:00
Andrew Welker	0228fd1c0f	fix a ;	2021-03-18 16:27:08 -06:00
Andrew Welker	085ba134c4	Set event to not be acknowledgable Added logic to acknowledge event Added debug statement to show that event was being fired	2021-03-18 12:44:20 -06:00
Andrew Welker	a9fce3237c	Added check for key to Clear command If the key was wrong or wasn't in the group, a `KeyNotFoundException` was thrown. Also added acknowledgment of a successful deletion	2021-03-18 12:43:29 -06:00
Andrew Welker	840fb21e15	Added console command to list events for a group	2021-03-18 12:42:29 -06:00
Neil Dorin	6ab4d4d090	#658 Initializes config properties in constructor(s)	2021-03-17 10:52:17 -06:00
Andrew Welker	fcdee3b9fd	Merge branch 'development' into feature/multi-display-adds	2021-03-17 09:01:00 -06:00
Neil Dorin	4e15d7fe5a	Adds necessary config properteis	2021-03-16 15:36:14 -06:00
Andrew Welker	2a76e2b3f9	Merge pull request #656 from PepperDash/hotfix/namespace-issues Hotfix/namespace issues	2021-03-12 17:37:14 -07:00
Andrew Welker	f9522a533a	Merge branch 'development' into hotfix/namespace-issues	2021-03-12 17:17:17 -07:00
Andrew Welker	ec07ec84f7	Merge pull request #655 from PepperDash/hotfix/techroom-scheduler-event-update Hotfix/techroom scheduler event update	2021-03-12 17:16:55 -07:00
Andrew Welker	0457bcf7fe	Merge branch 'development' into hotfix/techroom-scheduler-event-update	2021-03-12 17:02:29 -07:00
Andrew Welker	ba0b2e169a	Merge pull request #649 from PepperDash/feature/remove-tx-rx-debug Feature/remove tx rx debug	2021-03-12 17:02:17 -07:00
Andrew Welker	bebcc3c6e1	Merge branch 'development' into feature/remove-tx-rx-debug	2021-03-12 16:48:24 -07:00
Jonathan Arndt	8572191c1e	Removed the ._packages.config file from the repo.	2021-03-12 14:57:05 -08:00
Jonathan Arndt	00d2159d06	Reset branch HEAD to `f74fa35c` commit. Removed all TX: and RX: Console.Debug statements and built successfully.	2021-03-11 11:14:59 -08:00
Andrew Welker	7019b62610	Merge pull request #647 from PepperDash/feature/cecportcontroller-with-streamdebugging Update CecPortController class to implement IBasicCommunicationWithStreamDebugging	2021-03-11 10:43:41 -07:00
Evan	a583fdb72a	Update StreamDebugging on receive for both CECPortController and ComPortController	2021-03-11 12:25:46 -05:00
Andrew Welker	33bf98303d	Merge branch 'development' into feature/cecportcontroller-with-streamdebugging	2021-03-11 09:06:52 -07:00
Neil Dorin	b2f3aa9cfa	Merge pull request #644 from PepperDash/release/1.8.0 Release/1.8.0	2021-03-10 16:07:55 -07:00
Evan	29b77f5629	Update CecPortController class to implement IBasicCommunicationWithStreamDebuggingB	2021-03-10 17:28:32 -05:00
Jonathan Arndt	f74fa35ca4	Solution updated to remove all TX/RX data that device classes are printing when talking to 3rd party devices	2021-03-09 23:12:57 -08:00
Andrew Welker	74231a428d	removed unnecessary stack trace printing	2021-03-05 17:31:21 -07:00
Andrew Welker	8ba0920cc0	add jsonProperty decorator for PreferredName	2021-03-05 15:41:22 -07:00
Andrew Welker	e23fe06fef	update name change in csproj	2021-03-05 15:32:21 -07:00
Andrew Welker	79fd1f7424	add destinationListKey property and remove DDVC	2021-03-03 14:43:42 -07:00
Andrew Welker	d2ebc340bd	add Sink Type property	2021-03-01 15:15:50 -07:00
Andrew Welker	7c7ae65d40	Update PepperDash_Essentials_Core.csproj	2021-02-25 17:01:24 -07:00
Andrew Welker	0dcbb652df	add properties to SourceListItem add XML Comments	2021-02-25 17:00:57 -07:00
Andrew Welker	0649cea367	Add DestinationLists to config	2021-02-25 16:53:51 -07:00
Andrew Welker	9f840fae41	add DestinationListItem	2021-02-25 16:53:35 -07:00