fix: update Crestron.SimplSharp.SDK.ProgramLibrary version to 2.21.133

.gitignore

@@ -395,5 +395,3 @@ essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Pepp
 _site/
 api/
 *.DS_Store
-/._PepperDash.Essentials.4Series.sln
-dotnet

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.19.4-local</Version>
+    <Version>2.4.0-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/Directory.Build.targets

@@ -23,32 +23,23 @@
     <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz</FileName>
   </PropertyGroup>
 
-  <Target Name="DeleteCLZ" BeforeTargets="CoreBuild" Condition="$(ProjectType) == 'Library' And $(TargetDir) != ''">
+  <Target Name="DeleteCLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Library' And $(TargetDir) != '' And Exists($(FileName))">
-    <ItemGroup>
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).clz">
-      <OldCLZFiles Include="$(TargetDir)$(TargetName).*.$(TargetFramework).clz" />
-    </ItemGroup>
-    <Delete Files="@(OldCLZFiles)" Condition="@(OldCLZFiles) != ''">
       <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
     </Delete>
-    <Message Text="Deleted old CLZ files: '@(DeletedList)'" Condition="@(DeletedList) != ''" />
+    <Message Text="Deleted files: '@(DeletedList)'" />
   </Target>
-  <Target Name="DeleteCPZ" BeforeTargets="CoreBuild" Condition="$(ProjectType) == 'Program' And $(TargetDir) != ''">
+  <Target Name="DeleteCPZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Program' And $(TargetDir) != '' And Exists($(FileName))">
-    <ItemGroup>
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz">
-      <OldCPZFiles Include="$(TargetDir)$(TargetName).*.$(TargetFramework).cpz" />
-    </ItemGroup>
-    <Delete Files="@(OldCPZFiles)" Condition="@(OldCPZFiles) != ''">
       <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
     </Delete>
-    <Message Text="Deleted old CPZ files: '@(DeletedList)'" Condition="@(DeletedList) != ''" />
+    <Message Text="Deleted files: '@(DeletedList)'" />
   </Target>
-  <Target Name="DeleteCPLZ" BeforeTargets="CoreBuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
+  <Target Name="DeleteCPLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != '' And Exists($(FileName))">
-    <ItemGroup>
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz">
-      <OldCPLZFiles Include="$(TargetDir)$(TargetName).*.$(TargetFramework).cplz" />
-    </ItemGroup>
-    <Delete Files="@(OldCPLZFiles)" Condition="@(OldCPLZFiles) != ''">
       <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
     </Delete>
-    <Message Text="Deleted old CPLZ files: '@(DeletedList)'" Condition="@(DeletedList) != ''" />
+    <Message Text="Deleted files: '@(DeletedList)'" />
   </Target>
   
   <Target Name="CreateCPLZ" AfterTargets="Build" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''" DependsOnTargets="DeleteCPLZ">

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));
-    }
-  }
-}

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,
+    }
 }

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using Crestron.SimplSharp;
@@ -12,12 +11,11 @@ using Renci.SshNet.Common;
 namespace PepperDash.Core
 {
     /// <summary>
-    /// SSH Client
+    /// 
     /// </summary>
     public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
     {
         private const string SPlusKey = "Uninitialized SshClient";
-
         /// <summary>
         /// Object to enable stream debugging
         /// </summary>
@@ -38,6 +36,11 @@ namespace PepperDash.Core
         /// </summary>
         public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
+        /// <summary>
+        ///// 
+        ///// </summary>
+        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+
         /// <summary>
         /// Gets or sets the Hostname
         /// </summary>
@@ -64,7 +67,7 @@ namespace PepperDash.Core
         public bool IsConnected
         {
             // returns false if no client or not connected
-            get { return client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+            get { return Client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
         }
 
         /// <summary>
@@ -80,26 +83,16 @@ namespace PepperDash.Core
         /// </summary>
         public SocketStatus ClientStatus
         {
-            get { lock (_stateLock) { return _ClientStatus; } }
+            get { return _ClientStatus; }
             private set
             {
-                bool shouldFireEvent = false;
+                if (_ClientStatus == value)
-                lock (_stateLock)
+                    return;
-                {
+                _ClientStatus = value;
-                    if (_ClientStatus != value)
+                OnConnectionChange();
-                    {
-                        _ClientStatus = value;
-                        shouldFireEvent = true;
-                    }
-                }
-                // Fire event outside lock to avoid deadlock
-                if (shouldFireEvent)
-                    OnConnectionChange();
             }
         }
-
+        SocketStatus _ClientStatus;
-        private SocketStatus _ClientStatus;
-        private bool _ConnectEnabled;
 
         /// <summary>
         /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
@@ -107,7 +100,7 @@ namespace PepperDash.Core
         /// </summary>
         public ushort UStatus
         {
-            get { lock (_stateLock) { return (ushort)_ClientStatus; } }
+            get { return (ushort)_ClientStatus; }
         }
 
         /// <summary>
@@ -118,11 +111,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Will be set and unset by connect and disconnect only
         /// </summary>
-        public bool ConnectEnabled
+        public bool ConnectEnabled { get; private set; }
-        {
-            get { lock (_stateLock) { return _ConnectEnabled; } }
-            private set { lock (_stateLock) { _ConnectEnabled = value; } }
-        }
 
         /// <summary>
         /// S+ helper for AutoReconnect
@@ -138,25 +127,17 @@ namespace PepperDash.Core
         /// </summary>
         public int AutoReconnectIntervalMs { get; set; }
 
-        private SshClient client;
+        SshClient Client;
 
-        private ShellStream shellStream;
+        ShellStream TheStream;
 
-        private readonly Timer reconnectTimer;
+        CTimer ReconnectTimer;
 
         //Lock object to prevent simulatneous connect/disconnect operations
         //private CCriticalSection connectLock = new CCriticalSection();
-        private readonly SemaphoreSlim connectLock = new SemaphoreSlim(1);
+        private SemaphoreSlim connectLock = new SemaphoreSlim(1);
 
-        // Thread-safety lock for state changes
+        private bool DisconnectLogged = false;
-        private readonly object _stateLock = new object();
-
-        private bool disconnectLogged = false;
-
-        /// <summary>
-        /// When true, turns off echo for the SSH session
-        /// </summary>
-        public bool DisableEcho { get; set; }
 
         /// <summary>
         /// Typical constructor.
@@ -173,13 +154,13 @@ namespace PepperDash.Core
             Password = password;
             AutoReconnectIntervalMs = 5000;
 
-            reconnectTimer = new Timer(o =>
+            ReconnectTimer = new CTimer(o =>
                 {
-                    if (ConnectEnabled) // Now thread-safe property access
+                    if (ConnectEnabled)
                     {
                         Connect();
                     }
-                }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
+                }, System.Threading.Timeout.Infinite);
         }
 
         /// <summary>
@@ -191,23 +172,23 @@ namespace PepperDash.Core
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             AutoReconnectIntervalMs = 5000;
 
-            reconnectTimer = new Timer(o =>
+            ReconnectTimer = new CTimer(o =>
             {
-                if (ConnectEnabled) // Now thread-safe property access
+                if (ConnectEnabled)
                 {
                     Connect();
                 }
-            }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
+            }, System.Threading.Timeout.Infinite);
         }
 
         /// <summary>
         /// Handles closing this up when the program shuts down
         /// </summary>
-        private void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                if (client != null)
+                if (Client != null)
                 {
                     this.LogDebug("Program stopping. Closing connection");
                     Disconnect();
@@ -242,10 +223,10 @@ namespace PepperDash.Core
                     this.LogDebug("Attempting connect");
 
                     // Cancel reconnect if running.
-                    StopReconnectTimer();
+                    ReconnectTimer?.Stop();
 
                     // Cleanup the old client if it already exists
-                    if (client != null)
+                    if (Client != null)
                     {
                         this.LogDebug("Cleaning up disconnected client");
                         KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
@@ -258,36 +239,29 @@ namespace PepperDash.Core
 
                     this.LogDebug("Creating new SshClient");
                     ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-                    client = new SshClient(connectionInfo);
+                    Client = new SshClient(connectionInfo);
-                    client.ErrorOccurred += Client_ErrorOccurred;
+                    Client.ErrorOccurred += Client_ErrorOccurred;
 
                     //Attempt to connect
                     ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
                     try
                     {
-                        client.Connect();
+                        Client.Connect();
-
+                        TheStream = Client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534);
-                        var modes = new Dictionary<TerminalModes, uint>();
+                        if (TheStream.DataAvailable)
-
-                        if (DisableEcho)
-                        {
-                            modes.Add(TerminalModes.ECHO, 0);
-                        }
-
-                        shellStream = client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534, modes);
-                        if (shellStream.DataAvailable)
                         {
                             // empty the buffer if there is data
-                            shellStream.Read();
+                            string str = TheStream.Read();
                         }
-                        shellStream.DataReceived += Stream_DataReceived;
+                        TheStream.DataReceived += Stream_DataReceived;
                         this.LogInformation("Connected");
                         ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
-                        disconnectLogged = false;
+                        DisconnectLogged = false;
                     }
                     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)
                         {
@@ -312,36 +286,37 @@ namespace PepperDash.Core
                             this.LogVerbose(ie, "Exception details: ");
                         }
 
-                        disconnectLogged = true;
+                        DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            StartReconnectTimer();
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
                     catch (SshOperationTimeoutException ex)
                     {
                         this.LogWarning("Connection attempt timed out: {message}", ex.Message);
 
-                        disconnectLogged = true;
+                        DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            StartReconnectTimer();
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
                     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;
+                        DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            StartReconnectTimer();
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
                 }
@@ -359,7 +334,11 @@ namespace PepperDash.Core
         {
             ConnectEnabled = false;
             // Stop trying reconnects, if we are
-            StopReconnectTimer();
+            if (ReconnectTimer != null)
+            {
+                ReconnectTimer.Stop();
+                // ReconnectTimer = null;
+            }
 
             KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
         }
@@ -373,12 +352,12 @@ namespace PepperDash.Core
 
             try
             {
-                if (client != null)
+                if (Client != null)
                 {
-                    client.ErrorOccurred -= Client_ErrorOccurred;
+                    Client.ErrorOccurred -= Client_ErrorOccurred;
-                    client.Disconnect();
+                    Client.Disconnect();
-                    client.Dispose();
+                    Client.Dispose();
-                    client = null;
+                    Client = null;
                     ClientStatus = status;
                     this.LogDebug("Disconnected");
                 }
@@ -392,16 +371,16 @@ namespace PepperDash.Core
         /// <summary>
         /// Kills the stream
         /// </summary>
-        private void KillStream()
+		void KillStream()
         {
             try
             {
-                if (shellStream != null)
+                if (TheStream != null)
                 {
-                    shellStream.DataReceived -= Stream_DataReceived;
+                    TheStream.DataReceived -= Stream_DataReceived;
-                    shellStream.Close();
+                    TheStream.Close();
-                    shellStream.Dispose();
+                    TheStream.Dispose();
-                    shellStream = null;
+                    TheStream = null;
                     this.LogDebug("Disconnected stream");
                 }
             }
@@ -414,7 +393,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Handles the keyboard interactive authentication, should it be required.
         /// </summary>
-        private void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
+        void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
         {
             foreach (AuthenticationPrompt prompt in e.Prompts)
                 if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
@@ -424,7 +403,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Handler for data receive on ShellStream.  Passes data across to queue for line parsing.
         /// </summary>
-        private void Stream_DataReceived(object sender, ShellDataEventArgs e)
+        void Stream_DataReceived(object sender, ShellDataEventArgs e)
         {
             if (((ShellStream)sender).Length <= 0L)
             {
@@ -437,14 +416,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));
             }
@@ -456,7 +439,7 @@ namespace PepperDash.Core
         /// Error event handler for client events - disconnect, etc.  Will forward those events via ConnectionChange
         /// event
         /// </summary>
-        private void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
+        void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
         {
             CrestronInvoke.BeginInvoke(o =>
             {
@@ -476,7 +459,7 @@ namespace PepperDash.Core
                 if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                    StartReconnectTimer();
+                    ReconnectTimer.Reset(AutoReconnectIntervalMs);
                 }
             });
         }
@@ -484,7 +467,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Helper for ConnectionChange event
         /// </summary>
-        private void OnConnectionChange()
+        void OnConnectionChange()
         {
             ConnectionChange?.Invoke(this, new GenericSocketStatusChageEventArgs(this));
         }
@@ -499,12 +482,16 @@ namespace PepperDash.Core
         {
             try
             {
-                if (client != null && shellStream != null && IsConnected)
+                if (Client != null && TheStream != null && IsConnected)
                 {
-                    this.PrintSentText(text);
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                        this.LogInformation(
+                                      "Sending {length} characters of text: '{text}'",
+                                      text.Length,
+                                      ComTextHelper.GetDebugText(text));
 
-                    shellStream.Write(text);
+                    TheStream.Write(text);
-                    shellStream.Flush();
+                    TheStream.Flush();
                 }
                 else
                 {
@@ -516,7 +503,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                ReconnectTimer.Reset();
             }
             catch (Exception ex)
             {
@@ -532,12 +519,13 @@ namespace PepperDash.Core
         {
             try
             {
-                if (client != null && shellStream != null && IsConnected)
+                if (Client != null && TheStream != 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);
+                    TheStream.Write(bytes, 0, bytes.Length);
-                    shellStream.Flush();
+                    TheStream.Flush();
                 }
                 else
                 {
@@ -549,7 +537,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                ReconnectTimer.Reset();
             }
             catch (Exception ex)
             {
@@ -558,83 +546,6 @@ namespace PepperDash.Core
         }
         #endregion
 
-        /// <summary>
-        /// Safely starts the reconnect timer with exception handling
-        /// </summary>
-        private void StartReconnectTimer()
-        {
-            try
-            {
-                reconnectTimer?.Change(AutoReconnectIntervalMs, System.Threading.Timeout.Infinite);
-            }
-            catch (ObjectDisposedException)
-            {
-                // Timer was disposed, ignore
-                this.LogDebug("Attempted to start timer but it was already disposed");
-            }
-        }
-
-        /// <summary>
-        /// Safely stops the reconnect timer with exception handling
-        /// </summary>
-        private void StopReconnectTimer()
-        {
-            try
-            {
-                reconnectTimer?.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
-            }
-            catch (ObjectDisposedException)
-            {
-                // Timer was disposed, ignore
-                this.LogDebug("Attempted to stop timer but it was already disposed");
-            }
-        }
-
-        /// <summary>
-        /// Deactivate method - properly dispose of resources
-        /// </summary>
-        public override bool Deactivate()
-        {
-            try
-            {
-                this.LogDebug("Deactivating SSH client - disposing resources");
-
-                // Stop trying reconnects
-                ConnectEnabled = false;
-                StopReconnectTimer();
-
-                // Disconnect and cleanup client
-                KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
-
-                // Dispose timer
-                try
-                {
-                    reconnectTimer?.Dispose();
-                }
-                catch (ObjectDisposedException)
-                {
-                    // Already disposed, ignore
-                }
-
-                // Dispose semaphore
-                try
-                {
-                    connectLock?.Dispose();
-                }
-                catch (ObjectDisposedException)
-                {
-                    // Already disposed, ignore
-                }
-
-                return base.Deactivate();
-            }
-            catch (Exception ex)
-            {
-                this.LogException(ex, "Error during SSH client deactivation");
-                return false;
-            }
-        }
-
     }
 
     //*****************************************************************************************************

src/PepperDash.Core/Comm/GenericTcpIpClient.cs

@@ -19,44 +19,44 @@ namespace PepperDash.Core
         /// </summary>
         public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
-        /// <summary>
+		/// <summary>
-        /// Fires when data is received from the server and returns it as a Byte array
+		/// Fires when data is received from the server and returns it as a Byte array
-        /// </summary>
+		/// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
 
-        /// <summary>
+		/// <summary>
-        /// Fires when data is received from the server and returns it as text
+		/// Fires when data is received from the server and returns it as text
-        /// </summary>
+		/// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
-        /// <summary>
+		/// <summary>
-        /// 
+		/// 
-        /// </summary>
+		/// </summary>
-        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+		//public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
-        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+		public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
 
-        private string _hostname;
+		private string _hostname;
 
         /// <summary>
         /// Address of server
         /// </summary>
         public string Hostname
         {
-            get
+			get
-            {
+			{
-                return _hostname;
+				return _hostname;
-            }
+			}
 
-            set
+			set
-            {
+			{
-                _hostname = value;
+			 _hostname = value;
-                if (_client != null)
+				if (_client != null)
-                {
+				{
-                    _client.AddressClientConnectedTo = _hostname;
+					_client.AddressClientConnectedTo = _hostname;
-                }
+				}
-            }
+			}
-        }
+		}
 
         /// <summary>
         /// Gets or sets the Port
@@ -78,19 +78,19 @@ namespace PepperDash.Core
         /// </summary>
         public int BufferSize { get; set; }
 
-        /// <summary>
+		/// <summary>
-        /// The actual client class
+		/// The actual client class
-        /// </summary>
+		/// </summary>
-        private TCPClient _client;
+		private TCPClient _client;
 
-        /// <summary>
+		/// <summary>
-        /// Bool showing if socket is connected
+		/// Bool showing if socket is connected
-        /// </summary>
+		/// </summary>
-        public bool IsConnected
+		public bool IsConnected 
-        {
+        { 
-            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
         }
-
+        
         /// <summary>
         /// S+ helper for IsConnected
         /// </summary>
@@ -99,15 +99,15 @@ namespace PepperDash.Core
             get { return (ushort)(IsConnected ? 1 : 0); }
         }
 
-        /// <summary>
+		/// <summary>
-        /// _client socket status Read only
+		/// _client socket status Read only
-        /// </summary>
+		/// </summary>
-        public SocketStatus ClientStatus
+		public SocketStatus ClientStatus 
-        {
+        { 
-            get
+            get 
             {
-                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus;
+                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus; 
-            }
+            } 
         }
 
         /// <summary>
@@ -119,26 +119,26 @@ namespace PepperDash.Core
             get { return (ushort)ClientStatus; }
         }
 
-        /// <summary>
+		/// <summary>
         /// Status text shows the message associated with socket status
-        /// </summary>
+		/// </summary>
-        public string ClientStatusText { get { return ClientStatus.ToString(); } }
+		public string ClientStatusText { get { return ClientStatus.ToString(); } }
 
-        /// <summary>
+		/// <summary>
-        /// Ushort representation of client status
+		/// Ushort representation of client status
-        /// </summary>
+		/// </summary>
         [Obsolete]
-        public ushort UClientStatus { get { return (ushort)ClientStatus; } }
+		public ushort UClientStatus { get { return (ushort)ClientStatus; } }
 
-        /// <summary>
+		/// <summary>
-        /// Connection failure reason
+		/// Connection failure reason
-        /// </summary>
+		/// </summary>
-        public string ConnectionFailure { get { return ClientStatus.ToString(); } }
+		public string ConnectionFailure { get { return ClientStatus.ToString(); } }
 
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the AutoReconnect
+  /// Gets or sets the AutoReconnect
-        /// </summary>
+  /// </summary>
-        public bool AutoReconnect { get; set; }
+		public bool AutoReconnect { get; set; }
 
         /// <summary>
         /// S+ helper for AutoReconnect
@@ -149,29 +149,29 @@ namespace PepperDash.Core
             set { AutoReconnect = value == 1; }
         }
 
-        /// <summary>
+		/// <summary>
-        /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
-        /// </summary>
+		/// </summary>
-        public int AutoReconnectIntervalMs { get; set; }
+		public int AutoReconnectIntervalMs { get; set; }
 
-        /// <summary>
+		/// <summary>
-        /// Set only when the disconnect method is called
+		/// Set only when the disconnect method is called
-        /// </summary>
+		/// </summary>
-        bool DisconnectCalledByUser;
+		bool DisconnectCalledByUser;
 
-        /// <summary>
+		/// <summary>
-        /// 
+		/// 
-        /// </summary>
+		/// </summary>
-        public bool Connected
+		public bool Connected
-        {
+		{
-            get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+			get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
-        }
+		}
 
         //Lock object to prevent simulatneous connect/disconnect operations
         private CCriticalSection connectLock = new CCriticalSection();
 
         // private Timer for auto reconnect
-        private CTimer RetryTimer;
+		private CTimer RetryTimer;
 
         /// <summary>
         /// Constructor
@@ -181,8 +181,8 @@ namespace PepperDash.Core
         /// <param name="port"></param>
         /// <param name="bufferSize"></param>
 		public GenericTcpIpClient(string key, string address, int port, int bufferSize)
-            : base(key)
+			: base(key)
-        {
+		{
             StreamDebugging = new CommunicationStreamDebugging(key);
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             AutoReconnectIntervalMs = 5000;
@@ -218,18 +218,18 @@ namespace PepperDash.Core
         /// Default constructor for S+
         /// </summary>
         public GenericTcpIpClient()
-            : base(SplusKey)
+			: base(SplusKey)
         {
             StreamDebugging = new CommunicationStreamDebugging(SplusKey);
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-            AutoReconnectIntervalMs = 5000;
+			AutoReconnectIntervalMs = 5000;
             BufferSize = 2000;
 
             RetryTimer = new CTimer(o =>
             {
                 Reconnect();
             }, Timeout.Infinite);
-        }
+		}
 
         /// <summary>
         /// Initialize method
@@ -255,26 +255,26 @@ namespace PepperDash.Core
         /// 
         /// </summary>
         /// <returns></returns>
-        /// <summary>
+  /// <summary>
-        /// Deactivate method
+  /// Deactivate method
-        /// </summary>
+  /// </summary>
-        public override bool Deactivate()
+		public override bool Deactivate()
-        {
+		{
             RetryTimer.Stop();
             RetryTimer.Dispose();
             if (_client != null)
             {
-                _client.SocketStatusChange -= this.Client_SocketStatusChange;
+             _client.SocketStatusChange -= this.Client_SocketStatusChange;
                 DisconnectClient();
             }
-            return true;
+			return true;
-        }
+		}
 
-        /// <summary>
+  /// <summary>
-        /// Connect method
+  /// Connect method
-        /// </summary>
+  /// </summary>
-        public void Connect()
+		public void Connect()
-        {
+		{
             if (string.IsNullOrEmpty(Hostname))
             {
                 Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", Key);
@@ -310,7 +310,7 @@ namespace PepperDash.Core
             {
                 connectLock.Leave();
             }
-        }
+		}
 
         private void Reconnect()
         {
@@ -337,11 +337,11 @@ namespace PepperDash.Core
             }
         }
 
-        /// <summary>
+  /// <summary>
-        /// Disconnect method
+  /// Disconnect method
-        /// </summary>
+  /// </summary>
-        public void Disconnect()
+		public void Disconnect()
-        {
+		{
             try
             {
                 connectLock.Enter();
@@ -355,7 +355,7 @@ namespace PepperDash.Core
             {
                 connectLock.Leave();
             }
-        }
+		}
 
         /// <summary>
         /// DisconnectClient method
@@ -375,7 +375,7 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="c"></param>
 		void ConnectToServerCallback(TCPClient c)
-        {
+		{
             if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
             {
                 Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
@@ -385,13 +385,13 @@ namespace PepperDash.Core
             {
                 Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
             }
-        }
+		}
 
         /// <summary>
         /// Disconnects, waits and attemtps to connect again
         /// </summary>
 		void WaitAndTryReconnect()
-        {
+		{
             CrestronInvoke.BeginInvoke(o =>
             {
                 try
@@ -409,7 +409,7 @@ namespace PepperDash.Core
                     connectLock.Leave();
                 }
             });
-        }
+		}
 
         /// <summary>
         /// Recieves incoming data
@@ -417,7 +417,7 @@ namespace PepperDash.Core
         /// <param name="client"></param>
         /// <param name="numBytes"></param>
 		void Receive(TCPClient client, int numBytes)
-        {
+		{
             if (client != null)
             {
                 if (numBytes > 0)
@@ -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,53 +437,58 @@ 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));
-                    }
+                    }                    
                 }
                 client.ReceiveDataAsync(Receive);
             }
-        }
+		}
 
-        /// <summary>
+  /// <summary>
-        /// SendText method
+  /// SendText method
-        /// </summary>
+  /// </summary>
-        public void SendText(string text)
+		public void SendText(string text)
-        {
+		{
-            var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
-            // Check debug level before processing byte array
+			// 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);
+			    _client.SendData(bytes, bytes.Length);
-        }
+		}
 
-        /// <summary>
+  /// <summary>
-        /// SendEscapedText method
+  /// SendEscapedText method
-        /// </summary>
+  /// </summary>
-        public void SendEscapedText(string text)
+		public void SendEscapedText(string text)
-        {
+		{
-            var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
+			var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
-                {
+				{
-                    var hex = s.Groups[1].Value;
+					var hex = s.Groups[1].Value;
-                    return ((char)Convert.ToByte(hex, 16)).ToString();
+					return ((char)Convert.ToByte(hex, 16)).ToString();
-                });
+				});
-            SendText(unescapedText);
+			SendText(unescapedText);
-        }
+		}
 
         /// <summary>
         /// Sends Bytes to the server
         /// </summary>
         /// <param name="bytes"></param>
-        /// <summary>
+  /// <summary>
-        /// SendBytes method
+  /// SendBytes method
-        /// </summary>
+  /// </summary>
-        public void SendBytes(byte[] bytes)
+		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);
+			    _client.SendData(bytes, bytes.Length);
-        }
+		}
 
         /// <summary>
         /// Socket Status Change Handler
@@ -488,7 +496,7 @@ namespace PepperDash.Core
         /// <param name="client"></param>
         /// <param name="clientSocketStatus"></param>
 		void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
-        {
+		{
             if (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
             {
                 Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
@@ -497,73 +505,68 @@ namespace PepperDash.Core
             else
             {
                 Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-                _client.ReceiveDataAsync(Receive);
+			    _client.ReceiveDataAsync(Receive);
             }
 
-            var handler = ConnectionChange;
+			var handler = ConnectionChange;
-            if (handler != null)
+			if (handler != null)
-                ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
+				ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
-        }
+		}
-    }
+	}
 
-    /// <summary>
+ /// <summary>
-    /// Represents a TcpSshPropertiesConfig
+ /// Represents a TcpSshPropertiesConfig
-    /// </summary>
+ /// </summary>
-    public class TcpSshPropertiesConfig
+	public class TcpSshPropertiesConfig
-    {
+	{
         /// <summary>
         /// Address to connect to
         /// </summary>
 		[JsonProperty(Required = Required.Always)]
-        public string Address { get; set; }
+		public string Address { get; set; }
-
+		
         /// <summary>
         /// Port to connect to
         /// </summary>
-        [JsonProperty(Required = Required.Always)]
+		[JsonProperty(Required = Required.Always)]
-        public int Port { get; set; }
+		public int Port { get; set; }
-
+		
         /// <summary>
         /// Username credential
         /// </summary>
-        public string Username { get; set; }
+		public string Username { get; set; }
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the Password
+  /// Gets or sets the Password
-        /// </summary>
+  /// </summary>
-        public string Password { get; set; }
+		public string Password { get; set; }
 
-        /// <summary>
+		/// <summary>
-        /// Defaults to 32768
+		/// Defaults to 32768
-        /// </summary>
+		/// </summary>
-        public int BufferSize { get; set; }
+		public int BufferSize { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the AutoReconnect
+  /// Gets or sets the AutoReconnect
-        /// </summary>
+  /// </summary>
-        public bool AutoReconnect { get; set; }
+		public bool AutoReconnect { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the AutoReconnectIntervalMs
+  /// Gets or sets the AutoReconnectIntervalMs
-        /// </summary>
+  /// </summary>
-        public int AutoReconnectIntervalMs { get; set; }
+		public int AutoReconnectIntervalMs { get; set; }
-
-        /// <summary>
-        /// When true, turns off echo for the SSH session
-        /// </summary>
-        [JsonProperty("disableSshEcho")]
-        public bool DisableSshEcho { get; set; }
 
         /// <summary>
         /// Default constructor
         /// </summary>
 		public TcpSshPropertiesConfig()
-        {
+		{
-            BufferSize = 32768;
+			BufferSize = 32768;
-            AutoReconnect = true;
+			AutoReconnect = true;
-            AutoReconnectIntervalMs = 5000;
+			AutoReconnectIntervalMs = 5000;
             Username = "";
             Password = "";
-            DisableSshEcho = false;
+		}
-        }
+
-    }
+	}
+
 }

src/PepperDash.Core/Comm/GenericUdpServer.cs

@@ -124,21 +124,21 @@ namespace PepperDash.Core
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
         }
-
+       
         /// <summary>
         /// 
         /// </summary>
         /// <param name="key"></param>
         /// <param name="address"></param>
         /// <param name="port"></param>
-        /// <param name="bufferSize"></param>
+        /// <param name="buffefSize"></param>
-        public GenericUdpServer(string key, string address, int port, int bufferSize)
+        public GenericUdpServer(string key, string address, int port, int buffefSize)
             : base(key)
         {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+            StreamDebugging = new CommunicationStreamDebugging(key); 
             Hostname = address;
             Port = port;
-            BufferSize = bufferSize;
+            BufferSize = buffefSize;
 
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
@@ -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");
@@ -194,21 +194,7 @@ namespace PepperDash.Core
         {
             if (Server == null)
             {
-                try
+                Server = new UDPServer();
-                {
-                    var address = IPAddress.Parse(Hostname);
-
-                    Server = new UDPServer(address, Port, BufferSize);
-
-                }
-                catch (Exception ex)
-                {
-                    this.LogError("Error parsing IP Address '{ipAddress}': message: {message}", Hostname, ex.Message);
-                    this.LogInformation("Creating UDPServer with default buffersize");
-
-                    Server = new UDPServer();
-                }
-
             }
 
             if (string.IsNullOrEmpty(Hostname))
@@ -243,7 +229,7 @@ namespace PepperDash.Core
         /// </summary>
         public void Disconnect()
         {
-            if (Server != null)
+            if(Server != null)
                 Server.DisableUDPServer();
 
             IsConnected = false;
@@ -265,7 +251,7 @@ namespace PepperDash.Core
 
             try
             {
-                if (numBytes <= 0)
+                if (numBytes <= 0) 
                     return;
 
                 var sourceIp = Server.IPAddressLastMessageReceivedFrom;
@@ -281,13 +267,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 +304,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 +320,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 +329,11 @@ namespace PepperDash.Core
 
     }
 
-    /// <summary>
+ /// <summary>
-    /// Represents a GenericUdpReceiveTextExtraArgs
+ /// Represents a GenericUdpReceiveTextExtraArgs
-    /// </summary>
+ /// </summary>
-    public class GenericUdpReceiveTextExtraArgs : EventArgs
+	public class GenericUdpReceiveTextExtraArgs : EventArgs
-    {
+	{
         /// <summary>
         /// 
         /// </summary>
@@ -353,7 +345,7 @@ namespace PepperDash.Core
         /// <summary>
         /// 
         /// </summary>
-		public int Port { get; private set; }
+		public int	Port { get; private set; }
         /// <summary>
         /// 
         /// </summary>
@@ -367,18 +359,18 @@ namespace PepperDash.Core
         /// <param name="port"></param>
         /// <param name="bytes"></param>
 		public GenericUdpReceiveTextExtraArgs(string text, string ipAddress, int port, byte[] bytes)
-        {
+		{
-            Text = text;
+			Text = text;
-            IpAddress = ipAddress;
+			IpAddress = ipAddress;
-            Port = port;
+			Port = port;
-            Bytes = bytes;
+			Bytes = bytes;
-        }
+		}
 
-        /// <summary>
+		/// <summary>
-        /// Stupid S+ Constructor
+		/// Stupid S+ Constructor
-        /// </summary>
+		/// </summary>
-        public GenericUdpReceiveTextExtraArgs() { }
+		public GenericUdpReceiveTextExtraArgs() { }
-    }
+	}
 
     /// <summary>
     /// 

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)}'");
-    }
-  }
-}

src/PepperDash.Core/Comm/eControlMethods.cs

@@ -74,14 +74,6 @@ namespace PepperDash.Core
         /// <summary>
         /// Secure TCP/IP
         /// </summary>
-        SecureTcpIp,
+        SecureTcpIp
-        /// <summary>
-        /// Used when comms needs to be handled in SIMPL and bridged opposite the normal direction
-        /// </summary>
-        ComBridge,
-        /// <summary>
-        /// InfinetEX control
-        /// </summary>
-        InfinetEx
     }
 }

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
-  }
-}

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
-  }
-}

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>
+	/// <summary>
-    /// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
-    /// GenericTcpIpClient
+	/// GenericTcpIpClient
-    /// </summary>
+	/// </summary>
-    public interface ISocketStatus : IBasicCommunication
+	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>
-    /// 
+	/// 
-    /// </summary>
+	/// </summary>
-    public enum eGenericCommMethodStatusChangeType
+	public enum eGenericCommMethodStatusChangeType
-    {
+	{
         /// <summary>
         /// Connected
         /// </summary>
@@ -130,45 +133,45 @@ namespace PepperDash.Core
         /// Disconnected
         /// </summary>
         Disconnected
-    }
+	}
 
-    /// <summary>
+	/// <summary>
-    /// This delegate defines handler for IBasicCommunication status changes
+	/// This delegate defines handler for IBasicCommunication status changes
-    /// </summary>
+	/// </summary>
-    /// <param name="comm">Device firing the status change</param>
+	/// <param name="comm">Device firing the status change</param>
-    /// <param name="status"></param>
+	/// <param name="status"></param>
-    public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
+	public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
 
-    /// <summary>
+	/// <summary>
-    /// 
+	/// 
-    /// </summary>
+	/// </summary>
-    public class GenericCommMethodReceiveBytesArgs : EventArgs
+	public class GenericCommMethodReceiveBytesArgs : EventArgs
-    {
+	{
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the Bytes
+  /// Gets or sets the Bytes
-        /// </summary>
+  /// </summary>
-        public byte[] Bytes { get; private set; }
+		public byte[] Bytes { get; private set; }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="bytes"></param>
 		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
-        {
+		{
-            Bytes = bytes;
+			Bytes = bytes;
-        }
+		}
 
-        /// <summary>
+		/// <summary>
-        /// S+ Constructor
+		/// S+ Constructor
-        /// </summary>
+		/// </summary>
-        public GenericCommMethodReceiveBytesArgs() { }
+		public GenericCommMethodReceiveBytesArgs() { }
-    }
+	}
 
-    /// <summary>
+	/// <summary>
-    /// 
+	/// 
-    /// </summary>
+	/// </summary>
-    public class GenericCommMethodReceiveTextArgs : EventArgs
+	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));
+        }
+	}
 }

src/PepperDash.Core/Config/PortalConfigReader.cs

@@ -9,59 +9,40 @@ using Serilog.Events;
 
 namespace PepperDash.Core.Config
 {
-
-
     /// <summary>
     /// Reads a Portal formatted config file
     /// </summary>
 	public class PortalConfigReader
 	{
-        const string template = "template";
+		/// <summary>
-        const string system = "system";
+		/// Reads the config file, checks if it needs a merge, merges and saves, then returns the merged Object.
-		const string systemUrl = "system_url";
+		/// </summary>
-        const string templateUrl = "template_url";
+		/// <returns>JObject of config file</returns>
-		const string info = "info";
+		public static void ReadAndMergeFileIfNecessary(string filePath, string savePath)
-        const string devices = "devices";
-        const string rooms = "rooms";
-        const string sourceLists = "sourceLists";
-        const string destinationLists = "destinationLists";
-        const string cameraLists = "cameraLists";
-        const string audioControlPointLists = "audioControlPointLists";
-
-		const string tieLines = "tieLines";
-        const string joinMaps = "joinMaps";
-		const string global = "global";
-
-
-        /// <summary>
-        /// Reads the config file, checks if it needs a merge, merges and saves, then returns the merged Object.
-        /// </summary>
-        /// <returns>JObject of config file</returns>
-        public static void ReadAndMergeFileIfNecessary(string filePath, string savePath)
 		{
 			try
 			{
 				if (!File.Exists(filePath))
 				{
-					Debug.LogError(
+					Debug.Console(1, Debug.ErrorLogLevel.Error,
 						"ERROR: Configuration file not present. Please load file to {0} and reset program", filePath);
 				}
 
 				using (StreamReader fs = new StreamReader(filePath))
 				{
 					var jsonObj = JObject.Parse(fs.ReadToEnd());
-					if(jsonObj[template] != null && jsonObj[system] != null)
+					if(jsonObj["template"] != null && jsonObj["system"] != null)
 					{
 						// it's a double-config, merge it.
 						var merged = MergeConfigs(jsonObj);
-						if (jsonObj[systemUrl] != null)
+						if (jsonObj["system_url"] != null)
 						{
-							merged[systemUrl] = jsonObj[systemUrl].Value<string>();
+							merged["systemUrl"] = jsonObj["system_url"].Value<string>();
 						}
 
-						if (jsonObj[templateUrl] != null)
+						if (jsonObj["template_url"] != null)
 						{
-							merged[templateUrl] = jsonObj[templateUrl].Value<string>();
+							merged["templateUrl"] = jsonObj["template_url"].Value<string>();
 						}
 
 						jsonObj = merged;
@@ -96,62 +77,62 @@ namespace PepperDash.Core.Config
 			var merged = new JObject();
 
 			// Put together top-level objects
-			if (system[info] != null)
+			if (system["info"] != null)
-				merged.Add(info, Merge(template[info], system[info], info));
+				merged.Add("info", Merge(template["info"], system["info"], "infO"));
 			else
-				merged.Add(info, template[info]);
+				merged.Add("info", template["info"]);
 
-			merged.Add(devices, MergeArraysOnTopLevelProperty(template[devices] as JArray,
+			merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray,
-				system[devices] as JArray, "key", devices));
+				system["devices"] as JArray, "key", "devices"));
 
-			if (system[rooms] == null)
+			if (system["rooms"] == null)
-				merged.Add(rooms, template[rooms]);
+				merged.Add("rooms", template["rooms"]);
 			else
-				merged.Add(rooms, MergeArraysOnTopLevelProperty(template[rooms] as JArray,
+				merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray,
-					system[rooms] as JArray, "key", rooms));
+					system["rooms"] as JArray, "key", "rooms"));
 
-			if (system[sourceLists] == null)
+			if (system["sourceLists"] == null)
-				merged.Add(sourceLists, template[sourceLists]);
+				merged.Add("sourceLists", template["sourceLists"]);
 			else
-				merged.Add(sourceLists, Merge(template[sourceLists], system[sourceLists], sourceLists));
+				merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists"));
 
-		    if (system[destinationLists] == null)
+		    if (system["destinationLists"] == null)
-		        merged.Add(destinationLists, template[destinationLists]);
+		        merged.Add("destinationLists", template["destinationLists"]);
 		    else
-		        merged.Add(destinationLists,
+		        merged.Add("destinationLists",
-		            Merge(template[destinationLists], system[destinationLists], destinationLists));
+		            Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
 
 
-            if (system[cameraLists] == null)
+            if (system["cameraLists"] == null)
-                merged.Add(cameraLists, template[cameraLists]);
+                merged.Add("cameraLists", template["cameraLists"]);
             else
-                merged.Add(cameraLists, Merge(template[cameraLists], system[cameraLists], cameraLists));
+                merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists"));
 
-            if (system[audioControlPointLists] == null)
+            if (system["audioControlPointLists"] == null)
-                merged.Add(audioControlPointLists, template[audioControlPointLists]);
+                merged.Add("audioControlPointLists", template["audioControlPointLists"]);
             else
-                merged.Add(audioControlPointLists,
+                merged.Add("audioControlPointLists",
-                    Merge(template[audioControlPointLists], system[audioControlPointLists], audioControlPointLists));
+                    Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
 
 
             // Template tie lines take precedence.  Config tool doesn't do them at system
             // level anyway...
-            if (template[tieLines] != null)
+            if (template["tieLines"] != null)
-				merged.Add(tieLines, template[tieLines]);
+				merged.Add("tieLines", template["tieLines"]);
-			else if (system[tieLines] != null)
+			else if (system["tieLines"] != null)
-				merged.Add(tieLines, system[tieLines]);
+				merged.Add("tieLines", system["tieLines"]);
 			else
-				merged.Add(tieLines, new JArray());
+				merged.Add("tieLines", new JArray());
 
-            if (template[joinMaps] != null)
+            if (template["joinMaps"] != null)
-                merged.Add(joinMaps, template[joinMaps]);
+                merged.Add("joinMaps", template["joinMaps"]);
             else
-                merged.Add(joinMaps, new JObject());
+                merged.Add("joinMaps", new JObject());
 
-			if (system[global] != null)
+			if (system["global"] != null)
-				merged.Add(global, Merge(template[global], system[global], global));
+				merged.Add("global", Merge(template["global"], system["global"], "global"));
 			else
-				merged.Add(global, template[global]);
+				merged.Add("global", template["global"]);
 
 			//Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
 			return merged;
@@ -247,7 +228,7 @@ namespace PepperDash.Core.Config
 					}
 					catch (Exception e)
 					{
-						Debug.LogError($"Cannot merge items at path {propPath}: \r{e}");
+						Debug.Console(1, Debug.ErrorLogLevel.Warning, "Cannot merge items at path {0}: \r{1}", propPath, e);
 					}
 				}
 			}

src/PepperDash.Core/Logging/Debug.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
@@ -20,6 +19,7 @@ using Serilog.Templates;
 namespace PepperDash.Core
 {
     /// <summary>
+    /// Contains debug commands for use in various situations
     /// </summary>
     public static class Debug
     {
@@ -40,20 +40,20 @@ namespace PepperDash.Core
 
         private static ILogger _logger;
 
-        private static readonly LoggingLevelSwitch _consoleLogLevelSwitch;
+        private static readonly LoggingLevelSwitch _consoleLoggingLevelSwitch;
 
-        private static readonly LoggingLevelSwitch _websocketLogLevelSwitch;
+        private static readonly LoggingLevelSwitch _websocketLoggingLevelSwitch;
 
         private static readonly LoggingLevelSwitch _errorLogLevelSwitch;
 
-        private static readonly LoggingLevelSwitch _fileLogLevelSwitch;
+        private static readonly LoggingLevelSwitch _fileLevelSwitch;
 
         /// <summary>
         /// Gets the minimum log level for the websocket sink.
         /// </summary>
         public static LogEventLevel WebsocketMinimumLogLevel
         {
-            get { return _websocketLogLevelSwitch.MinimumLevel; }
+            get { return _websocketLoggingLevelSwitch.MinimumLevel; }
         }
 
         private static readonly DebugWebsocketSink _websocketSink;
@@ -138,13 +138,13 @@ namespace PepperDash.Core
 
             var defaultFileLogLevel = GetStoredLogEventLevel(FileLevelStoreKey);
 
-            _consoleLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
+            _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
 
-            _websocketLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
+            _websocketLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
 
             _errorLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultErrorLogLevel);
 
-            _fileLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultFileLogLevel);
+            _fileLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultFileLogLevel);
 
             _websocketSink = new DebugWebsocketSink(new JsonFormatter(renderMessage: true));
 
@@ -162,14 +162,14 @@ namespace PepperDash.Core
                 .MinimumLevel.Verbose()
                 .Enrich.FromLogContext()
                 .Enrich.With(new CrestronEnricher())
-                .WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLogLevelSwitch)
+                .WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLoggingLevelSwitch)
-                .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLogLevelSwitch)
+                .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
                 .WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate(errorLogTemplate)), levelSwitch: _errorLogLevelSwitch)
                 .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,
                     rollingInterval: RollingInterval.Day,
                     restrictedToMinimumLevel: LogEventLevel.Debug,
-                    retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 7 : 14,
+                    retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 30 : 60,
-                    levelSwitch: _fileLogLevelSwitch
+                    levelSwitch: _fileLevelSwitch
                 );
 
             try
@@ -237,13 +237,10 @@ namespace PepperDash.Core
             if (DoNotLoadConfigOnNextBoot)
                 CrestronConsole.PrintLine(string.Format("Program {0} will not load config after next boot.  Use console command go:{0} to load the config manually", InitialParametersClass.ApplicationNumber));
 
-            _errorLogLevelSwitch.MinimumLevelChanged += (sender, args) =>
+            _consoleLoggingLevelSwitch.MinimumLevelChanged += (sender, args) =>
             {
-                LogMessage(LogEventLevel.Information, "Error log debug level set to {minimumLevel}", _errorLogLevelSwitch.MinimumLevel);
+                LogMessage(LogEventLevel.Information, "Console debug level set to {minimumLevel}", _consoleLoggingLevelSwitch.MinimumLevel);
             };
-
-            // Set initial error log level based on platform && stored level. If appliance, use stored level, otherwise default to verbose
-            SetErrorLogMinimumDebugLevel(CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? _errorLogLevelSwitch.MinimumLevel : LogEventLevel.Verbose);
         }
 
         /// <summary>
@@ -275,10 +272,7 @@ namespace PepperDash.Core
                 if (result != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 {
                     CrestronConsole.Print($"Unable to retrieve stored log level for {levelStoreKey}.\r\nError: {result}.\r\nSetting level to {LogEventLevel.Information}\r\n");
-
+                    return LogEventLevel.Information;
-                    CrestronDataStoreStatic.SetLocalIntValue(levelStoreKey, levelStoreKey == ErrorLogLevelStoreKey ? (int)LogEventLevel.Warning : (int)LogEventLevel.Information);
-
-                    return levelStoreKey == ErrorLogLevelStoreKey ? LogEventLevel.Warning : LogEventLevel.Information;
                 }
 
                 if (logLevel < 0 || logLevel > 5)
@@ -287,8 +281,6 @@ namespace PepperDash.Core
                     return LogEventLevel.Information;
                 }
 
-                CrestronConsole.PrintLine($"Stored log level for {levelStoreKey} is {logLevel}");
-
                 return (LogEventLevel)logLevel;
             }
             catch (Exception ex)
@@ -354,104 +346,44 @@ namespace PepperDash.Core
                 if (levelString.Trim() == "?")
                 {
                     CrestronConsole.ConsoleCommandResponse(
-                    "Used to set the minimum level of debug messages:\r\n" +
+                    $@"Used to set the minimum level of debug messages to be printed to the console:
-                    "Usage: appdebug:P [sink] [level]\r\n" +
+{_logLevels[0]} = 0
-                    "  sink: console (default), errorlog, file, all\r\n" +
+{_logLevels[1]} = 1
-                    "  all: sets all sinks to the specified level\r\n" +
+{_logLevels[2]} = 2
-                    "  level: 0-5 or LogEventLevel name\r\n" +
+{_logLevels[3]} = 3
-                    $"{_logLevels[0]} = 0\r\n" +
+{_logLevels[4]} = 4
-                    $"{_logLevels[1]} = 1\r\n" +
+{_logLevels[5]} = 5");
-                    $"{_logLevels[2]} = 2\r\n" +
-                    $"{_logLevels[3]} = 3\r\n" +
-                    $"{_logLevels[4]} = 4\r\n" +
-                    $"{_logLevels[5]} = 5");
                     return;
                 }
 
                 if (string.IsNullOrEmpty(levelString.Trim()))
                 {
-                    CrestronConsole.ConsoleCommandResponse("Console log level = {0}\r\n", _consoleLogLevelSwitch.MinimumLevel);
+                    CrestronConsole.ConsoleCommandResponse("AppDebug level = {0}", _consoleLoggingLevelSwitch.MinimumLevel);
-                    CrestronConsole.ConsoleCommandResponse("File log level = {0}\r\n", _fileLogLevelSwitch.MinimumLevel);
-                    CrestronConsole.ConsoleCommandResponse("Error log level = {0}\r\n", _errorLogLevelSwitch.MinimumLevel);
                     return;
                 }
 
-                // Parse tokens: first token is sink (defaults to console), second token is level
+                if (int.TryParse(levelString, out var levelInt))
-                var tokens = levelString.Trim().Split(new char[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-
-                string sinkName;
-                string levelToken;
-
-                if (tokens.Length == 1)
-                {
-                    // Single token - assume it's a level for console sink
-                    sinkName = "console";
-                    levelToken = tokens[0];
-                }
-                else if (tokens.Length == 2)
-                {
-                    // Two tokens - first is sink, second is level
-                    sinkName = tokens[0].ToLowerInvariant();
-                    levelToken = tokens[1];
-                }
-                else
-                {
-                    CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [sink] [level]");
-                    return;
-                }
-
-                // Parse the level using the same logic as before
-                LogEventLevel level;
-
-                if (int.TryParse(levelToken, out var levelInt))
                 {
                     if (levelInt < 0 || levelInt > 5)
                     {
-                        CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelToken} to valid log level. If using a number, value must be between 0-5");
+                        CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level. If using a number, value must be between 0-5");
                         return;
                     }
-
+                    SetDebugLevel((uint)levelInt);
-                    if (!_logLevels.TryGetValue((uint)levelInt, out level))
-                    {
-                        level = LogEventLevel.Information;
-                        CrestronConsole.ConsoleCommandResponse($"{levelInt} not valid. Setting level to {level}");
-                    }
-                }
-                else if (Enum.TryParse(levelToken, true, out level))
-                {
-                    // Successfully parsed as LogEventLevel enum
-                }
-                else
-                {
-                    CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelToken} to valid log level");
                     return;
                 }
 
-                // Set the level for the specified sink
+                if (Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
-                switch (sinkName)
                 {
-                    case "console":
+                    SetDebugLevel(levelEnum);
-                        SetDebugLevel(level);
+                    return;
-                        break;
-                    case "errorlog":
-                        SetErrorLogMinimumDebugLevel(level);
-                        break;
-                    case "file":
-                        SetFileMinimumDebugLevel(level);
-                        break;
-                    case "all":
-                        SetDebugLevel(level);
-                        SetErrorLogMinimumDebugLevel(level);
-                        SetFileMinimumDebugLevel(level);
-                        break;
-                    default:
-                        CrestronConsole.ConsoleCommandResponse($"Error: Unknown sink '{sinkName}'. Valid sinks: console, errorlog, file");
-                        break;
                 }
+
+                CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level");
             }
             catch
             {
-                CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [sink] [level]");
+                CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [0-5]");
             }
         }
 
@@ -481,10 +413,10 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetDebugLevel(LogEventLevel level)
         {
-            _consoleLogLevelSwitch.MinimumLevel = level;
+            _consoleLoggingLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}] Debug level set to {1}\r\n",
+            CrestronConsole.ConsoleCommandResponse("[Application {0}], Debug level set to {1}\r\n",
-                InitialParametersClass.ApplicationNumber, _consoleLogLevelSwitch.MinimumLevel);
+                InitialParametersClass.ApplicationNumber, _consoleLoggingLevelSwitch.MinimumLevel);
 
             CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
 
@@ -501,14 +433,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetWebSocketMinimumDebugLevel(LogEventLevel level)
         {
-            _websocketLogLevelSwitch.MinimumLevel = level;
+            _websocketLoggingLevelSwitch.MinimumLevel = level;
 
             var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint)level);
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 LogMessage(LogEventLevel.Information, "Error saving websocket debug level setting: {erro}", err);
 
-            LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLogLevelSwitch.MinimumLevel);
+            LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -518,17 +450,12 @@ namespace PepperDash.Core
         {
             _errorLogLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}] Error log level set to {1}\r\n",
+            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
-                InitialParametersClass.ApplicationNumber, _errorLogLevelSwitch.MinimumLevel);
-
-            CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
-
-            var err = CrestronDataStoreStatic.SetLocalIntValue(ErrorLogLevelStoreKey, (int)level);
-
-            CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                CrestronConsole.PrintLine($"Error saving error log debug level setting: {err}");
+                LogMessage(LogEventLevel.Information, "Error saving Error Log debug level setting: {error}", err);
+
+            LogMessage(LogEventLevel.Information, "Error log debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -536,19 +463,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetFileMinimumDebugLevel(LogEventLevel level)
         {
-            _fileLogLevelSwitch.MinimumLevel = level;
+            _errorLogLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}] File log level set to {1}\r\n",
+            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
-                InitialParametersClass.ApplicationNumber, _fileLogLevelSwitch.MinimumLevel);
-
-            CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
-
-            var err = CrestronDataStoreStatic.SetLocalIntValue(FileLevelStoreKey, (int)level);
-
-            CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                CrestronConsole.PrintLine($"Error saving file debug level setting: {err}");
+                LogMessage(LogEventLevel.Information, "Error saving File debug level setting: {error}", err);
+
+            LogMessage(LogEventLevel.Information, "File debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -1081,6 +1003,9 @@ namespace PepperDash.Core
         /// Logs to Console when at-level, and all messages to error log
         /// </summary>
         [Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
+        /// <summary>
+        /// Console method
+        /// </summary>
         public static void Console(uint level, ErrorLogLevel errorLogLevel,
             string format, params object[] items)
         {
@@ -1093,6 +1018,9 @@ namespace PepperDash.Core
         /// it will only be written to the log.
         /// </summary>
         [Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
+        /// <summary>
+        /// ConsoleWithLog method
+        /// </summary>
         public static void ConsoleWithLog(uint level, string format, params object[] items)
         {
             LogMessage(level, format, items);

src/PepperDash.Core/Logging/DebugExtensions.cs

@@ -1,5 +1,5 @@
-using System;
+using Serilog.Events;
-using Serilog.Events;
+using System;
 using Log = PepperDash.Core.Debug;
 
 namespace PepperDash.Core.Logging
@@ -11,7 +11,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogException(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(ex, message, device: device, args);
+            Log.LogMessage(ex, message, device, args);
         }
 
         /// <summary>
@@ -19,7 +19,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogVerbose(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
         }
 
         /// <summary>
@@ -27,7 +27,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogVerbose(this IKeyed device, string message, params object[] args)
         {
-            Log.LogVerbose(device, message, args);
+            Log.LogMessage(LogEventLevel.Verbose, device, message, args);
         }
 
         /// <summary>
@@ -35,7 +35,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogDebug(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
         }
 
         /// <summary>
@@ -43,7 +43,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogDebug(this IKeyed device, string message, params object[] args)
         {
-            Log.LogDebug(device, message, args);
+            Log.LogMessage(LogEventLevel.Debug, device, message, args);
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogInformation(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
         }
 
         /// <summary>
@@ -59,7 +59,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogInformation(this IKeyed device, string message, params object[] args)
         {
-            Log.LogInformation(device, message, args);
+            Log.LogMessage(LogEventLevel.Information, device, message, args);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogWarning(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
         }
 
         /// <summary>
@@ -75,7 +75,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogWarning(this IKeyed device, string message, params object[] args)
         {
-            Log.LogWarning(device, message, args);
+            Log.LogMessage(LogEventLevel.Warning, device, message, args);
         }
 
         /// <summary>
@@ -83,7 +83,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogError(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
         }
 
         /// <summary>
@@ -91,7 +91,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogError(this IKeyed device, string message, params object[] args)
         {
-            Log.LogError(device, message, args);
+            Log.LogMessage(LogEventLevel.Error, device, message, args);
         }
 
         /// <summary>
@@ -99,7 +99,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogFatal(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
         }
 
         /// <summary>
@@ -107,7 +107,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogFatal(this IKeyed device, string message, params object[] args)
         {
-            Log.LogFatal(device, message, args);
+            Log.LogMessage(LogEventLevel.Fatal, device, message, args);
         }
     }
 }

src/PepperDash.Core/PepperDash.Core.csproj

@@ -43,7 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.133" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -3,28 +3,26 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
+using System.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
+
 using Newtonsoft.Json;
+
 using PepperDash.Core;
-using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
 
+//using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
     /// Base class for bridge API variants
     /// </summary>
-    [Obsolete("Will be removed in v3.0.0")]
     public abstract class BridgeApi : EssentialsDevice
     {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key">Device key</param>
         protected BridgeApi(string key) :
             base(key)
         {
@@ -33,36 +31,23 @@ namespace PepperDash.Essentials.Core.Bridges
     }
 
     /// <summary>
-    /// Class to link devices and rooms to an EISC Instance
+    /// Represents a EiscApiAdvanced
     /// </summary>
     public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
     {
-        /// <summary>
-        /// Gets the PropertiesConfig
-        /// </summary>
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
-        /// <summary>
-        /// Gets the JoinMaps dictionary
-        /// </summary>
         public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
 
-        /// <summary>
-        /// Gets the EISC instance
-        /// </summary>
         public BasicTriList Eisc { get; private set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="dc">Device configuration</param>
-        /// <param name="eisc">EISC instance</param>
         public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
             base(dc.Key)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
 
             PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
+            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
             Eisc = eisc;
 
@@ -77,7 +62,8 @@ namespace PepperDash.Essentials.Core.Bridges
 
         /// <summary>
         /// CustomActivate method
-        /// </summary>        
+        /// </summary>
+        /// <inheritdoc />
         public override bool CustomActivate()
         {
             CommunicationMonitor.Start();
@@ -99,7 +85,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (PropertiesConfig.Devices == null)
             {
-                this.LogDebug("No devices linked to this bridge");
+                Debug.LogMessage(LogEventLevel.Debug, this, "No devices linked to this bridge");
                 return;
             }
 
@@ -120,7 +106,9 @@ namespace PepperDash.Essentials.Core.Bridges
                     continue;
                 }
 
-                this.LogWarning("{deviceKey} is not compatible with this bridge type. Please update the device.", device.Key);
+                Debug.LogMessage(LogEventLevel.Information, this,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
             }
         }
 
@@ -135,31 +123,34 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
             {
-                this.LogVerbose("Registration result: {registerResult}", registerResult);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Registration result: {0}", registerResult);
                 return;
             }
 
-            this.LogDebug("EISC registration successful");
+            Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
         }
 
         /// <summary>
-        /// Link rooms to this EISC. Rooms MUST implement IBridgeAdvanced
+        /// LinkRooms method
         /// </summary>
         public void LinkRooms()
         {
-            this.LogDebug("Linking Rooms...");
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
 
             if (PropertiesConfig.Rooms == null)
             {
-                this.LogDebug("No rooms linked to this bridge.");
+                Debug.LogMessage(LogEventLevel.Debug, this, "No rooms linked to this bridge.");
                 return;
             }
 
             foreach (var room in PropertiesConfig.Rooms)
             {
-                if (!(DeviceManager.GetDeviceForKey(room.RoomKey) is IBridgeAdvanced rm))
+                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+                if (rm == null)
                 {
-                    this.LogDebug("Room {roomKey} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    Debug.LogMessage(LogEventLevel.Debug, this,
+                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
                     continue;
                 }
 
@@ -170,8 +161,11 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Adds a join map
         /// </summary>
-        /// <param name="deviceKey">The key of the device to add the join map for</param>
+        /// <param name="deviceKey"></param>
-        /// <param name="joinMap">The join map to add</param>        
+        /// <param name="joinMap"></param>
+        /// <summary>
+        /// AddJoinMap method
+        /// </summary>
         public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
         {
             if (!JoinMaps.ContainsKey(deviceKey))
@@ -180,13 +174,14 @@ namespace PepperDash.Essentials.Core.Bridges
             }
             else
             {
-                this.LogWarning("Unable to add join map with key '{deviceKey}'.  Key already exists in JoinMaps dictionary", deviceKey);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
             }
         }
 
         /// <summary>
         /// PrintJoinMaps method
-        /// </summary>        
+        /// </summary>
+        /// <inheritdoc />
         public virtual void PrintJoinMaps()
         {
             CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
@@ -197,17 +192,17 @@ namespace PepperDash.Essentials.Core.Bridges
                 joinMap.Value.PrintJoinMapInfo();
             }
         }
-
         /// <summary>
         /// MarkdownForBridge method
-        /// </summary>        
+        /// </summary>
+        /// <inheritdoc />
         public virtual void MarkdownForBridge(string bridgeKey)
         {
-            this.LogInformation("Writing Joinmaps to files for EISC IPID: {eiscId}", Eisc.ID.ToString("X"));
+            Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
 
             foreach (var joinMap in JoinMaps)
             {
-                this.LogInformation("Generating markdown for device '{deviceKey}':", joinMap.Key);
+                Debug.LogMessage(LogEventLevel.Information, "Generating markdown for device '{0}':", joinMap.Key);
                 joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
             }
         }
@@ -215,45 +210,53 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Prints the join map for a device by key
         /// </summary>
-        /// <param name="deviceKey">The key of the device to print the join map for</param>        
+        /// <param name="deviceKey"></param>
+        /// <summary>
+        /// PrintJoinMapForDevice method
+        /// </summary>
         public void PrintJoinMapForDevice(string deviceKey)
         {
             var joinMap = JoinMaps[deviceKey];
 
             if (joinMap == null)
             {
-                this.LogInformation("Unable to find joinMap for device with key: '{deviceKey}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
                 return;
             }
 
-            this.LogInformation("Join map for device '{deviceKey}' on EISC '{eiscKey}':", deviceKey, Key);
+            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
             joinMap.PrintJoinMapInfo();
         }
         /// <summary>
-        /// Prints the join map for a device by key in Markdown format
+        /// Prints the join map for a device by key
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <summary>
+        /// MarkdownJoinMapForDevice method
         /// </summary>
-        /// <param name="deviceKey">The key of the device to print the join map for</param>
-        /// <param name="bridgeKey">The key of the bridge to use for the Markdown output</param>        
         public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
         {
             var joinMap = JoinMaps[deviceKey];
 
             if (joinMap == null)
             {
-                this.LogInformation("Unable to find joinMap for device with key: '{deviceKey}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
                 return;
             }
 
-            this.LogInformation("Join map for device '{deviceKey}' on EISC '{eiscKey}':", deviceKey, Key);
+            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
             joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
         }
 
         /// <summary>
         /// Used for debugging to trigger an action based on a join number and type
         /// </summary>
-        /// <param name="join">The join number to execute the action for</param>
+        /// <param name="join"></param>
-        /// <param name="type">The type of join (digital, analog, serial)</param>
+        /// <param name="type"></param>
-        /// <param name="state">The state to pass to the action</param>        
+        /// <param name="state"></param>
+        /// <summary>
+        /// ExecuteJoinAction method
+        /// </summary>
         public void ExecuteJoinAction(uint join, string type, object state)
         {
             try
@@ -262,87 +265,78 @@ namespace PepperDash.Essentials.Core.Bridges
                 {
                     case "digital":
                         {
-                            if (Eisc.BooleanOutput[join].UserObject is Action<bool> userObject)
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
+                            if (uo != null)
                             {
-                                this.LogVerbose("Executing Boolean Action");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                userObject(Convert.ToBoolean(state));
+                                uo(Convert.ToBoolean(state));
                             }
                             else
-                                this.LogVerbose("User Object is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                             break;
                         }
                     case "analog":
                         {
-                            if (Eisc.UShortOutput[join].UserObject is Action<ushort> userObject)
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
+                            if (uo != null)
                             {
-                                this.LogVerbose("Executing Analog Action");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                userObject(Convert.ToUInt16(state));
+                                uo(Convert.ToUInt16(state));
                             }
                             else
-                                this.LogVerbose("User Object is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute"); break;
-                            break;
                         }
                     case "serial":
                         {
-                            if (Eisc.StringOutput[join].UserObject is Action<string> userObject)
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
+                            if (uo != null)
                             {
-                                this.LogVerbose("Executing Serial Action");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                userObject(Convert.ToString(state));
+                                uo(Convert.ToString(state));
                             }
                             else
-                                this.LogVerbose("User Object is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                             break;
                         }
                     default:
                         {
-                            this.LogVerbose("Unknown join type.  Use digital/serial/analog");
+                            Debug.LogMessage(LogEventLevel.Verbose, "Unknown join type.  Use digital/serial/analog");
                             break;
                         }
                 }
             }
             catch (Exception e)
             {
-                this.LogError("ExecuteJoinAction error: {message}", e.Message);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
-                this.LogDebug(e, "Stack Trace: ");
             }
 
         }
 
         /// <summary>
-        /// Handle incoming sig changes
+        /// Handles incoming sig changes
         /// </summary>
-        /// <param name="currentDevice">BasicTriList device that triggered the event</param>
+        /// <param name="currentDevice"></param>
-        /// <param name="args">Event arguments containing the signal information</param>
+        /// <param name="args"></param>
         protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
-                this.LogVerbose("EiscApiAdvanced change: {type} {number}={value}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-                var userObject = args.Sig.UserObject;
+                var uo = args.Sig.UserObject;
 
-                if (userObject == null) return;
+                if (uo == null) return;
 
-
+                Debug.LogMessage(LogEventLevel.Debug, this, "Executing Action: {0}", uo.ToString());
-                if (userObject is Action<bool>)
+                if (uo is Action<bool>)
-                {
+                    (uo as Action<bool>)(args.Sig.BoolValue);
-                    this.LogDebug("Executing Boolean Action");
+                else if (uo is Action<ushort>)
-                    (userObject as Action<bool>)(args.Sig.BoolValue);
+                    (uo as Action<ushort>)(args.Sig.UShortValue);
-                }
+                else if (uo is Action<string>)
-                else if (userObject is Action<ushort>)
+                    (uo as Action<string>)(args.Sig.StringValue);
-                {
-                    this.LogDebug("Executing Analog Action");
-                    (userObject as Action<ushort>)(args.Sig.UShortValue);
-                }
-                else if (userObject is Action<string>)
-                {
-                    this.LogDebug("Executing Serial Action");
-                    (userObject as Action<string>)(args.Sig.StringValue);
-                }
             }
             catch (Exception e)
             {
-                this.LogError("Eisc_SigChange handler error: {message}", e.Message);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Error in Eisc_SigChange handler: {0}", e);
-                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -361,22 +355,22 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class EiscApiPropertiesConfig
     {
+        [JsonProperty("control")]
         /// <summary>
         /// Gets or sets the Control
         /// </summary>
-        [JsonProperty("control")]
         public EssentialsControlPropertiesConfig Control { get; set; }
 
+        [JsonProperty("devices")]
         /// <summary>
         /// Gets or sets the Devices
         /// </summary>
-        [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
@@ -385,22 +379,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiDevicePropertiesConfig
         {
+            [JsonProperty("deviceKey")]
             /// <summary>
             /// Gets or sets the DeviceKey
             /// </summary>
-            [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
@@ -409,55 +403,44 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiRoomPropertiesConfig
         {
+            [JsonProperty("roomKey")]
             /// <summary>
             /// Gets or sets the RoomKey
             /// </summary>
-            [JsonProperty("roomKey")]
             public string RoomKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
     }
 
     /// <summary>
-    /// Factory class for EiscApiAdvanced devices
+    /// Represents a EiscApiAdvancedFactory
     /// </summary>
-    /// <remarks>
-    /// Supported types:
-    /// eiscapiadv - Create a standard EISC client over TCP/IP
-    /// eiscapiadvanced - Create a standard EISC client over TCP/IP
-    /// eiscapiadvancedserver - Create an EISC server
-    /// eiscapiadvancedclient - Create an EISC client
-    /// vceiscapiadv - Create a VC-4 EISC client
-    /// vceiscapiadvanced - Create a VC-4 EISC client
-    /// eiscapiadvudp - Create a standard EISC client over UDP
-    /// eiscapiadvancedudp - Create a standard EISC client over UDP
-    /// </remarks>
     public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
     {
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced", "eiscapiadvudp", "eiscapiadvancedudp" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Attempting to create new EiscApiAdvanced Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
 
             var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
 
@@ -465,13 +448,6 @@ namespace PepperDash.Essentials.Core.Bridges
 
             switch (dc.Type.ToLower())
             {
-                case "eiscapiadvudp":
-                case "eiscapiadvancedudp":
-                    {
-                        eisc = new EthernetIntersystemCommunications(controlProperties.IpIdInt,
-                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
                 case "eiscapiadv":
                 case "eiscapiadvanced":
                     {
@@ -494,7 +470,7 @@ namespace PepperDash.Essentials.Core.Bridges
                     {
                         if (string.IsNullOrEmpty(controlProperties.RoomId))
                         {
-                            Debug.LogInformation("Unable to build VC-4 EISC Client for device {deviceKey}. Room ID is missing or empty", dc.Key);
+                            Debug.LogMessage(LogEventLevel.Information, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
                             eisc = null;
                             break;
                         }

src/PepperDash.Essentials.Core/Bridges/IBridge.cs

@@ -7,13 +7,6 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public interface IBridgeAdvanced
     {
-        /// <summary>
-        /// Links the bridge to the API using the provided trilist, join start, join map key, and bridge.
-        /// </summary>
-        /// <param name="trilist">The trilist to link to.</param>
-        /// <param name="joinStart">The starting join number.</param>
-        /// <param name="joinMapKey">The key for the join map.</param>
-        /// <param name="bridge">The EISC API bridge.</param>
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 }

src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs

@@ -12,15 +12,15 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-    /// <summary>
+ /// <summary>
-    /// Represents a CecPortController
+ /// Represents a CecPortController
-    /// </summary>
+ /// </summary>
-    public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
+	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
     {
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the StreamDebugging
+  /// Gets or sets the StreamDebugging
-        /// </summary>
+  /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+		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)
+			if (textHandler != null)
-            {
+			{
-                this.PrintReceivedText(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+					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);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
-            Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             Port.StreamCec.Send.StringValue = text;
         }
 

src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs

@@ -1,78 +1,59 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 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;
 
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
+ /// <summary>
-	/// Represents a ComPortController
+ /// Represents a ComPortController
-	/// </summary>
+ /// </summary>
 	public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
 	{
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the StreamDebugging
+        /// Gets or sets the StreamDebugging
-		/// </summary>
+        /// </summary>
-		public CommunicationStreamDebugging StreamDebugging { get; private set; }
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
-		/// <summary>
-		/// Event fired when bytes are received
-		/// </summary>
 		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-		/// <summary>
-		/// Event fired when text is received
-		/// </summary>
 		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the IsConnected
+  /// Gets or sets the IsConnected
-		/// </summary>
+  /// </summary>
 		public bool IsConnected { get { return true; } }
 
 		ComPort Port;
 		ComPort.ComPortSpec Spec;
 
-		/// <summary>
+	    public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
-		/// Constructor
+	        ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
-		/// </summary>
+	    {
-		/// <param name="key"></param>
+            StreamDebugging = new CommunicationStreamDebugging(key);
-		/// <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)
-		{
-			StreamDebugging = new CommunicationStreamDebugging(key);
 
-			Spec = spec;
+	        Spec = spec;
 
-			AddPostActivationAction(() =>
+            AddPostActivationAction(() =>
-			{
+            {
-				Port = postActivationFunc(config);
+                Port = postActivationFunc(config);
 
-				RegisterAndConfigureComPort();
+                RegisterAndConfigureComPort();
-			});
+            });
-		}
+	    }
 
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key">Device key</param>
-		/// <param name="port">COM port instance</param>
-		/// <param name="spec">COM port specification</param>
 		public ComPortController(string key, ComPort port, ComPort.ComPortSpec spec)
 			: base(key)
 		{
 			if (port == null)
 			{
-				Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Invalid com port, continuing but comms will not function");
+				Debug.LogMessage(LogEventLevel.Information, this,  "ERROR: Invalid com port, continuing but comms will not function");
 				return;
 			}
 
@@ -83,77 +64,71 @@ namespace PepperDash.Essentials.Core
 			RegisterAndConfigureComPort();
 		}
 
-		private void RegisterAndConfigureComPort()
+	    private void RegisterAndConfigureComPort()
-		{
+	    {
-			if (Port == null)
+	        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;
+	            return;
-			}
+	        }
+            if (Port.Parent is CrestronControlSystem)
+            {
+                var result = Port.Register();
+                if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Com port: {0}", result);
+                    return; // false
+                }
+            }
 
+	        var specResult = Port.SetComPortSpec(Spec);
+	        if (specResult != 0)
+	        {
+	            Debug.LogMessage(LogEventLevel.Information, this, "WARNING: Cannot set comspec");
+	            return;
+	        }
+	        Port.SerialDataReceived += Port_SerialDataReceived;
+	    }
 
-			if (Port.Parent is CrestronControlSystem || Port.Parent is CenIoCom102)
+	    ~ComPortController()
-			{
-				var result = Port.Register();
-				if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-				{
-					this.LogError($"Cannot register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
-					return;
-				}
-				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})");
-				return;
-			}
-			this.LogInformation($"Successfully set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
-
-			Port.SerialDataReceived += Port_SerialDataReceived;
-		}
-
-		/// <summary>
-		/// Destructor
-		/// </summary>
-		~ComPortController()
 		{
 			Port.SerialDataReceived -= Port_SerialDataReceived;
 		}
 
 		void Port_SerialDataReceived(ComPort ReceivingComPort, ComPortSerialDataEventArgs args)
 		{
-			OnDataReceived(args.SerialData);
+            OnDataReceived(args.SerialData);
 		}
 
-		void OnDataReceived(string s)
+        void OnDataReceived(string s)
-		{
+        {
 			var eventSubscribed = false;
 
-			var bytesHandler = BytesReceived;
+            var bytesHandler = BytesReceived;
-			if (bytesHandler != null)
+            if (bytesHandler != null)
-			{
+            {
-				var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
-				this.PrintReceivedBytes(bytes);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-				bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
+                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
 				eventSubscribed = true;
-			}
+            }
-			var textHandler = TextReceived;
+            var textHandler = TextReceived;
-			if (textHandler != null)
+            if (textHandler != null)
-			{
+            {
-				this.PrintReceivedText(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
+                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
 				eventSubscribed = true;
-			}
+            }
 
-			if (!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
+			if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
-		}
+        }
 
-		/// <summary>
+  /// <summary>
-		/// Deactivate method
+  /// Deactivate method
-		/// </summary>
+  /// </summary>
-		/// <inheritdoc />
+  /// <inheritdoc />
 		public override bool Deactivate()
 		{
 			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
@@ -161,68 +136,70 @@ namespace PepperDash.Essentials.Core
 
 		#region IBasicCommunication Members
 
-		/// <summary>
+  /// <summary>
-		/// SendText method
+  /// SendText method
-		/// </summary>
+  /// </summary>
 		public void SendText(string text)
 		{
 			if (Port == null)
 				return;
 
-			this.PrintSentText(text);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-			Port.Send(text);
+                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+            Port.Send(text);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// SendBytes method
+  /// SendBytes method
-		/// </summary>
+  /// </summary>
 		public void SendBytes(byte[] bytes)
 		{
 			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);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Connect method
+  /// Connect method
-		/// </summary>
+  /// </summary>
 		public void Connect()
-		{
+		{		
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Disconnect method
+  /// Disconnect method
-		/// </summary>
+  /// </summary>
 		public void Disconnect()
 		{
 		}
 
 		#endregion
 
-		/// <summary>
+        /// <summary>
-		/// 
+        /// 
-		/// </summary>
+        /// </summary>
-		/// <param name="s"></param>
+        /// <param name="s"></param>
-		/// <summary>
+        /// <summary>
-		/// SimulateReceive method
+        /// SimulateReceive method
-		/// </summary>
+        /// </summary>
-		public void SimulateReceive(string s)
+        public void SimulateReceive(string s)
-		{
+        {
-			// split out hex chars and build string
+            // split out hex chars and build string
-			var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
+            var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
-			StringBuilder b = new StringBuilder();
+            StringBuilder b = new StringBuilder();
-			foreach (var t in split)
+            foreach (var t in split)
-			{
+            {
-				if (t.StartsWith(@"\") && t.Length == 4)
+                if (t.StartsWith(@"\") && t.Length == 4)
-					b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
+                    b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
-				else
+                else
-					b.Append(t);
+                    b.Append(t);
-			}
+            }
 
-			OnDataReceived(b.ToString());
+            OnDataReceived(b.ToString());
-		}
+        }
 	}
 }

src/PepperDash.Essentials.Core/Comm and IR/CommBridge.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Crestron.SimplSharp.CrestronSockets;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Logging;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Devices;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Implements IBasicCommunication and sends all communication through an EISC
-    /// </summary>
-    [Description("Generic communication wrapper class for any IBasicCommunication type")]
-    public class CommBridge : EssentialsBridgeableDevice, IBasicCommunication
-    {
-        private EiscApiAdvanced eisc;
-
-        private IBasicCommunicationJoinMap joinMap;
-
-        /// <summary>
-        /// Event triggered when text is received through the communication bridge.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-        /// <summary>
-        /// Event triggered when bytes are received through the communication bridge.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-        /// <summary>
-        /// Indicates whether the communication bridge is currently connected.
-        /// </summary>
-        public bool IsConnected { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommBridge"/> class.
-        /// </summary>
-        /// <param name="key">The unique key for the communication bridge.</param>
-        /// <param name="name">The display name for the communication bridge.</param>
-        public CommBridge(string key, string name)
-            : base(key, name)
-        {
-
-        }
-
-        /// <summary>
-        /// Sends a byte array through the communication bridge.
-        /// </summary>
-        /// <param name="bytes">The byte array to send.</param>
-        public void SendBytes(byte[] bytes)
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot send bytes.");
-                return;
-            }
-            eisc.Eisc.SetString(joinMap.SendText.JoinNumber, Encoding.ASCII.GetString(bytes, 0, bytes.Length));
-        }
-
-        /// <summary>
-        /// Sends a text string through the communication bridge.
-        /// </summary>
-        /// <param name="text">The text string to send.</param>
-        public void SendText(string text)
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot send text.");
-                return;
-            }
-            eisc.Eisc.SetString(joinMap.SendText.JoinNumber, text);
-        }
-
-        /// <summary>
-        /// Initiates a connection through the communication bridge.
-        /// </summary>
-        public void Connect()
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot connect.");
-                return;
-            }
-            eisc.Eisc.SetBool(joinMap.Connect.JoinNumber, true);
-        }
-
-        /// <summary>
-        /// Terminates the connection through the communication bridge.
-        /// </summary>
-        public void Disconnect()
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot disconnect.");
-                return;
-            }
-            eisc.Eisc.SetBool(joinMap.Connect.JoinNumber, false);
-        }
-
-        /// <inheritdoc />
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            joinMap = new IBasicCommunicationJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            eisc = bridge;
-
-            trilist.SetBoolSigAction(joinMap.Connected.JoinNumber, (b) => IsConnected = b);
-
-            trilist.SetStringSigAction(joinMap.TextReceived.JoinNumber, (s) =>
-            {
-                TextReceived?.Invoke(this, new GenericCommMethodReceiveTextArgs(s));
-                BytesReceived?.Invoke(this, new GenericCommMethodReceiveBytesArgs(Encoding.ASCII.GetBytes(s)));
-            });
-        }
-    }
-}

src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs

@@ -1,9 +1,11 @@
 
 
 using System;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -36,9 +38,9 @@ namespace PepperDash.Essentials.Core
 		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
 		/// </summary>
 		/// <param name="deviceConfig">The Device config object</param>
-		/// <summary>
+  /// <summary>
-		/// CreateCommForDevice method
+  /// CreateCommForDevice method
-		/// </summary>
+  /// </summary>
 		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
 		{
 			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
@@ -54,51 +56,41 @@ namespace PepperDash.Essentials.Core
 					case eControlMethod.Com:
 						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig);
 						break;
-					case eControlMethod.ComBridge:
+                    case eControlMethod.Cec:
-						comm = new CommBridge(deviceConfig.Key + "-simpl", deviceConfig.Name + " Simpl");
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-						break;
+                        break;
-					case eControlMethod.Cec:
-						comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-						break;
 					case eControlMethod.IR:
 						break;
-					case eControlMethod.Ssh:
+                    case eControlMethod.Ssh:
-						{
+                        {
-							var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password)
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-							{
+                            ssh.AutoReconnect = c.AutoReconnect;
-								AutoReconnect = c.AutoReconnect,
+                            if(ssh.AutoReconnect)
-								DisableEcho = c.DisableSshEcho
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							};
+                            comm = ssh;
-							if (ssh.AutoReconnect)
+                            break;
-								ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                        }
-							comm = ssh;
+                    case eControlMethod.Tcpip:
-							break;
+                        {
-						}
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-					case eControlMethod.Tcpip:
+                            tcp.AutoReconnect = c.AutoReconnect;
-						{
+                            if (tcp.AutoReconnect)
-							var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize)
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							{
+                            comm = tcp;
-								AutoReconnect = c.AutoReconnect
+                            break;
-							};
+                        }
-							if (tcp.AutoReconnect)
+                    case eControlMethod.Udp:
-								tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                        {
-							comm = tcp;
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-							break;
+                            comm = udp;
-						}
+                            break;
-					case eControlMethod.Udp:
+                        }
-						{
-							var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-							comm = udp;
-							break;
-						}
 					case eControlMethod.Telnet:
 						break;
 					case eControlMethod.SecureTcpIp:
 						{
-							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize)
+							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize);
-							{
+							secureTcp.AutoReconnect = c.AutoReconnect;
-								AutoReconnect = c.AutoReconnect
-							};
 							if (secureTcp.AutoReconnect)
 								secureTcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
 							comm = secureTcp;
@@ -106,7 +98,7 @@ namespace PepperDash.Essentials.Core
 						}
 					default:
 						break;
-				}
+				}				
 			}
 			catch (Exception e)
 			{
@@ -115,14 +107,15 @@ namespace PepperDash.Essentials.Core
 			}
 
 			// put it in the device manager if it's the right flavor
-			if (comm is Device comDev)
+			var comDev = comm as Device;
+			if (comDev != null)
 				DeviceManager.AddDevice(comDev);
 			return comm;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// GetComPort method
+  /// GetComPort method
-		/// </summary>
+  /// </summary>
 		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
 		{
 			var comPar = config.ComParams;
@@ -133,74 +126,74 @@ namespace PepperDash.Essentials.Core
 			return null;
 		}
 
-		/// <summary>
+        /// <summary>
-		///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-		/// </summary>
+        /// </summary>
-		/// <param name="config"></param>
+        /// <param name="config"></param>
-		/// <returns></returns>
+        /// <returns></returns>
-		/// <summary>
+        /// <summary>
-		/// GetCecPort method
+        /// GetCecPort method
-		/// </summary>
+        /// </summary>
-		public static ICec GetCecPort(ControlPropertiesConfig config)
+        public static ICec GetCecPort(ControlPropertiesConfig config)
-		{
+        {
-			try
+	        try
-			{
+	        {
-				var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-				Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
+		        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
-					? "is not valid, failed to get cec port"
+			        ? "is not valid, failed to get cec port"
-					: "found in device manager, attempting to get cec port");
+			        : "found in device manager, attempting to get cec port");
 
-				if (dev == null)
+		        if (dev == null)
-					return null;
+			        return null;
 
-				if (String.IsNullOrEmpty(config.ControlPortName))
+		        if (String.IsNullOrEmpty(config.ControlPortName))
-				{
+		        {
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
-					return null;
+			        return null;
-				}
+		        }
 
 
-				var inputsOutputs = dev as IRoutingInputsOutputs;
+		        var inputsOutputs = dev as IRoutingInputsOutputs;
-				if (inputsOutputs == null)
+		        if (inputsOutputs == null)
-				{
+		        {
 					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
 						config.ControlPortDevKey, config.ControlPortName);
 
-					return null;
+			        return null;
-				}
+		        }
 
 				var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
-				if (inputPort != null && inputPort.Port is ICec)
+		        if (inputPort != null && inputPort.Port is ICec)
 					return inputPort.Port as ICec;
+		        
 
-
+		        var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
-				var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
+		        if (outputPort != null && outputPort.Port is ICec)
-				if (outputPort != null && outputPort.Port is ICec)
+					return outputPort.Port as ICec;		        
-					return outputPort.Port as ICec;
+	        }
-			}
+	        catch (Exception ex)
-			catch (Exception ex)
+	        {
-			{
+		        Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
-				Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
+		        Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
-				Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
+		        if (ex.InnerException != null)
-				if (ex.InnerException != null)
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);
+	        }
-			}
 
 			Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
 					config.ControlPortDevKey, config.ControlPortName);
 
 			return null;
-		}
+        }
 
 		/// <summary>
 		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
 		/// return the ControlSystem object from the Global class.
 		/// </summary>
 		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		/// <summary>
+  /// <summary>
-		/// GetIComPortsDeviceFromManagedDevice method
+  /// GetIComPortsDeviceFromManagedDevice method
-		/// </summary>
+  /// </summary>
 		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
 		{
 			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
@@ -217,81 +210,81 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
-	/// <summary>
+    /// <summary>
-	/// Represents a EssentialsControlPropertiesConfig
+    /// Represents a EssentialsControlPropertiesConfig
-	/// </summary>
+    /// </summary>
-	public class EssentialsControlPropertiesConfig :
+    public class EssentialsControlPropertiesConfig :
-			ControlPropertiesConfig
+        ControlPropertiesConfig
-	{
+    {
 
-		[JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
-		[JsonConverter(typeof(ComSpecJsonConverter))]
+        [JsonConverter(typeof(ComSpecJsonConverter))]
-		public ComPort.ComPortSpec? ComParams { get; set; }
+        public ComPort.ComPortSpec? ComParams { get; set; }
 
-		[JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
-		public string CresnetId { get; set; }
+        public string CresnetId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// Attempts to provide uint conversion of string CresnetId
+        /// Attempts to provide uint conversion of string CresnetId
-		/// </summary>
+        /// </summary>
-		[JsonIgnore]
+        [JsonIgnore]
-		public uint CresnetIdInt
+        public uint CresnetIdInt
-		{
+        {
-			get
+            get
-			{
+            {
-				try
+                try
-				{
+                {
-					return Convert.ToUInt32(CresnetId, 16);
+                    return Convert.ToUInt32(CresnetId, 16);
-				}
+                }
-				catch (Exception)
+                catch (Exception)
-				{
+                {
-					throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-				}
+                }
-			}
+            }
-		}
+        }
 
-		[JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the InfinetId
+        /// Gets or sets the InfinetId
-		/// </summary>
+        /// </summary>
-		public string InfinetId { get; set; }
+        public string InfinetId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// Attepmts to provide uiont conversion of string InifinetId
+        /// Attepmts to provide uiont conversion of string InifinetId
-		/// </summary>
+        /// </summary>
-		[JsonIgnore]
+        [JsonIgnore]
-		public uint InfinetIdInt
+        public uint InfinetIdInt
-		{
+        {
-			get
+            get
-			{
+            {
-				try
+                try
-				{
+                {
-					return Convert.ToUInt32(InfinetId, 16);
+                    return Convert.ToUInt32(InfinetId, 16);
-				}
+                }
-				catch (Exception)
+                catch (Exception)
-				{
+                {
-					throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
+                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
-				}
+                }
-			}
+            }
-		}
+        }
-	}
+    }
 
-	/// <summary>
+    /// <summary>
-	/// Represents a IrControlSpec
+    /// Represents a IrControlSpec
-	/// </summary>
+    /// </summary>
-	public class IrControlSpec
+    public class IrControlSpec
-	{
+    {
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the PortDeviceKey
+        /// Gets or sets the PortDeviceKey
-		/// </summary>
+        /// </summary>
-		public string PortDeviceKey { get; set; }
+        public string PortDeviceKey { get; set; }
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the PortNumber
+        /// Gets or sets the PortNumber
-		/// </summary>
+        /// </summary>
-		public uint PortNumber { get; set; }
+        public uint PortNumber { get; set; }
-		/// <summary>
+        /// <summary>
-		/// Gets or sets the File
+        /// Gets or sets the File
-		/// </summary>
+        /// </summary>
-		public string File { get; set; }
+        public string File { get; set; }
-	}
+    }
 }

src/PepperDash.Essentials.Core/Config/BaseStreamingDeviceProperties.cs

@@ -1,29 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core.Config
-{
-  /// <summary>
-  /// Represents the base properties for a streaming device.
-  /// </summary>
-  public class BaseStreamingDeviceProperties
-  {
-    /// <summary>
-    /// The multicast video address for the streaming device.
-    /// </summary>
-    [JsonProperty("multicastVideoAddress", NullValueHandling = NullValueHandling.Ignore)]
-    public string MulticastVideoAddress { get; set; }
-
-    /// <summary>
-    /// The multicast audio address for the streaming device.
-    /// </summary>
-    [JsonProperty("multicastAudioAddress", NullValueHandling = NullValueHandling.Ignore)]
-    public string MulticastAudioAddress { get; set; }
-
-    /// <summary>
-    /// The URL for the streaming device's media stream.
-    /// </summary>
-    [JsonProperty("streamUrl", NullValueHandling = NullValueHandling.Ignore)]
-    public string StreamUrl { get; set; }
-  }
-}

src/PepperDash.Essentials.Core/Config/DeviceConfig.cs

@@ -18,41 +18,41 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class DeviceConfig
     {
+        [JsonProperty("key")]
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
-        [JsonProperty("key")]
         public string Key { get; set; }
 
+        [JsonProperty("uid")]
         /// <summary>
         /// Gets or sets the Uid
         /// </summary>
-        [JsonProperty("uid")]
         public int Uid { get; set; }
 
+        [JsonProperty("name")]
         /// <summary>
         /// Gets or sets the Name
         /// </summary>
-        [JsonProperty("name")]
         public string Name { get; set; }
 
+        [JsonProperty("group")]
         /// <summary>
         /// Gets or sets the Group
         /// </summary>
-        [JsonProperty("group")]
         public string Group { get; set; }
 
+        [JsonProperty("type")]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
-        [JsonProperty("type")]
         public string Type { get; set; }
 
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(DevicePropertiesConverter))]
         /// <summary>
         /// Gets or sets the Properties
         /// </summary>
-        [JsonProperty("properties")]
-        [JsonConverter(typeof(DevicePropertiesConverter))]
         public JToken Properties { get; set; }
 
         public DeviceConfig(DeviceConfig dc)
@@ -68,7 +68,7 @@ namespace PepperDash.Essentials.Core.Config
             //Properties = JToken.FromObject(dc.Properties);
         }
 
-        public DeviceConfig() { }
+        public DeviceConfig() {}
     }
 
     /// <summary>

src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs

@@ -124,35 +124,22 @@ namespace PepperDash.Essentials.Core.Config
                         Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Local Config");
 
                         return true;
-                    }                   
+                    }
                     else
                     {
-                        var parsedConfig = JObject.Parse(fs.ReadToEnd());
+                        var doubleObj = JObject.Parse(fs.ReadToEnd());
-
+                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
-                        // Check if it's a v2 config (check for "version" node)
-                        // this means it's already merged by the Portal API
-                        // from the v2 config tool
-                        var isV2Config = parsedConfig["versions"] != null;
-                        
-                        if (isV2Config)
-                        {
-                            Debug.LogMessage(LogEventLevel.Information, "Config file is a v2 format, no merge necessary.");
-                            ConfigObject = parsedConfig.ToObject<EssentialsConfig>();
-                            Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded v2 Config");
-                            return true;
-                        }
 
                         // Extract SystemUrl and TemplateUrl into final config output
-                        ConfigObject = PortalConfigReader.MergeConfigs(parsedConfig).ToObject<EssentialsConfig>();
 
-                        if (parsedConfig["system_url"] != null)
+                        if (doubleObj["system_url"] != null)
                         {
-                            ConfigObject.SystemUrl = parsedConfig["system_url"].Value<string>();
+                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
                         }
 
-                        if (parsedConfig["template_url"] != null)
+                        if (doubleObj["template_url"] != null)
                         {
-                            ConfigObject.TemplateUrl = parsedConfig["template_url"].Value<string>();
+                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
                         }
                     }
 

src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs

@@ -11,169 +11,86 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Config
 {
-    /// <summary>
+	/// <summary>
-    /// Loads the ConfigObject from the file
+	/// Loads the ConfigObject from the file
-    /// </summary>
+	/// </summary>
-    public class EssentialsConfig : BasicConfig
+	public class EssentialsConfig : BasicConfig
-    {
+	{
-        /// <summary>
+		[JsonProperty("system_url")]
-        /// Gets or sets the SystemUrl
-        /// </summary>
-        [JsonProperty("system_url")]
         public string SystemUrl { get; set; }
 
-        /// <summary>
+		[JsonProperty("template_url")]
-        /// Gets or sets the TemplateUrl
-        /// </summary>
-        [JsonProperty("template_url")]
         public string TemplateUrl { get; set; }
 
-        /// <summary>
+
-        /// 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))
+				if (SystemUrl.Contains("#"))
-                {
+				{
-                    uuid = "missing url";
+					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-                }
+					string uuid = result.Groups[1].Value;
-                else if (SystemUrl.Contains("#"))
+					return uuid;
-                {
+				} else
-                    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
-                {
                     var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
-                    uuid = result.Groups[1].Value;
+                    string uuid = result.Groups[1].Value;
+                    return uuid;
                 }
-
-                return uuid;
             }
         }
 
-        /// <summary>
-        /// 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))
+				if (TemplateUrl.Contains("#"))
-                {
+				{
-                    uuid = "missing template url";
+					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-                }
+					string uuid = result.Groups[1].Value;
-                else if (TemplateUrl.Contains("#"))
+					return uuid;
-                {
+				} else
-                    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
-                {
                     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;
             }
         }
 
+		[JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<DeviceConfig> Rooms { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Versions
-        /// </summary>
-        public VersionData Versions { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsConfig"/> class.
-        /// </summary>
         public EssentialsConfig()
             : base()
         {
             Rooms = new List<DeviceConfig>();
         }
-    }
+	}
-
+		
-    /// <summary>
+ /// <summary>
-    /// Represents version data for Essentials and its packages
+ /// Represents a SystemTemplateConfigs
-    /// </summary>
+ /// </summary>
-    public class VersionData
+	public class SystemTemplateConfigs
-    {
+	{
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the Essentials version
+  /// Gets or sets the System
-        /// </summary>
+  /// </summary>
-        [JsonProperty("essentials")]
-        public NugetVersion Essentials { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of Packages
-        /// </summary>
-        [JsonProperty("packages")]
-        public List<NugetVersion> Packages { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VersionData"/> class.
-        /// </summary>
-        public VersionData()
-        {
-            Packages = new List<NugetVersion>();
-        }
-    }
-
-    /// <summary>
-    /// Represents a NugetVersion
-    /// </summary>
-    public class NugetVersion
-    {
-        /// <summary>
-        /// Gets or sets the Version
-        /// </summary>
-        [JsonProperty("version")]
-        public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the PackageId
-        /// </summary>
-        [JsonProperty("packageId")]
-        public string PackageId { get; set; }
-    }
-
-    /// <summary>
-    /// Represents a SystemTemplateConfigs
-    /// </summary>
-    public class SystemTemplateConfigs
-    {
-        /// <summary>
-        /// Gets or sets the System
-        /// </summary>
 		public EssentialsConfig System { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Template
-        /// </summary>
 		public EssentialsConfig Template { get; set; }
-    }
+	}
 }

src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs

@@ -2,54 +2,59 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
-
+    [Description("Wrapper class for Digital Input")]
     /// <summary>
     /// Represents a GenericDigitalInputDevice
     /// </summary>
-    /// [Description("Wrapper class for Digital Input")]
+    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IHasFeedback
     {
-        private DigitalInput inputPort;
+        /// <summary>
+        /// Gets or sets the InputPort
+        /// </summary>
+        public DigitalInput InputPort { get; private set; }
 
         /// <summary>
         /// Gets or sets the InputStateFeedback
         /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        /// <inheritdoc />
+        Func<bool> InputStateFeedbackFunc
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        {
+            get
+            {
+                return () => InputPort.State;
+            }
+        }
+
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericDigitalInputDevice"/> class.
-        /// </summary>
-        /// <param name="key">key for device</param>
-        /// <param name="name">name for device</param>
-        /// <param name="postActivationFunc">function to call after activation. Should return the DigitalInput</param>
-        /// <param name="config">config for device</param>
         public GenericDigitalInputDevice(string key, string name, Func<IOPortConfig, DigitalInput> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
         {
-            InputStateFeedback = new BoolFeedback("inputState", () => inputPort.State);
+            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
-                inputPort = postActivationFunc(config);
+                InputPort = postActivationFunc(config);
 
-                inputPort.Register();
+                InputPort.Register();
+
+                InputPort.StateChange += InputPort_StateChange;
 
-                inputPort.StateChange += InputPort_StateChange;
             });
         }
 
@@ -66,31 +71,41 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         private static DigitalInput GetDigitalInput(IOPortConfig dc)
         {
+            IDigitalInputPorts ioPortDevice;
 
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsDigitalInput)
                 {
-                    Debug.LogError("GetDigitalInput: Processor does not support Digital Inputs");
+                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Processor does not support Digital Inputs");
                     return null;
                 }
-
+                ioPortDevice = Global.ControlSystem;
-                return Global.ControlSystem.DigitalInputPorts[dc.PortNumber];
             }
-
+            else
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IDigitalInputPorts ioPortDevice))
             {
-                Debug.LogError("GetDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IDigitalInputPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfDigitalInputPorts)
             {
-                Debug.LogError("GetDigitalInput: Device {key} does not contain a digital input port {port}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
             }
 
             return ioPortDevice.DigitalInputPorts[dc.PortNumber];
+
+
         }
 
         #endregion
@@ -116,20 +131,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device {key}.  {message}", Key, e.Message);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -138,22 +153,22 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #region Factory
 
         /// <summary>
-        /// Factory for creating GenericDigitalInputDevice devices
+        /// Represents a GenericDigitalInputDeviceFactory
         /// </summary>
         public class GenericDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericDigitalInputDevice>
         {
-            /// <summary>
-            /// Constructor for GenericDigitalInputDeviceFactory
-            /// </summary>
             public GenericDigitalInputDeviceFactory()
             {
                 TypeNames = new List<string>() { "digitalinput" };
             }
 
+            /// <summary>
+            /// BuildDevice method
+            /// </summary>
             /// <inheritdoc />
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.LogDebug("Factory Attempting to create new Generic Digital Input Device");
+                Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs

@@ -2,64 +2,66 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
+
 using PepperDash.Core;
-using PepperDash.Core.Logging;
-using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
+
+
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput, IHasFeedback
+    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput
     {
-        private Versiport inputPort;
+        public Versiport InputPort { get; private set; }
 
-        /// <inheritdoc />
         public IntFeedback InputValueFeedback { get; private set; }
-
-        /// <summary>
-        /// Get the InputMinimumChangeFeedback
-        /// </summary>
-        /// <remarks>
-        /// Updates when the analog input minimum change value changes
-        /// </remarks>
         public IntFeedback InputMinimumChangeFeedback { get; private set; }
 
-        /// <inheritdoc />
+        Func<int> InputValueFeedbackFunc
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        {
+            get
+            {
+                return () => InputPort.AnalogIn;
+            }
+        }
+
+        Func<int> InputMinimumChangeFeedbackFunc
+        {
+            get { return () => InputPort.AnalogMinChange; }
+        } 
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVersiportAnalogInputDevice"/> class.
-        /// </summary>
-        /// <param name="key">key for the device</param>
-        /// <param name="name">name for the device</param>
-        /// <param name="postActivationFunc">function to call after activation</param>
-        /// <param name="config">IO port configuration</param>
         public GenericVersiportAnalogInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            InputValueFeedback = new IntFeedback("inputValue", () => inputPort.AnalogIn);
+            InputValueFeedback = new IntFeedback(InputValueFeedbackFunc);
-            InputMinimumChangeFeedback = new IntFeedback("inputMinimumChange", () => inputPort.AnalogMinChange);
+            InputMinimumChangeFeedback = new IntFeedback(InputMinimumChangeFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
-                inputPort = postActivationFunc(config);
+                InputPort = postActivationFunc(config);
 
-                inputPort.Register();
+                InputPort.Register();
 
-                inputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
-                inputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
+                InputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
                 if (config.DisablePullUpResistor)
-                    inputPort.DisablePullUpResistor = true;
+                    InputPort.DisablePullUpResistor = true;
 
-                inputPort.VersiportChange += InputPort_VersiportChange;
+                InputPort.VersiportChange += InputPort_VersiportChange;
+
+                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportAnalogInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
 
-                this.LogDebug("Created GenericVersiportAnalogInputDevice on port {port}.  DisablePullUpResistor: {pullUpResistorDisabled}", config.PortNumber, inputPort.DisablePullUpResistor);
             });
 
         }
@@ -67,17 +69,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// <summary>
         /// Set minimum voltage change for device to update voltage changed method
         /// </summary>
-        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>        
+        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>
+        /// <summary>
+        /// SetMinimumChange method
+        /// </summary>
         public void SetMinimumChange(ushort value)
         {
-            inputPort.AnalogMinChange = value;
+            InputPort.AnalogMinChange = value;
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-            this.LogDebug("Versiport change: {event}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
-            if (args.Event == eVersiportEvent.AnalogInChange)
+            if(args.Event == eVersiportEvent.AnalogInChange)
                 InputValueFeedback.FireUpdate();
             if (args.Event == eVersiportEvent.AnalogMinChangeChange)
                 InputMinimumChangeFeedback.FireUpdate();
@@ -86,6 +91,9 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Bridge Linking
 
+        /// <summary>
+        /// LinkToApi method
+        /// </summary>
         /// <inheritdoc />
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
@@ -102,12 +110,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{trilistId}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputValueFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputValue.JoinNumber]);
@@ -117,8 +125,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device {key}: {message}", Key, e.Message);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
 
             trilist.OnlineStatusChange += (d, args) =>
@@ -130,6 +138,11 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         }
 
+        void trilist_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
 
 
@@ -138,55 +151,70 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
+         
+            IIOPorts ioPortDevice;
+
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogError("GetVersiportAnalogInput: Processor does not support Versiports");
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Processor does not support Versiports");
                     return null;
                 }
-                return Global.ControlSystem.VersiPorts[dc.PortNumber];
+                ioPortDevice = Global.ControlSystem;
             }
-
+            else
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
             {
-                Debug.LogError("GetVersiportAnalogInput: Device {key} is not a valid device", dc.PortDeviceKey);
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogError("GetVersiportAnalogInput: Device {key} does not contain a port {port}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
-            if (!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
+            if(!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
             {
-                Debug.LogError("GetVersiportAnalogInput: Device {key} does not support AnalogInput on port {port}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not support AnalogInput on port {1}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
 
+
             return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
         }
     }
 
 
     /// <summary>
-    /// Factory for creating GenericVersiportAnalogInputDevice devices
+    /// Represents a GenericVersiportAbalogInputDeviceFactory
     /// </summary>
-    public class GenericVersiportAnalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
+    public class GenericVersiportAbalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
     {
-        /// <summary>
+        public GenericVersiportAbalogInputDeviceFactory()
-        /// Constructor for GenericVersiportAnalogInputDeviceFactory
-        /// </summary>
-        public GenericVersiportAnalogInputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportanaloginput" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs

@@ -2,82 +2,78 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
+
 using PepperDash.Core;
-using PepperDash.Core.Logging;
-using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
+
+
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider, IHasFeedback
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider
     {
-        private Versiport inputPort;
+        public Versiport InputPort { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the InputStateFeedback
-        /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        /// <inheritdoc />
+        Func<bool> InputStateFeedbackFunc
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        {
+            get
+            {
+                return () => InputPort.DigitalIn;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the PartitionPresentFeedback
         /// </summary>
         public BoolFeedback PartitionPresentFeedback { get; }
 
-        /// <summary>
+        public bool PartitionPresent => !InputStateFeedbackFunc();
-        /// Get partition state
-        /// </summary>
-        public bool PartitionPresent => !inputPort.DigitalIn;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVersiportDigitalInputDevice"/> class.
-        /// </summary>
-        /// <param name="key">key for device</param>
-        /// <param name="name">name for device</param>
-        /// <param name="postActivationFunc">function to call after activation. Should return the Versiport</param>
-        /// <param name="config">config for device</param>
         public GenericVersiportDigitalInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            InputStateFeedback = new BoolFeedback("inputState", () => inputPort.DigitalIn);
+            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
-            PartitionPresentFeedback = new BoolFeedback("partitionPresent", () => !inputPort.DigitalIn);
+            PartitionPresentFeedback = new BoolFeedback(() => !InputStateFeedbackFunc());
 
             AddPostActivationAction(() =>
             {
-                inputPort = postActivationFunc(config);
+                InputPort = postActivationFunc(config);
 
-                inputPort.Register();
+                InputPort.Register();
 
-                inputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
                 if (config.DisablePullUpResistor)
-                    inputPort.DisablePullUpResistor = true;
+                    InputPort.DisablePullUpResistor = true;
 
-                inputPort.VersiportChange += InputPort_VersiportChange;
+                InputPort.VersiportChange += InputPort_VersiportChange;
 
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
 
-                this.LogDebug("Created GenericVersiportDigitalInputDevice for port {port}.  DisablePullUpResistor: {pullUpResistorDisable}", config.PortNumber, inputPort.DisablePullUpResistor);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
 
             });
 
-            Feedbacks.Add(InputStateFeedback);
-            Feedbacks.Add(PartitionPresentFeedback);
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-            this.LogDebug("Versiport change: {0}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
-            if (args.Event == eVersiportEvent.DigitalInChange)
+            if(args.Event == eVersiportEvent.DigitalInChange)
             {
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
@@ -106,20 +102,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device {key}.  Input is null. {message}", Key, e.Message);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -131,50 +127,63 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
+         
+            IIOPorts ioPortDevice;
+
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogError("GetVersiportDigitalInput: Processor does not support Versiports");
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Processor does not support Versiports");
                     return null;
                 }
-                return Global.ControlSystem.VersiPorts[dc.PortNumber];
+                ioPortDevice = Global.ControlSystem;
             }
-
+            else
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
             {
-                Debug.LogError("GetVersiportDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogError("GetVersiportDigitalInput: Device {key} does not contain versiport {port}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
             }
 
             return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
         }
     }
 
 
     /// <summary>
-    /// Factory class for GenericVersiportDigitalInputDevice
+    /// Represents a GenericVersiportDigitalInputDeviceFactory
     /// </summary>
     public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
     {
-        /// <summary>
-        /// Constructor for GenericVersiportDigitalInputDeviceFactory
-        /// </summary>
         public GenericVersiportDigitalInputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportinput" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs

@@ -2,13 +2,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
+
 using PepperDash.Core;
-using PepperDash.Core.Logging;
-using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
+
+
+using Newtonsoft.Json;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
@@ -16,68 +21,76 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalOutputDevice : EssentialsBridgeableDevice, IDigitalOutput, IHasFeedback
+    public class GenericVersiportDigitalOutputDevice : EssentialsBridgeableDevice, IDigitalOutput
     {
-        private Versiport outputPort;
+        public Versiport OutputPort { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the OutputStateFeedback
-        /// </summary>
         public BoolFeedback OutputStateFeedback { get; private set; }
 
-        /// <inheritdoc />
+        Func<bool> OutputStateFeedbackFunc
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        {
+            get
+            {
+                return () => OutputPort.DigitalOut;
+            }
+        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVersiportDigitalOutputDevice"/> class.
-        /// </summary>
         public GenericVersiportDigitalOutputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            OutputStateFeedback = new BoolFeedback("outputState", () => outputPort.DigitalOut);
+            OutputStateFeedback = new BoolFeedback(OutputStateFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
-                outputPort = postActivationFunc(config);
+                OutputPort = postActivationFunc(config);
 
-                outputPort.Register();
+                OutputPort.Register();
 
 
-                if (!outputPort.SupportsDigitalOutput)
+                if (!OutputPort.SupportsDigitalOutput)
                 {
-                    this.LogError("Device does not support configuration as a Digital Output");
+                    Debug.LogMessage(LogEventLevel.Information, this, "Device does not support configuration as a Digital Output");
                     return;
                 }
 
-                outputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
+                OutputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
 
 
-                outputPort.VersiportChange += OutputPort_VersiportChange;
+                OutputPort.VersiportChange += OutputPort_VersiportChange;
 
             });
+
         }
 
         void OutputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-            this.LogDebug("Versiport change: {event}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
-            if (args.Event == eVersiportEvent.DigitalOutChange)
+            if(args.Event == eVersiportEvent.DigitalOutChange)
                 OutputStateFeedback.FireUpdate();
         }
 
         /// <summary>
         /// Set value of the versiport digital output
         /// </summary>
-        /// <param name="state">value to set the output to</param>        
+        /// <param name="state">value to set the output to</param>
+        /// <summary>
+        /// SetOutput method
+        /// </summary>
         public void SetOutput(bool state)
         {
-            if (!outputPort.SupportsDigitalOutput)
+                if (OutputPort.SupportsDigitalOutput)
-            {
+                {
-                this.LogError("Versiport does not support Digital Output Mode");
+                    Debug.LogMessage(LogEventLevel.Information, this, "Passed the Check");
-                return;
+
-            }
+                    OutputPort.DigitalOut = state;
+
+                }
+                else
+                {
+                    Debug.LogMessage(LogEventLevel.Information, this, "Versiport does not support Digital Output Mode");
+                }
 
-            outputPort.DigitalOut = state;
         }
 
         #region Bridge Linking
@@ -101,12 +114,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 OutputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OutputState.JoinNumber]);
@@ -114,8 +127,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device: {message}", e.Message);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -127,28 +140,41 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalOutput(IOPortConfig dc)
         {
-            if (dc.PortDeviceKey.Equals("processor"))
+
-            {
+                IIOPorts ioPortDevice;
-                if (!Global.ControlSystem.SupportsVersiport)
+
+                if (dc.PortDeviceKey.Equals("processor"))
                 {
-                    Debug.LogError("GetVersiportDigitalOutput: Processor does not support Versiports");
+                    if (!Global.ControlSystem.SupportsVersiport)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Processor does not support Versiports");
+                        return null;
+                    }
+                    ioPortDevice = Global.ControlSystem;
+                }
+                else
+                {
+                    var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                    if (ioPortDev == null)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
+                        return null;
+                    }
+                    ioPortDevice = ioPortDev;
+                }
+                if (ioPortDevice == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device '0' is not a valid IOPorts Device", dc.PortDeviceKey);
                     return null;
                 }
-                return Global.ControlSystem.VersiPorts[dc.PortNumber];
-            }
 
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
+                if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
-            {
+                {
-                Debug.LogError("GetVersiportDigitalOutput: Device {key} is not a valid device", dc.PortDeviceKey);
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
+                }
-            }
+                var port = ioPortDevice.VersiPorts[dc.PortNumber];
+                return port;
 
-            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOutput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
-            }
-            return ioPortDevice.VersiPorts[dc.PortNumber];
         }
     }
 
@@ -158,18 +184,18 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public class GenericVersiportDigitalOutputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
     {
-        /// <summary>
-        /// Initialize a new instance of the <see cref="GenericVersiportDigitalOutputDeviceFactory"/> class.
-        /// </summary>
         public GenericVersiportDigitalOutputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportoutput" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs

@@ -12,12 +12,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public interface IAnalogInput
     {
-        /// <summary>
-        /// Get the InputValueFeedback.
-        /// </summary>
-        /// <remarks>
-        /// Updates when the analog input value changes
-        /// </remarks>
         IntFeedback InputValueFeedback { get; }
     }
 }

src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs

@@ -14,28 +14,25 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public class IOPortConfig
     {
+        [JsonProperty("portDeviceKey")]
         /// <summary>
         /// Gets or sets the PortDeviceKey
         /// </summary>
-        [JsonProperty("portDeviceKey")]
         public string PortDeviceKey { get; set; }
-
+        [JsonProperty("portNumber")]
         /// <summary>
         /// Gets or sets the PortNumber
         /// </summary>
-        [JsonProperty("portNumber")]
         public uint PortNumber { get; set; }
-
+        [JsonProperty("disablePullUpResistor")]
         /// <summary>
         /// Gets or sets the DisablePullUpResistor
         /// </summary>
-        [JsonProperty("disablePullUpResistor")]
         public bool DisablePullUpResistor { get; set; }
-
+        [JsonProperty("minimumChange")]
         /// <summary>
         /// Gets or sets the MinimumChange
         /// </summary>
-        [JsonProperty("minimumChange")]
         public int MinimumChange { get; set; }
     }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ICustomMobileControl.cs

@@ -1,11 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Use this interface on a device or room if it uses custom Mobile Control messengers
-  /// </summary>
-  public interface ICustomMobileControl : IKeyed
-  {
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs

@@ -1,72 +1,155 @@
 using System;
+using System.Collections.ObjectModel;
+using Crestron.SimplSharpPro;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
+    /// <summary>
+    /// Use this interface on a device or room if it uses custom Mobile Control messengers
+    /// </summary>
+    public interface ICustomMobileControl : IKeyed
+    {
+    }
+
+    /*/// <summary>
+    /// Describes a MobileControlSystemController
+    /// </summary>
+    public interface IMobileControl : IKeyed
+    {
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+
+        void LinkSystemMonitorToAppServer();
+    }*/
 
     /// <summary>
     /// Defines the contract for IMobileControl
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        /// <summary>
-        /// Gets the Host
-        /// </summary>
         string Host { get; }
 
-        /// <summary>
-        /// Gets the Client App URL
-        /// </summary>
         string ClientAppUrl { get; }
 
-        /// <summary>
-        /// Gets the System UUID
-        /// </summary>
         string SystemUuid { get; }
 
-        /// <summary>
-        /// Gets the ApiOnlineAndAuthorized feedback
-        /// </summary>
         BoolFeedback ApiOnlineAndAuthorized { get; }
 
-        /// <summary>
-        /// Sends the message object to the AppServer
-        /// </summary>
-        /// <param name="o">Message to send</param>
         void SendMessageObject(IMobileControlMessage o);
 
-        /// <summary>
-        /// Adds an action for a messenger
-        /// </summary>
-        /// <typeparam name="T">Messenger type. Must implement IMobileControlMessenger</typeparam>
-        /// <param name="messenger">messenger to register</param>
-        /// <param name="action">action to add</param>
         void AddAction<T>(T messenger, Action<string, string, JToken> action) where T : IMobileControlMessenger;
 
-        /// <summary>
-        /// Removes an action for a messenger
-        /// </summary>
-        /// <param name="key">key for action</param>
         void RemoveAction(string key);
 
-        /// <summary>
-        /// Adds a device messenger
-        /// </summary>
-        /// <param name="messenger">Messenger to add</param>
         void AddDeviceMessenger(IMobileControlMessenger messenger);
 
-        /// <summary>
-        /// Check if a device messenger exists
-        /// </summary>
-        /// <param name="key">Messenger key to find</param>
         bool CheckForDeviceMessenger(string key);
 
-        /// <summary>
-        /// Get a Room Messenger by key
-        /// </summary>
-        /// <param name="key">messenger key to find</param>
-        /// <returns>Messenger if found, null otherwise</returns>
         IMobileControlRoomMessenger GetRoomMessenger(string key);
+
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlMessenger
+    /// </summary>
+    public interface IMobileControlMessenger : IKeyed
+    {
+        IMobileControl AppServerController { get; }
+        string MessagePath { get; }
+
+        string DeviceKey { get; }
+        void RegisterWithAppServer(IMobileControl appServerController);
+    }
+
+    public interface IMobileControlMessage
+    {
+        [JsonProperty("type")]
+        string Type { get; }
+
+        [JsonProperty("clientId", NullValueHandling = NullValueHandling.Ignore)]
+        string ClientId { get; }
+
+        [JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
+        JToken Content { get; }
+
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlRoomMessenger
+    /// </summary>
+    public interface IMobileControlRoomMessenger : IKeyed
+    {
+        event EventHandler<EventArgs> UserCodeChanged;
+
+        event EventHandler<EventArgs> UserPromptedForCode;
+
+        event EventHandler<EventArgs> ClientJoined;
+
+        event EventHandler<EventArgs> AppUrlChanged;
+
+        string UserCode { get; }
+
+        string QrCodeUrl { get; }
+
+        string QrCodeChecksum { get; }
+
+        string McServerUrl { get; }
+
+        string RoomName { get; }
+
+        string AppUrl { get; }
+
+        void UpdateAppUrl(string url);
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlAction
+    /// </summary>
+    public interface IMobileControlAction
+    {
+        IMobileControlMessenger Messenger { get; }
+
+        Action<string, string, JToken> Action { get; }
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlTouchpanelController
+    /// </summary>
+    public interface IMobileControlTouchpanelController : IKeyed
+    {
+        /// <summary>
+        /// The default room key for the controller
+        /// </summary>
+        string DefaultRoomKey { get; }
+
+        /// <summary>
+        /// Sets the application URL for the controller
+        /// </summary>
+        /// <param name="url">The application URL</param>
+        void SetAppUrl(string url);
+
+        /// <summary>
+        /// Indicates whether the controller uses a direct server connection
+        /// </summary>
+        bool UseDirectServer { get; }
+
+        /// <summary>
+        /// Indicates whether the controller is a Zoom Room controller
+        /// </summary>
+        bool ZoomRoomController { get; }
+    }
+
+    /// <summary>
+    /// Describes a MobileControl Crestron Touchpanel Controller
+    /// This interface extends the IMobileControlTouchpanelController to include connected IP information
+    /// </summary>
+    public interface IMobileControlCrestronTouchpanelController : IMobileControlTouchpanelController
+    {
+        /// <summary>
+        /// Gets a collection of connected IP information for the touchpanel controller
+        /// </summary>
+        ReadOnlyCollection<ConnectedIpInformation> ConnectedIps { get; }
     }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlAction.cs

@@ -1,15 +0,0 @@
-using System;
-using Newtonsoft.Json.Linq;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlAction
-  /// </summary>
-  public interface IMobileControlAction
-  {
-    IMobileControlMessenger Messenger { get; }
-
-    Action<string, string, JToken> Action { get; }
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlCrestronTouchpanelController.cs

@@ -1,17 +0,0 @@
-using System.Collections.ObjectModel;
-using Crestron.SimplSharpPro;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Describes a MobileControl Crestron Touchpanel Controller
-  /// This interface extends the IMobileControlTouchpanelController to include connected IP information
-  /// </summary>
-  public interface IMobileControlCrestronTouchpanelController : IMobileControlTouchpanelController
-  {
-    /// <summary>
-    /// Gets a collection of connected IP information for the touchpanel controller
-    /// </summary>
-    ReadOnlyCollection<ConnectedIpInformation> ConnectedIps { get; }
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessage.cs

@@ -1,18 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  public interface IMobileControlMessage
-  {
-    [JsonProperty("type")]
-    string Type { get; }
-
-    [JsonProperty("clientId", NullValueHandling = NullValueHandling.Ignore)]
-    string ClientId { get; }
-
-    [JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
-    JToken Content { get; }
-
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessenger.cs

@@ -1,31 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlMessenger
-  /// </summary>
-  public interface IMobileControlMessenger : IKeyed
-  {
-    /// <summary>
-    /// Parent controller for this messenger
-    /// </summary>
-    IMobileControl AppServerController { get; }
-
-    /// <summary>
-    /// Path to listen for messages
-    /// </summary>
-    string MessagePath { get; }
-
-    /// <summary>
-    /// Key of the device this messenger is associated with
-    /// </summary>
-    string DeviceKey { get; }
-
-    /// <summary>
-    /// Register this messenger with the AppServerController
-    /// </summary>
-    /// <param name="appServerController"></param>
-    void RegisterWithAppServer(IMobileControl appServerController);
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessengerWithSubscriptions.cs

@@ -1,23 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlMessenger
-  /// </summary>
-  public interface IMobileControlMessengerWithSubscriptions : IMobileControlMessenger
-  {
-    /// <summary>
-    /// Unsubscribe a client from this messenger
-    /// </summary>
-    /// <param name="clientId"></param>
-    void UnsubscribeClient(string clientId);
-
-    /// <summary>
-    /// Register this messenger with the AppServerController
-    /// </summary>
-    /// <param name="appServerController">parent for this messenger</param>
-    /// <param name="enableMessengerSubscriptions">Enable messenger subscriptions</param>
-    void RegisterWithAppServer(IMobileControl appServerController, bool enableMessengerSubscriptions);
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlRoomMessenger.cs

@@ -1,33 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlRoomMessenger
-  /// </summary>
-  public interface IMobileControlRoomMessenger : IKeyed
-  {
-    event EventHandler<EventArgs> UserCodeChanged;
-
-    event EventHandler<EventArgs> UserPromptedForCode;
-
-    event EventHandler<EventArgs> ClientJoined;
-
-    event EventHandler<EventArgs> AppUrlChanged;
-
-    string UserCode { get; }
-
-    string QrCodeUrl { get; }
-
-    string QrCodeChecksum { get; }
-
-    string McServerUrl { get; }
-
-    string RoomName { get; }
-
-    string AppUrl { get; }
-
-    void UpdateAppUrl(string url);
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlTouchpanelController.cs

@@ -1,31 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlTouchpanelController
-  /// </summary>
-  public interface IMobileControlTouchpanelController : IKeyed
-  {
-    /// <summary>
-    /// The default room key for the controller
-    /// </summary>
-    string DefaultRoomKey { get; }
-
-    /// <summary>
-    /// Sets the application URL for the controller
-    /// </summary>
-    /// <param name="url">The application URL</param>
-    void SetAppUrl(string url);
-
-    /// <summary>
-    /// Indicates whether the controller uses a direct server connection
-    /// </summary>
-    bool UseDirectServer { get; }
-
-    /// <summary>
-    /// Indicates whether the controller is a Zoom Room controller
-    /// </summary>
-    bool ZoomRoomController { get; }
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INvxNetworkPortInformation.cs

@@ -1,7 +1,6 @@
+using Crestron.SimplSharpPro.DM.Streaming;
 using System;
 using System.Collections.Generic;
-using Crestron.SimplSharpPro.DM.Streaming;
-using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
@@ -12,7 +11,7 @@ namespace PepperDash.Essentials.Core
     /// subscribers when the port information is updated. Implementations of this interface should ensure that the  <see
     /// cref="PortInformationChanged"/> event is raised whenever the <see cref="NetworkPorts"/> collection
     /// changes.</remarks>
-    public interface INvxNetworkPortInformation : IKeyed
+    public interface INvxNetworkPortInformation
     {
         /// <summary>
         /// Occurs when the port information changes.

src/PepperDash.Essentials.Core/Devices/DeviceManager.cs

@@ -60,9 +60,9 @@ namespace PepperDash.Essentials.Core
                 ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "",
                 ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s).Replace(Environment.NewLine, "\r\n")), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s).Replace(Environment.NewLine, "\r\n")), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s).Replace(Environment.NewLine, "\r\n")), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
                 "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -202,15 +202,14 @@ namespace PepperDash.Essentials.Core
 
         private static void ListDevices(string s)
         {
-            CrestronConsole.ConsoleCommandResponse($"{Devices.Count} Devices registered with Device Manager:\r\n");
+            Debug.LogMessage(LogEventLevel.Information, "{0} Devices registered with Device Manager:", Devices.Count);
-
             var sorted = Devices.Values.ToList();
             sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
 
             foreach (var d in sorted)
             {
                 var name = d is IKeyName ? (d as IKeyName).Name : "---";
-                CrestronConsole.ConsoleCommandResponse($"  [{d.Key}] {name}\r\n");
+                Debug.LogMessage(LogEventLevel.Information, "  [{0}] {1}", d.Key, name);
             }
         }
 
@@ -219,17 +218,28 @@ namespace PepperDash.Essentials.Core
             var dev = GetDeviceForKey(devKey);
             if (dev == null)
             {
-                CrestronConsole.ConsoleCommandResponse($"Device '{devKey}' not found\r\n");
+                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
                 return;
             }
             if (!(dev is IHasFeedback statusDev))
             {
-                CrestronConsole.ConsoleCommandResponse($"Device '{devKey}' does not have visible feedbacks\r\n");
+                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' does not have visible feedbacks", devKey);
                 return;
             }
             statusDev.DumpFeedbacksToConsole(true);
         }
 
+        //static void ListDeviceCommands(string devKey)
+        //{
+        //    var dev = GetDeviceForKey(devKey);
+        //    if (dev == null)
+        //    {
+        //        Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
+        //        return;
+        //    }
+        //    Debug.LogMessage(LogEventLevel.Information, "This needs to be reworked.  Stay tuned.", devKey);
+        //}
+
         private static void ListDeviceCommStatuses(string input)
         {
 
@@ -239,6 +249,12 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+
+        //static void DoDeviceCommand(string command)
+        //{
+        //    Debug.LogMessage(LogEventLevel.Information, "Not yet implemented.  Stay tuned");
+        //}
+
         /// <summary>
         /// AddDevice method
         /// </summary>
@@ -459,9 +475,9 @@ namespace PepperDash.Essentials.Core
             if (String.IsNullOrEmpty(s) || s.Contains("?"))
             {
                 CrestronConsole.ConsoleCommandResponse(
-                    "SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]\r\n" +
+                    @"SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]
-                    "    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use\r\n" +
+    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use
-                    "    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
+    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
                 return;
             }
 

src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs

@@ -3,29 +3,16 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    /// <summary>
+    public abstract class EssentialsBridgeableDevice:EssentialsDevice, IBridgeAdvanced
-    /// Base class for devices that can be bridged to an EISC API.
-    /// </summary>
-    public abstract class EssentialsBridgeableDevice : EssentialsDevice, IBridgeAdvanced
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsBridgeableDevice"/> class with the specified key.
-        /// </summary>
-        /// <param name="key">The unique key for the device.</param>
         protected EssentialsBridgeableDevice(string key) : base(key)
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsBridgeableDevice"/> class with the specified key and name.
-        /// </summary>
-        /// <param name="key">The unique key for the device.</param>
-        /// <param name="name">The display name for the device.</param>
         protected EssentialsBridgeableDevice(string key, string name) : base(key, name)
         {
         }
 
-        /// <inheritdoc />
         public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 }

src/PepperDash.Essentials.Core/Devices/EssentialsDeviceFactory.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core
     public List<string> TypeNames { get; protected set; }
 
     /// <summary>
-    /// Build the device using the configuration
+    /// The method that will build the device
     /// </summary>
     /// <param name="dc">The device config</param>
     /// <returns>An instance of the device</returns>

src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs

@@ -1,90 +1,65 @@
 using System;
 using System.Linq;
-using Crestron.SimplSharp;
+
 using PepperDash.Core;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
+ /// <summary>
-	/// Defines the contract for IHasFeedback
+ /// Defines the contract for IHasFeedback
-	/// </summary>
+ /// </summary>
 	public interface IHasFeedback : IKeyed
 	{
 		/// <summary>
-		/// This method returns a list of all Output objects on a device,
+		/// This method shall return a list of all Output objects on a device,
 		/// including all "aggregate" devices.
 		/// </summary>
 		FeedbackCollection<Feedback> Feedbacks { get; }
 
 	}
 
-	/// <summary>
+
-	/// Extension methods for IHasFeedback
-	/// </summary>
 	public static class IHasFeedbackExtensions
 	{
-		/// <summary>
-		/// Gets the feedback type name for sorting purposes
-		/// </summary>
-		/// <param name="feedback">The feedback to get the type name for</param>
-		/// <returns>A string representing the feedback type</returns>
-		private static string GetFeedbackTypeName(Feedback feedback)
-		{
-			if (feedback is BoolFeedback)
-				return "boolean";
-			else if (feedback is IntFeedback)
-				return "integer";
-			else if (feedback is StringFeedback)
-				return "string";
-			else
-				return feedback.GetType().Name;
-		}
-
-		/// <summary>
-		/// Dumps the feedbacks to the console
-		/// </summary>
-		/// <param name="source"></param>
-		/// <param name="getCurrentStates"></param>
 		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
 		{
+            Type t = source.GetType();
+            // get the properties and set them into a new collection of NameType wrappers
+            var props = t.GetProperties().Select(p => new PropertyNameType(p, t));
+
 			var feedbacks = source.Feedbacks;
-
+			if (feedbacks != null)
-			if (feedbacks == null || feedbacks.Count == 0)
 			{
-				CrestronConsole.ConsoleCommandResponse("No available feedbacks\r\n");
+				Debug.LogMessage(LogEventLevel.Information, source, "\n\nAvailable feedbacks:");
-				return;
+				foreach (var f in feedbacks)
-			}
-
-			CrestronConsole.ConsoleCommandResponse("Available feedbacks:\r\n");
-
-			// Sort feedbacks by type first, then by key
-			var sortedFeedbacks = feedbacks.OrderBy(f => GetFeedbackTypeName(f)).ThenBy(f => string.IsNullOrEmpty(f.Key) ? "" : f.Key);
-
-			foreach (var feedback in sortedFeedbacks)
-			{
-				string value = "";
-				string type = "";
-				if (getCurrentStates)
 				{
-					if (feedback is BoolFeedback)
+					string val = "";
+                    string type = "";
+					if (getCurrentStates)
 					{
-						value = feedback.BoolValue.ToString();
+                        if (f is BoolFeedback)
-						type = "boolean";
+                        {
-					}
+                            val = f.BoolValue.ToString();
-					else if (feedback is IntFeedback)
+                            type = "boolean";
-					{
+                        }
-						value = feedback.IntValue.ToString();
+                        else if (f is IntFeedback)
-						type = "integer";
+                        {
-					}
+                            val = f.IntValue.ToString();
-					else if (feedback is StringFeedback)
+                            type = "integer";
-					{
+                        }
-						value = feedback.StringValue;
+                        else if (f is StringFeedback)
-						type = "string";
+                        {
+                            val = f.StringValue;
+                            type = "string";
+                        }
 					}
+					Debug.LogMessage(LogEventLevel.Information, "{0,-12} {1, -25} {2}", type,
+						(string.IsNullOrEmpty(f.Key) ? "-no key-" : f.Key), val);
 				}
-				CrestronConsole.ConsoleCommandResponse($"  {type,-12} {(string.IsNullOrEmpty(feedback.Key) ? "-no key-" : feedback.Key),-25} {value}\r\n");
 			}
+			else
+				Debug.LogMessage(LogEventLevel.Information, source, "No available outputs:");
 		}
 	}
 }

src/PepperDash.Essentials.Core/Devices/SourceListItem.cs

@@ -77,6 +77,9 @@ namespace PepperDash.Essentials.Core
         /// A name that will override the source's name on the UI
         /// </summary>
         [JsonProperty("name")]
+        /// <summary>
+        /// Gets or sets the Name
+        /// </summary>
         public string Name { get; set; }
 
         /// <summary>
@@ -241,20 +244,6 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         [JsonProperty("type")]
         public eRoutingSignalType Type { get; set; }
-
-        /// <summary>
-        /// Key for a destination list item. If BOTH SourceListItemKey AND DestinationListItemKey are defined,
-        /// then the direct route method should be used.
-        /// </summary>
-        [JsonProperty("destinationListItemKey", NullValueHandling = NullValueHandling.Ignore)]
-        public string DestinationListItemKey { get; set; }
-
-        /// <summary>
-        /// Key for a source list item. If BOTH SourceListItemKey AND DestinationListItemKey are defined,
-        /// then the direct route method should be used.
-        /// </summary>
-        [JsonProperty("sourceListItemKey", NullValueHandling = NullValueHandling.Ignore)]
-        public string SourceListItemKey { get; set; }
     }
 
     /// <summary>

src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs

@@ -135,7 +135,7 @@ namespace PepperDash.Essentials.Core
         {
             if (FactoryMethods.ContainsKey(typeName))
             {
-                Debug.LogInformation("Unable to add type: '{typeName}'. Already exists in DeviceFactory", typeName);
+                Debug.LogInformation("Unable to add type: '{typeName}'.  Already exists in DeviceFactory", typeName);
                 return;
             }
 
@@ -217,8 +217,7 @@ namespace PepperDash.Essentials.Core
             }
             catch (Exception ex)
             {
-                Debug.LogError(ex, "Exception occurred while creating device {key}: {message}", dc.Key, ex.Message);
+                Debug.LogError(ex, "Exception occurred while creating device {0}: {1}", null, dc.Key, ex.Message);
-                Debug.LogDebug(ex, "Exception details: {stackTrace}", ex.StackTrace);
                 return null;
             }
         }
@@ -250,9 +249,9 @@ namespace PepperDash.Essentials.Core
                 }
 
                 CrestronConsole.ConsoleCommandResponse(
-                    "Type: '{0}'\r\n" +
+                    @"Type: '{0}' 
-                    "                    Type: '{1}'\r\n" +
+                    Type: '{1}' 
-                    "                    Description: {2}{3}", type.Key, Type, description, CrestronEnvironment.NewLine);
+                    Description: {2}{3}", type.Key, Type, description, CrestronEnvironment.NewLine);
             }
         }
 

src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -1,4 +1,6 @@
-using Crestron.SimplSharp;
+
+
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.CrestronXml;
 using Crestron.SimplSharp.CrestronXml.Serialization;
@@ -6,7 +8,6 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.Fusion;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using Serilog.Events;
@@ -14,49 +15,32 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Timers;
 
 namespace PepperDash.Essentials.Core.Fusion
 {
     /// <summary>
     /// Represents a EssentialsHuddleSpaceFusionSystemControllerBase
     /// </summary>
-    public class IEssentialsRoomFusionController : EssentialsDevice, IOccupancyStatusProvider, IFusionHelpRequest, IHasFeedback
+    public class EssentialsHuddleSpaceFusionSystemControllerBase : Device, IOccupancyStatusProvider
     {
-        private IEssentialsRoomFusionControllerPropertiesConfig _config;
+        private readonly EssentialsHuddleSpaceRoomFusionRoomJoinMap JoinMap;
-
-        private EssentialsHuddleSpaceRoomFusionRoomJoinMap JoinMap;
 
         private const string RemoteOccupancyXml = "<Occupancy><Type>Local</Type><State>{0}</State></Occupancy>";
-        private bool _guidFileExists;
+        private readonly bool _guidFileExists;
 
         private readonly Dictionary<Device, BoolInputSig> _sourceToFeedbackSigs =
             new Dictionary<Device, BoolInputSig>();
 
-        /// <summary>
-        /// Gets or sets the CurrentRoomSourceNameSig
-        /// </summary>
         protected StringSigData CurrentRoomSourceNameSig;
 
         private readonly FusionCustomPropertiesBridge CustomPropertiesBridge = new FusionCustomPropertiesBridge();
-
-        /// <summary>
-        /// Gets or sets the FusionOccSensor
-        /// </summary>
         protected FusionOccupancySensorAsset FusionOccSensor;
         private readonly FusionRemoteOccupancySensor FusionRemoteOccSensor;
 
-        /// <summary>
-        /// Gets or sets the FusionRoom
-        /// </summary>
         protected FusionRoom FusionRoom;
-
-        /// <summary>
-        /// Gets or sets the FusionStaticAssets
-        /// </summary>
         protected Dictionary<int, FusionAsset> FusionStaticAssets;
         private readonly long PushNotificationTimeout = 5000;
-        private IEssentialsRoom Room;
+        private readonly IEssentialsRoom Room;
         private readonly long SchedulePollInterval = 300000;
 
         private Event _currentMeeting;
@@ -64,7 +48,8 @@ namespace PepperDash.Essentials.Core.Fusion
         private CTimer _dailyTimeRequestTimer;
         private StatusMonitorCollection _errorMessageRollUp;
 
-        private FusionRoomGuids _guids;
+        private FusionRoomGuids _guiDs;
+        private uint _ipId;
 
         private bool _isRegisteredForSchedulePushNotifications;
         private Event _nextMeeting;
@@ -75,30 +60,14 @@ namespace PepperDash.Essentials.Core.Fusion
 
         private string _roomOccupancyRemoteString;
 
-        private bool _helpRequestSent;
+        #region System Info Sigs
 
-        private eFusionHelpResponse _helpRequestStatus;
+        //StringSigData SystemName;
+        //StringSigData Model;
+        //StringSigData SerialNumber;
+        //StringSigData Uptime;
 
-        /// <inheritdoc />
+        #endregion
-        public StringFeedback HelpRequestResponseFeedback { get; private set; }
-
-        /// <inheritdoc />
-        public BoolFeedback HelpRequestSentFeedback { get; private set; }
-
-        /// <inheritdoc />
-        public StringFeedback HelpRequestStatusFeedback { get; private set; }
-
-        private Timer _helpRequestTimeoutTimer;
-
-        /// <summary>
-        /// Gets the DefaultHelpRequestTimeoutMs
-        /// </summary>
-        public int HelpRequestTimeoutMs => _config.HelpRequestTimeoutMs;
-
-        /// <summary>
-        /// Gets whether to use a timer for help requests
-        /// </summary>
-        public bool UseHelpRequestTimer => _config.UseTimeoutForHelpRequests;
 
         #region Processor Info Sigs
 
@@ -124,110 +93,71 @@ namespace PepperDash.Essentials.Core.Fusion
 
         #endregion
 
-        /// <summary>
+        public EssentialsHuddleSpaceFusionSystemControllerBase(IEssentialsRoom room, uint ipId, string joinMapKey)
-        /// Constructor
-        /// </summary>
-        public IEssentialsRoomFusionController(string key, string name, IEssentialsRoomFusionControllerPropertiesConfig config)
-            : base(key, name)
-        {
-            _config = config;
-
-            AddPostActivationAction(() =>
-            {
-                var room = DeviceManager.GetDeviceForKey<IEssentialsRoom>(_config.RoomKey);
-
-                if (room == null)
-                {
-                    this.LogError("Error Creating Fusion Room Controller.  No room found with key '{0}'", _config.RoomKey);
-                    return;
-                }
-
-                this.LogInformation("Creating Fusion Room Controller for room '{0}' at IPID: {1:X2}", room.Key, _config.IpIdInt);
-
-                ConstructorHelper(room, _config.IpIdInt, _config.JoinMapKey);
-
-            });
-        }
-
-        /// <summary>
-        ///     
-        /// </summary>
-        /// <param name="room"></param>
-        /// <param name="ipId"></param>
-        /// <param name="joinMapKey"></param>
-        public IEssentialsRoomFusionController(IEssentialsRoom room, string ipId, string joinMapKey)
             : base(room.Key + "-fusion")
-        {
-            _config = new IEssentialsRoomFusionControllerPropertiesConfig()
-            {
-                IpId = ipId,
-                RoomKey = room.Key,
-                JoinMapKey = joinMapKey
-            };
-
-            ConstructorHelper(room, _config.IpIdInt, joinMapKey);
-        }
-
-        private void ConstructorHelper(IEssentialsRoom room, uint ipId, string joinMapKey)
         {
             try
             {
-                this.LogDebug("ConstructorHelper called for Fusion Room Controller for room '{0}' with IPID {1:X2}", room.Key, ipId);
-
-                this.LogDebug("JoinMap Key: {0}", joinMapKey);
-
                 JoinMap = new EssentialsHuddleSpaceRoomFusionRoomJoinMap(1);
 
-                this.LogDebug("JoinMap created");
+                CrestronConsole.AddNewConsoleCommand((o) => JoinMap.PrintJoinMapInfo(), string.Format("ptjnmp-{0}", Key), "Prints Attribute Join Map", ConsoleAccessLevelEnum.AccessOperator);
-
-                CrestronConsole.AddNewConsoleCommand((o) =>
-                {
-                    if (o is string deviceKey)
-                    {
-                        if (string.IsNullOrEmpty(deviceKey) || deviceKey == "?")
-                        {
-                            CrestronConsole.ConsoleCommandResponse("Please provide a device key for a Fusion Room instance");
-                            return;
-                        }
-                        else if (deviceKey != this.Key)
-                        {
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        CrestronConsole.ConsoleCommandResponse("Invalid parameter.  Please provide a device key for a Fusion Room instance");
-                        return;
-                    }
-
-                    JoinMap.PrintJoinMapInfo();
-                }, "printfusionjoinmap", "Prints Attribute Join Map", ConsoleAccessLevelEnum.AccessOperator);
 
                 if (!string.IsNullOrEmpty(joinMapKey))
                 {
-                    // this.LogDebug("Attempting to get custom join map for key: {0}", joinMapKey);
                     var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
                     if (customJoins != null)
                     {
                         JoinMap.SetCustomJoinData(customJoins);
                     }
                 }
-
+                 
                 Room = room;
 
-                this.LogDebug("Room found: {0}", Room.Key);
+                _ipId = ipId;
 
                 FusionStaticAssets = new Dictionary<int, FusionAsset>();
 
-                this.LogDebug("FusionStaticAssets dictionary created");
+                _guiDs = new FusionRoomGuids();
 
-                _guids = new FusionRoomGuids();
+                var mac =
+                    CrestronEthernetHelper.GetEthernetParameter(
+                        CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
+
+                var slot = Global.ControlSystem.ProgramNumber;
+
+                var guidFilePath = Global.FilePathPrefix +
+                                   string.Format(@"{0}-FusionGuids-{1:X2}.json", InitialParametersClass.ProgramIDTag, _ipId);
+
+                var oldGuidFilePath = Global.FilePathPrefix +
+                                      string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
+
+                if (File.Exists(oldGuidFilePath))
+                {
+                    Debug.LogMessage(LogEventLevel.Information, this, "Migrating from old Fusion GUID file to new Fusion GUID File");
+
+                    File.Copy(oldGuidFilePath, guidFilePath);
+
+                    File.Delete(oldGuidFilePath);
+                }
+
+                _guidFileExists = File.Exists(guidFilePath); 
+
+                // Check if file exists
+                if (!_guidFileExists)
+                {
+                    // Does not exist. Create GUIDs
+                    _guiDs = new FusionRoomGuids(Room.Name, ipId, _guiDs.GenerateNewRoomGuid(slot, mac),
+                        FusionStaticAssets);
+                }
+                else
+                {
+                    // Exists. Read GUIDs
+                    ReadGuidFile(guidFilePath);
+                }
 
-                this.LogDebug("FusionRoomGuids created");
 
                 if (Room is IRoomOccupancy occupancyRoom)
                 {
-                    Debug.LogDebug(this, "Room '{0}' supports IRoomOccupancy", Room.Key);
                     if (occupancyRoom.RoomOccupancy != null)
                     {
                         if (occupancyRoom.OccupancyStatusProviderIsRemote)
@@ -241,21 +171,8 @@ namespace PepperDash.Essentials.Core.Fusion
                     }
                 }
 
-                this.LogDebug("Occupancy setup complete");
-
-                HelpRequestResponseFeedback = new StringFeedback("HelpRequestResponse", () => FusionRoom.Help.OutputSig.StringValue);
-
-                HelpRequestSentFeedback = new BoolFeedback("HelpRequestSent", () => _helpRequestSent);
-                HelpRequestStatusFeedback = new StringFeedback("HelpRequestStatus", () => _helpRequestStatus.ToString());
-
-                Feedbacks.Add(HelpRequestResponseFeedback);
-                Feedbacks.Add(HelpRequestSentFeedback);
-                Feedbacks.Add(HelpRequestStatusFeedback);
-                if (RoomOccupancyRemoteStringFeedback != null)
-                    Feedbacks.Add(RoomOccupancyRemoteStringFeedback);
-                if (RoomIsOccupiedFeedback != null)
-                    Feedbacks.Add(RoomIsOccupiedFeedback);
 
+                AddPostActivationAction(() => PostActivate(guidFilePath));
             }
             catch (Exception e)
             {
@@ -263,54 +180,9 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        private string GetGuidFilePath(uint ipId)
+        private void PostActivate(string guidFilePath)
         {
-            var mac =
+            CreateSymbolAndBasicSigs(_ipId);
-                CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
-
-            var slot = Global.ControlSystem.ProgramNumber;
-
-            var guidFilePath = Global.FilePathPrefix +
-                               string.Format(@"{0}-FusionGuids-{1:X2}.json", InitialParametersClass.ProgramIDTag, _config.IpIdInt);
-
-            var oldGuidFilePath = Global.FilePathPrefix +
-                                  string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
-
-            if (File.Exists(oldGuidFilePath))
-            {
-                Debug.LogMessage(LogEventLevel.Information, this, "Migrating from old Fusion GUID file to new Fusion GUID File");
-
-                File.Copy(oldGuidFilePath, guidFilePath);
-
-                File.Delete(oldGuidFilePath);
-            }
-
-            _guidFileExists = File.Exists(guidFilePath);
-
-            // Check if file exists
-            if (!_guidFileExists)
-            {
-                // Does not exist. Create GUIDs
-                _guids = new FusionRoomGuids(Room.Name, ipId, _guids.GenerateNewRoomGuid(slot, mac),
-                    FusionStaticAssets);
-            }
-            else
-            {
-                // Exists. Read GUIDs
-                ReadGuidFile(guidFilePath);
-            }
-
-            return guidFilePath;
-        }
-
-        /// <inheritdoc />
-        public override void Initialize()
-        {
-
-            GenerateGuidFile(GetGuidFilePath(_config.IpIdInt));
-
-            CreateSymbolAndBasicSigs(_config.IpIdInt);
             SetUpSources();
             SetUpCommunitcationMonitors();
             SetUpDisplay();
@@ -319,14 +191,12 @@ namespace PepperDash.Essentials.Core.Fusion
 
             FusionRVI.GenerateFileForAllFusionDevices();
 
+            GenerateGuidFile(guidFilePath);
         }
 
-        /// <summary>
-        /// Gets the RoomGuid
-        /// </summary>
         protected string RoomGuid
         {
-            get { return _guids.RoomGuid; }
+            get { return _guiDs.RoomGuid; }
         }
 
         /// <summary>
@@ -334,9 +204,6 @@ namespace PepperDash.Essentials.Core.Fusion
         /// </summary>
         public StringFeedback RoomOccupancyRemoteStringFeedback { get; private set; }
 
-        /// <summary>
-        /// Gets the RoomIsOccupiedFeedbackFunc
-        /// </summary>
         protected Func<bool> RoomIsOccupiedFeedbackFunc
         {
             get { return () => FusionRemoteOccSensor.RoomOccupied.OutputSig.BoolValue; }
@@ -351,21 +218,10 @@ namespace PepperDash.Essentials.Core.Fusion
 
         #endregion
 
-
-        /// <inheritdoc />
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
-
-
-        /// <summary>
-        /// ScheduleChange event
-        /// </summary>
         public event EventHandler<ScheduleChangeEventArgs> ScheduleChange;
         //public event EventHandler<MeetingChangeEventArgs> MeetingEndWarning;
         //public event EventHandler<MeetingChangeEventArgs> NextMeetingBeginWarning;
 
-        /// <summary>
-        /// RoomInfoChange event
-        /// </summary>
         public event EventHandler<EventArgs> RoomInfoChange;
 
         //ScheduleResponseEvent NextMeeting;
@@ -402,11 +258,11 @@ namespace PepperDash.Essentials.Core.Fusion
 
                 Debug.LogMessage(LogEventLevel.Debug, this, "Writing GUIDs to file");
 
-                _guids = FusionOccSensor == null
+                _guiDs = FusionOccSensor == null
-                    ? new FusionRoomGuids(Room.Name, _config.IpIdInt, RoomGuid, FusionStaticAssets)
+                    ? new FusionRoomGuids(Room.Name, _ipId, RoomGuid, FusionStaticAssets)
-                    : new FusionRoomGuids(Room.Name, _config.IpIdInt, RoomGuid, FusionStaticAssets, FusionOccSensor);
+                    : new FusionRoomGuids(Room.Name, _ipId, RoomGuid, FusionStaticAssets, FusionOccSensor);
 
-                var json = JsonConvert.SerializeObject(_guids, Newtonsoft.Json.Formatting.Indented);
+                var json = JsonConvert.SerializeObject(_guiDs, Newtonsoft.Json.Formatting.Indented);
 
                 using (var sw = new StreamWriter(filePath))
                 {
@@ -456,17 +312,17 @@ namespace PepperDash.Essentials.Core.Fusion
                 {
                     var json = File.ReadToEnd(filePath, Encoding.ASCII);
 
-                    _guids = JsonConvert.DeserializeObject<FusionRoomGuids>(json);
+                    _guiDs = JsonConvert.DeserializeObject<FusionRoomGuids>(json);
 
-                    // _config.IpId = _guids.IpId;
+                    _ipId = _guiDs.IpId;
 
-                    FusionStaticAssets = _guids.StaticAssets;
+                    FusionStaticAssets = _guiDs.StaticAssets;
                 }
 
                 Debug.LogMessage(LogEventLevel.Information, this, "Fusion Guids successfully read from file: {0}",
                     filePath);
 
-                Debug.LogMessage(LogEventLevel.Debug, this, "\r\n********************\r\n\tRoom Name: {0}\r\n\tIPID: {1:X}\r\n\tRoomGuid: {2}\r\n*******************", Room.Name, _config.IpIdInt, RoomGuid);
+                Debug.LogMessage(LogEventLevel.Debug, this, "\r\n********************\r\n\tRoom Name: {0}\r\n\tIPID: {1:X}\r\n\tRoomGuid: {2}\r\n*******************", Room.Name, _ipId, RoomGuid);
 
                 foreach (var item in FusionStaticAssets)
                 {
@@ -487,10 +343,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        /// <summary>
-        /// CreateSymbolAndBasicSigs method
-        /// </summary>
-        /// <param name="ipId"></param>
         protected virtual void CreateSymbolAndBasicSigs(uint ipId)
         {
             Debug.LogMessage(LogEventLevel.Information, this, "Creating Fusion Room symbol with GUID: {0} and IP-ID {1:X2}", RoomGuid, ipId);
@@ -553,10 +405,6 @@ namespace PepperDash.Essentials.Core.Fusion
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
         }
 
-        /// <summary>
-        /// CrestronEnvironment_EthernetEventHandler method
-        /// </summary>
-        /// <param name="ethernetEventArgs"></param>
         protected void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs ethernetEventArgs)
         {
             if (ethernetEventArgs.EthernetEventType == eEthernetEventType.LinkUp)
@@ -565,9 +413,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        /// <summary>
-        /// GetSystemInfo method
-        /// </summary>
         protected void GetSystemInfo()
         {
             //SystemName.InputSig.StringValue = Room.Name;
@@ -581,9 +426,6 @@ namespace PepperDash.Essentials.Core.Fusion
                 () => CrestronConsole.SendControlSystemCommand("reboot", ref response));
         }
 
-        /// <summary>
-        /// SetUpEthernetValues method
-        /// </summary>
         protected void SetUpEthernetValues()
         {
             _ip1 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorIp1.JoinNumber, JoinMap.ProcessorIp1.AttributeName, eSigIoMask.InputSigOnly);
@@ -599,9 +441,6 @@ namespace PepperDash.Essentials.Core.Fusion
             _netMask2 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorNetMask2.JoinNumber, JoinMap.ProcessorNetMask2.AttributeName, eSigIoMask.InputSigOnly);
         }
 
-        /// <summary>
-        /// GetProcessorEthernetValues method
-        /// </summary>
         protected void GetProcessorEthernetValues()
         {
             _ip1.InputSig.StringValue =
@@ -636,7 +475,7 @@ namespace PepperDash.Essentials.Core.Fusion
             // Interface 1
 
             if (InitialParametersClass.NumberOfEthernetInterfaces > 1)
-            // Only get these values if the processor has more than 1 NIC
+                // Only get these values if the processor has more than 1 NIC
             {
                 _ip2.InputSig.StringValue =
                     CrestronEthernetHelper.GetEthernetParameter(
@@ -650,9 +489,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        /// <summary>
-        /// GetProcessorInfo method
-        /// </summary>
         protected void GetProcessorInfo()
         {
             _firmware = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorFirmware.JoinNumber, JoinMap.ProcessorFirmware.AttributeName, eSigIoMask.InputSigOnly);
@@ -663,7 +499,7 @@ namespace PepperDash.Essentials.Core.Fusion
                 {
                     var join = JoinMap.ProgramNameStart.JoinNumber + i;
                     var progNum = i + 1;
-                    _program[i] = FusionRoom.CreateOffsetStringSig((uint)join,
+                    _program[i] = FusionRoom.CreateOffsetStringSig((uint) join,
                         string.Format("{0} {1}", JoinMap.ProgramNameStart.AttributeName, progNum), eSigIoMask.InputSigOnly);
                 }
             }
@@ -671,9 +507,6 @@ namespace PepperDash.Essentials.Core.Fusion
             _firmware.InputSig.StringValue = InitialParametersClass.FirmwareVersion;
         }
 
-        /// <summary>
-        /// GetCustomProperties method
-        /// </summary>
         protected void GetCustomProperties()
         {
             if (FusionRoom.IsOnline)
@@ -691,16 +524,11 @@ namespace PepperDash.Essentials.Core.Fusion
             // TODO: Get IP and Project Name from TP
         }
 
-        /// <summary>
-        /// FusionRoom_OnlineStatusChange method
-        /// </summary>
-        /// <param name="currentDevice"></param>
-        /// <param name="args"></param>
         protected void FusionRoom_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
         {
             if (args.DeviceOnLine)
             {
-                CrestronInvoke.BeginInvoke((o) =>
+                CrestronInvoke.BeginInvoke( (o) => 
                 {
                     CrestronEnvironment.Sleep(200);
 
@@ -848,7 +676,7 @@ namespace PepperDash.Essentials.Core.Fusion
                     var extendTime = _currentMeeting.dtEnd - DateTime.Now;
                     var extendMinutesRaw = extendTime.TotalMinutes;
 
-                    extendMinutes += (int)Math.Round(extendMinutesRaw);
+                    extendMinutes += (int) Math.Round(extendMinutesRaw);
                 }
 
 
@@ -956,11 +784,11 @@ namespace PepperDash.Essentials.Core.Fusion
                     var parameters = actionResponse["Parameters"];
 
                     foreach (var isRegistered in from XmlElement parameter in parameters
-                                                 where parameter.HasAttributes
+                        where parameter.HasAttributes
-                                                 select parameter.Attributes
+                        select parameter.Attributes
                         into attributes
-                                                 where attributes["ID"].Value == "Registered"
+                        where attributes["ID"].Value == "Registered"
-                                                 select Int32.Parse(attributes["Value"].Value))
+                        select Int32.Parse(attributes["Value"].Value))
                     {
                         switch (isRegistered)
                         {
@@ -1017,9 +845,9 @@ namespace PepperDash.Essentials.Core.Fusion
                             Debug.LogMessage(LogEventLevel.Debug, this, "DateTime from Fusion Server: {0}", currentTime);
 
                             // Parse time and date from response and insert values
-                            CrestronEnvironment.SetTimeAndDate((ushort)currentTime.Hour, (ushort)currentTime.Minute,
+                            CrestronEnvironment.SetTimeAndDate((ushort) currentTime.Hour, (ushort) currentTime.Minute,
-                                (ushort)currentTime.Second, (ushort)currentTime.Month, (ushort)currentTime.Day,
+                                (ushort) currentTime.Second, (ushort) currentTime.Month, (ushort) currentTime.Day,
-                                (ushort)currentTime.Year);
+                                (ushort) currentTime.Year);
 
                             Debug.LogMessage(LogEventLevel.Debug, this, "Processor time set to {0}", CrestronEnvironment.GetLocalTime());
                         }
@@ -1237,9 +1065,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        /// <summary>
-        /// SetUpSources method
-        /// </summary>
         protected virtual void SetUpSources()
         {
             // Sources
@@ -1249,10 +1074,10 @@ namespace PepperDash.Essentials.Core.Fusion
                 // NEW PROCESS:
                 // Make these lists and insert the fusion attributes by iterating these
                 var setTopBoxes = dict.Where(d => d.Value.SourceDevice is ISetTopBoxControls);
-                uint i = 0;
+                uint i = 1;
                 foreach (var kvp in setTopBoxes)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1SetTopBoxSourceStart.AttributeName + " " + (i + 1), JoinMap.Display1SetTopBoxSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1SetTopBoxSourceStart.AttributeName + " " + i, JoinMap.Display1SetTopBoxSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > JoinMap.Display1SetTopBoxSourceStart.JoinSpan) // We only have five spots
                     {
@@ -1261,10 +1086,10 @@ namespace PepperDash.Essentials.Core.Fusion
                 }
 
                 var discPlayers = dict.Where(d => d.Value.SourceDevice is IDiscPlayerControls);
-                i = 0;
+                i = 1;
                 foreach (var kvp in discPlayers)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + (i + 1), JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > JoinMap.Display1DiscPlayerSourceStart.JoinSpan) // We only have five spots
                     {
@@ -1273,10 +1098,10 @@ namespace PepperDash.Essentials.Core.Fusion
                 }
 
                 var laptops = dict.Where(d => d.Value.SourceDevice is IRoutingSource);
-                i = 0;
+                i = 1;
                 foreach (var kvp in laptops)
                 {
-                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + (i + 1), JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + i, JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > JoinMap.Display1LaptopSourceStart.JoinSpan) // We only have ten spots???
                     {
@@ -1286,7 +1111,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
                 foreach (var usageDevice in dict.Select(kvp => kvp.Value.SourceDevice).OfType<IUsageTracking>())
                 {
-                    usageDevice.UsageTracker = new UsageTracking(usageDevice as Device) { UsageIsTracked = true };
+                    usageDevice.UsageTracker = new UsageTracking(usageDevice as Device) {UsageIsTracked = true};
                     usageDevice.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
                 }
             }
@@ -1332,31 +1157,17 @@ namespace PepperDash.Essentials.Core.Fusion
             Debug.LogMessage(LogEventLevel.Debug, this, "Device usage string: {0}", deviceUsage);
         }
 
-        /// <summary>
+
-        /// Tries to add route action sigs for a source
-        /// </summary>
-        /// <param name="attrName"></param>
-        /// <param name="attrNum"></param>
-        /// <param name="routeKey"></param>
-        /// <param name="pSrc"></param>
         protected void TryAddRouteActionSigs(string attrName, uint attrNum, string routeKey, Device pSrc)
         {
-            this.LogVerbose("Creating attribute '{0}' with join {1} for source {2}",
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Creating attribute '{0}' with join {1} for source {2}",
                 attrName, attrNum, pSrc.Key);
             try
             {
                 var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputOutputSig);
                 // Need feedback when this source is selected
                 // Event handler, added below, will compare source changes with this sig dict
-                if (!_sourceToFeedbackSigs.ContainsKey(pSrc))
+                _sourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
-                {
-                    _sourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
-                }
-                else
-                {
-                    this.LogWarning("Source '{0}' already has a feedback sig mapped. Overwriting.", pSrc.Key);
-                    _sourceToFeedbackSigs[pSrc] = sigD.InputSig;
-                }
 
                 // And respond to selection in Fusion
                 sigD.OutputSig.SetSigFalseAction(() =>
@@ -1369,12 +1180,14 @@ namespace PepperDash.Essentials.Core.Fusion
             }
             catch (Exception)
             {
-                this.LogVerbose("Error creating Fusion signal {0} {1} for device '{2}'. THIS NEEDS REWORKING",
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Error creating Fusion signal {0} {1} for device '{2}'. THIS NEEDS REWORKING",
                     attrNum, attrName, pSrc.Key);
             }
         }
 
-
+        /// <summary>
+        /// 
+        /// </summary>
         private void SetUpCommunitcationMonitors()
         {
             uint displayNum = 0;
@@ -1461,8 +1274,6 @@ namespace PepperDash.Essentials.Core.Fusion
 
                 if (attrName != null)
                 {
-                    this.LogDebug("Linking communication monitor for device '{0}' to Fusion attribute '{1}' at join {2}",
-                        dev.Key, attrName, attrNum);
                     // Link comm status to sig and update
                     var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputSigOnly);
                     var smd = dev as ICommunicationMonitor;
@@ -1474,9 +1285,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        /// <summary>
-        /// SetUpDisplay method
-        /// </summary>
         protected virtual void SetUpDisplay()
         {
             try
@@ -1489,7 +1297,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
                 foreach (var display in displays.Cast<IDisplay>())
                 {
-                    display.UsageTracker = new UsageTracking(display as Device) { UsageIsTracked = true };
+                    display.UsageTracker = new UsageTracking(display as Device) {UsageIsTracked = true};
                     display.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
                 }
 
@@ -1602,7 +1410,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
 
             // Power on
-            var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On",
+            var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint) joinOffset, displayName + "Power On",
                 eSigIoMask.InputOutputSig);
             defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b =>
             {
@@ -1613,7 +1421,7 @@ namespace PepperDash.Essentials.Core.Fusion
             });
 
             // Power Off
-            var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off",
+            var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint) joinOffset + 1, displayName + "Power Off",
                 eSigIoMask.InputOutputSig);
             defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b =>
             {
@@ -1631,7 +1439,7 @@ namespace PepperDash.Essentials.Core.Fusion
             }
 
             // Current Source
-            var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8,
+            var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint) joinOffset + 8,
                 displayName + "Source None", eSigIoMask.InputOutputSig);
             defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b =>
             {
@@ -1699,7 +1507,7 @@ namespace PepperDash.Essentials.Core.Fusion
             //if (Room.OccupancyObj != null)
             //{ 
 
-            var tempOccAsset = _guids.OccupancyAsset;
+            var tempOccAsset = _guiDs.OccupancyAsset;
 
             if (tempOccAsset == null)
             {
@@ -1724,7 +1532,7 @@ namespace PepperDash.Essentials.Core.Fusion
                 occRoom.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
             }
             RoomOccupancyRemoteStringFeedback = new StringFeedback(() => _roomOccupancyRemoteString);
-
+            
             RoomOccupancyRemoteStringFeedback.LinkInputSig(occSensorAsset.RoomOccupancyInfo.InputSig);
 
             //}
@@ -1780,82 +1588,12 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        /// <summary>
-        /// Event handler for Fusion state changes
-        /// </summary>
-        /// <param name="device"></param>
-        /// <param name="args"></param>
         protected void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventArgs args)
         {
-            if (args.EventId == FusionEventIds.HelpMessageReceivedEventId)
-            {
-                this.LogInformation("Help message received from Fusion for room '{0}'",
-             Room.Name);
-
-                this.LogDebug("Help message content: {0}", FusionRoom.Help.OutputSig.StringValue);
-                // Fire help request event
-                HelpRequestResponseFeedback.FireUpdate();
-
-                if (!string.IsNullOrEmpty(FusionRoom.Help.OutputSig.StringValue))
-                {
-                    switch (FusionRoom.Help.OutputSig.StringValue)
-                    {
-                        case "Please wait, a technician is on his / her way.":
-                            // this.LogInformation("Please wait, a technician is on his / her way.",
-                            //  Room.Name);
-
-                            _helpRequestStatus = eFusionHelpResponse.HelpOnTheWay;
-                            break;
-                        case "Please call the helpdesk.":
-                            // this.LogInformation("Please call the helpdesk.");
-                            _helpRequestStatus = eFusionHelpResponse.CallHelpDesk;
-                            break;
-                        case "Please wait, I will reschedule your meeting to a different room.":
-                            // this.LogInformation("Please wait, I will reschedule your meeting to a different room.",
-                            //  Room.Name);
-
-                            _helpRequestStatus = eFusionHelpResponse.ReschedulingMeeting;
-                            break;
-                        case "I will be taking control of your system. Please be patient while I adjust the settings.":
-                            // this.LogInformation("I will be taking control of your system. Please be patient while I adjust the settings.",
-                            //  Room.Name);
-
-                            _helpRequestStatus = eFusionHelpResponse.TakingControl;
-                            break;
-                        default:
-                            // this.LogInformation("Unknown help request code received from Fusion for room '{0}'",
-                            //  Room.Name);
-
-                            _helpRequestStatus = eFusionHelpResponse.None;
-                            break;
-                    }
-                }
-                else
-                {
-                    _helpRequestStatus = eFusionHelpResponse.None;
-                }
-
-                if (_helpRequestStatus == eFusionHelpResponse.None)
-                {
-                    _helpRequestSent = false;
-                    HelpRequestSentFeedback.FireUpdate();
-                }
-
-                HelpRequestStatusFeedback.FireUpdate();
-
-                if (_helpRequestTimeoutTimer != null)
-                {
-                    _helpRequestTimeoutTimer.Stop();
-                    _helpRequestTimeoutTimer.Elapsed -= OnTimedEvent;
-                    _helpRequestTimeoutTimer.Dispose();
-                    _helpRequestTimeoutTimer = null;
-                }
-            }
-
-
             // The sig/UO method: Need separate handlers for fixed and user sigs, all flavors, 
             // even though they all contain sigs.
 
+
             BoolOutputSig outSig;
             if (args.UserConfiguredSigDetail is BooleanSigDataFixedName sigData)
             {
@@ -1894,102 +1632,9 @@ namespace PepperDash.Essentials.Core.Fusion
                 (outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
             }
         }
-
-        /// <inheritdoc />
-        public void SendHelpRequest()
-        {
-
-            var now = DateTime.Now;
-
-            var breakString = _config.UseHtmlFormatForHelpRequests ? "<BR>" : "\r\n";
-
-            var date = now.ToString("MMMM dd, yyyy");
-            var time = now.ToString("hh:mm tt");
-            if (_config.Use24HourTimeFormat)
-            {
-                time = now.ToString("HH:mm");
-            }
-
-            var requestString = $"HR00: {breakString} Assistance has been requested from room {Room.Name}{breakString}on {date} at {time}";
-
-            FusionRoom.Help.InputSig.StringValue = requestString;
-
-            this.LogInformation("Help request sent to Fusion from room '{0}'", Room.Name);
-            this.LogDebug("Help request content: {0}", FusionRoom.Help.InputSig.StringValue);
-
-            _helpRequestSent = true;
-            HelpRequestSentFeedback.FireUpdate();
-
-            if (UseHelpRequestTimer)
-            {
-                if (_helpRequestTimeoutTimer == null)
-                {
-                    _helpRequestTimeoutTimer = new Timer(HelpRequestTimeoutMs);
-                    _helpRequestTimeoutTimer.AutoReset = false;
-                    _helpRequestTimeoutTimer.Enabled = true;
-
-                    _helpRequestTimeoutTimer.Elapsed += OnTimedEvent;
-                }
-
-                _helpRequestTimeoutTimer.Interval = HelpRequestTimeoutMs;
-                _helpRequestTimeoutTimer.Start();
-
-                this.LogDebug("Help request timeout timer started for room '{0}' with timeout of {1} ms.",
-    Room.Name, HelpRequestTimeoutMs);
-            }
-
-            _helpRequestStatus = eFusionHelpResponse.HelpRequested;
-            HelpRequestStatusFeedback.FireUpdate();
-        }
-
-        private void OnTimedEvent(object source, ElapsedEventArgs e)
-        {
-            this.LogInformation("Help request timeout reached for room '{0}'. Cancelling help request.", Room.Name);
-            CancelHelpRequest();
-        }
-
-        /// <inheritdoc />
-        public void CancelHelpRequest()
-        {
-            if (_helpRequestSent)
-            {
-                FusionRoom.Help.InputSig.StringValue = "";
-                _helpRequestSent = false;
-                HelpRequestSentFeedback.FireUpdate();
-                _helpRequestStatus = eFusionHelpResponse.None;
-                HelpRequestStatusFeedback.FireUpdate();
-                Debug.LogMessage(LogEventLevel.Information, this, "Help request cancelled for room '{0}'", Room.Name);
-            }
-
-            if (_helpRequestTimeoutTimer != null)
-            {
-                _helpRequestTimeoutTimer.Stop();
-                _helpRequestTimeoutTimer.Elapsed -= OnTimedEvent;
-                _helpRequestTimeoutTimer.Dispose();
-                _helpRequestTimeoutTimer = null;
-                this.LogDebug("Help request timeout timer stopped for room '{0}'.", Room.Name);
-            }
-        }
-
-        /// <inheritdoc />
-        public void ToggleHelpRequest()
-        {
-            if (_helpRequestSent)
-            {
-                CancelHelpRequest();
-            }
-            else
-            {
-                SendHelpRequest();
-            }
-        }
-
     }
 
 
-    /// <summary>
-    /// Extensions to enhance Fusion room, asset and signal creation.
-    /// </summary>
     public static class FusionRoomExtensions
     {
         /// <summary>
@@ -2003,8 +1648,6 @@ namespace PepperDash.Essentials.Core.Fusion
         /// </summary>
         public static BooleanSigData CreateOffsetBoolSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
         {
-            Debug.LogDebug("Creating Offset Bool Sig: {0} at Join {1}", name, number);
-
             if (number < 50)
             {
                 throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
@@ -2025,8 +1668,6 @@ namespace PepperDash.Essentials.Core.Fusion
         /// </summary>
         public static UShortSigData CreateOffsetUshortSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
         {
-            Debug.LogDebug("Creating Offset UShort Sig: {0} at Join {1}", name, number);
-
             if (number < 50)
             {
                 throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
@@ -2047,8 +1688,6 @@ namespace PepperDash.Essentials.Core.Fusion
         /// </summary>
         public static StringSigData CreateOffsetStringSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
         {
-            Debug.LogDebug("Creating Offset String Sig: {0} at Join {1}", name, number);
-
             if (number < 50)
             {
                 throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
@@ -2164,9 +1803,6 @@ namespace PepperDash.Essentials.Core.Fusion
     /// </summary>
     public class RoomInformation
     {
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public RoomInformation()
         {
             FusionCustomProperties = new List<FusionCustomProperty>();
@@ -2219,17 +1855,10 @@ namespace PepperDash.Essentials.Core.Fusion
     /// </summary>
     public class FusionCustomProperty
     {
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public FusionCustomProperty()
         {
         }
 
-        /// <summary>
-        /// Constructor with id
-        /// </summary>
-        /// <param name="id"></param>
         public FusionCustomProperty(string id)
         {
             ID = id;

src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs

@@ -16,201 +16,121 @@ namespace PepperDash.Essentials.Core.Fusion
     {
 
         // Processor Attributes
-        /// <summary>
-        /// Processor IP 1
-        /// </summary>
         [JoinName("ProcessorIp1")]
         public JoinDataComplete ProcessorIp1 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1, AttributeName = "Info - Processor - IP 1" },
             new JoinMetadata { Description = "Info - Processor - IP 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor IP 2
-        /// </summary>
         [JoinName("ProcessorIp2")]
         public JoinDataComplete ProcessorIp2 = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1, AttributeName = "Info - Processor - IP 2" },
             new JoinMetadata { Description = "Info - Processor - IP 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Gateway
-        /// </summary>
         [JoinName("ProcessorGateway")]
         public JoinDataComplete ProcessorGateway = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1, AttributeName = "Info - Processor - Gateway" },
             new JoinMetadata { Description = "Info - Processor - Gateway", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Hostname
-        /// </summary>
         [JoinName("ProcessorHostname")]
         public JoinDataComplete ProcessorHostname = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1, AttributeName = "Info - Processor - Hostname" },
             new JoinMetadata { Description = "Info - Processor - Hostname", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Domain
-        /// </summary>
         [JoinName("ProcessorDomain")]
         public JoinDataComplete ProcessorDomain = new JoinDataComplete(new JoinData { JoinNumber = 54, JoinSpan = 1, AttributeName = "Info - Processor - Domain" },
             new JoinMetadata { Description = "Info - Processor - Domain", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor DNS 1
-        /// </summary>
         [JoinName("ProcessorDns1")]
         public JoinDataComplete ProcessorDns1 = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1, AttributeName = "Info - Processor - DNS 1" },
             new JoinMetadata { Description = "Info - Processor - DNS 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor DNS 2
-        /// </summary>
         [JoinName("ProcessorDns2")]
         public JoinDataComplete ProcessorDns2 = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1, AttributeName = "Info - Processor - DNS 2" },
             new JoinMetadata { Description = "Info - Processor - DNS 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor MAC 1
-        /// </summary>
         [JoinName("ProcessorMac1")]
         public JoinDataComplete ProcessorMac1 = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1, AttributeName = "Info - Processor - MAC 1" },
             new JoinMetadata { Description = "Info - Processor - MAC 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor MAC 2
-        /// </summary>
         [JoinName("ProcessorMac2")]
         public JoinDataComplete ProcessorMac2 = new JoinDataComplete(new JoinData { JoinNumber = 58, JoinSpan = 1, AttributeName = "Info - Processor - MAC 2" },
             new JoinMetadata { Description = "Info - Processor - MAC 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Net Mask 1
-        /// </summary>
         [JoinName("ProcessorNetMask1")]
         public JoinDataComplete ProcessorNetMask1 = new JoinDataComplete(new JoinData { JoinNumber = 59, JoinSpan = 1, AttributeName = "Info - Processor - Net Mask 1" },
             new JoinMetadata { Description = "Info - Processor - Net Mask 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Net Mask 2
-        /// </summary>
         [JoinName("ProcessorNetMask2")]
         public JoinDataComplete ProcessorNetMask2 = new JoinDataComplete(new JoinData { JoinNumber = 60, JoinSpan = 1, AttributeName = "Info - Processor - Net Mask 2" },
             new JoinMetadata { Description = "Info - Processor - Net Mask 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Firmware
-        /// </summary>
         [JoinName("ProcessorFirmware")]
         public JoinDataComplete ProcessorFirmware = new JoinDataComplete(new JoinData { JoinNumber = 61, JoinSpan = 1, AttributeName = "Info - Processor - Firmware" },
             new JoinMetadata { Description = "Info - Processor - Firmware", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Program Name Start
-        /// </summary>
         [JoinName("ProgramNameStart")]
         public JoinDataComplete ProgramNameStart = new JoinDataComplete(new JoinData { JoinNumber = 62, JoinSpan = 10, AttributeName = "Info - Processor - Program" },
             new JoinMetadata { Description = "Info - Processor - Program", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Reboot
-        /// </summary>
         [JoinName("ProcessorReboot")]
         public JoinDataComplete ProcessorReboot = new JoinDataComplete(new JoinData { JoinNumber = 74, JoinSpan = 1, AttributeName = "Processor - Reboot" },
             new JoinMetadata { Description = "Processor - Reboot", JoinCapabilities = eJoinCapabilities.FromFusion, JoinType = eJoinType.Digital });
 
         // Volume Controls
-        /// <summary>
-        /// Volume Fader 1
-        /// </summary>
         [JoinName("VolumeFader1")]
         public JoinDataComplete VolumeFader1 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1, AttributeName = "Volume - Fader01" },
             new JoinMetadata { Description = "Volume - Fader01", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Analog });
 
         // Codec Info
-        /// <summary>
-        /// VC Codec In Call
-        /// </summary>
         [JoinName("VcCodecInCall")]
         public JoinDataComplete VcCodecInCall = new JoinDataComplete(new JoinData { JoinNumber = 69, JoinSpan = 1, AttributeName = "Conf - VC 1 In Call" },
             new JoinMetadata { Description = "Conf - VC 1 In Call", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// VC Codec Online
-        /// </summary>
         [JoinName("VcCodecOnline")]
         public JoinDataComplete VcCodecOnline = new JoinDataComplete(new JoinData { JoinNumber = 122, JoinSpan = 1, AttributeName = "Online - VC 1" },
             new JoinMetadata { Description = "Online - VC 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// VC Codec IP Address
-        /// </summary>
         [JoinName("VcCodecIpAddress")]
         public JoinDataComplete VcCodecIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 121, JoinSpan = 1, AttributeName = "IP Address - VC" },
             new JoinMetadata { Description = "IP Address - VC", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// VC Codec IP Port
-        /// </summary>
         [JoinName("VcCodecIpPort")]
         public JoinDataComplete VcCodecIpPort = new JoinDataComplete(new JoinData { JoinNumber = 150, JoinSpan = 1, AttributeName = "IP Port - VC" },
             new JoinMetadata { Description = "IP Port - VC", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
         // Source Attributes 
-        /// <summary>
-        /// Display 1 Current Source Name
-        /// </summary>
         [JoinName("Display1CurrentSourceName")]
         public JoinDataComplete Display1CurrentSourceName = new JoinDataComplete(new JoinData { JoinNumber = 84, JoinSpan = 1, AttributeName = "Display 1 - Current Source" },
             new JoinMetadata { Description = "Display 1 - Current Source", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
 
 
         // Device Online Status
-        /// <summary>
-        /// Touchpanel Online Start
-        /// </summary>
         [JoinName("TouchpanelOnlineStart")]
         public JoinDataComplete TouchpanelOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 150, JoinSpan = 10, AttributeName = "Online - Touch Panel" },
             new JoinMetadata { Description = "Online - Touch Panel", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Xpanel Online Start
-        /// </summary>
         [JoinName("XpanelOnlineStart")]
         public JoinDataComplete XpanelOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 160, JoinSpan = 5, AttributeName = "Online - XPanel" },
             new JoinMetadata { Description = "Online - XPanel", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Display Online Start
-        /// </summary>
         [JoinName("DisplayOnlineStart")]
         public JoinDataComplete DisplayOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 170, JoinSpan = 10, AttributeName = "Online - Display" },
             new JoinMetadata { Description = "Online - Display", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Display 1 Laptop Source Start
-        /// </summary>
         [JoinName("Display1LaptopSourceStart")]
-        public JoinDataComplete Display1LaptopSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 165, JoinSpan = 5, AttributeName = "Display 1 - Source Laptop" },
+        public JoinDataComplete Display1LaptopSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 166, JoinSpan = 5, AttributeName = "Display 1 - Source Laptop" },
             new JoinMetadata { Description = "Display 1 - Source Laptop", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
         
-        /// <summary>
-        /// Display 1 Disc Player Source Start
-        /// </summary>
         [JoinName("Display1DiscPlayerSourceStart")]
-        public JoinDataComplete Display1DiscPlayerSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 180, JoinSpan = 5, AttributeName = "Display 1 - Source Disc Player" },
+        public JoinDataComplete Display1DiscPlayerSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 181, JoinSpan = 5, AttributeName = "Display 1 - Source Disc Player" },
             new JoinMetadata { Description = "Display 1 - Source Disc Player", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Display 1 Set Top Box Source Start
-        /// </summary>
         [JoinName("Display1SetTopBoxSourceStart")]
-        public JoinDataComplete Display1SetTopBoxSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 185, JoinSpan = 5, AttributeName = "Display 1 - Source TV" },
+        public JoinDataComplete Display1SetTopBoxSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 188, JoinSpan = 5, AttributeName = "Display 1 - Source TV" },
             new JoinMetadata { Description = "Display 1 - Source TV", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
 
         // Display 1 
-        /// <summary>
-        /// Display 1 Start
-        /// </summary>
         [JoinName("Display1Start")]
-        public JoinDataComplete Display1Start = new JoinDataComplete(new JoinData { JoinNumber = 190, JoinSpan = 1 },
+        public JoinDataComplete Display1Start = new JoinDataComplete(new JoinData { JoinNumber = 158, JoinSpan = 1 },
             new JoinMetadata { Description = "Display 1 Start", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
 
+
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it
         /// </summary>

src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerFactory.cs

@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Fusion;
-
-/// <summary>
-/// Factory for creating IEssentialsRoomFusionController devices
-/// </summary>
-public class IEssentialsRoomFusionControllerFactory : EssentialsDeviceFactory<IEssentialsRoomFusionController>
-{
-    /// <summary>
-    /// Constructor
-    /// </summary>
-    public IEssentialsRoomFusionControllerFactory()
-    {
-        TypeNames = new List<string>() { "fusionRoom" };
-    }
-
-    /// <summary>
-    /// Builds the device
-    /// </summary>
-    /// <param name="dc"></param>
-    /// <returns></returns>
-    public override EssentialsDevice BuildDevice(PepperDash.Essentials.Core.Config.DeviceConfig dc)
-    {
-        Debug.LogDebug("Factory Attempting to create new IEssentialsRoomFusionController Device");
-
-
-        var properties = dc.Properties.ToObject<IEssentialsRoomFusionControllerPropertiesConfig>();
-
-        return new IEssentialsRoomFusionController(dc.Key, dc.Name, properties);
-    }
-}

src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs

@@ -1,71 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Core;
-
-/// <summary>
-/// Config properties for an IEssentialsRoomFusionController device
-/// </summary>
-public class IEssentialsRoomFusionControllerPropertiesConfig
-{
-    /// <summary>
-    /// Gets or sets the IP ID of the Fusion Room Controller
-    /// </summary>
-    [JsonProperty("ipId")]
-    public string IpId { get; set; }
-
-    /// <summary>
-    /// Gets the IP ID as a UInt16
-    /// </summary>
-    [JsonIgnore]
-    public uint IpIdInt
-    {
-        get
-        {
-            // Try to parse the IpId string to UInt16 as hex
-            if (ushort.TryParse(IpId, System.Globalization.NumberStyles.HexNumber, null, out ushort result))
-            {
-                return result;
-            }
-            else
-            {
-                Debug.LogWarning( "Failed to parse IpId '{0}' as UInt16", IpId);
-                return 0;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Gets or sets the join map key
-    /// </summary>
-    [JsonProperty("joinMapKey")]
-    public string JoinMapKey { get; set; }
-
-    /// <summary>
-    /// Gets or sets the room key associated with this Fusion Room Controller
-    /// </summary>
-    [JsonProperty("roomKey")]
-    public string RoomKey { get; set; }
-
-    /// <summary>
-    /// Gets or sets whether to use HTML format for help requests
-    /// </summary>
-    [JsonProperty("useHtmlFormatForHelpRequests")]
-    public bool UseHtmlFormatForHelpRequests { get; set; } = false;
-
-    /// <summary>
-    /// Gets or sets whether to use 24-hour time format
-    /// </summary>
-    [JsonProperty("use24HourTimeFormat")]
-    public bool Use24HourTimeFormat { get; set; } = false;
-
-    /// <summary>
-    /// Gets or sets whether to use a timeout for help requests
-    /// </summary>
-    [JsonProperty("useTimeoutForHelpRequests")]
-    public bool UseTimeoutForHelpRequests { get; set; } = false;
-
-    /// <summary>
-    /// Gets or sets the timeout duration for help requests in milliseconds
-    /// </summary>
-    [JsonProperty("helpRequestTimeoutMs")]
-    public int HelpRequestTimeoutMs { get; set; } = 30000;
-}

src/PepperDash.Essentials.Core/Fusion/IFusionHelpRequest.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Fusion
-{
-    /// <summary>
-    /// Represents Fusion Help Request functionality
-    /// </summary>
-    public interface IFusionHelpRequest
-    {
-        /// <summary>
-        /// Feedback containing the response to a help request
-        /// </summary>
-        StringFeedback HelpRequestResponseFeedback { get; }
-
-        /// <summary>
-        /// Indicates whether a help request has been sent
-        /// </summary>
-        BoolFeedback HelpRequestSentFeedback { get; }
-
-        /// <summary>
-        /// Feedback containing the current status of the help request
-        /// </summary>
-        StringFeedback HelpRequestStatusFeedback { get; }
-
-        /// <summary>
-        /// Sends a help request
-        /// </summary>
-        void SendHelpRequest();
-
-        /// <summary>
-        /// Clears the current help request status
-        /// </summary>
-        void CancelHelpRequest();
-
-        /// <summary>
-        /// Toggles between sending and cancelling a help request
-        /// </summary>
-        void ToggleHelpRequest();
-    }
-}

src/PepperDash.Essentials.Core/Fusion/eFusionHelpResponse.cs

@@ -1,37 +0,0 @@
-
-
-namespace PepperDash.Essentials.Core.Fusion
-{
-    /// <summary>
-    /// Enumeration of possible Fusion Help Responses based on the standard responses from Fusion
-    /// </summary>
-    public enum eFusionHelpResponse
-    {
-        /// <summary>
-        /// No help response
-        /// </summary>
-        None,
-        /// <summary>
-        /// Help has been requested
-        /// </summary>
-        HelpRequested,
-        /// <summary>
-        /// Help is on the way
-        /// </summary>
-        HelpOnTheWay,
-        /// <summary>
-        /// Please call the helpdesk.
-        /// </summary>
-        CallHelpDesk,
-        /// <summary>
-        /// Rescheduling meeting.
-        /// </summary>
-        ReschedulingMeeting,
-
-        /// <summary>
-        /// Technician taking control.
-        /// </summary>
-        TakingControl,
-    }
-
-}

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -25,7 +25,7 @@
     <DocumentationFile>bin\$(Configuration)\PepperDash_Essentials_Core.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.133" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs

@@ -49,7 +49,7 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public IRoomOccupancy Room { get; private set; }
 
-        private Fusion.IEssentialsRoomFusionController FusionRoom;
+        private Fusion.EssentialsHuddleSpaceFusionSystemControllerBase FusionRoom;
 
         public RoomOnToDefaultSourceWhenOccupied(DeviceConfig config) :
             base (config)
@@ -74,7 +74,7 @@ namespace PepperDash.Essentials.Core
 
                 var fusionRoomKey = PropertiesConfig.RoomKey + "-fusion";
 
-                FusionRoom = DeviceManager.GetDeviceForKey(fusionRoomKey) as Core.Fusion.IEssentialsRoomFusionController;
+                FusionRoom = DeviceManager.GetDeviceForKey(fusionRoomKey) as Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase;
 
                 if (FusionRoom == null)
                     Debug.LogMessage(LogEventLevel.Debug, this, "Unable to get Fusion Room from Device Manager with key: {0}", fusionRoomKey);

src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs

@@ -103,12 +103,6 @@ namespace PepperDash.Essentials.Core
         [JsonProperty("name")]
         public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to hide this scenario in the UI.
-        /// </summary>
-        [JsonProperty("hideInUi", NullValueHandling = NullValueHandling.Ignore)]
-        public bool HideInUi { get; set; }
-
         /// <summary>
         /// Gets or sets the collection of partition states.
         /// </summary>

src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs

@@ -109,12 +109,6 @@ namespace PepperDash.Essentials.Core
         [JsonProperty("isActive")]
         bool IsActive { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether this scenario should be hidden in the UI.
-        /// </summary>
-        [JsonProperty("hideInUi")]
-        bool HideInUi { get; }
-
         /// <summary>
         /// Activates this room combination scenario
         /// </summary>

src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs

@@ -14,40 +14,18 @@ namespace PepperDash.Essentials.Core
     {
         private RoomCombinationScenarioConfig _config;
 
-        /// <summary>
-        /// Gets or sets the key associated with the object.
-        /// </summary>
         [JsonProperty("key")]
         public string Key { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name associated with the object.
-        /// </summary>
         [JsonProperty("name")]
         public string Name { get; set; }
 
-        /// <summary>
+        [JsonProperty("partitionStates")]
-        /// Gets a value indicating whether to hide this scenario in the UI.
-        /// </summary>
-        ///        
-        [JsonProperty("hideInUi")]
-
-        public bool HideInUi
-        {
-            get { return _config.HideInUi; }
-        }
-
         /// <summary>
         /// Gets or sets the PartitionStates
         /// </summary>
-        ///
-        [JsonProperty("partitionStates")]
-
         public List<PartitionState> PartitionStates { get; private set; }
 
-        /// <summary>
-        /// Determines which UI devices get mapped to which room in this scenario.  The Key should be the key of the UI device and the Value should be the key of the room to map to
-        /// </summary>
         [JsonProperty("uiMap")]
         public Dictionary<string, string> UiMap { get; set; }
 

src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs

@@ -9,11 +9,11 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Room.Config
 {
-    /// <summary>
+ /// <summary>
-    /// Represents a EssentialsRoomConfigHelper
+ /// Represents a EssentialsRoomConfigHelper
-    /// </summary>
+ /// </summary>
-    public class EssentialsRoomConfigHelper
+	public class EssentialsRoomConfigHelper
-    {
+	{
         /// <summary>
         /// GetEmergency method
         /// </summary>
@@ -31,109 +31,100 @@ namespace PepperDash.Essentials.Room.Config
             return null;
         }
 
-        /// <summary>
+		/// <summary>
-        /// 
+		/// 
-        /// </summary>
+		/// </summary>
-        /// <param name="props"></param>
+		/// <param name="props"></param>
-        /// <param name="room"></param>
+		/// <param name="room"></param>
-        /// <returns></returns>
+		/// <returns></returns>
-        /// <summary>
+  /// <summary>
-        /// GetMicrophonePrivacy method
+  /// GetMicrophonePrivacy method
-        /// </summary>
+  /// </summary>
-        public static MicrophonePrivacyController GetMicrophonePrivacy(
+		public static MicrophonePrivacyController GetMicrophonePrivacy(
-            EssentialsRoomPropertiesConfig props, IPrivacy room)
+			EssentialsRoomPropertiesConfig props, IPrivacy room)
-        {
+		{
-            var microphonePrivacy = props.MicrophonePrivacy;
+			var microphonePrivacy = props.MicrophonePrivacy;
-            if (microphonePrivacy == null)
+			if (microphonePrivacy == null)
-            {
+			{
-                Debug.LogMessage(LogEventLevel.Information, "Cannot create microphone privacy with null properties");
+				Debug.LogMessage(LogEventLevel.Information, "Cannot create microphone privacy with null properties");
-                return null;
+				return null;
-            }
+			}
-            // Get the MicrophonePrivacy device from the device manager
+			// Get the MicrophonePrivacy device from the device manager
-            var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as MicrophonePrivacyController);
+			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as MicrophonePrivacyController);
-            // Set this room as the IPrivacy device
+			// Set this room as the IPrivacy device
-            if (mP == null)
+			if (mP == null)
-            {
+			{
-                Debug.LogMessage(LogEventLevel.Information, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
+				Debug.LogMessage(LogEventLevel.Information, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
-                return null;
+				return null;
-            }
+			}
-            mP.SetPrivacyDevice(room);
+			mP.SetPrivacyDevice(room);
 
-            var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
+			var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
 
-            if (behaviour == null)
+			if (behaviour == null)
-            {
+			{
-                Debug.LogMessage(LogEventLevel.Information, "WARNING: No behaviour defined for MicrophonePrivacyController");
+				Debug.LogMessage(LogEventLevel.Information, "WARNING: No behaviour defined for MicrophonePrivacyController");
-                return null;
+				return null;
-            }
+			}
-            if (behaviour == "trackroomstate")
+			if (behaviour == "trackroomstate")
-            {
+			{
-                // Tie LED enable to room power state
+				// Tie LED enable to room power state
                 var essRoom = room as IEssentialsRoom;
                 essRoom.OnFeedback.OutputChange += (o, a) =>
-                {
+				{
                     if (essRoom.OnFeedback.BoolValue)
-                        mP.EnableLeds = true;
+						mP.EnableLeds = true;
-                    else
+					else
-                        mP.EnableLeds = false;
+						mP.EnableLeds = false;
-                };
+				};
 
                 mP.EnableLeds = essRoom.OnFeedback.BoolValue;
-            }
+			}
-            else if (behaviour == "trackcallstate")
+			else if (behaviour == "trackcallstate")
-            {
+			{
-                // Tie LED enable to room power state
+				// Tie LED enable to room power state
                 var inCallRoom = room as IHasInCallFeedback;
                 inCallRoom.InCallFeedback.OutputChange += (o, a) =>
-                {
+				{
                     if (inCallRoom.InCallFeedback.BoolValue)
-                        mP.EnableLeds = true;
+						mP.EnableLeds = true;
-                    else
+					else
-                        mP.EnableLeds = false;
+						mP.EnableLeds = false;
-                };
+				};
 
                 mP.EnableLeds = inCallRoom.InCallFeedback.BoolValue;
-            }
+			}
 
-            return mP;
+			return mP;
-        }
+		}
+	
+	}
 
-    }
+ /// <summary>
+ /// Represents a EssentialsRoomPropertiesConfig
+ /// </summary>
+	public class EssentialsRoomPropertiesConfig
+	{
+		[JsonProperty("addresses")]
+		public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
 
-    /// <summary>
+		[JsonProperty("description")]
-    /// Represents a EssentialsRoomPropertiesConfig
+		public string Description { get; set; }
-    /// </summary>
-    public class EssentialsRoomPropertiesConfig
-    {
-        /// <summary>
-        /// Gets or sets the Addresses
-        /// </summary>
-        [JsonProperty("addresses")]
-        public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
 
-        /// <summary>
+		[JsonProperty("emergency")]
-        /// Gets or sets the Description
+		public EssentialsRoomEmergencyConfig Emergency { get; set; }
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; set; }
 
-        /// <summary>
+		[JsonProperty("help")]
-        /// Gets or sets the Emergency
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Help
-        [JsonProperty("emergency")]
+  /// </summary>
-        public EssentialsRoomEmergencyConfig Emergency { get; set; }
+		public EssentialsHelpPropertiesConfig Help { get; set; }
 
-        /// <summary>
+		[JsonProperty("helpMessage")]
-        /// Gets or sets the Help
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the HelpMessage
-        [JsonProperty("help")]
+  /// </summary>
-        public EssentialsHelpPropertiesConfig Help { get; set; }
+		public string HelpMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the HelpMessage
-        /// </summary>
-        [JsonProperty("helpMessage")]
-        public string HelpMessage { get; set; }
 
         /// <summary>
         /// Read this value to get the help message.  It checks for the old and new config format.
@@ -142,120 +133,120 @@ namespace PepperDash.Essentials.Room.Config
         {
             get
             {
-                if (Help != null && !string.IsNullOrEmpty(Help.Message))
+                if(Help != null && !string.IsNullOrEmpty(Help.Message))
                 {
                     return Help.Message;
                 }
                 else
                 {
-                    return HelpMessage;
+                    return HelpMessage; 
                 }
             }
         }
 
-        /// <summary>
+		[JsonProperty("environment")]
-        /// Gets or sets the Environment
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Environment
-        [JsonProperty("environment")]
+  /// </summary>
-        public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
+		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
 
-        /// <summary>
+		[JsonProperty("logo")]
-        /// Gets or sets the LogoLight
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the LogoLight
-        [JsonProperty("logo")]
+  /// </summary>
-        public EssentialsLogoPropertiesConfig LogoLight { get; set; }
+		public EssentialsLogoPropertiesConfig LogoLight { get; set; }
 
+        [JsonProperty("logoDark")]
         /// <summary>
         /// Gets or sets the LogoDark
         /// </summary>
-        [JsonProperty("logoDark")]
         public EssentialsLogoPropertiesConfig LogoDark { get; set; }
+	
+		[JsonProperty("microphonePrivacy")]
+  /// <summary>
+  /// Gets or sets the MicrophonePrivacy
+  /// </summary>
+		public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
 
-        /// <summary>
+		[JsonProperty("occupancy")]
-        /// Gets or sets the MicrophonePrivacy
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Occupancy
-        [JsonProperty("microphonePrivacy")]
+  /// </summary>
-        public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
+		public EssentialsRoomOccSensorConfig Occupancy { get; set; }
 
-        /// <summary>
+		[JsonProperty("oneButtonMeeting")]
-        /// Gets or sets the Occupancy
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the OneButtonMeeting
-        [JsonProperty("occupancy")]
+  /// </summary>
-        public EssentialsRoomOccSensorConfig Occupancy { get; set; }
+		public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
 
-        /// <summary>
+		[JsonProperty("shutdownVacancySeconds")]
-        /// Gets or sets the OneButtonMeeting
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the ShutdownVacancySeconds
-        [JsonProperty("oneButtonMeeting")]
+  /// </summary>
-        public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
+		public int ShutdownVacancySeconds { get; set; }
 
-        /// <summary>
+		[JsonProperty("shutdownPromptSeconds")]
-        /// Gets or sets the ShutdownVacancySeconds
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the ShutdownPromptSeconds
-        [JsonProperty("shutdownVacancySeconds")]
+  /// </summary>
-        public int ShutdownVacancySeconds { get; set; }
+		public int ShutdownPromptSeconds { get; set; }
 
-        /// <summary>
+		[JsonProperty("tech")]
-        /// Gets or sets the ShutdownPromptSeconds
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Tech
-        [JsonProperty("shutdownPromptSeconds")]
+  /// </summary>
-        public int ShutdownPromptSeconds { get; set; }
+		public EssentialsRoomTechConfig Tech { get; set; }
 
-        /// <summary>
+		[JsonProperty("volumes")]
-        /// Gets or sets the Tech
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Volumes
-        [JsonProperty("tech")]
+  /// </summary>
-        public EssentialsRoomTechConfig Tech { get; set; }
+		public EssentialsRoomVolumesConfig Volumes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Volumes
-        /// </summary>
-        [JsonProperty("volumes")]
-        public EssentialsRoomVolumesConfig Volumes { get; set; }
 
+        [JsonProperty("fusion")]
         /// <summary>
         /// Gets or sets the Fusion
         /// </summary>
-        [JsonProperty("fusion")]
         public EssentialsRoomFusionConfig Fusion { get; set; }
 
+        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling=NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the UiBehavior
         /// </summary>
-        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling = NullValueHandling.Ignore)]
         public EssentialsRoomUiBehaviorConfig UiBehavior { get; set; }
 
-        /// <summary>
+		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
-        /// Gets or sets the ZeroVolumeWhenSwtichingVolumeDevices
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the ZeroVolumeWhenSwtichingVolumeDevices
-        [JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
+  /// </summary>
-        public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
+		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
         /// <summary>
         /// Indicates if this room represents a combination of other rooms
         /// </summary>
         [JsonProperty("isRoomCombinationScenario")]
+        /// <summary>
+        /// Gets or sets the IsRoomCombinationScenario
+        /// </summary>
         public bool IsRoomCombinationScenario { get; set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public EssentialsRoomPropertiesConfig()
         {
             LogoLight = new EssentialsLogoPropertiesConfig();
             LogoDark = new EssentialsLogoPropertiesConfig();
         }
-    }
+	}
 
     /// <summary>
     /// Represents a EssentialsRoomUiBehaviorConfig
     /// </summary>
     public class EssentialsRoomUiBehaviorConfig
     {
+        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
         /// <summary>
         /// Gets or sets the DisableActivityButtonsWhileWarmingCooling
         /// </summary>
-        [JsonProperty("disableActivityButtonsWhileWarmingCooling")]
         public bool DisableActivityButtonsWhileWarmingCooling { get; set; }
     }
 
@@ -264,129 +255,111 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
     {
+        [JsonProperty("defaultAudioKey")]
         /// <summary>
         /// Gets or sets the DefaultAudioKey
         /// </summary>
-        [JsonProperty("defaultAudioKey")]
         public string DefaultAudioKey { get; set; }
-
+        [JsonProperty("sourceListKey")]
-        /// <summary>
-        /// Gets or sets the DefaultOnDspPresetKey
-        /// </summary>
-        [JsonProperty("defaultOnDspPresetKey")]
-        public string DefaultOnDspPresetKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the DefaultOffDspPresetKey
-        /// </summary>
-        [JsonProperty("defaultOffDspPresetKey")]
-        public string DefaultOffDspPresetKey { get; set; }
-
         /// <summary>
         /// Gets or sets the SourceListKey
         /// </summary>
-        /// </summary>
-        [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
+        [JsonProperty("destinationListKey")]
         /// <summary>
         /// Gets or sets the DestinationListKey
         /// </summary>
-        [JsonProperty("destinationListKey")]
         public string DestinationListKey { get; set; }
+        [JsonProperty("audioControlPointListKey")]
         /// <summary>
         /// Gets or sets the AudioControlPointListKey
         /// </summary>
-        [JsonProperty("audioControlPointListKey")]
         public string AudioControlPointListKey { get; set; }
+        [JsonProperty("cameraListKey")]
         /// <summary>
         /// Gets or sets the CameraListKey
         /// </summary>
-        [JsonProperty("cameraListKey")]
         public string CameraListKey { get; set; }
 
 
+        [JsonProperty("defaultSourceItem")]
         /// <summary>
         /// Gets or sets the DefaultSourceItem
         /// </summary>
-        [JsonProperty("defaultSourceItem")]
         public string DefaultSourceItem { get; set; }
         /// <summary>
         /// Indicates if the room supports advanced sharing
         /// </summary>
         [JsonProperty("supportsAdvancedSharing")]
+        /// <summary>
+        /// Gets or sets the SupportsAdvancedSharing
+        /// </summary>
         public bool SupportsAdvancedSharing { get; set; }
-
         /// <summary>
         /// Indicates if non-tech users can change the share mode
         /// </summary>
         [JsonProperty("userCanChangeShareMode")]
+        /// <summary>
+        /// Gets or sets the UserCanChangeShareMode
+        /// </summary>
         public bool UserCanChangeShareMode { get; set; }
 
 
+        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the MatrixRoutingKey
         /// </summary>
-        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
         public string MatrixRoutingKey { get; set; }
     }
 
-    /// <summary>
-    /// Represents a EssentialsConferenceRoomPropertiesConfig
-    /// </summary>
     public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
     {
+        [JsonProperty("videoCodecKey")]
         /// <summary>
         /// Gets or sets the VideoCodecKey
         /// </summary>
-        [JsonProperty("videoCodecKey")]
         public string VideoCodecKey { get; set; }
+        [JsonProperty("audioCodecKey")]
         /// <summary>
         /// Gets or sets the AudioCodecKey
         /// </summary>
-        [JsonProperty("audioCodecKey")]
         public string AudioCodecKey { get; set; }
 
     }
 
-    /// <summary>
+ /// <summary>
-    /// Represents a EssentialsEnvironmentPropertiesConfig
+ /// Represents a EssentialsEnvironmentPropertiesConfig
-    /// </summary>
+ /// </summary>
-    public class EssentialsEnvironmentPropertiesConfig
+	public class EssentialsEnvironmentPropertiesConfig
-    {
+	{
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the Enabled
+  /// Gets or sets the Enabled
-        /// </summary>
+  /// </summary>
-        public bool Enabled { get; set; }
+		public bool Enabled { get; set; }
 
+        [JsonProperty("deviceKeys")]
         /// <summary>
         /// Gets or sets the DeviceKeys
         /// </summary>
-        [JsonProperty("deviceKeys")]
         public List<string> DeviceKeys { get; set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public EssentialsEnvironmentPropertiesConfig()
         {
             DeviceKeys = new List<string>();
         }
 
-    }
+	}
 
     /// <summary>
     /// Represents a EssentialsRoomFusionConfig
     /// </summary>
     public class EssentialsRoomFusionConfig
     {
-        /// <summary>
-        /// Gets the the IpId as a UInt16
-        /// </summary>
         public uint IpIdInt
         {
             get
             {
-                try
+                try 
                 {
                     return Convert.ToUInt32(IpId, 16);
                 }
@@ -394,20 +367,20 @@ namespace PepperDash.Essentials.Room.Config
                 {
                     throw new FormatException(string.Format("ERROR:Unable to convert IP ID: {0} to hex.  Error:\n{1}", IpId));
                 }
-
+          
             }
         }
 
+        [JsonProperty("ipId")]
         /// <summary>
         /// Gets or sets the IpId
         /// </summary>
-        [JsonProperty("ipId")]
         public string IpId { get; set; }
 
+        [JsonProperty("joinMapKey")]
         /// <summary>
         /// Gets or sets the JoinMapKey
         /// </summary>
-        [JsonProperty("joinMapKey")]
         public string JoinMapKey { get; set; }
 
     }
@@ -417,17 +390,17 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomMicrophonePrivacyConfig
     {
-        /// <summary>
+		[JsonProperty("deviceKey")]
-        /// Gets or sets the DeviceKey
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the DeviceKey
-        [JsonProperty("deviceKey")]
+  /// </summary>
-        public string DeviceKey { get; set; }
+		public string DeviceKey { get; set; }
 
-        /// <summary>
+		[JsonProperty("behaviour")]
-        /// Gets or sets the Behaviour
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Behaviour
-        [JsonProperty("behaviour")]
+  /// </summary>
-        public string Behaviour { get; set; }
+		public string Behaviour { get; set; }
     }
 
     /// <summary>
@@ -435,27 +408,24 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsHelpPropertiesConfig
     {
-        /// <summary>
+		[JsonProperty("message")]
-        /// Gets or sets the Message
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Message
-        [JsonProperty("message")]
+  /// </summary>
-        public string Message { get; set; }
+		public string Message { get; set; }
 
-        /// <summary>
+		[JsonProperty("showCallButton")]
-        /// Gets or sets the ShowCallButton
+		public bool ShowCallButton { get; set; }
-        /// </summary>
+        
-        [JsonProperty("showCallButton")]
+		/// <summary>
-        public bool ShowCallButton { get; set; }
-
-        /// <summary>
         /// Defaults to "Call Help Desk"
         /// </summary>
-        [JsonProperty("callButtonText")]
+		[JsonProperty("callButtonText")]
-        public string CallButtonText { get; set; }
+  /// <summary>
+  /// Gets or sets the CallButtonText
+  /// </summary>
+		public string CallButtonText { get; set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public EssentialsHelpPropertiesConfig()
         {
             CallButtonText = "Call Help Desk";
@@ -467,29 +437,23 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsOneButtonMeetingPropertiesConfig
     {
-        /// <summary>
+		[JsonProperty("enable")]
-        /// Gets or sets the Enable
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Enable
-        [JsonProperty("enable")]
+  /// </summary>
-        public bool Enable { get; set; }
+		public bool Enable { get; set; }
     }
 
-    /// <summary>
-    /// Represents a EssentialsRoomAddressPropertiesConfig
-    /// </summary>
     public class EssentialsRoomAddressPropertiesConfig
     {
-        /// <summary>
+		[JsonProperty("phoneNumber")]
-        /// Gets or sets the PhoneNumber
+		public string PhoneNumber { get; set; }
-        /// </summary>
-        [JsonProperty("phoneNumber")]
-        public string PhoneNumber { get; set; }
 
-        /// <summary>
+		[JsonProperty("sipAddress")]
-        /// Gets or sets the SipAddress
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the SipAddress
-        [JsonProperty("sipAddress")]
+  /// </summary>
-        public string SipAddress { get; set; }
+		public string SipAddress { get; set; }
     }
 
 
@@ -498,18 +462,14 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsLogoPropertiesConfig
     {
-        /// <summary>
+		[JsonProperty("type")]
-        /// Gets or sets the Type
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the Type
-        [JsonProperty("type")]
+  /// </summary>
-        public string Type { get; set; }
+		public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Url
-        /// </summary>
-        [JsonProperty("url")]
-        public string Url { get; set; }
 
+		[JsonProperty("url")]
+		public string Url { get; set; }
         /// <summary>
         /// GetLogoUrlLight method
         /// </summary>
@@ -518,7 +478,7 @@ namespace PepperDash.Essentials.Room.Config
             if (Type == "url")
                 return Url;
             if (Type == "system")
-                return string.Format("http://{0}:8080/logo.png",
+                return string.Format("http://{0}:8080/logo.png", 
                     CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
             return null;
         }
@@ -542,28 +502,22 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomOccSensorConfig
     {
-        /// <summary>
+		[JsonProperty("deviceKey")]
-        /// Gets or sets the DeviceKey
+  /// <summary>
-        /// </summary>
+  /// Gets or sets the DeviceKey
-        [JsonProperty("deviceKey")]
+  /// </summary>
-        public string DeviceKey { get; set; }
+		public string DeviceKey { get; set; }
 
-        /// <summary>
+		[JsonProperty("timeoutMinutes")]
-        /// Gets or sets the TimeoutMinutes
+		public int TimeoutMinutes { get; set; }
-        /// </summary>
-        [JsonProperty("timeoutMinutes")]
-        public int TimeoutMinutes { get; set; }
     }
 
-    /// <summary>
+	public class EssentialsRoomTechConfig
-    /// Represents a EssentialsRoomTechConfig
+	{
-    /// </summary>
+		[JsonProperty("password")]
-    public class EssentialsRoomTechConfig
+  /// <summary>
-    {
+  /// Gets or sets the Password
-        /// <summary>
+  /// </summary>
-        /// Gets or sets the Password
+		public string Password { get; set; }
-        /// </summary>
+	}
-        [JsonProperty("password")]
-        public string Password { get; set; }
-    }
 }

src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs

@@ -408,7 +408,7 @@ namespace PepperDash.Essentials.Core
             Debug.LogMessage(LogEventLevel.Information, this, "Timeout Minutes from Config is: {0}", timeoutMinutes);
 
             // If status provider is fusion, set flag to remote
-            if (statusProvider is Core.Fusion.IEssentialsRoomFusionController)
+            if (statusProvider is Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase)
                 OccupancyStatusProviderIsRemote = true;
 
             if(timeoutMinutes > 0)

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -1,11 +1,11 @@
-using System;
+using Crestron.SimplSharpPro.Keypads;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Crestron.SimplSharpPro.Keypads;
 using PepperDash.Essentials.Core.Queues;
 using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using Debug = PepperDash.Core.Debug;
 
 
@@ -115,7 +115,7 @@ namespace PepperDash.Essentials.Core
         public static (RouteDescriptor, RouteDescriptor) GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort, RoutingOutputPort sourcePort)
         {
             // if it's a single signal type, find the route
-            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo) &&
+            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo) && 
                 !(signalType.HasFlag(eRoutingSignalType.Video) && signalType.HasFlag(eRoutingSignalType.SecondaryAudio)))
             {
                 var singleTypeRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, signalType);
@@ -134,15 +134,14 @@ namespace PepperDash.Essentials.Core
             }
             // otherwise, audioVideo needs to be handled as two steps.
 
-            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {destinationKey} to {sourceKey} of type {type}", destination, source.Key, signalType);
+            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key);
 
             RouteDescriptor audioRouteDescriptor;
 
             if (signalType.HasFlag(eRoutingSignalType.SecondaryAudio))
             {
                 audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.SecondaryAudio);
-            }
+            } else
-            else
             {
                 audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.Audio);
             }
@@ -200,13 +199,13 @@ namespace PepperDash.Essentials.Core
                 Source = source,
                 SourcePort = sourcePort,
                 SignalType = signalType
-            };
+            };            
 
             var coolingDevice = destination as IWarmingCooling;
 
             //We already have a route request for this device, and it's a cooling device and is cooling
             if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
+            {                
                 coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
 
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
@@ -220,7 +219,7 @@ namespace PepperDash.Essentials.Core
 
             //New Request
             if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
+            {               
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
 
                 RouteRequests.Add(destination.Key, routeRequest);
@@ -240,9 +239,9 @@ namespace PepperDash.Essentials.Core
                 Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
             }
 
-            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination, destinationPort?.Key ?? string.Empty, false));
+            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination,destinationPort?.Key ?? string.Empty, false));
 
-            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));
+            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));            
         }
 
         /// <summary>
@@ -273,8 +272,7 @@ namespace PepperDash.Essentials.Core
 
                 audioOrSingleRoute.ExecuteRoutes();
                 videoRoute?.ExecuteRoutes();
-            }
+            } catch(Exception ex)
-            catch (Exception ex)
             {
                 Debug.LogMessage(ex, "Exception Running Route Request {request}", null, request);
             }
@@ -307,10 +305,9 @@ namespace PepperDash.Essentials.Core
                     Debug.LogMessage(LogEventLevel.Information, "Releasing current route: {0}", destination, current.Source.Key);
                     current.ReleaseRoutes(clearRoute);
                 }
-            }
+            } catch (Exception ex)
-            catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'", null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'",null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
             }
         }
 

src/PepperDash.Essentials.Core/Routing/ICurrentSources.cs

@@ -1,5 +1,5 @@
-using System;
 using System.Collections.Generic;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Routing
 {
@@ -25,19 +25,5 @@ namespace PepperDash.Essentials.Core.Routing
     /// </summary>
     Dictionary<eRoutingSignalType, string> CurrentSourceKeys { get; }
 
-    /// <summary>
-    /// Event raised when the current sources change.
-    /// </summary>
-    event EventHandler CurrentSourcesChanged;
-
-    /// <summary>
-    /// Sets the current source for a specific signal type.
-    /// This method updates the current source for the specified signal type and notifies any subscribers of the change.
-    /// </summary>
-    /// <param name="signalType">The signal type to update.</param>
-    /// <param name="sourceListKey">The key for the source list.</param>
-    /// <param name="sourceListItem">The source list item to set as the current source.</param>
-    void SetCurrentSource(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem);
-
   }
 }

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)
             {

src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs

@@ -22,38 +22,38 @@ namespace PepperDash.Essentials.Core.Config
 		/// The key of the source device.
 		/// </summary>
 		public string SourceKey { get; set; }
-
+		
-		/// <summary>
+  /// <summary>
-		/// The key of the source card (if applicable, e.g., in a modular chassis).
+  /// The key of the source card (if applicable, e.g., in a modular chassis).
-		/// </summary>
+  /// </summary>
 		public string SourceCard { get; set; }
-
+		
-		/// <summary>
+  /// <summary>
-		/// The key of the source output port, used for routing configurations.
+  /// The key of the source output port, used for routing configurations.
-		/// </summary>
+  /// </summary>
 		public string SourcePort { get; set; }
-
+		
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the DestinationKey
+  /// Gets or sets the DestinationKey
-		/// </summary>
+  /// </summary>
 		public string DestinationKey { get; set; }
-
+		
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the DestinationCard
+  /// Gets or sets the DestinationCard
-		/// </summary>
+  /// </summary>
 		public string DestinationCard { get; set; }
-
+		
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the DestinationPort
+  /// Gets or sets the DestinationPort
-		/// </summary>
+  /// </summary>
 		public string DestinationPort { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// Optional override for the signal type of the tie line. If set, this overrides the destination port's type for routing calculations.
+        /// Optional override for the signal type of the tie line. If set, this overrides the destination port's type for routing calculations.
-		/// </summary>
+        /// </summary>
-		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
-		[JsonConverter(typeof(StringEnumConverter))]
+        [JsonConverter(typeof(StringEnumConverter))]
-		public eRoutingSignalType? OverrideType { get; set; }
+        public eRoutingSignalType? OverrideType { get; set; }
 
 		/// <summary>
 		/// Returns the appropriate tie line for either a card-based device or 
@@ -62,39 +62,40 @@ namespace PepperDash.Essentials.Core.Config
 		/// <returns>null if config data does not match ports, cards or devices</returns>
 		public TieLine GetTieLine()
 		{
-			Debug.LogInformation("Build TieLine: {config}", ToString());
+			Debug.LogMessage(LogEventLevel.Information, "Build TieLine: {0}",null, this);
-
 			// Get the source device
-			if (!(DeviceManager.GetDeviceForKey(SourceKey) is IRoutingOutputs sourceDev))
+			var sourceDev = DeviceManager.GetDeviceForKey(SourceKey) as IRoutingOutputs;
+			if (sourceDev == null)
 			{
 				LogError("Routable source not found");
 				return null;
 			}
 
 			// Get the destination device
-			if (!(DeviceManager.GetDeviceForKey(DestinationKey) is IRoutingInputs destDev))
+			var destDev = DeviceManager.GetDeviceForKey(DestinationKey) as IRoutingInputs;
+			if (destDev == null)
 			{
 				LogError("Routable destination not found");
 				return null;
 			}
 
-			//Get the source port
+            //Get the source port
-			var sourceOutputPort = sourceDev.OutputPorts[SourcePort];
+            var sourceOutputPort = sourceDev.OutputPorts[SourcePort];
 
-			if (sourceOutputPort == null)
+            if (sourceOutputPort == null)
 			{
 				LogError("Source does not contain port");
 				return null;
 			}
 
-			//Get the Destination port
+            //Get the Destination port
-			var destinationInputPort = destDev.InputPorts[DestinationPort];
+            var destinationInputPort = destDev.InputPorts[DestinationPort];
 
-			if (destinationInputPort == null)
+            if (destinationInputPort == null)
-			{
+				{
-				LogError("Destination does not contain port");
+					LogError("Destination does not contain port");
-				return null;
+					return null;
-			}
+				}            
 
 			return new TieLine(sourceOutputPort, destinationInputPort, OverrideType);
 		}
@@ -103,9 +104,9 @@ namespace PepperDash.Essentials.Core.Config
 		/// Logs an error message related to creating this tie line configuration.
 		/// </summary>
 		/// <param name="msg">The specific error message.</param>
-		private void LogError(string msg)
+		void LogError(string msg)
 		{
-			Debug.LogError("Cannot create tie line: {message}", msg);
+			Debug.LogMessage(LogEventLevel.Error, "WARNING: Cannot create tie line: {message}:\r   {tieLineConfig}",null, msg, this);
 		}
 
 		/// <summary>
@@ -114,7 +115,8 @@ namespace PepperDash.Essentials.Core.Config
 		/// <returns>A string describing the source and destination of the configured tie line.</returns>
 		public override string ToString()
 		{
-			return $"{SourceKey}.{SourceCard}.{SourcePort} --> {DestinationKey}.{DestinationCard}.{DestinationPort}";
+			return string.Format("{0}.{1}.{2} --> {3}.{4}.{5}", SourceKey, SourceCard, SourcePort,
+				DestinationKey, DestinationCard, DestinationPort);
 		}
 	}
 }

src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceList.cs

@@ -14,14 +14,14 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-	////*****************************************************************************
+    ////*****************************************************************************
-	///// <summary>
+    /// <summary>
-	///// Base class for all subpage reference list controllers
+    /// Base class for all subpage reference list controllers
-	///// </summary>
+    /// </summary>
-	//public class SubpageReferenceListController
+    //public class SubpageReferenceListController
-	//{
+    //{
-	//    public SubpageReferenceList TheList { get; protected set; }
+    //    public SubpageReferenceList TheList { get; protected set; }
-	//}
+    //}
 
 	//*****************************************************************************
 	/// <summary>
@@ -34,26 +34,26 @@ namespace PepperDash.Essentials.Core
 		public ushort Count
 		{
 			get { return SetNumberOfItemsSig.UShortValue; }
-			set { SetNumberOfItemsSig.UShortValue = value; }
+			set { SetNumberOfItemsSig.UShortValue = value;  }
 		}
 		public ushort MaxDefinedItems { get; private set; }
 
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the ScrollToItemSig
+  /// Gets or sets the ScrollToItemSig
-		/// </summary>
+  /// </summary>
 		public UShortInputSig ScrollToItemSig { get; private set; }
 		UShortInputSig SetNumberOfItemsSig;
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the BoolIncrement
+  /// Gets or sets the BoolIncrement
-		/// </summary>
+  /// </summary>
 		public uint BoolIncrement { get; protected set; }
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the UShortIncrement
+  /// Gets or sets the UShortIncrement
-		/// </summary>
+  /// </summary>
 		public uint UShortIncrement { get; protected set; }
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the StringIncrement
+  /// Gets or sets the StringIncrement
-		/// </summary>
+  /// </summary>
 		public uint StringIncrement { get; protected set; }
 
 		protected readonly SmartObject SRL;
@@ -87,8 +87,8 @@ namespace PepperDash.Essentials.Core
 				SRL.SigChange += new SmartObjectSigChangeEventHandler(SRL_SigChange);
 			}
 			else
-				Debug.LogMessage(LogEventLevel.Information, "ERROR: TriList 0x{0:X2} Cannot load smart object {1}. Verify correct SGD file is loaded",
+				Debug.LogMessage(LogEventLevel.Information, "ERROR: TriList 0x{0:X2} Cannot load smart object {1}. Verify correct SGD file is loaded", 
-										triList.ID, smartObjectId);
+                    triList.ID, smartObjectId);
 		}
 
 		/// <summary>
@@ -96,17 +96,17 @@ namespace PepperDash.Essentials.Core
 		/// DOES NOT adjust Count
 		/// </summary>
 		/// <param name="item"></param>
-		/// <summary>
+  /// <summary>
-		/// AddItem method
+  /// AddItem method
-		/// </summary>
+  /// </summary>
 		public void AddItem(SubpageReferenceListItem item)
 		{
 			Items.Add(item);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Clear method
+  /// Clear method
-		/// </summary>
+  /// </summary>
 		public void Clear()
 		{
 			// If a line item needs to disconnect an CueActionPair or do something to release RAM
@@ -116,12 +116,12 @@ namespace PepperDash.Essentials.Core
 			// Clean up the SRL
 			Count = 1;
 
-			ScrollToItemSig.UShortValue = 1;
+		    ScrollToItemSig.UShortValue = 1;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Refresh method
+  /// Refresh method
-		/// </summary>
+  /// </summary>
 		public void Refresh()
 		{
 			foreach (var item in Items) item.Refresh();
@@ -157,7 +157,7 @@ namespace PepperDash.Essentials.Core
 		public UShortOutputSig GetUShortOutputSig(uint index, uint sigNum)
 		{
 			if (sigNum > UShortIncrement) return null;
-			return SRL.UShortOutput.FirstOrDefault(s => s.Name.Equals(GetUShortOutputSigName(index, sigNum)));
+            return SRL.UShortOutput.FirstOrDefault(s => s.Name.Equals(GetUShortOutputSigName(index, sigNum)));
 		}
 
 		/// <summary>
@@ -172,7 +172,7 @@ namespace PepperDash.Essentials.Core
 		public StringOutputSig GetStringOutputSig(uint index, uint sigNum)
 		{
 			if (sigNum > StringIncrement) return null;
-			return SRL.StringOutput.FirstOrDefault(s => s.Name.Equals(GetStringOutputSigName(index, sigNum)));
+            return SRL.StringOutput.FirstOrDefault(s => s.Name.Equals(GetStringOutputSigName(index, sigNum)));
 		}
 
 		/// <summary>
@@ -263,9 +263,9 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		/// <param name="currentDevice"></param>
 		/// <param name="args"></param>
-		/// <summary>
+  /// <summary>
-		/// SRL_SigChange method
+  /// SRL_SigChange method
-		/// </summary>
+  /// </summary>
 		public static void SRL_SigChange(GenericBase currentDevice, SmartObjectEventArgs args)
 		{
 			var uo = args.Sig.UserObject;

src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs

@@ -6,9 +6,9 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
+ /// <summary>
-	/// Represents a ModalDialog
+ /// Represents a ModalDialog
-	/// </summary>
+ /// </summary>
 	public class ModalDialog
 	{
 		/// <summary>
@@ -19,10 +19,10 @@ namespace PepperDash.Essentials.Core
 		/// Bool press 3992
 		/// </summary>
 		public const uint Button2Join = 3992;
-		/// <summary>
+        /// <summary>
-		/// 3993
+        /// 3993
-		/// </summary>
+        /// </summary>
-		public const uint CancelButtonJoin = 3993;
+        public const uint CancelButtonJoin = 3993;
 		/// <summary>
 		///For visibility of single button.  Bool feedback 3994
 		/// </summary>
@@ -35,19 +35,19 @@ namespace PepperDash.Essentials.Core
 		/// Shows the timer guage if in use. Bool feedback 3996
 		/// </summary>
 		public const uint TimerVisibleJoin = 3996;
-		/// <summary>
+        /// <summary>
-		/// Visibility join to show "X" button 3997
+        /// Visibility join to show "X" button 3997
-		/// </summary>
+        /// </summary>
-		public const uint CancelVisibleJoin = 3997;
+        public const uint CancelVisibleJoin = 3997;
 		/// <summary>
 		/// Shows the modal subpage. Boolean feeback join 3999
 		/// </summary>
 		public const uint ModalVisibleJoin = 3999;
 
-		///// <summary>
+		/// <summary>
-		///// The seconds value of the countdown timer. Ushort join 3991
+		/// The seconds value of the countdown timer. Ushort join 3991
-		///// </summary>
+		/// </summary>
-		//public const uint TimerSecondsJoin = 3991;
+        //public const uint TimerSecondsJoin = 3991;
 		/// <summary>
 		/// The full ushort value of the countdown timer for a gauge. Ushort join 3992
 		/// </summary>
@@ -77,15 +77,15 @@ namespace PepperDash.Essentials.Core
 		/// <summary>
 		/// Returns true when modal is showing
 		/// </summary>
-		public bool ModalIsVisible
+		public bool ModalIsVisible 
-		{
+		{ 
-			get { return TriList.BooleanInput[ModalVisibleJoin].BoolValue; }
+			get { return TriList.BooleanInput[ModalVisibleJoin].BoolValue; } 
 		}
 
-		/// <summary>
+        /// <summary>
-		/// 
+        /// 
-		/// </summary>
+        /// </summary>
-		public bool CanCancel { get; private set; }
+        public bool CanCancel { get; private set; }
 
 
 		BasicTriList TriList;
@@ -103,10 +103,10 @@ namespace PepperDash.Essentials.Core
 			TriList = triList;
 			// Attach actions to buttons
 
-			triList.SetSigFalseAction(Button1Join, () => OnModalComplete(1));
+            triList.SetSigFalseAction(Button1Join, () => OnModalComplete(1));
 			triList.SetSigFalseAction(Button2Join, () => OnModalComplete(2));
-			triList.SetSigFalseAction(CancelButtonJoin, () => { if (CanCancel) CancelDialog(); });
+            triList.SetSigFalseAction(CancelButtonJoin, () => { if (CanCancel) CancelDialog(); });
-			CanCancel = true;
+            CanCancel = true;
 		}
 
 		/// <summary>
@@ -117,7 +117,7 @@ namespace PepperDash.Essentials.Core
 		/// <param name="decreasingGauge">If the progress bar gauge needs to count down instead of up</param>
 		/// <param name="completeAction">The action to run when the dialog is dismissed. Parameter will be 1 or 2 if button pressed, or 0 if dialog times out</param>
 		/// <returns>True when modal is created.</returns>
-		public bool PresentModalDialog(uint numberOfButtons, string title, string iconName,
+		public bool PresentModalDialog(uint numberOfButtons, string title, string iconName, 
 			string message, string button1Text,
 			string button2Text, bool showGauge, bool showCancel, Action<uint> completeAction)
 		{
@@ -151,15 +151,15 @@ namespace PepperDash.Essentials.Core
 					TriList.StringInput[Button2TextJoin].StringValue = button2Text;
 				}
 				// Show/hide guage
-				TriList.BooleanInput[TimerVisibleJoin].BoolValue = showGauge;
+                TriList.BooleanInput[TimerVisibleJoin].BoolValue = showGauge;
-
+                
-				CanCancel = showCancel;
+                CanCancel = showCancel;
-				TriList.BooleanInput[CancelVisibleJoin].BoolValue = showCancel;
+                TriList.BooleanInput[CancelVisibleJoin].BoolValue = showCancel;
 
 				//Reveal and activate
 				TriList.BooleanInput[ModalVisibleJoin].BoolValue = true;
 
-				WakePanel();
+                WakePanel();
 
 				return true;
 			}
@@ -167,48 +167,48 @@ namespace PepperDash.Essentials.Core
 			return false;
 		}
 
-		/// <summary>
+        /// <summary>
-		/// WakePanel method
+        /// WakePanel method
-		/// </summary>
+        /// </summary>
-		public void WakePanel()
+        public void WakePanel()
-		{
+        {
-			try
+            try
-			{
+            {
-				var panel = TriList as TswFt5Button;
+                var panel = TriList as TswFt5Button;
 
-				if (panel != null && panel.ExtenderSystemReservedSigs.BacklightOffFeedback.BoolValue)
+                if (panel != null && panel.ExtenderSystemReservedSigs.BacklightOffFeedback.BoolValue)
-					panel.ExtenderSystemReservedSigs.BacklightOn();
+                    panel.ExtenderSystemReservedSigs.BacklightOn();
-			}
+            }
-			catch
+            catch
-			{
+            {
-				Debug.LogMessage(LogEventLevel.Debug, "Error Waking Panel.  Maybe testing with Xpanel?");
+                Debug.LogMessage(LogEventLevel.Debug, "Error Waking Panel.  Maybe testing with Xpanel?");
-			}
+            }
-		}
+        }
 
-		/// <summary>
+  /// <summary>
-		/// CancelDialog method
+  /// CancelDialog method
-		/// </summary>
+  /// </summary>
 		public void CancelDialog()
 		{
-			OnModalComplete(0);
+            OnModalComplete(0);
 		}
 
-		/// <summary>
+        /// <summary>
-		/// Hides dialog. Fires no action
+        /// Hides dialog. Fires no action
-		/// </summary>
+        /// </summary>
-		public void HideDialog()
+        public void HideDialog()
-		{
+        {
-			TriList.BooleanInput[ModalVisibleJoin].BoolValue = false;
+            TriList.BooleanInput[ModalVisibleJoin].BoolValue = false;
-		}
+        }
 
 		// When the modal is cleared or times out, clean up the various bits
 		void OnModalComplete(uint buttonNum)
 		{
 			TriList.BooleanInput[ModalVisibleJoin].BoolValue = false;
 
-			var action = ModalCompleteAction;
+            var action = ModalCompleteAction;
-			if (action != null)
+            if (action != null)
-				action(buttonNum);
+                action(buttonNum);
 		}
 	}
 

src/PepperDash.Essentials.Core/UI/TouchpanelBase.cs

@@ -1,22 +1,20 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using Crestron.SimplSharp.CrestronIO;
+using System.Text;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
-using PepperDash.Core.Logging;
+using Crestron.SimplSharpPro.UI;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.UI
 {
-    /// <summary>
+    public abstract class TouchpanelBase: EssentialsDevice, IHasBasicTriListWithSmartObject
-    /// Base class for Touchpanel devices
-    /// </summary>
-    public abstract class TouchpanelBase : EssentialsDevice, IHasBasicTriListWithSmartObject
     {
-        /// <summary>
-        /// Gets or sets the configuration for the Crestron touchpanel.
-        /// </summary>
         protected CrestronTouchpanelPropertiesConfig _config;
         /// <summary>
         /// Gets or sets the Panel
@@ -29,11 +27,12 @@ namespace PepperDash.Essentials.Core.UI
         /// is provided.
         /// </summary>
         /// <param name="key">Essentials Device Key</param>
-        /// <param name="name">Essentials Device Name</param>    
+        /// <param name="name">Essentials Device Name</param>
-        /// <param name="panel">Crestron Touchpanel Device</param>    
+        /// <param name="type">Touchpanel Type to build</param>
-        /// <param name="config">Touchpanel Configuration</param>        
+        /// <param name="config">Touchpanel Configuration</param>
+        /// <param name="id">IP-ID to use for touch panel</param>
         protected TouchpanelBase(string key, string name, BasicTriListWithSmartObject panel, CrestronTouchpanelPropertiesConfig config)
-            : base(key, name)
+            :base(key, name)
         {
 
             if (panel == null)
@@ -56,21 +55,23 @@ namespace PepperDash.Essentials.Core.UI
                 tsw.ButtonStateChange += Tsw_ButtonStateChange;
             }
 
-            _config = config;
+            _config = config;            
+
+            AddPreActivationAction(() => {
+                if (Panel.Register() != eDeviceRegistrationUnRegistrationResponse.Success)
+                    Debug.LogMessage(LogEventLevel.Information, this, "WARNING: Registration failed. Continuing, but panel may not function: {0}", Panel.RegistrationFailureReason);
 
-            AddPreActivationAction(() =>
-            {
                 // Give up cleanly if SGD is not present.
                 var sgdName = Global.FilePathPrefix + "sgd" + Global.DirectorySeparator + _config.SgdFile;
                 if (!File.Exists(sgdName))
                 {
-                    this.LogInformation("Smart object file '{0}' not present in User folder. Looking for embedded file", sgdName);
+                    Debug.LogMessage(LogEventLevel.Information, this, "Smart object file '{0}' not present in User folder. Looking for embedded file", sgdName);
 
                     sgdName = Global.ApplicationDirectoryPathPrefix + Global.DirectorySeparator + "SGD" + Global.DirectorySeparator + _config.SgdFile;
 
                     if (!File.Exists(sgdName))
                     {
-                        this.LogWarning("Unable to find SGD file '{0}' in User sgd or application SGD folder. Exiting touchpanel load.", sgdName);
+                        Debug.LogMessage(LogEventLevel.Information, this, "Unable to find SGD file '{0}' in User sgd or application SGD folder. Exiting touchpanel load.", sgdName);
                         return;
                     }
                 }
@@ -81,11 +82,12 @@ namespace PepperDash.Essentials.Core.UI
             AddPostActivationAction(() =>
             {
                 // Check for IEssentialsRoomCombiner in DeviceManager and if found, subscribe to its event
+                var roomCombiner = DeviceManager.AllDevices.FirstOrDefault((d) => d is IEssentialsRoomCombiner) as IEssentialsRoomCombiner;
 
-                if (DeviceManager.AllDevices.FirstOrDefault((d) => d is IEssentialsRoomCombiner) is IEssentialsRoomCombiner roomCombiner)
+                if (roomCombiner != null)
                 {
                     // Subscribe to the even
-                    roomCombiner.RoomCombinationScenarioChanged += new EventHandler<EventArgs>(RoomCombiner_RoomCombinationScenarioChanged);
+                    roomCombiner.RoomCombinationScenarioChanged += new EventHandler<EventArgs>(roomCombiner_RoomCombinationScenarioChanged);
 
                     // Connect to the initial roomKey
                     if (roomCombiner.CurrentScenario != null)
@@ -104,11 +106,6 @@ namespace PepperDash.Essentials.Core.UI
                     // No room combiner, use the default key
                     SetupPanelDrivers(_config.DefaultRoomKey);
                 }
-
-                var panelRegistrationResponse = Panel.Register();
-
-                if (panelRegistrationResponse != eDeviceRegistrationUnRegistrationResponse.Success)
-                    this.LogInformation("WARNING: Registration failed. Continuing, but panel may not function: {0}", Panel.RegistrationFailureReason);
             });
         }
 
@@ -118,6 +115,7 @@ namespace PepperDash.Essentials.Core.UI
         /// <param name="roomKey">Room Key for this panel</param>
         protected abstract void SetupPanelDrivers(string roomKey);
 
+
         /// <summary>
         /// Event handler for System Extender Events
         /// </summary>
@@ -131,7 +129,7 @@ namespace PepperDash.Essentials.Core.UI
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected virtual void RoomCombiner_RoomCombinationScenarioChanged(object sender, EventArgs e)
+        protected virtual void roomCombiner_RoomCombinationScenarioChanged(object sender, EventArgs e)
         {
             var roomCombiner = sender as IEssentialsRoomCombiner;
 
@@ -158,23 +156,23 @@ namespace PepperDash.Essentials.Core.UI
             SetupPanelDrivers(newRoomKey);
         }
 
-        private void Panel_SigChange(object currentDevice, SigEventArgs args)
+        private void Panel_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
-        {
+		{
-            this.LogVerbose("Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+			Debug.LogMessage(LogEventLevel.Verbose, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-            var uo = args.Sig.UserObject;
+			var uo = args.Sig.UserObject;
-            if (uo is Action<bool>)
+			if (uo is Action<bool>)
-                (uo as Action<bool>)(args.Sig.BoolValue);
+				(uo as Action<bool>)(args.Sig.BoolValue);
-            else if (uo is Action<ushort>)
+			else if (uo is Action<ushort>)
-                (uo as Action<ushort>)(args.Sig.UShortValue);
+				(uo as Action<ushort>)(args.Sig.UShortValue);
-            else if (uo is Action<string>)
+			else if (uo is Action<string>)
-                (uo as Action<string>)(args.Sig.StringValue);
+				(uo as Action<string>)(args.Sig.StringValue);
-        }
+		}
-
+	
-        private void Tsw_ButtonStateChange(GenericBase device, ButtonEventArgs args)
+		private void Tsw_ButtonStateChange(GenericBase device, ButtonEventArgs args)
-        {
+		{
-            var uo = args.Button.UserObject;
+			var uo = args.Button.UserObject;
-            if (uo is Action<bool>)
+			if(uo is Action<bool>)
-                (uo as Action<bool>)(args.Button.State == eButtonState.Pressed);
+				(uo as Action<bool>)(args.Button.State == eButtonState.Pressed);
-        }
+		}
     }
 }

src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs

@@ -6,9 +6,9 @@ using PepperDash.Core.Web.RequestHandlers;
 
 namespace PepperDash.Essentials.Core.Web.RequestHandlers
 {
-	/// <summary>
+ /// <summary>
-	/// Represents a SetDeviceStreamDebugRequestHandler
+ /// Represents a SetDeviceStreamDebugRequestHandler
-	/// </summary>
+ /// </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))
+            if (!(DeviceManager.GetDeviceForKey(body.DeviceKey) is IStreamDebugging device))
-			{
+            {
-				context.Response.StatusCode = 404;
+                context.Response.StatusCode = 404;
-				context.Response.StatusDescription = "Not Found";
+                context.Response.StatusDescription = "Not Found";
-				context.Response.End();
+                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>
+  /// <summary>
-		/// Gets or sets the DeviceKey
+  /// Gets or sets the DeviceKey
-		/// </summary>
+  /// </summary>
 		public string DeviceKey { get; set; }
 
 		[JsonProperty("setting", NullValueHandling = NullValueHandling.Include)]
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the Setting
+  /// Gets or sets the Setting
-		/// </summary>
+  /// </summary>
 		public string Setting { get; set; }
 
 		[JsonProperty("timeout")]
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the Timeout
+  /// Gets or sets the Timeout
-		/// </summary>
+  /// </summary>
 		public int Timeout { get; set; }
 
 		public SetDeviceStreamDebugConfig()

src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs

@@ -1,4 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -13,68 +17,48 @@ namespace PepperDash.Essentials.Devices.Common
 	/// </summary>
 	public class GenericAudioOut : EssentialsDevice, IRoutingSink
 	{
-		/// <summary>
+        public RoutingInputPort CurrentInputPort => AnyAudioIn;
-		/// Gets the current input port
-		/// </summary>
-		public RoutingInputPort CurrentInputPort => AnyAudioIn;
 
-		/// <summary>
+        public event SourceInfoChangeHandler CurrentSourceChange;
-		/// Event fired when the current source changes
-		/// </summary>
-		public event SourceInfoChangeHandler CurrentSourceChange;
 
-		/// <summary>
+        public string CurrentSourceInfoKey { get; set; }
-		/// Gets or sets the current source info key
+        public SourceListItem CurrentSourceInfo
-		/// </summary>
+        {
-		public string CurrentSourceInfoKey { get; set; }
+            get
-		/// <summary>
+            {
-		/// Gets or sets the current source info
+                return _CurrentSourceInfo;
-		/// </summary>
+            }
-		public SourceListItem CurrentSourceInfo
+            set
-		{
+            {
-			get
+                if (value == _CurrentSourceInfo) return;
-			{
-				return _CurrentSourceInfo;
-			}
-			set
-			{
-				if (value == _CurrentSourceInfo) return;
 
-				var handler = CurrentSourceChange;
+                var handler = CurrentSourceChange;
 
-				if (handler != null)
+                if (handler != null)
-					handler(_CurrentSourceInfo, ChangeType.WillChange);
+                    handler(_CurrentSourceInfo, ChangeType.WillChange);
 
-				_CurrentSourceInfo = value;
+                _CurrentSourceInfo = value;
 
-				if (handler != null)
+                if (handler != null)
-					handler(_CurrentSourceInfo, ChangeType.DidChange);
+                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-			}
+            }
-		}
+        }
-		SourceListItem _CurrentSourceInfo;
+        SourceListItem _CurrentSourceInfo;
 
-		/// <summary>
+  /// <summary>
-		/// Gets or sets the AnyAudioIn
+  /// Gets or sets the AnyAudioIn
-		/// </summary>
+  /// </summary>
 		public RoutingInputPort AnyAudioIn { get; private set; }
 
-		/// <summary>
-		/// Constructor for GenericAudioOut
-		/// </summary>
-		/// <param name="key">Device key</param>
-		/// <param name="name">Device name</param>
 		public GenericAudioOut(string key, string name)
 			: base(key, name)
 		{
-			AnyAudioIn = new RoutingInputPort(RoutingPortNames.AnyAudioIn, eRoutingSignalType.Audio,
+			AnyAudioIn = new RoutingInputPort(RoutingPortNames.AnyAudioIn, eRoutingSignalType.Audio, 
 				eRoutingPortConnectionType.LineAudio, null, this);
 		}
 
 		#region IRoutingInputs Members
 
-		/// <summary>
-		/// Gets the collection of input ports
-		/// </summary>
 		public RoutingPortCollection<RoutingInputPort> InputPorts
 		{
 			get { return new RoutingPortCollection<RoutingInputPort> { AnyAudioIn }; }
@@ -84,32 +68,23 @@ namespace PepperDash.Essentials.Devices.Common
 	}
 
 
-	/// <summary>
+ /// <summary>
-	/// Represents a GenericAudioOutWithVolume
+ /// Represents a GenericAudioOutWithVolume
-	/// </summary>
+ /// </summary>
 	public class GenericAudioOutWithVolume : GenericAudioOut, IHasVolumeDevice
 	{
-		/// <summary>
-		/// Gets the volume device key
-		/// </summary>
 		public string VolumeDeviceKey { get; private set; }
-		/// <summary>
-		/// Gets the volume zone
-		/// </summary>
 		public uint VolumeZone { get; private set; }
 
-		/// <summary>
-		/// Gets the volume device
-		/// </summary>
 		public IBasicVolumeControls VolumeDevice
-		{
+		{ 
 			get
 			{
 				var dev = DeviceManager.GetDeviceForKey(VolumeDeviceKey);
 				if (dev is IAudioZones)
 					return (dev as IAudioZones).Zone[VolumeZone];
 				else return dev as IBasicVolumeControls;
-			}
+			} 
 		}
 
 		/// <summary>
@@ -128,30 +103,24 @@ namespace PepperDash.Essentials.Devices.Common
 
 	}
 
-	/// <summary>
+    public class GenericAudioOutWithVolumeFactory : EssentialsDeviceFactory<GenericAudioOutWithVolume>
-	/// Factory for creating GenericAudioOutWithVolume devices
+    {
-	/// </summary>
+        public GenericAudioOutWithVolumeFactory()
-	public class GenericAudioOutWithVolumeFactory : EssentialsDeviceFactory<GenericAudioOutWithVolume>
+        {
-	{
+            TypeNames = new List<string>() { "genericaudiooutwithvolume" };
-		/// <summary>
+        }
-		/// Constructor for GenericAudioOutWithVolumeFactory
-		/// </summary>
-		public GenericAudioOutWithVolumeFactory()
-		{
-			TypeNames = new List<string>() { "genericaudiooutwithvolume" };
-		}
 
-		/// <summary>
+        /// <summary>
-		/// BuildDevice method
+        /// BuildDevice method
-		/// </summary>
+        /// </summary>
-		/// <inheritdoc />
+        /// <inheritdoc />
-		public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-		{
+        {
-			Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new GenericAudioOutWithVolumeFactory Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new GenericAudioOutWithVolumeFactory Device");
-			var zone = dc.Properties.Value<uint>("zone");
+            var zone = dc.Properties.Value<uint>("zone");
-			return new GenericAudioOutWithVolume(dc.Key, dc.Name,
+            return new GenericAudioOutWithVolume(dc.Key, dc.Name,
-					dc.Properties.Value<string>("volumeDeviceKey"), zone);
+                dc.Properties.Value<string>("volumeDeviceKey"), zone);
-		}
+        }
-	}
+    }
 
 }

src/PepperDash.Essentials.Devices.Common/AudioCodec/AudioCodecBase.cs

@@ -1,20 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.Codec;
 
 namespace PepperDash.Essentials.Devices.Common.AudioCodec
 {
-    /// <summary>
-    /// Abstract base class for audio codec devices
-    /// </summary>
     public abstract class AudioCodecBase : EssentialsDevice, IHasDialer, IUsageTracking, IAudioCodecInfo
     {
 
-        /// <summary>
-        /// Event fired when call status changes
-        /// </summary>
         public event EventHandler<CodecCallStatusItemChangeEventArgs> CallStatusChange;
 
         /// <summary>
@@ -54,11 +52,6 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
         /// </summary>
         public List<CodecActiveCallItem> ActiveCalls { get; set; }
 
-        /// <summary>
-        /// Constructor for AudioCodecBase
-        /// </summary>
-        /// <param name="key">Device key</param>
-        /// <param name="name">Device name</param>
         public AudioCodecBase(string key, string name)
             : base(key, name)
         {
@@ -77,9 +70,11 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
         }
 
         /// <summary>
-        /// Handles call status change events
+        /// 
         /// </summary>
-        /// <param name="item">The call item that changed status</param>
+        /// <param name="previousStatus"></param>
+        /// <param name="newStatus"></param>
+        /// <param name="item"></param>
         protected void OnCallStatusChange(CodecActiveCallItem item)
         {
             var handler = CallStatusChange;
@@ -97,22 +92,16 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
 
         #region IHasDialer Members
 
-        /// <inheritdoc />
         public abstract void Dial(string number);
 
-        /// <inheritdoc />
         public abstract void EndCall(CodecActiveCallItem activeCall);
 
-        /// <inheritdoc />
         public abstract void EndAllCalls();
 
-        /// <inheritdoc />
         public abstract void AcceptCall(CodecActiveCallItem item);
 
-        /// <inheritdoc />
         public abstract void RejectCall(CodecActiveCallItem item);
 
-        /// <inheritdoc />
         public abstract void SendDtmf(string digit);
 
         #endregion

src/PepperDash.Essentials.Devices.Common/AudioCodec/Interfaces/IAudioCodecInfo.cs

@@ -1,13 +1,16 @@
-namespace PepperDash.Essentials.Devices.Common.AudioCodec
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.AudioCodec
 {
     /// <summary>
     /// Implements a common set of data about a codec
     /// </summary>
     public interface IAudioCodecInfo
     {
-        /// <summary>
-        /// Gets the codec information
-        /// </summary>
         AudioCodecInfo CodecInfo { get; }
     }
 
@@ -16,9 +19,6 @@
     /// </summary>
     public abstract class AudioCodecInfo
     {
-        /// <summary>
-        /// Gets or sets the phone number
-        /// </summary>
         public abstract string PhoneNumber { get; set; }
     }
 }

src/PepperDash.Essentials.Devices.Common/AudioCodec/Interfaces/IHasAudioCodec.cs

@@ -1,17 +1,23 @@
-using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.AudioCodec
 {
     /// <summary>
     /// For rooms that have audio codec
     /// </summary>
-    public interface IHasAudioCodec : IHasInCallFeedback
+    public interface IHasAudioCodec:IHasInCallFeedback
     {
-        /// <summary>
-        /// Gets the audio codec device
-        /// </summary>
         AudioCodecBase AudioCodec { get; }
 
+        /// <summary>
+        /// Make this more specific
+        /// </summary>
         //List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem> ActiveCalls { get; }
     }
 }

src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAC.cs

@@ -1,4 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -13,12 +17,6 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// </summary>
     public class MockAC : AudioCodecBase
     {
-        /// <summary>
-        /// Constructor for MockAC
-        /// </summary>
-        /// <param name="key">Device key</param>
-        /// <param name="name">Device name</param>
-        /// <param name="props">MockAC properties configuration</param>
         public MockAC(string key, string name, MockAcPropertiesConfig props)
             : base(key, name)
         {
@@ -111,10 +109,13 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
             Debug.LogMessage(LogEventLevel.Debug, this, "BEEP BOOP SendDTMF: {0}", s);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="url"></param>
         /// <summary>
         /// TestIncomingAudioCall method
         /// </summary>
-        /// <param name="number">Phone number to call from</param>
         public void TestIncomingAudioCall(string number)
         {
             Debug.LogMessage(LogEventLevel.Debug, this, "TestIncomingAudioCall from {0}", number);
@@ -132,7 +133,6 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     {
         string _phoneNumber;
 
-        /// <inheritdoc />
         public override string PhoneNumber
         {
             get
@@ -151,9 +151,6 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// </summary>
     public class MockACFactory : EssentialsDeviceFactory<MockAC>
     {
-        /// <summary>
-        /// Constructor for MockACFactory
-        /// </summary>
         public MockACFactory()
         {
             TypeNames = new List<string>() { "mockac" };

src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.cs

@@ -1,4 +1,12 @@
-using Newtonsoft.Json;
+
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.AudioCodec
 {
@@ -7,10 +15,10 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// </summary>
     public class MockAcPropertiesConfig
     {
+        [JsonProperty("phoneNumber")]
         /// <summary>
         /// Gets or sets the PhoneNumber
         /// </summary>
-        [JsonProperty("phoneNumber")]
         public string PhoneNumber { get; set; }
     }
 }

src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs

@@ -3,14 +3,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using System.Reflection;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Presets;
+using PepperDash.Essentials.Devices.Common.Codec;
+
+using Newtonsoft.Json;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
@@ -20,52 +26,31 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public enum eCameraCapabilities
     {
-        /// <summary>
-        /// No camera capabilities
-        /// </summary>
         None = 0,
-        /// <summary>
-        /// Camera supports pan movement
-        /// </summary>
         Pan = 1,
-        /// <summary>
+        Tilt = 2, 
-        /// Camera supports tilt movement
-        /// </summary>
-        Tilt = 2,
-        /// <summary>
-        /// Camera supports zoom functionality
-        /// </summary>
         Zoom = 4,
-        /// <summary>
-        /// Camera supports focus adjustment
-        /// </summary>
         Focus = 8
     }
 
-    /// <summary>
-    /// Abstract base class for camera devices that provides common camera functionality and capabilities
-    /// </summary>
     public abstract class CameraBase : ReconfigurableDevice, IRoutingOutputs
-    {
+	{
+        [JsonProperty("controlMode", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the ControlMode
         /// </summary>
-        [JsonProperty("controlMode", NullValueHandling = NullValueHandling.Ignore)]
         public eCameraControlMode ControlMode { get; protected set; }
 
         #region IRoutingOutputs Members
 
+        [JsonIgnore]
         /// <summary>
         /// Gets or sets the OutputPorts
         /// </summary>
-        [JsonIgnore]
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; protected set; }
 
         #endregion
 
-        /// <summary>
-        /// Gets a value indicating whether this camera supports pan movement
-        /// </summary>
         [JsonProperty("canPan", NullValueHandling = NullValueHandling.Ignore)]
         public bool CanPan
         {
@@ -74,10 +59,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 return (Capabilities & eCameraCapabilities.Pan) == eCameraCapabilities.Pan;
             }
         }
-
-        /// <summary>
-        /// Gets a value indicating whether this camera supports tilt movement
-        /// </summary>
         [JsonProperty("canTilt", NullValueHandling = NullValueHandling.Ignore)]
         public bool CanTilt
         {
@@ -86,10 +67,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 return (Capabilities & eCameraCapabilities.Tilt) == eCameraCapabilities.Tilt;
             }
         }
-
-        /// <summary>
-        /// Gets a value indicating whether this camera supports zoom functionality
-        /// </summary>
         [JsonProperty("canZoom", NullValueHandling = NullValueHandling.Ignore)]
         public bool CanZoom
         {
@@ -98,10 +75,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 return (Capabilities & eCameraCapabilities.Zoom) == eCameraCapabilities.Zoom;
             }
         }
-
-        /// <summary>
-        /// Gets a value indicating whether this camera supports focus adjustment
-        /// </summary>
         [JsonProperty("canFocus", NullValueHandling = NullValueHandling.Ignore)]
         public bool CanFocus
         {
@@ -111,42 +84,23 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             }
         }
 
-        /// <summary>
+        // A bitmasked value to indicate the movement capabilites of this camera
-        /// Gets or sets a bitmasked value to indicate the movement capabilities of this camera
-        /// </summary>
         protected eCameraCapabilities Capabilities { get; set; }
 
-        /// <summary>
+		protected CameraBase(DeviceConfig config) : base(config)
-        /// Initializes a new instance of the CameraBase class with the specified device configuration
+		{
-        /// </summary>
+			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-        /// <param name="config">The device configuration</param>
+
-        protected CameraBase(DeviceConfig config) : base(config)
+			ControlMode = eCameraControlMode.Manual;
+
+		}
+
+        protected CameraBase(string key, string name) : 
+			this (new DeviceConfig{Name = name, Key = key})
         {
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
+				
-
-            ControlMode = eCameraControlMode.Manual;
-
         }
 
-        /// <summary>
-        /// Initializes a new instance of the CameraBase class with the specified key and name
-        /// </summary>
-        /// <param name="key">The unique key for this camera device</param>
-        /// <param name="name">The friendly name for this camera device</param>
-        protected CameraBase(string key, string name) :
-            this(new DeviceConfig { Name = name, Key = key })
-        {
-
-        }
-
-        /// <summary>
-        /// Links the camera device to the API bridge for control and feedback
-        /// </summary>
-        /// <param name="cameraDevice">The camera device to link</param>
-        /// <param name="trilist">The trilist for communication</param>
-        /// <param name="joinStart">The starting join number for the camera controls</param>
-        /// <param name="joinMapKey">The join map key for custom join mappings</param>
-        /// <param name="bridge">The EiscApiAdvanced bridge for advanced join mapping</param>
         protected void LinkCameraToApi(CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
             EiscApiAdvanced bridge)
         {
@@ -286,13 +240,13 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 {
                     int tempNum = i;
 
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallStart.JoinNumber + tempNum), () =>
+                    trilist.SetSigTrueAction((ushort) (joinMap.PresetRecallStart.JoinNumber + tempNum), () =>
                     {
                         presetsCamera.PresetSelect(tempNum);
                     });
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveStart.JoinNumber + tempNum), () =>
+                    trilist.SetSigTrueAction((ushort) (joinMap.PresetSaveStart.JoinNumber + tempNum), () =>
                     {
-                        var label = trilist.GetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum));
+                        var label = trilist.GetString((ushort) (joinMap.PresetLabelStart.JoinNumber + tempNum));
 
                         presetsCamera.PresetStore(tempNum, label);
                     });
@@ -323,7 +277,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
             }
         }
-    }
+	}
 
 
     /// <summary>
@@ -331,13 +285,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public class CameraPreset : PresetBase
     {
-        /// <summary>
-        /// Initializes a new instance of the CameraPreset class
-        /// </summary>
-        /// <param name="id">The preset ID</param>
-        /// <param name="description">The preset description</param>
-        /// <param name="isDefined">Whether the preset is defined</param>
-        /// <param name="isDefinable">Whether the preset can be defined</param>
         public CameraPreset(int id, string description, bool isDefined, bool isDefinable)
             : base(id, description, isDefined, isDefinable)
         {
@@ -346,37 +293,37 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     }
 
 
-    /// <summary>
+ /// <summary>
-    /// Represents a CameraPropertiesConfig
+ /// Represents a CameraPropertiesConfig
-    /// </summary>
+ /// </summary>
-    public class CameraPropertiesConfig
+	public class CameraPropertiesConfig
-    {
+	{
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the CommunicationMonitorProperties
+  /// Gets or sets the CommunicationMonitorProperties
-        /// </summary>
+  /// </summary>
-        public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
+		public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the Control
+  /// Gets or sets the Control
-        /// </summary>
+  /// </summary>
-        public ControlPropertiesConfig Control { get; set; }
+		public ControlPropertiesConfig Control { get; set; }
 
+        [JsonProperty("supportsAutoMode")]
         /// <summary>
         /// Gets or sets the SupportsAutoMode
         /// </summary>
-        [JsonProperty("supportsAutoMode")]
         public bool SupportsAutoMode { get; set; }
 
+        [JsonProperty("supportsOffMode")]
         /// <summary>
         /// Gets or sets the SupportsOffMode
         /// </summary>
-        [JsonProperty("supportsOffMode")]
         public bool SupportsOffMode { get; set; }
 
+        [JsonProperty("presets")]
         /// <summary>
         /// Gets or sets the Presets
         /// </summary>
-        [JsonProperty("presets")]
         public List<CameraPreset> Presets { get; set; }
-    }
+	}
 }

src/PepperDash.Essentials.Devices.Common/Cameras/CameraControl.cs

@@ -0,0 +1,326 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Devices.Common.Cameras
+{
+    /// <summary>
+    /// Enum for camera control modes
+    /// </summary>
+    public enum eCameraControlMode
+    {
+        /// <summary>
+        /// Manual control mode, where the camera is controlled directly by the user or system
+        /// </summary>
+        Manual = 0,
+        /// <summary>
+        /// Off control mode, where the camera is turned off or disabled
+        /// </summary>
+        Off,
+        /// <summary>
+        ///  Auto control mode, where the camera automatically adjusts settings based on the environment or conditions
+        /// </summary>
+        Auto
+    }
+
+
+    /// <summary>
+    /// Interface for devices that have cameras
+    /// </summary>
+    public interface IHasCameras : IKeyName
+    {
+        /// <summary>
+        /// Event that is raised when a camera is selected
+        /// </summary>
+        event EventHandler<CameraSelectedEventArgs> CameraSelected;
+
+        /// <summary>
+        /// List of cameras on the device.  This should be a list of CameraBase objects
+        /// </summary>
+        List<CameraBase> Cameras { get; }
+
+        /// <summary>
+        /// The currently selected camera.  This should be a CameraBase object
+        /// </summary>
+        CameraBase SelectedCamera { get; }
+
+        /// <summary>
+        /// Feedback that indicates the currently selected camera
+        /// </summary>
+        StringFeedback SelectedCameraFeedback { get; }
+
+        /// <summary>
+        /// Selects a camera from the list of available cameras based on the provided key.
+        /// </summary>
+        /// <param name="key">The unique identifier or name of the camera to select.</param>
+        void SelectCamera(string key);
+    }
+
+    /// <summary>
+    /// Defines the contract for IHasCodecCameras
+    /// </summary>
+    public interface IHasCodecCameras : IHasCameras, IHasFarEndCameraControl
+    {
+
+    }
+
+    /// <summary>
+    /// To be implmented on codecs that can disable their camera(s) to blank the near end video
+    /// </summary>
+    public interface IHasCameraOff
+    {
+        /// <summary>
+        /// Feedback that indicates whether the camera is off
+        /// </summary>
+        BoolFeedback CameraIsOffFeedback { get; }
+
+        /// <summary>
+        /// Turns the camera off, blanking the near end video
+        /// </summary>
+        void CameraOff();
+    }
+
+    /// <summary>
+    /// Describes the ability to mute and unmute camera video
+    /// </summary>
+    public interface IHasCameraMute
+    {
+        /// <summary>
+        /// Feedback that indicates whether the camera is muted
+        /// </summary>
+        BoolFeedback CameraIsMutedFeedback { get; }
+
+        /// <summary>
+        /// Mutes the camera video, preventing it from being sent to the far end
+        /// </summary>
+        void CameraMuteOn();
+
+        /// <summary>
+        /// Unmutes the camera video, allowing it to be sent to the far end
+        /// </summary>
+        void CameraMuteOff();
+
+        /// <summary>
+        /// Toggles the camera mute state. If the camera is muted, it will be unmuted, and vice versa.
+        /// </summary>
+        void CameraMuteToggle();
+    }
+
+    /// <summary>
+    /// Interface for devices that can mute and unmute their camera video, with an event for unmute requests
+    /// </summary>
+    public interface IHasCameraMuteWithUnmuteReqeust : IHasCameraMute
+    {
+        /// <summary>
+        /// Event that is raised when a video unmute is requested, typically by the far end
+        /// </summary>
+        event EventHandler VideoUnmuteRequested;
+    }
+
+    /// <summary>
+    /// Event arguments for the CameraSelected event
+    /// </summary>
+    public class CameraSelectedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the SelectedCamera
+        /// </summary>
+        public CameraBase SelectedCamera { get; private set; }
+
+        /// <summary>
+        /// Constructor for CameraSelectedEventArgs
+        /// </summary>
+        /// <param name="camera"></param>
+        public CameraSelectedEventArgs(CameraBase camera)
+        {
+            SelectedCamera = camera;
+        }
+    }
+
+    /// <summary>
+    /// Interface for devices that have a far end camera control
+    /// </summary>
+    public interface IHasFarEndCameraControl
+    {
+        /// <summary>
+        /// Gets the far end camera, which is typically a CameraBase object that represents the camera at the far end of a call
+        /// </summary>
+        CameraBase FarEndCamera { get; }
+
+        /// <summary>
+        /// Feedback that indicates whether the far end camera is being controlled
+        /// </summary>
+        BoolFeedback ControllingFarEndCameraFeedback { get; }
+
+    }
+
+    /// <summary>
+    /// Defines the contract for IAmFarEndCamera
+    /// </summary>
+    public interface IAmFarEndCamera
+    {
+
+    }
+
+    /// <summary>
+    /// Interface for devices that have camera controls
+    /// </summary>
+    public interface IHasCameraControls
+    {
+    }
+
+    /// <summary>
+    /// Defines the contract for IHasCameraPtzControl
+    /// </summary>
+    public interface IHasCameraPtzControl : IHasCameraPanControl, IHasCameraTiltControl, IHasCameraZoomControl
+    {
+        /// <summary>
+        /// Resets the camera position
+        /// </summary>
+        void PositionHome();
+    }
+
+    /// <summary>
+    /// Interface for camera pan control
+    /// </summary>
+    public interface IHasCameraPanControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Pans the camera left
+        /// </summary>
+        void PanLeft();
+
+        /// <summary>
+        /// Pans the camera right
+        /// </summary>
+        void PanRight();
+
+        /// <summary>
+        /// Stops the camera pan movement
+        /// </summary>
+        void PanStop();
+    }
+
+    /// <summary>
+    /// Defines the contract for IHasCameraTiltControl
+    /// </summary>
+    public interface IHasCameraTiltControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Tilts the camera down
+        /// </summary>
+        void TiltDown();
+
+        /// <summary>
+        /// Tilts the camera up
+        /// </summary>
+        void TiltUp();
+
+        /// <summary>
+        /// Stops the camera tilt movement
+        /// </summary>
+        void TiltStop();
+    }
+
+    /// <summary>
+    /// Defines the contract for IHasCameraZoomControl
+    /// </summary>
+    public interface IHasCameraZoomControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Zooms the camera in
+        /// </summary>
+        void ZoomIn();
+
+        /// <summary>
+        /// Zooms the camera out
+        /// </summary>
+        void ZoomOut();
+
+        /// <summary>
+        /// Stops the camera zoom movement
+        /// </summary>
+        void ZoomStop();
+    }
+
+    /// <summary>
+    /// Defines the contract for IHasCameraFocusControl
+    /// </summary>
+    public interface IHasCameraFocusControl : IHasCameraControls
+    {
+        /// <summary>
+        /// Focuses the camera near
+        /// </summary>
+        void FocusNear();
+
+        /// <summary>
+        /// Focuses the camera far
+        /// </summary>
+        void FocusFar();
+
+        /// <summary>
+        /// Stops the camera focus movement
+        /// </summary>
+        void FocusStop();
+
+        /// <summary>
+        /// Triggers the camera's auto focus functionality, if available.
+        /// </summary>
+        void TriggerAutoFocus();
+    }
+
+    /// <summary>
+    /// Interface for devices that have auto focus mode control
+    /// </summary>
+    public interface IHasAutoFocusMode
+    {
+        /// <summary>
+        /// Sets the focus mode to auto or manual, or toggles between them.
+        /// </summary>
+        void SetFocusModeAuto();
+
+        /// <summary>
+        /// Sets the focus mode to manual, allowing for manual focus adjustments.
+        /// </summary>
+        void SetFocusModeManual();
+
+        /// <summary>
+        /// Toggles the focus mode between auto and manual.
+        /// </summary>
+        void ToggleFocusMode();
+    }
+
+    /// <summary>
+    /// Interface for devices that have camera auto mode control
+    /// </summary>
+    public interface IHasCameraAutoMode : IHasCameraControls
+    {
+        /// <summary>
+        /// Enables or disables the camera's auto mode, which may include automatic adjustments for focus, exposure, and other settings.
+        /// </summary>
+        void CameraAutoModeOn();
+
+        /// <summary>
+        /// Disables the camera's auto mode, allowing for manual control of camera settings.
+        /// </summary>
+        void CameraAutoModeOff();
+
+        /// <summary>
+        /// Toggles the camera's auto mode state. If the camera is in auto mode, it will switch to manual mode, and vice versa.
+        /// </summary>
+        void CameraAutoModeToggle();
+
+        /// <summary>
+        /// Feedback that indicates whether the camera's auto mode is currently enabled.
+        /// </summary>
+        BoolFeedback CameraAutoModeIsOnFeedback { get; }
+    }
+
+
+
+
+}

src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs

@@ -3,33 +3,38 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Devices.Common.Codec;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+using Newtonsoft.Json;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
-    /// <summary>
+ /// <summary>
-    /// Represents a CameraVisca
+ /// Represents a CameraVisca
-    /// </summary>
+ /// </summary>
-    public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IHasPowerControlWithFeedback, IBridgeAdvanced, IHasCameraFocusControl, IHasAutoFocusMode
+	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IHasPowerControlWithFeedback, IBridgeAdvanced, IHasCameraFocusControl, IHasAutoFocusMode
-    {
+	{
         private readonly CameraViscaPropertiesConfig PropertiesConfig;
 
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the Communication
+  /// Gets or sets the Communication
-        /// </summary>
+  /// </summary>
-        public IBasicCommunication Communication { get; private set; }
+		public IBasicCommunication Communication { get; private set; }
 
-        /// <summary>
+  /// <summary>
-        /// Gets or sets the CommunicationMonitor
+  /// Gets or sets the CommunicationMonitor
-        /// </summary>
+  /// </summary>
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
+		public StatusMonitorBase CommunicationMonitor { get; private set; }
 
         /// <summary>
         /// Used to store the actions to parse inquiry responses as the inquiries are sent
@@ -40,41 +45,20 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         /// Camera ID (Default 1)
         /// </summary>
         public byte ID = 0x01;
-
-        /// <summary>
-        /// Response ID used for VISCA communication
-        /// </summary>
         public byte ResponseID;
 
-        /// <summary>
-        /// Slow speed value for pan movement
-        /// </summary>
-        public byte PanSpeedSlow = 0x10;
 
-        /// <summary>
+		public byte PanSpeedSlow = 0x10;
-        /// Slow speed value for tilt movement
+		public byte TiltSpeedSlow = 0x10;
-        /// </summary>
-        public byte TiltSpeedSlow = 0x10;
 
-        /// <summary>
-        /// Fast speed value for pan movement
-        /// </summary>
         public byte PanSpeedFast = 0x13;
-
-        /// <summary>
-        /// Fast speed value for tilt movement
-        /// </summary>
         public byte TiltSpeedFast = 0x13;
 
         // private bool IsMoving;
-        private bool IsZooming;
+		private bool IsZooming;
 
         bool _powerIsOn;
-
+		public bool PowerIsOn 
-        /// <summary>
-        /// Gets or sets a value indicating whether the camera power is on
-        /// </summary>
-        public bool PowerIsOn
         {
             get
             {
@@ -103,23 +87,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
         long FastSpeedHoldTimeMs = 2000;
 
-        byte[] IncomingBuffer = new byte[] { };
+		byte[] IncomingBuffer = new byte[] { };
+		public BoolFeedback PowerIsOnFeedback  { get; private set; }
 
-        /// <summary>
-        /// Feedback indicating whether the camera power is on
-        /// </summary>
-        public BoolFeedback PowerIsOnFeedback { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the CameraVisca class
-        /// </summary>
-        /// <param name="key">The unique key for this camera device</param>
-        /// <param name="name">The friendly name for this camera device</param>
-        /// <param name="comm">The communication interface for VISCA protocol</param>
-        /// <param name="props">The camera properties configuration</param>
         public CameraVisca(string key, string name, IBasicCommunication comm, CameraViscaPropertiesConfig props) :
-            base(key, name)
+			base(key, name)
-        {
+		{
             InquiryResponseQueue = new CrestronQueue<Action<byte[]>>(15);
 
             Presets = props.Presets;
@@ -134,8 +107,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             OutputPorts.Add(new RoutingOutputPort("videoOut", eRoutingSignalType.Video, eRoutingPortConnectionType.None, null, this, true));
 
             // Default to all capabilties
-            Capabilities = eCameraCapabilities.Pan | eCameraCapabilities.Tilt | eCameraCapabilities.Zoom | eCameraCapabilities.Focus;
+            Capabilities = eCameraCapabilities.Pan | eCameraCapabilities.Tilt | eCameraCapabilities.Zoom | eCameraCapabilities.Focus; 
-
+            
             Communication = comm;
             if (comm is ISocketStatus socket)
             {
@@ -148,19 +121,19 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             }
 
             Communication.BytesReceived += new EventHandler<GenericCommMethodReceiveBytesArgs>(Communication_BytesReceived);
-            PowerIsOnFeedback = new BoolFeedback("powerIsOn", () => { return PowerIsOn; });
+			PowerIsOnFeedback = new BoolFeedback(() => { return PowerIsOn; });
-            CameraIsOffFeedback = new BoolFeedback("cameraIsOff", () => { return !PowerIsOn; });
+            CameraIsOffFeedback = new BoolFeedback(() => { return !PowerIsOn; });
 
-            if (props.CommunicationMonitorProperties != null)
+			if (props.CommunicationMonitorProperties != null)
-            {
+			{
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
+				CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
-            }
+			}
-            else
+			else
-            {
+			{
-                CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 20000, 120000, 300000, "\x81\x09\x04\x00\xFF");
+				CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 20000, 120000, 300000, "\x81\x09\x04\x00\xFF");
-            }
+			}
-            DeviceManager.AddDevice(CommunicationMonitor);
+			DeviceManager.AddDevice(CommunicationMonitor);
-        }
+		}
 
 
         /// <summary>
@@ -192,57 +165,57 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             }
         }
 
-        /// <summary>
+  /// <summary>
-        /// CustomActivate method
+  /// CustomActivate method
-        /// </summary>
+  /// </summary>
-        /// <inheritdoc />
+  /// <inheritdoc />
-        public override bool CustomActivate()
+		public override bool CustomActivate()
-        {
+		{
-            Communication.Connect();
+			Communication.Connect();
+
+			
+			CommunicationMonitor.StatusChange += (o, a) => { Debug.LogMessage(LogEventLevel.Verbose, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+			CommunicationMonitor.Start();
 
 
-            CommunicationMonitor.StatusChange += (o, a) => { Debug.LogMessage(LogEventLevel.Verbose, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+			CrestronConsole.AddNewConsoleCommand(s => Communication.Connect(), "con" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
-            CommunicationMonitor.Start();
+			return true;
+		}
 
+     /// <summary>
+     /// LinkToApi method
+     /// </summary>
+	    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+	    {
+	        LinkCameraToApi(this, trilist, joinStart, joinMapKey, bridge);
+	    }
 
-            CrestronConsole.AddNewConsoleCommand(s => Communication.Connect(), "con" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
+	    void Socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
-            return true;
+		{
-        }
+			Debug.LogMessage(LogEventLevel.Verbose, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
 
-        /// <summary>
+			if (e.Client.IsConnected)
-        /// LinkToApi method
+			{
-        /// </summary>
+				
-        public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+			}
-        {
+			else
-            LinkCameraToApi(this, trilist, joinStart, joinMapKey, bridge);
+			{
-        }
 
-        void Socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
+			}
-        {
+		}
-            Debug.LogMessage(LogEventLevel.Verbose, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
+	
 
-            if (e.Client.IsConnected)
+		void SendBytes(byte[] b)
-            {
+		{
+			
+			if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
+				Debug.LogMessage(LogEventLevel.Verbose, this, "Sending:{0}", ComTextHelper.GetEscapedText(b));
 
-            }
+			Communication.SendBytes(b);
-            else
+		}
-            {
 
-            }
+		void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
-        }
+		{
-
-
-        void SendBytes(byte[] b)
-        {
-
-            if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Sending:{0}", ComTextHelper.GetEscapedText(b));
-
-            Communication.SendBytes(b);
-        }
-
-        void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
-        {
             var newBytes = new byte[IncomingBuffer.Length + e.Bytes.Length];
 
             try
@@ -382,10 +355,10 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         /// <summary>
         /// Sends a pan/tilt command. If the command is not for fastSpeed then it starts a timer to initiate fast speed.
         /// </summary>
-        /// <param name="cmd">The VISCA command to send</param>
+        /// <param name="cmd"></param>
-        /// <param name="fastSpeedEnabled">Whether fast speed is enabled for this command</param>
+        /// <param name="fastSpeed"></param>
-		private void SendPanTiltCommand(byte[] cmd, bool fastSpeedEnabled)
+		private void SendPanTiltCommand (byte[] cmd, bool fastSpeedEnabled)
-        {
+		{
             SendBytes(GetPanTiltCommand(cmd, fastSpeedEnabled));
 
             if (!fastSpeedEnabled)
@@ -399,7 +372,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 SpeedTimer = new CTimer((o) => SendPanTiltCommand(GetPanTiltCommand(cmd, true), true), FastSpeedHoldTimeMs);
             }
 
-        }
+		}
 
         private void StopSpeedTimer()
         {
@@ -408,7 +381,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 SpeedTimer.Stop();
                 SpeedTimer.Dispose();
                 SpeedTimer = null;
-            }
+            }     
         }
 
         /// <summary>
@@ -451,14 +424,14 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             InquiryResponseQueue.Enqueue(HandlePowerResponse);
         }
 
-        /// <summary>
+  /// <summary>
-        /// PowerOn method
+  /// PowerOn method
-        /// </summary>
+  /// </summary>
-        public void PowerOn()
+		public void PowerOn()
-        {
+		{
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x00, 0x02, 0xFF });
+			SendBytes(new byte[] { ID, 0x01, 0x04, 0x00, 0x02, 0xFF });
             SendPowerQuery();
-        }
+		}
 
         void HandlePowerResponse(byte[] response)
         {
@@ -477,12 +450,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             }
         }
 
-        /// <summary>
+  /// <summary>
-        /// PowerOff method
+  /// PowerOff method
-        /// </summary>
+  /// </summary>
-        public void PowerOff()
+		public void PowerOff()
-        {
+		{
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x00, 0x03, 0xFF });
+			SendBytes(new byte[] {ID, 0x01, 0x04, 0x00, 0x03, 0xFF});
             SendPowerQuery();
         }
 
@@ -497,22 +470,22 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                 PowerOn();
         }
 
-        /// <summary>
+  /// <summary>
-        /// PanLeft method
+  /// PanLeft method
-        /// </summary>
+  /// </summary>
-        public void PanLeft()
+		public void PanLeft() 
-        {
+		{
-            SendPanTiltCommand(new byte[] { 0x01, 0x03 }, false);
+			SendPanTiltCommand(new byte[] {0x01, 0x03}, false);
-            // IsMoving = true;
+			// IsMoving = true;
-        }
+		}
-        /// <summary>
+  /// <summary>
-        /// PanRight method
+  /// PanRight method
-        /// </summary>
+  /// </summary>
-        public void PanRight()
+		public void PanRight() 
-        {
+		{
             SendPanTiltCommand(new byte[] { 0x02, 0x03 }, false);
-            // IsMoving = true;
+			// IsMoving = true;
-        }
+		}
         /// <summary>
         /// PanStop method
         /// </summary>
@@ -520,22 +493,22 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         {
             Stop();
         }
-        /// <summary>
+  /// <summary>
-        /// TiltDown method
+  /// TiltDown method
-        /// </summary>
+  /// </summary>
-        public void TiltDown()
+		public void TiltDown() 
-        {
+		{
             SendPanTiltCommand(new byte[] { 0x03, 0x02 }, false);
-            // IsMoving = true;
+			// IsMoving = true;
-        }
+		}
-        /// <summary>
+  /// <summary>
-        /// TiltUp method
+  /// TiltUp method
-        /// </summary>
+  /// </summary>
-        public void TiltUp()
+		public void TiltUp() 
-        {
+		{
             SendPanTiltCommand(new byte[] { 0x03, 0x01 }, false);
-            // IsMoving = true;
+			// IsMoving = true;
-        }
+		}
         /// <summary>
         /// TiltStop method
         /// </summary>
@@ -544,28 +517,28 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             Stop();
         }
 
-        private void SendZoomCommand(byte cmd)
+		private void SendZoomCommand (byte cmd)
-        {
+		{
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x07, cmd, 0xFF });
+			SendBytes(new byte[] {ID, 0x01, 0x04, 0x07, cmd, 0xFF} );
-        }
+		}
 
 
-        /// <summary>
+  /// <summary>
-        /// ZoomIn method
+  /// ZoomIn method
-        /// </summary>
+  /// </summary>
-        public void ZoomIn()
+		public void ZoomIn() 
-        {
+		{
             SendZoomCommand(ZoomInCmd);
-            IsZooming = true;
+			IsZooming = true;
-        }
+		}
-        /// <summary>
+  /// <summary>
-        /// ZoomOut method
+  /// ZoomOut method
-        /// </summary>
+  /// </summary>
-        public void ZoomOut()
+		public void ZoomOut() 
-        {
+		{
             SendZoomCommand(ZoomOutCmd);
-            IsZooming = true;
+			IsZooming = true;
-        }
+		}
         /// <summary>
         /// ZoomStop method
         /// </summary>
@@ -574,23 +547,23 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             Stop();
         }
 
-        /// <summary>
+  /// <summary>
-        /// Stop method
+  /// Stop method
-        /// </summary>
+  /// </summary>
-        public void Stop()
+		public void Stop() 
-        {
+		{
-            if (IsZooming)
+			if (IsZooming)
-            {
+			{
                 SendZoomCommand(ZoomStopCmd);
-                IsZooming = false;
+				IsZooming = false;
-            }
+			}
-            else
+			else
-            {
+			{
                 StopSpeedTimer();
                 SendPanTiltCommand(new byte[] { 0x03, 0x03 }, false);
-                // IsMoving = false;
+				// IsMoving = false;
-            }
+			}
-        }
+		}
         /// <summary>
         /// PositionHome method
         /// </summary>
@@ -599,39 +572,33 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             SendBytes(new byte[] { ID, 0x01, 0x06, 0x02, PanSpeedFast, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF });
             SendBytes(new byte[] { ID, 0x01, 0x04, 0x47, 0x00, 0x00, 0x00, 0x00, 0xFF });
         }
-        /// <summary>
+  /// <summary>
-        /// RecallPreset method
+  /// RecallPreset method
-        /// </summary>
+  /// </summary>
-        public void RecallPreset(int presetNumber)
+		public void RecallPreset(int presetNumber)
-        {
+		{
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x3F, 0x02, (byte)presetNumber, 0xFF });
+			SendBytes(new byte[] {ID, 0x01, 0x04, 0x3F, 0x02, (byte)presetNumber, 0xFF} );
-        }
+		}
-        /// <summary>
+  /// <summary>
-        /// SavePreset method
+  /// SavePreset method
-        /// </summary>
+  /// </summary>
-        public void SavePreset(int presetNumber)
+		public void SavePreset(int presetNumber)
-        {
+		{
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
+			SendBytes(new byte[] { ID, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
-        }
+		}
 
         #region IHasCameraPresets Members
 
-        /// <summary>
-        /// Event that is raised when the presets list has changed
-        /// </summary>
         public event EventHandler<EventArgs> PresetsListHasChanged;
 
-        /// <summary>
+		protected void OnPresetsListHasChanged()
-        /// Raises the PresetsListHasChanged event
+		{
-        /// </summary>
+			var handler = PresetsListHasChanged;
-        protected void OnPresetsListHasChanged()
+			if (handler == null)
-        {
+				return;
-            var handler = PresetsListHasChanged;
-            if (handler == null)
-                return;
 
-            handler.Invoke(this, EventArgs.Empty);
+			handler.Invoke(this, EventArgs.Empty);
-        }
+		}
 
         /// <summary>
         /// Gets or sets the Presets
@@ -774,9 +741,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public class CameraViscaFactory : EssentialsDeviceFactory<CameraVisca>
     {
-        /// <summary>
-        /// Initializes a new instance of the CameraViscaFactory class
-        /// </summary>
         public CameraViscaFactory()
         {
             TypeNames = new List<string>() { "cameravisca" };
@@ -804,9 +768,11 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     {
         /// <summary>
         /// Control ID of the camera (1-7)
-        /// Gets or sets the Id
         /// </summary>
         [JsonProperty("id")]
+        /// <summary>
+        /// Gets or sets the Id
+        /// </summary>
         public uint Id { get; set; }
 
         /// <summary>
@@ -824,7 +790,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         /// <summary>
         /// Slow tilt speed (0-18)
         /// </summary>
-        [JsonProperty("tiltSpeedSlow")]
+        [JsonProperty("tiltSpeedSlow")] 
         public uint TiltSpeedSlow { get; set; }
 
         /// <summary>

src/PepperDash.Essentials.Devices.Common/Cameras/IHasCameraPresets.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
@@ -8,27 +11,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraPresets
     {
-        /// <summary>
-        /// Event that is raised when the presets list has changed
-        /// </summary>
         event EventHandler<EventArgs> PresetsListHasChanged;
 
-        /// <summary>
-        /// Gets the list of camera presets
-        /// </summary>
         List<CameraPreset> Presets { get; }
 
-        /// <summary>
-        /// Selects the specified preset
-        /// </summary>
-        /// <param name="preset">The preset number to select</param>
         void PresetSelect(int preset);
 
-        /// <summary>
-        /// Stores a preset at the specified location with the given description
-        /// </summary>
-        /// <param name="preset">The preset number to store</param>
-        /// <param name="description">The description for the preset</param>
         void PresetStore(int preset, string description);
     }
 }

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/CameraSelectedEventArgs.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Event arguments for the CameraSelected event
-    /// </summary>
-    [Obsolete("Use CameraSelectedEventArgs<T> instead. This class will be removed in a future version")]
-    public class CameraSelectedEventArgs : EventArgs
-    {
-        /// Gets or sets the SelectedCamera
-        /// </summary>
-        public CameraBase SelectedCamera { get; private set; }
-
-        /// <summary>
-        /// Constructor for CameraSelectedEventArgs
-        /// </summary>
-        /// <param name="camera"></param>
-        public CameraSelectedEventArgs(CameraBase camera)
-        {
-            SelectedCamera = camera;
-        }
-    }
-
-    /// <summary>
-    /// Event arguments for the CameraSelected event
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class CameraSelectedEventArgs<T> : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the SelectedCamera
-        /// </summary>
-        public T SelectedCamera { get; private set; }
-
-        /// <summary>
-        /// Constructor for CameraSelectedEventArgs
-        /// </summary>
-        /// <param name="camera"></param>
-        public CameraSelectedEventArgs(T camera)
-        {
-            SelectedCamera = camera;
-        }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IAmFarEndCamera.cs

@@ -1,12 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Defines the contract for IAmFarEndCamera
-    /// </summary>
-    public interface IAmFarEndCamera : IKeyName
-    {
-
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/ICameraCapabilities.cs

@@ -1,86 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for camera capabilities
-    /// </summary>
-    public interface ICameraCapabilities: IKeyName
-    {
-        /// <summary>
-        /// Indicates whether the camera can pan
-        /// </summary>
-        [JsonProperty("canPan", NullValueHandling = NullValueHandling.Ignore)]
-        bool CanPan { get;  }
-
-        /// <summary>
-        /// Indicates whether the camera can tilt
-        /// </summary>
-        [JsonProperty("canTilt", NullValueHandling = NullValueHandling.Ignore)]
-         bool CanTilt { get; }
-
-        /// <summary>
-        /// Indicates whether the camera can zoom
-        /// </summary>
-        [JsonProperty("canZoom", NullValueHandling = NullValueHandling.Ignore)]
-        bool CanZoom { get;  }
-
-
-        /// <summary>
-        /// Indicates whether the camera can focus
-        /// </summary>
-        [JsonProperty("canFocus", NullValueHandling = NullValueHandling.Ignore)]
-        bool CanFocus { get;  }
-    }
-
-    /// <summary>
-    /// Indicates the capabilities of a camera
-    /// </summary>
-    public class CameraCapabilities : ICameraCapabilities
-    {
-
-        /// <summary>
-        /// Unique Key
-        /// </summary>
-        [JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
-        public string Key { get; set; }
-
-        /// <summary>
-        /// Isn't it obvious :)
-        /// </summary>
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
-        public string Name { get; set; }
-
-
-        /// <summary>
-        /// Indicates whether the camera can pan
-        /// </summary>
-        [JsonProperty("canPan", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CanPan { get; set; }
-
-        /// <summary>
-        /// Indicates whether the camera can tilt
-        /// </summary>
-        [JsonProperty("canTilt", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CanTilt { get; set; }
-
-        /// <summary>
-        /// Indicates whether the camera can zoom
-        /// </summary>
-        [JsonProperty("canZoom", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CanZoom { get; set; }
-
-
-        /// <summary>
-        /// Indicates whether the camera can focus
-        /// </summary>
-        [JsonProperty("canFocus", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CanFocus { get; set; }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasAutoFocusMode.cs

@@ -1,24 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for devices that have auto focus mode control
-    /// </summary>
-    public interface IHasAutoFocusMode : IHasCameraControls
-    {
-        /// <summary>
-        /// Sets the focus mode to auto or manual, or toggles between them.
-        /// </summary>
-        void SetFocusModeAuto();
-
-        /// <summary>
-        /// Sets the focus mode to manual, allowing for manual focus adjustments.
-        /// </summary>
-        void SetFocusModeManual();
-
-        /// <summary>
-        /// Toggles the focus mode between auto and manual.
-        /// </summary>
-        void ToggleFocusMode();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraAutoMode.cs

@@ -1,31 +0,0 @@
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-
-    /// <summary>
-    /// Interface for devices that have camera auto mode control
-    /// </summary>
-    public interface IHasCameraAutoMode : IHasCameraControls
-    {
-        /// <summary>
-        /// Enables or disables the camera's auto mode, which may include automatic adjustments for focus, exposure, and other settings.
-        /// </summary>
-        void CameraAutoModeOn();
-
-        /// <summary>
-        /// Disables the camera's auto mode, allowing for manual control of camera settings.
-        /// </summary>
-        void CameraAutoModeOff();
-
-        /// <summary>
-        /// Toggles the camera's auto mode state. If the camera is in auto mode, it will switch to manual mode, and vice versa.
-        /// </summary>
-        void CameraAutoModeToggle();
-
-        /// <summary>
-        /// Feedback that indicates whether the camera's auto mode is currently enabled.
-        /// </summary>
-        BoolFeedback CameraAutoModeIsOnFeedback { get; }
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraControls.cs

@@ -1,13 +0,0 @@
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-
-    /// <summary>
-    /// Interface for devices that have camera controls
-    /// </summary>
-    public interface IHasCameraControls : IKeyName
-    {
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraFocusControl.cs

@@ -1,29 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Defines the contract for IHasCameraFocusControl
-    /// </summary>
-    public interface IHasCameraFocusControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Focuses the camera near
-        /// </summary>
-        void FocusNear();
-
-        /// <summary>
-        /// Focuses the camera far
-        /// </summary>
-        void FocusFar();
-
-        /// <summary>
-        /// Stops the camera focus movement
-        /// </summary>
-        void FocusStop();
-
-        /// <summary>
-        /// Triggers the camera's auto focus functionality, if available.
-        /// </summary>
-        void TriggerAutoFocus();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraMute.cs

@@ -1,31 +0,0 @@
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Describes the ability to mute and unmute camera video
-    /// </summary>
-    public interface IHasCameraMute : IKeyName
-    {
-        /// <summary>
-        /// Feedback that indicates whether the camera is muted
-        /// </summary>
-        BoolFeedback CameraIsMutedFeedback { get; }
-
-        /// <summary>
-        /// Mutes the camera video, preventing it from being sent to the far end
-        /// </summary>
-        void CameraMuteOn();
-
-        /// <summary>
-        /// Unmutes the camera video, allowing it to be sent to the far end
-        /// </summary>
-        void CameraMuteOff();
-
-        /// <summary>
-        /// Toggles the camera mute state. If the camera is muted, it will be unmuted, and vice versa.
-        /// </summary>
-        void CameraMuteToggle();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraMuteWithUnmuteRequest.cs

@@ -1,16 +0,0 @@
-using System;
-
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for devices that can mute and unmute their camera video, with an event for unmute requests
-    /// </summary>
-    public interface IHasCameraMuteWithUnmuteReqeust : IHasCameraMute
-    {
-        /// <summary>
-        /// Event that is raised when a video unmute is requested, typically by the far end
-        /// </summary>
-        event EventHandler VideoUnmuteRequested;
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraOff.cs

@@ -1,27 +0,0 @@
-using PepperDash.Essentials.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-
-
-    /// <summary>
-    /// To be implmented on codecs that can disable their camera(s) to blank the near end video
-    /// </summary>
-    public interface IHasCameraOff : IHasCameraControls
-    {
-        /// <summary>
-        /// Feedback that indicates whether the camera is off
-        /// </summary>
-        BoolFeedback CameraIsOffFeedback { get; }
-
-        /// <summary>
-        /// Turns the camera off, blanking the near end video
-        /// </summary>
-        void CameraOff();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraPanControl.cs

@@ -1,24 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for camera pan control
-    /// </summary>
-    public interface IHasCameraPanControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Pans the camera left
-        /// </summary>
-        void PanLeft();
-
-        /// <summary>
-        /// Pans the camera right
-        /// </summary>
-        void PanRight();
-
-        /// <summary>
-        /// Stops the camera pan movement
-        /// </summary>
-        void PanStop();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraPtzControl.cs

@@ -1,14 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Defines the contract for IHasCameraPtzControl
-    /// </summary>
-    public interface IHasCameraPtzControl : IHasCameraPanControl, IHasCameraTiltControl, IHasCameraZoomControl
-    {
-        /// <summary>
-        /// Resets the camera position
-        /// </summary>
-        void PositionHome();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraTiltControl.cs

@@ -1,24 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Defines the contract for IHasCameraTiltControl
-    /// </summary>
-    public interface IHasCameraTiltControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Tilts the camera down
-        /// </summary>
-        void TiltDown();
-
-        /// <summary>
-        /// Tilts the camera up
-        /// </summary>
-        void TiltUp();
-
-        /// <summary>
-        /// Stops the camera tilt movement
-        /// </summary>
-        void TiltStop();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameraZoomControl.cs

@@ -1,24 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Defines the contract for IHasCameraZoomControl
-    /// </summary>
-    public interface IHasCameraZoomControl : IHasCameraControls
-    {
-        /// <summary>
-        /// Zooms the camera in
-        /// </summary>
-        void ZoomIn();
-
-        /// <summary>
-        /// Zooms the camera out
-        /// </summary>
-        void ZoomOut();
-
-        /// <summary>
-        /// Stops the camera zoom movement
-        /// </summary>
-        void ZoomStop();
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCameras.cs

@@ -1,41 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for devices that have cameras
-    /// </summary>
-    [Obsolete("Use IHasCamerasWithControls instead. This interface will be removed in a future version")]
-    public interface IHasCameras : IKeyName
-    {
-        /// <summary>
-        /// Event that is raised when a camera is selected
-        /// </summary>
-        event EventHandler<CameraSelectedEventArgs> CameraSelected;
-
-        /// <summary>
-        /// List of cameras on the device.  This should be a list of CameraBase objects
-        /// </summary>
-        List<CameraBase> Cameras { get; }
-
-        /// <summary>
-        /// The currently selected camera.  This should be a CameraBase object
-        /// </summary>
-        CameraBase SelectedCamera { get; }
-
-        /// <summary>
-        /// Feedback that indicates the currently selected camera
-        /// </summary>
-        StringFeedback SelectedCameraFeedback { get; }
-
-        /// <summary>
-        /// Selects a camera from the list of available cameras based on the provided key.
-        /// </summary>
-        /// <param name="key">The unique identifier or name of the camera to select.</param>
-        void SelectCamera(string key);
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCamerasWithControls.cs

@@ -1,40 +0,0 @@
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using System;
-using System.Collections.Generic;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for devices that have cameras with controls
-    /// </summary>
-    public interface IHasCamerasWithControls : IKeyName, IKeyed
-    {
-        /// <summary>
-        /// List of cameras on the device. This should be a list of IHasCameraControls objects
-        /// </summary>
-        
-        List<IHasCameraControls> Cameras { get; }
-
-        /// <summary>
-        /// The currently selected camera. This should be an IHasCameraControls object
-        /// </summary>
-        IHasCameraControls SelectedCamera { get; }
-
-        /// <summary>
-        /// Feedback that indicates the currently selected camera
-        /// </summary>
-        StringFeedback SelectedCameraFeedback { get; }
-
-        /// <summary>
-        /// Event that is raised when a camera is selected
-        /// </summary>
-        event EventHandler<CameraSelectedEventArgs<IHasCameraControls>> CameraSelected;
-
-        /// <summary>
-        /// Selects a camera from the list of available cameras based on the provided key.
-        /// </summary>
-        /// <param name="key"></param>
-        void SelectCamera(string key);
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasCodecCameras.cs

@@ -1,13 +0,0 @@
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-
-    /// <summary>
-    /// Defines the contract for IHasCodecCameras
-    /// </summary>
-    public interface IHasCodecCameras : IHasCameras, IHasFarEndCameraControl
-    {
-
-    }
-
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/IHasFarEndCameraControl.cs

@@ -1,23 +0,0 @@
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Interface for devices that have a far end camera control
-    /// </summary>
-    public interface IHasFarEndCameraControl : IKeyName
-    {
-        /// <summary>
-        /// Gets the far end camera, which is typically a CameraBase object that represents the camera at the far end of a call
-        /// </summary>
-        CameraBase FarEndCamera { get; }
-
-        /// <summary>
-        /// Feedback that indicates whether the far end camera is being controlled
-        /// </summary>
-        BoolFeedback ControllingFarEndCameraFeedback { get; }
-
-    }
-}

src/PepperDash.Essentials.Devices.Common/Cameras/Interfaces/eCameraControlMode.cs

@@ -1,24 +0,0 @@
-
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Enum for camera control modes
-    /// </summary>
-    public enum eCameraControlMode
-    {
-        /// <summary>
-        /// Manual control mode, where the camera is controlled directly by the user or system
-        /// </summary>
-        Manual = 0,
-        /// <summary>
-        /// Off control mode, where the camera is turned off or disabled
-        /// </summary>
-        Off,
-        /// <summary>
-        ///  Auto control mode, where the camera automatically adjusts settings based on the environment or conditions
-        /// </summary>
-        Auto
-    }
-
-}

src/PepperDash.Essentials.Devices.Common/Codec/Call.cs

@@ -1,26 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a Call
-  /// </summary>
-  public class Call
-  {
-    /// <summary>
-    /// Gets or sets the Number
-    /// </summary>
-    public string Number { get; set; }
-    /// <summary>
-    /// Gets or sets the Protocol
-    /// </summary>
-    public string Protocol { get; set; }
-    /// <summary>
-    /// Gets or sets the CallRate
-    /// </summary>
-    public string CallRate { get; set; }
-    /// <summary>
-    /// Gets or sets the CallType
-    /// </summary>
-    public string CallType { get; set; }
-  }
-
-}