fix: change number of retained files to 7 instead of 30 for processors

2026-01-12 12:05:00 +00:00 · 2025-10-31 13:09:12 -05:00
20 changed files with 377 additions and 446 deletions
--- a/src/PepperDash.Core/ComTextHelper.cs
+++ b/src/PepperDash.Core/ComTextHelper.cs
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// Helper class for formatting communication text and byte data for debugging purposes.
-  /// </summary>
-  public class ComTextHelper
-  {
-    /// <summary>
-    /// Gets escaped text for a byte array
-    /// </summary>
-    /// <param name="bytes"></param>
-    /// <returns>string with all bytes escaped</returns>
-    public static string GetEscapedText(byte[] bytes)
-    {
-      return string.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
-    }
-
-    /// <summary>
-    /// Gets escaped text for a string
-    /// </summary>
-    /// <param name="text"></param>
-    /// <returns>string with all bytes escaped</returns>
-    public static string GetEscapedText(string text)
-    {
-      var bytes = Encoding.GetEncoding(28591).GetBytes(text);
-      return string.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
-    }
-
-    /// <summary>
-    /// Gets debug text for a string
-    /// </summary>
-    /// <param name="text"></param>
-    /// <returns>string with all non-printable characters escaped</returns>
-    public static string GetDebugText(string text)
-    {
-      return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
-    }
-  }
-}
--- a/src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs
+++ b/src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -36,14 +37,14 @@ namespace PepperDash.Core
        {
            get
            {
-                return _DebugTimeoutInMs / 60000;
+                return _DebugTimeoutInMs/60000;
            }
        }

        /// <summary>
        /// Gets or sets the RxStreamDebuggingIsEnabled
        /// </summary>
-        public bool RxStreamDebuggingIsEnabled { get; private set; }
+        public bool RxStreamDebuggingIsEnabled{ get; private set; }

        /// <summary>
        /// Indicates that transmit stream debugging is enabled
@@ -107,7 +108,7 @@ namespace PepperDash.Core
                TxStreamDebuggingIsEnabled = true;

            Debug.SetDeviceDebugSettings(ParentDeviceKey, setting);
-
+        
        }

        /// <summary>
@@ -135,4 +136,51 @@ namespace PepperDash.Core
            DebugExpiryPeriod = null;
        }
    }
+
+    /// <summary>
+    /// The available settings for stream debugging
+    /// </summary>
+    [Flags]
+    /// <summary>
+    /// Enumeration of eStreamDebuggingSetting values
+    /// </summary>
+    public enum eStreamDebuggingSetting
+    {
+        /// <summary>
+        /// Debug off
+        /// </summary>
+        Off = 0,
+        /// <summary>
+        /// Debug received data
+        /// </summary>
+        Rx = 1, 
+        /// <summary>
+        /// Debug transmitted data
+        /// </summary>
+        Tx = 2,
+        /// <summary>
+        /// Debug both received and transmitted data
+        /// </summary>
+        Both = Rx | Tx
+    }
+
+    /// <summary>
+    /// The available settings for stream debugging response types
+    /// </summary>
+    [Flags]
+    public enum eStreamDebuggingDataTypeSettings
+    {
+        /// <summary>
+        /// Debug data in byte format
+        /// </summary>
+        Bytes = 0,
+        /// <summary>
+        /// Debug data in text format
+        /// </summary>
+        Text = 1,
+        /// <summary>
+        /// Debug data in both byte and text formats
+        /// </summary>
+        Both = Bytes | Text,
+    }
 }
--- a/src/PepperDash.Core/Comm/GenericSshClient.cs
+++ b/src/PepperDash.Core/Comm/GenericSshClient.cs
@@ -278,7 +278,7 @@ namespace PepperDash.Core
                        if (shellStream.DataAvailable)
                        {
                            // empty the buffer if there is data
-                            shellStream.Read();
+                            string str = shellStream.Read();
                        }
                        shellStream.DataReceived += Stream_DataReceived;
                        this.LogInformation("Connected");
@@ -288,6 +288,7 @@ namespace PepperDash.Core
                    catch (SshConnectionException e)
                    {
                        var ie = e.InnerException; // The details are inside!!
+                        var errorLogLevel = disconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;

                        if (ie is SocketException)
                        {
@@ -334,6 +335,7 @@ namespace PepperDash.Core
                    }
                    catch (Exception e)
                    {
+                        var errorLogLevel = disconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
                        this.LogError("Unhandled exception on connect: {error}", e.Message);
                        this.LogVerbose(e, "Exception details: ");
                        disconnectLogged = true;
@@ -437,14 +439,18 @@ namespace PepperDash.Core
            if (bytesHandler != null)
            {
                var bytes = Encoding.UTF8.GetBytes(response);
-                this.PrintReceivedBytes(bytes);
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                {
+                    this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                }
                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
            }

            var textHandler = TextReceived;
            if (textHandler != null)
            {
-                this.PrintReceivedText(response);
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));

                textHandler(this, new GenericCommMethodReceiveTextArgs(response));
            }
@@ -501,7 +507,11 @@ namespace PepperDash.Core
            {
                if (client != null && shellStream != null && IsConnected)
                {
-                    this.PrintSentText(text);
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                        this.LogInformation(
+                                      "Sending {length} characters of text: '{text}'",
+                                      text.Length,
+                                      ComTextHelper.GetDebugText(text));

                    shellStream.Write(text);
                    shellStream.Flush();
@@ -516,7 +526,7 @@ namespace PepperDash.Core
                this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());

                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                StopReconnectTimer();
            }
            catch (Exception ex)
            {
@@ -534,7 +544,8 @@ namespace PepperDash.Core
            {
                if (client != null && shellStream != null && IsConnected)
                {
-                    this.PrintSentBytes(bytes);
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                        this.LogInformation("Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));

                    shellStream.Write(bytes, 0, bytes.Length);
                    shellStream.Flush();
@@ -549,7 +560,7 @@ namespace PepperDash.Core
                this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));

                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                StopReconnectTimer();
            }
            catch (Exception ex)
            {
--- a/src/PepperDash.Core/Comm/GenericTcpIpClient.cs
+++ b/src/PepperDash.Core/Comm/GenericTcpIpClient.cs
@@ -426,7 +426,10 @@ namespace PepperDash.Core
                    var bytesHandler = BytesReceived;
                    if (bytesHandler != null)
                    {
-                        this.PrintReceivedBytes(bytes);
+                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
+                            Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                        }
                        bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                    }
                    var textHandler = TextReceived;
@@ -434,7 +437,10 @@ namespace PepperDash.Core
                    {
                        var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);

-                        this.PrintReceivedText(str);
+                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
+                            Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                        }

                        textHandler(this, new GenericCommMethodReceiveTextArgs(str));
                    }
@@ -450,7 +456,8 @@ namespace PepperDash.Core
        {
            var bytes = Encoding.GetEncoding(28591).GetBytes(text);
            // Check debug level before processing byte array
-            this.PrintSentText(text);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
            if (_client != null)
                _client.SendData(bytes, bytes.Length);
        }
@@ -477,7 +484,8 @@ namespace PepperDash.Core
        /// </summary>
        public void SendBytes(byte[] bytes)
        {
-            this.PrintSentBytes(bytes);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
            if (_client != null)
                _client.SendData(bytes, bytes.Length);
        }
--- a/src/PepperDash.Core/Comm/GenericUdpServer.cs
+++ b/src/PepperDash.Core/Comm/GenericUdpServer.cs
@@ -124,7 +124,7 @@ namespace PepperDash.Core
            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
        }
-
+       
        /// <summary>
        /// 
        /// </summary>
@@ -135,7 +135,7 @@ namespace PepperDash.Core
        public GenericUdpServer(string key, string address, int port, int bufferSize)
            : base(key)
        {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+            StreamDebugging = new CommunicationStreamDebugging(key); 
            Hostname = address;
            Port = port;
            BufferSize = bufferSize;
@@ -180,7 +180,7 @@ namespace PepperDash.Core
        /// <param name="programEventType"></param>
        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
        {
-            if (programEventType != eProgramStatusEventType.Stopping)
+            if (programEventType != eProgramStatusEventType.Stopping) 
                return;

            Debug.Console(1, this, "Program stopping. Disabling Server");
@@ -243,7 +243,7 @@ namespace PepperDash.Core
        /// </summary>
        public void Disconnect()
        {
-            if (Server != null)
+            if(Server != null)
                Server.DisableUDPServer();

            IsConnected = false;
@@ -265,7 +265,7 @@ namespace PepperDash.Core

            try
            {
-                if (numBytes <= 0)
+                if (numBytes <= 0) 
                    return;

                var sourceIp = Server.IPAddressLastMessageReceivedFrom;
@@ -281,13 +281,17 @@ namespace PepperDash.Core
                var bytesHandler = BytesReceived;
                if (bytesHandler != null)
                {
-                    this.PrintReceivedBytes(bytes);
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    {
+                        Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                    }
                    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                }
                var textHandler = TextReceived;
                if (textHandler != null)
                {
-                    this.PrintReceivedText(str);
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
                    textHandler(this, new GenericCommMethodReceiveTextArgs(str));
                }
            }
@@ -314,7 +318,8 @@ namespace PepperDash.Core

            if (IsConnected && Server != null)
            {
-                this.PrintSentText(text);
+                if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));

                Server.SendData(bytes, bytes.Length);
            }
@@ -329,7 +334,8 @@ namespace PepperDash.Core
        /// </summary>
        public void SendBytes(byte[] bytes)
        {
-            this.PrintSentBytes(bytes);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));

            if (IsConnected && Server != null)
                Server.SendData(bytes, bytes.Length);
@@ -337,11 +343,11 @@ namespace PepperDash.Core

    }

-    /// <summary>
-    /// Represents a GenericUdpReceiveTextExtraArgs
-    /// </summary>
-    public class GenericUdpReceiveTextExtraArgs : EventArgs
-    {
+ /// <summary>
+ /// Represents a GenericUdpReceiveTextExtraArgs
+ /// </summary>
+	public class GenericUdpReceiveTextExtraArgs : EventArgs
+	{
        /// <summary>
        /// 
        /// </summary>
@@ -353,7 +359,7 @@ namespace PepperDash.Core
        /// <summary>
        /// 
        /// </summary>
-		public int Port { get; private set; }
+		public int	Port { get; private set; }
        /// <summary>
        /// 
        /// </summary>
@@ -367,18 +373,18 @@ namespace PepperDash.Core
        /// <param name="port"></param>
        /// <param name="bytes"></param>
 		public GenericUdpReceiveTextExtraArgs(string text, string ipAddress, int port, byte[] bytes)
-        {
-            Text = text;
-            IpAddress = ipAddress;
-            Port = port;
-            Bytes = bytes;
-        }
+		{
+			Text = text;
+			IpAddress = ipAddress;
+			Port = port;
+			Bytes = bytes;
+		}

-        /// <summary>
-        /// Stupid S+ Constructor
-        /// </summary>
-        public GenericUdpReceiveTextExtraArgs() { }
-    }
+		/// <summary>
+		/// Stupid S+ Constructor
+		/// </summary>
+		public GenericUdpReceiveTextExtraArgs() { }
+	}

    /// <summary>
    /// 
--- a/src/PepperDash.Core/Comm/StreamDebuggingExtensions.cs
+++ b/src/PepperDash.Core/Comm/StreamDebuggingExtensions.cs
@@ -1,69 +0,0 @@
-using System;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// Extension methods for stream debugging
-  /// </summary>
-  public static class StreamDebuggingExtensions
-  {
-    private static readonly string app = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? $"App {InitialParametersClass.ApplicationNumber}" : $"{InitialParametersClass.RoomId}";
-
-    /// <summary>
-    /// Print the sent bytes to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="bytes">bytes to print</param>
-    public static void PrintSentBytes(this IStreamDebugging comms, byte[] bytes)
-    {
-      if (!comms.StreamDebugging.TxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Sending {bytes.Length} bytes: '{ComTextHelper.GetEscapedText(bytes)}'");
-    }
-
-    /// <summary>
-    /// Print the received bytes to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="bytes">bytes to print</param>
-    public static void PrintReceivedBytes(this IStreamDebugging comms, byte[] bytes)
-    {
-      if (!comms.StreamDebugging.RxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Received {bytes.Length} bytes: '{ComTextHelper.GetEscapedText(bytes)}'");
-    }
-
-    /// <summary>
-    /// Print the sent text to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="text">text to print</param>
-    public static void PrintSentText(this IStreamDebugging comms, string text)
-    {
-      if (!comms.StreamDebugging.TxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Sending Text: '{ComTextHelper.GetDebugText(text)}'");
-    }
-
-    /// <summary>
-    /// Print the received text to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="text">text to print</param>
-    public static void PrintReceivedText(this IStreamDebugging comms, string text)
-    {
-      if (!comms.StreamDebugging.RxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Received Text: '{ComTextHelper.GetDebugText(text)}'");
-    }
-  }
-}
--- a/src/PepperDash.Core/Comm/eControlMethods.cs
+++ b/src/PepperDash.Core/Comm/eControlMethods.cs
@@ -82,10 +82,6 @@ namespace PepperDash.Core
        /// <summary>
        /// InfinetEX control
        /// </summary>
-        InfinetEx,
-        /// <summary>
-        /// TCP/IP Server
-        /// </summary>
-        TcpServer
+        InfinetEx
    }
 }
--- a/src/PepperDash.Core/Comm/eStreamDebuggingDataTypeSettings.cs
+++ b/src/PepperDash.Core/Comm/eStreamDebuggingDataTypeSettings.cs
@@ -1,24 +0,0 @@
-using System;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// The available settings for stream debugging data format types
-  /// </summary>
-  [Flags]
-  public enum eStreamDebuggingDataTypeSettings
-  {
-    /// <summary>
-    /// Debug data in byte format
-    /// </summary>
-    Bytes = 0,
-    /// <summary>
-    /// Debug data in text format
-    /// </summary>
-    Text = 1,
-    /// <summary>
-    /// Debug data in both byte and text formats
-    /// </summary>
-    Both = Bytes | Text
-  }
-}
--- a/src/PepperDash.Core/Comm/eStreamDebuggingSetting.cs
+++ b/src/PepperDash.Core/Comm/eStreamDebuggingSetting.cs
@@ -1,28 +0,0 @@
-using System;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// The available settings for stream debugging
-  /// </summary>
-  [Flags]
-  public enum eStreamDebuggingSetting
-  {
-    /// <summary>
-    /// Debug off
-    /// </summary>
-    Off = 0,
-    /// <summary>
-    /// Debug received data
-    /// </summary>
-    Rx = 1,
-    /// <summary>
-    /// Debug transmitted data
-    /// </summary>
-    Tx = 2,
-    /// <summary>
-    /// Debug both received and transmitted data
-    /// </summary>
-    Both = Rx | Tx
-  }
-}
--- a/src/PepperDash.Core/CommunicationExtras.cs
+++ b/src/PepperDash.Core/CommunicationExtras.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
+using System.Text.RegularExpressions;
 using Newtonsoft.Json;

 namespace PepperDash.Core
@@ -39,7 +42,7 @@ namespace PepperDash.Core
    /// Defines the contract for IBasicCommunication
    /// </summary>
    public interface IBasicCommunication : ICommunicationReceiver
-    {
+	{
        /// <summary>
        /// Send text to the device
        /// </summary>
@@ -51,7 +54,7 @@ namespace PepperDash.Core
        /// </summary>
        /// <param name="bytes"></param>
 		void SendBytes(byte[] bytes);
-    }
+	}

    /// <summary>
    /// Represents a device that implements IBasicCommunication and IStreamDebugging
@@ -64,7 +67,7 @@ namespace PepperDash.Core
    /// <summary>
    /// Represents a device with stream debugging capablities
    /// </summary>
-    public interface IStreamDebugging : IKeyed
+    public interface IStreamDebugging
    {
        /// <summary>
        /// Object to enable stream debugging
@@ -73,12 +76,12 @@ namespace PepperDash.Core
        CommunicationStreamDebugging StreamDebugging { get; }
    }

-    /// <summary>
-    /// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
-    /// GenericTcpIpClient
-    /// </summary>
-    public interface ISocketStatus : IBasicCommunication
-    {
+	/// <summary>
+	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+	/// GenericTcpIpClient
+	/// </summary>
+	public interface ISocketStatus : IBasicCommunication
+	{
        /// <summary>
        /// Notifies of socket status changes
        /// </summary>
@@ -90,7 +93,7 @@ namespace PepperDash.Core
        [JsonProperty("clientStatus")]
        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
        SocketStatus ClientStatus { get; }
-    }
+	}

    /// <summary>
    /// Describes a device that implements ISocketStatus and IStreamDebugging
@@ -104,24 +107,24 @@ namespace PepperDash.Core
    /// Describes a device that can automatically attempt to reconnect
    /// </summary>
 	public interface IAutoReconnect
-    {
+	{
        /// <summary>
        /// Enable automatic recconnect
        /// </summary>
        [JsonProperty("autoReconnect")]
-        bool AutoReconnect { get; set; }
+		bool AutoReconnect { get; set; }
        /// <summary>
        /// Interval in ms to attempt automatic recconnections
        /// </summary>
        [JsonProperty("autoReconnectIntervalMs")]
-        int AutoReconnectIntervalMs { get; set; }
-    }
+		int AutoReconnectIntervalMs { get; set; }
+	}

-    /// <summary>
-    /// 
-    /// </summary>
-    public enum eGenericCommMethodStatusChangeType
-    {
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum eGenericCommMethodStatusChangeType
+	{
        /// <summary>
        /// Connected
        /// </summary>
@@ -130,45 +133,45 @@ namespace PepperDash.Core
        /// Disconnected
        /// </summary>
        Disconnected
-    }
+	}

-    /// <summary>
-    /// This delegate defines handler for IBasicCommunication status changes
-    /// </summary>
-    /// <param name="comm">Device firing the status change</param>
-    /// <param name="status"></param>
-    public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
+	/// <summary>
+	/// This delegate defines handler for IBasicCommunication status changes
+	/// </summary>
+	/// <param name="comm">Device firing the status change</param>
+	/// <param name="status"></param>
+	public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);

-    /// <summary>
-    /// 
-    /// </summary>
-    public class GenericCommMethodReceiveBytesArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the Bytes
-        /// </summary>
-        public byte[] Bytes { get; private set; }
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveBytesArgs : EventArgs
+	{
+  /// <summary>
+  /// Gets or sets the Bytes
+  /// </summary>
+		public byte[] Bytes { get; private set; }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="bytes"></param>
 		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
-        {
-            Bytes = bytes;
-        }
+		{
+			Bytes = bytes;
+		}

-        /// <summary>
-        /// S+ Constructor
-        /// </summary>
-        public GenericCommMethodReceiveBytesArgs() { }
-    }
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveBytesArgs() { }
+	}

-    /// <summary>
-    /// 
-    /// </summary>
-    public class GenericCommMethodReceiveTextArgs : EventArgs
-    {
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveTextArgs : EventArgs
+	{
        /// <summary>
        /// 
        /// </summary>
@@ -182,9 +185,9 @@ namespace PepperDash.Core
        /// </summary>
        /// <param name="text"></param>
 		public GenericCommMethodReceiveTextArgs(string text)
-        {
-            Text = text;
-        }
+		{
+			Text = text;
+		}

        /// <summary>
        /// 
@@ -192,14 +195,59 @@ namespace PepperDash.Core
        /// <param name="text"></param>
        /// <param name="delimiter"></param>
        public GenericCommMethodReceiveTextArgs(string text, string delimiter)
-            : this(text)
+            :this(text)
        {
            Delimiter = delimiter;
        }

+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveTextArgs() { }
+	}
+
+
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class ComTextHelper
+	{
        /// <summary>
-        /// S+ Constructor
+        /// Gets escaped text for a byte array
        /// </summary>
-        public GenericCommMethodReceiveTextArgs() { }
-    }
+        /// <param name="bytes"></param>
+        /// <returns></returns>
+		public static string GetEscapedText(byte[] bytes)
+		{
+			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets escaped text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+  /// <summary>
+  /// GetEscapedText method
+  /// </summary>
+		public static string GetEscapedText(string text)
+		{
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets debug text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetDebugText method
+        /// </summary>
+        public static string GetDebugText(string text)
+        {
+            return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
+        }
+	}
 }
--- a/src/PepperDash.Essentials.Core/Comm
+++ b/src/PepperDash.Essentials.Core/Comm
@@ -12,15 +12,15 @@ using Serilog.Events;

 namespace PepperDash.Essentials.Core
 {
-    /// <summary>
-    /// Represents a CecPortController
-    /// </summary>
-    public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
+ /// <summary>
+ /// Represents a CecPortController
+ /// </summary>
+	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
    {
-        /// <summary>
-        /// Gets or sets the StreamDebugging
-        /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+  /// <summary>
+  /// Gets or sets the StreamDebugging
+  /// </summary>
+		public CommunicationStreamDebugging StreamDebugging { get; private set; }

        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
@@ -33,16 +33,16 @@ namespace PepperDash.Essentials.Core
        ICec Port;

        public CecPortController(string key, Func<EssentialsControlPropertiesConfig, ICec> postActivationFunc,
-            EssentialsControlPropertiesConfig config) : base(key)
+            EssentialsControlPropertiesConfig config):base(key)
        {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+			StreamDebugging = new CommunicationStreamDebugging(key);

            AddPostActivationAction(() =>
            {
                Port = postActivationFunc(config);

                Port.StreamCec.CecChange += StreamCec_CecChange;
-            });
+            });            
        }

        public CecPortController(string key, ICec port)
@@ -58,25 +58,27 @@ namespace PepperDash.Essentials.Core
            if (args.EventId == CecEventIds.CecMessageReceivedEventId)
                OnDataReceived(cecDevice.Received.StringValue);
            else if (args.EventId == CecEventIds.ErrorFeedbackEventId)
-                if (cecDevice.ErrorFeedback.BoolValue)
+                if(cecDevice.ErrorFeedback.BoolValue)
                    Debug.LogMessage(LogEventLevel.Verbose, this, "CEC NAK Error");
        }

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

        #region IBasicCommunication Members
@@ -88,7 +90,8 @@ namespace PepperDash.Essentials.Core
        {
            if (Port == null)
                return;
-            this.PrintSentText(text);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
            Port.StreamCec.Send.StringValue = text;
        }

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

--- a/src/PepperDash.Essentials.Core/Comm
+++ b/src/PepperDash.Essentials.Core/Comm
@@ -1,9 +1,7 @@
 using System;
 using System.Text;
 using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using Serilog.Events;
@@ -25,10 +23,10 @@ namespace PepperDash.Essentials.Core
 		/// Event fired when bytes are received
 		/// </summary>
 		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
+		
 		/// <summary>
-		/// Event fired when text is received
-		/// </summary>
+        /// Event fired when text is received
+        /// </summary>
 		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;

 		/// <summary>
@@ -40,12 +38,12 @@ namespace PepperDash.Essentials.Core
 		ComPort.ComPortSpec Spec;

 		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="postActivationFunc"></param>
-		/// <param name="spec"></param>
-		/// <param name="config"></param>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="postActivationFunc"></param>
+        /// <param name="spec"></param>
+        /// <param name="config"></param>
 		public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
 			ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
 		{
@@ -87,29 +85,61 @@ namespace PepperDash.Essentials.Core
 		{
 			if (Port == null)
 			{
-				this.LogInformation($"Configured {Port.Parent.GetType().Name}-comport-{Port.ID} for {Key} does not exist.");
+				Debug.LogMessage(LogEventLevel.Information, this, "Configured com Port for this device does not exist.");
 				return;
 			}
-
-
-			if (Port.Parent is CrestronControlSystem || Port.Parent is CenIoCom102)
+			// TODO [ ] - Remove commented out code once verified working
+			//if (Port.Parent is CrestronControlSystem || Port.Parent is CenIoCom102)
+			if (Port.Parent is GenericBase genericDevice && genericDevice.Registerable)
 			{
-				var result = Port.Register();
+				//this.LogInformation($"INFO: Attempting to register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID}");
+				var result = genericDevice.Register();
 				if (result != eDeviceRegistrationUnRegistrationResponse.Success)
 				{
-					this.LogError($"Cannot register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
-					return;
+					this.LogError($"ERROR: Cannot register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
+					return; // false
 				}
-				this.LogInformation($"Successfully registered {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
 			}
-
+			
 			var specResult = Port.SetComPortSpec(Spec);
 			if (specResult != 0)
 			{
-				this.LogError($"Cannot set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
+				this.LogError($"ERROR: Cannot set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
 				return;
 			}
-			this.LogInformation($"Successfully set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
+			//this.LogInformation($"INFO: Successfully set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
+
+
+			// TODO [ ] - Remove debug logging once verified working
+			// if (Port.Parent is CenIoCom102)
+			// {				
+			// 	Port.PropertyChanged += (s, e) =>
+			// 	{					
+			// 		this.LogInformation($@"RegisterAndConfigureComPort: PropertyChanged Fired >> 
+			// 			comPort-'{Port.ID}', 
+			// 			Property Changed-'{e.Property}', 
+			// 			Value Changed-'{e.Value}',
+			// 			deviceName-'{Port.DeviceName}', 
+			// 			parentDevice-'{Port.ParentDevice}', 
+			// 			parent-`{Port.Parent}`, 
+			// 			online-`{Port.IsOnline}`, 
+			// 			present-`{Port.Present}`, 
+			// 			supportedBaudRates-'{Port.SupportedBaudRates}'");
+			// 	};
+			// 	Port.ExtendedInformationChanged += (s, e) =>
+			// 	{
+
+			// 		this.LogInformation($@"RegisterAndConfigureComPort: ExtendedInformationChanged Fired >> 
+			// 			comPort-'{Port.ID}', 
+			// 			{e.Protocol},
+			// 			{e.BaudRate},
+			// 			{e.Parity},
+			// 			{e.DataBits},
+			// 			{e.StopBits}, 
+			// 			HW Handshake-'{e.HardwareHandshakeSetting}', 
+			// 			SW Handshake-'{e.SoftwareHandshakeSetting}'");
+			// 	};
+			// }

 			Port.SerialDataReceived += Port_SerialDataReceived;
 		}
@@ -135,14 +165,16 @@ namespace PepperDash.Essentials.Core
 			if (bytesHandler != null)
 			{
 				var bytes = Encoding.GetEncoding(28591).GetBytes(s);
-				this.PrintReceivedBytes(bytes);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
 				bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
 				eventSubscribed = true;
 			}
 			var textHandler = TextReceived;
 			if (textHandler != null)
 			{
-				this.PrintReceivedText(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
 				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
 				eventSubscribed = true;
 			}
@@ -169,7 +201,8 @@ namespace PepperDash.Essentials.Core
 			if (Port == null)
 				return;

-			this.PrintSentText(text);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
 			Port.Send(text);
 		}

@@ -181,7 +214,8 @@ namespace PepperDash.Essentials.Core
 			if (Port == null)
 				return;
 			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-			this.PrintSentBytes(bytes);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));

 			Port.Send(text);
 		}
--- a/src/PepperDash.Essentials.Core/Comm
+++ b/src/PepperDash.Essentials.Core/Comm
@@ -104,12 +104,6 @@ namespace PepperDash.Essentials.Core
 							comm = secureTcp;
 							break;
 						}
-					case eControlMethod.TcpServer:
-						{
-							var tcpServer = new GenericTcpIpServer(deviceConfig.Key + "-tcpServer", c.Address, c.Port, c.BufferSize);
-							comm = tcpServer;
-							break;
-						}
 					default:
 						break;
 				}
--- a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
+++ b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
@@ -11,11 +11,11 @@ using PepperDash.Core;

 namespace PepperDash.Essentials.Core.Config
 {
-    /// <summary>
-    /// Loads the ConfigObject from the file
-    /// </summary>
-    public class EssentialsConfig : BasicConfig
-    {
+	/// <summary>
+	/// Loads the ConfigObject from the file
+	/// </summary>
+	public class EssentialsConfig : BasicConfig
+	{
        /// <summary>
        /// Gets or sets the SystemUrl
        /// </summary>
@@ -32,33 +32,24 @@ namespace PepperDash.Essentials.Core.Config
        /// Gets the SystemUuid extracted from the SystemUrl
        /// </summary>
 		[JsonProperty("systemUuid")]
-        public string SystemUuid
+		public string SystemUuid
        {
            get
            {
-                string uuid;
+				if (string.IsNullOrEmpty(SystemUrl))
+					return "missing url";

-                if (string.IsNullOrEmpty(SystemUrl))
-                {
-                    uuid = "missing url";
-                }
-                else if (SystemUrl.Contains("#"))
-                {
-                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-                    uuid = result.Groups[1].Value;
-                }
-                else if (SystemUrl.Contains("detail"))
-                {
-                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/detail\/(.*)\/.*");
-                    uuid = result.Groups[1].Value;
-                }
-                else
-                {
+				if (SystemUrl.Contains("#"))
+				{
+					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
+					string uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
-                    uuid = result.Groups[1].Value;
+                    string uuid = result.Groups[1].Value;
+                    return uuid;
                }
-
-                return uuid;
            }
        }

@@ -66,33 +57,24 @@ namespace PepperDash.Essentials.Core.Config
        /// Gets the TemplateUuid extracted from the TemplateUrl
        /// </summary>
 		[JsonProperty("templateUuid")]
-        public string TemplateUuid
+		public string TemplateUuid
        {
            get
            {
-                string uuid;
+				if (string.IsNullOrEmpty(TemplateUrl))
+					return "missing template url";

-                if (string.IsNullOrEmpty(TemplateUrl))
-                {
-                    uuid = "missing template url";
-                }
-                else if (TemplateUrl.Contains("#"))
-                {
-                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-                    uuid = result.Groups[1].Value;
-                }
-                else if (TemplateUrl.Contains("detail"))
-                {
-                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/detail\/(.*)\/system-template-versions\/detail\/(.*)\/.*");
-                    uuid = result.Groups[2].Value;
-                }
-                else
-                {
+				if (TemplateUrl.Contains("#"))
+				{
+					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
+					string uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
-                    uuid = result.Groups[2].Value;
+                    string uuid = result.Groups[2].Value;
+                    return uuid;
                }
-
-                return uuid;
            }
        }

@@ -115,7 +97,7 @@ namespace PepperDash.Essentials.Core.Config
        {
            Rooms = new List<DeviceConfig>();
        }
-    }
+	}

    /// <summary>
    /// Represents version data for Essentials and its packages
@@ -165,7 +147,7 @@ namespace PepperDash.Essentials.Core.Config
    /// Represents a SystemTemplateConfigs
    /// </summary>
    public class SystemTemplateConfigs
-    {
+	{
        /// <summary>
        /// Gets or sets the System
        /// </summary>
@@ -175,5 +157,5 @@ namespace PepperDash.Essentials.Core.Config
        /// Gets or sets the Template
        /// </summary>
 		public EssentialsConfig Template { get; set; }
-    }
+	}
 }
--- a/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
@@ -98,7 +98,7 @@ namespace PepperDash.Essentials.Core.Routing
        /// <param name="inputPort">The currently selected input port on the destination device.</param>
        private void UpdateDestination(IRoutingSinkWithSwitching destination, RoutingInputPort inputPort)
        {            
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this, destination?.Key, inputPort?.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this,destination?.Key, inputPort?.Key);

            if(inputPort == null)
            {
--- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs
+++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs
@@ -6,9 +6,9 @@ using PepperDash.Core.Web.RequestHandlers;

 namespace PepperDash.Essentials.Core.Web.RequestHandlers
 {
-	/// <summary>
-	/// Represents a SetDeviceStreamDebugRequestHandler
-	/// </summary>
+ /// <summary>
+ /// Represents a SetDeviceStreamDebugRequestHandler
+ /// </summary>
 	public class SetDeviceStreamDebugRequestHandler : WebApiBaseRequestHandler
 	{
 		/// <summary>
@@ -122,23 +122,23 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
 				return;
 			}

-			if (!(DeviceManager.GetDeviceForKey(body.DeviceKey) is IStreamDebugging device))
-			{
-				context.Response.StatusCode = 404;
-				context.Response.StatusDescription = "Not Found";
-				context.Response.End();
+            if (!(DeviceManager.GetDeviceForKey(body.DeviceKey) is IStreamDebugging device))
+            {
+                context.Response.StatusCode = 404;
+                context.Response.StatusDescription = "Not Found";
+                context.Response.End();

-				return;
-			}
+                return;
+            }

-			eStreamDebuggingSetting debugSetting;
+            eStreamDebuggingSetting debugSetting;
 			try
 			{
-				debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), body.Setting, true);
+				debugSetting = (eStreamDebuggingSetting) Enum.Parse(typeof (eStreamDebuggingSetting), body.Setting, true);				
 			}
 			catch (Exception ex)
 			{
-				Debug.LogMessage(ex, "Exception handling set debug request");
+                Debug.LogMessage(ex, "Exception handling set debug request");
 				context.Response.StatusCode = 500;
 				context.Response.StatusDescription = "Internal Server Error";
 				context.Response.End();
@@ -164,7 +164,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
 			}
 			catch (Exception ex)
 			{
-				Debug.LogMessage(ex, "Exception handling set debug request");
+                Debug.LogMessage(ex, "Exception handling set debug request");
 				context.Response.StatusCode = 500;
 				context.Response.StatusDescription = "Internal Server Error";
 				context.Response.End();
@@ -198,21 +198,21 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
 	public class SetDeviceStreamDebugConfig
 	{
 		[JsonProperty("deviceKey", NullValueHandling = NullValueHandling.Include)]
-		/// <summary>
-		/// Gets or sets the DeviceKey
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the DeviceKey
+  /// </summary>
 		public string DeviceKey { get; set; }

 		[JsonProperty("setting", NullValueHandling = NullValueHandling.Include)]
-		/// <summary>
-		/// Gets or sets the Setting
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the Setting
+  /// </summary>
 		public string Setting { get; set; }

 		[JsonProperty("timeout")]
-		/// <summary>
-		/// Gets or sets the Timeout
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the Timeout
+  /// </summary>
 		public int Timeout { get; set; }

 		public SetDeviceStreamDebugConfig()
--- a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
@@ -9,7 +9,7 @@ namespace PepperDash.Essentials.Devices.Common.Generic
    /// <summary>
    /// Represents a GenericSink
    /// </summary>
-    public class GenericSink : EssentialsDevice, IRoutingSinkWithSwitchingWithInputPort
+    public class GenericSink : EssentialsDevice, IRoutingSinkWithInputPort
    {
        /// <summary>
        /// Initializes a new instance of the GenericSink class
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Devices.Common.Generic
        {
            InputPorts = new RoutingPortCollection<RoutingInputPort>();

-            var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo | eRoutingSignalType.SecondaryAudio, eRoutingPortConnectionType.Hdmi, null, this);
+            var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);

            InputPorts.Add(inputPort);
        }
@@ -66,15 +66,6 @@ namespace PepperDash.Essentials.Devices.Common.Generic
        /// Event fired when the current source changes
        /// </summary>
        public event SourceInfoChangeHandler CurrentSourceChange;
-
-        /// <inheritdoc />
-        public event InputChangedEventHandler InputChanged;
-
-        /// <inheritdoc />
-        public void ExecuteSwitch(object inputSelector)
-        {
-            throw new System.NotImplementedException();
-        }
    }

    /// <summary>
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
@@ -31,12 +31,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// <remarks>
        /// Unsoliciited feedback from a device in a messenger will ONLY be sent to devices in this subscription list. When a client disconnects, it's ID will be removed from the collection.
        /// </remarks>
-        private readonly HashSet<string> subscriberIds = new HashSet<string>();
-
-        /// <summary>
-        /// Lock object for thread-safe access to SubscriberIds
-        /// </summary>
-        private readonly object _subscriberLock = new object();
+        protected HashSet<string> SubscriberIds = new HashSet<string>();

        private readonly List<string> _deviceInterfaces;

@@ -194,18 +189,18 @@ namespace PepperDash.Essentials.AppServer.Messengers
        {
            if (!enableMessengerSubscriptions)
            {
+                this.LogWarning("Messenger subscriptions not enabled");
                return;
            }

-            lock (_subscriberLock)
+            if (SubscriberIds.Any(id => id == clientId))
            {
-                if (!subscriberIds.Add(clientId))
-                {
-                    this.LogVerbose("Client {clientId} already subscribed", clientId);
-                    return;
-                }
+                this.LogVerbose("Client {clientId} already subscribed", clientId);
+                return;
            }

+            SubscriberIds.Add(clientId);
+
            this.LogDebug("Client {clientId} subscribed", clientId);
        }

@@ -217,26 +212,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
        {
            if (!enableMessengerSubscriptions)
            {
+                this.LogWarning("Messenger subscriptions not enabled");
                return;
            }

-            bool wasSubscribed;
-            lock (_subscriberLock)
-            {
-                wasSubscribed = subscriberIds.Contains(clientId);
-                if (wasSubscribed)
-                {
-                    subscriberIds.Remove(clientId);
-                }
-            }
-
-            if (!wasSubscribed)
+            if (!SubscriberIds.Any(i => i == clientId))
            {
                this.LogVerbose("Client with ID {clientId} is not subscribed", clientId);
                return;
            }

-            this.LogDebug("Client with ID {clientId} unsubscribed", clientId);
+            SubscriberIds.RemoveWhere((i) => i == clientId);
+
+            this.LogInformation("Client with ID {clientId} unsubscribed", clientId);
        }

        /// <summary>
@@ -270,8 +258,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            }
            catch (Exception ex)
            {
-                this.LogError("Exception posting status message for {messagePath} to {clientId}: {message}", MessagePath, clientId ?? "all clients", ex.Message);
-                this.LogDebug(ex, "Stack trace: ");
+                this.LogError(ex, "Exception posting status message for {messagePath} to {clientId}", MessagePath, clientId ?? "all clients");
            }
        }

@@ -300,8 +287,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            }
            catch (Exception ex)
            {
-                this.LogError("Exception posting status message for {type} to {clientId}: {message}", type, clientId ?? "all clients", ex.Message);
-                this.LogDebug(ex, "Stack trace: ");
+                this.LogError(ex, "Exception posting status message for {type} to {clientId}", type, clientId ?? "all clients");
            }
        }

@@ -326,14 +312,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                // If client is null or empty, this message is unsolicited feedback. Iterate through the subscriber list and send to all interested parties
                if (string.IsNullOrEmpty(clientId))
                {
-                    // Create a snapshot of subscribers to avoid collection modification during iteration
-                    List<string> subscriberSnapshot;
-                    lock (_subscriberLock)
-                    {
-                        subscriberSnapshot = new List<string>(subscriberIds);
-                    }
-
-                    foreach (var client in subscriberSnapshot)
+                    foreach (var client in SubscriberIds)
                    {
                        AppServerController?.SendMessageObject(new MobileControlMessage { Type = !string.IsNullOrEmpty(type) ? type : MessagePath, ClientId = client, Content = content });
                    }
--- a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
+++ b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
@@ -1312,11 +1312,6 @@ namespace PepperDash.Essentials
        /// <inheritdoc />
        public override void Initialize()
        {
-            if (!Config.EnableMessengerSubscriptions)
-            {
-                this.LogWarning("Messenger subscriptions disabled. add \"enableMessengerSubscriptions\": true to config for {key} to enable.", Key);
-            }
-
            foreach (var messenger in _messengers)
            {
                try
--- a/src/PepperDash.Essentials.MobileControl/Touchpanel/ThemeMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/ThemeMessenger.cs
@@ -40,7 +40,7 @@ namespace PepperDash.Essentials.Touchpanel
                this.LogInformation("Setting theme to {theme}", theme.Value);
                _tpDevice.UpdateTheme(theme.Value);

-                PostStatusMessage(JToken.FromObject(new { theme = theme.Value }), clientId: id);
+                PostStatusMessage(JToken.FromObject(new { theme = theme.Value }), id);
            });
        }
    }